diff --git a/app/Http/Controllers/Api/FileController.php b/app/Http/Controllers/Api/FileController.php index 2510b431..98b823a1 100755 --- a/app/Http/Controllers/Api/FileController.php +++ b/app/Http/Controllers/Api/FileController.php @@ -420,12 +420,19 @@ class FileController extends AbstractController 'doc', 'docx' => "word", 'xls', 'xlsx' => "excel", 'ppt', 'pptx' => "ppt", - 'txt', 'html', 'htm', 'asp', 'jsp', 'xml', 'json', 'properties', 'md', 'gitignore', 'log', 'java', 'py', 'c', 'cpp', 'sql', 'sh', 'bat', 'm', 'bas', 'prg', 'cmd' => "text", - 'jpg', 'jpeg', 'png', 'gif' => 'image', - 'zip', 'rar', 'jar', 'tar', 'gzip' => 'compress', - 'mp3', 'wav', 'mp4', 'flv' => 'media', - 'pdf' => 'pdf', - 'dwg' => 'cad', + + 'wps' => "wps", // + 'jpg', 'jpeg', 'png', 'gif', 'bmp', 'ico', 'raw' => "picture", + 'rar', 'zip', 'jar', '7-zip', 'tar', 'gzip', '7z' => "archive", + 'tif', 'tiff' => "tif", // + 'dwg', 'dxf' => "cad", + 'ofd' => "ofd", // + 'pdf' => "pdf", + 'txt' => "txt", + 'html', 'htm', 'asp', 'jsp', 'xml', 'json', 'properties', 'md', 'gitignore', 'log', 'java', 'py', 'c', 'cpp', 'sql', 'sh', 'bat', 'm', 'bas', 'prg', 'cmd', + 'php', 'go', 'python', 'js', 'ftl', 'css', 'lua', 'rb', 'yaml', 'yml', 'h', 'cs', 'aspx' => "code", + 'mp3', 'wav', 'mp4', 'flv', + 'avi', 'mov', 'wmv', 'mkv', '3gp', 'rm' => "media", default => "", }; $file = File::createInstance([ diff --git a/app/Module/Base.php b/app/Module/Base.php index 59a14b22..0d48a6c3 100755 --- a/app/Module/Base.php +++ b/app/Module/Base.php @@ -2226,13 +2226,18 @@ class Base break; case 'more': $type = [ - 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', - 'txt', 'html', 'htm', 'asp', 'jsp', 'xml', 'json', 'properties', 'md', 'gitignore', 'log', 'java', 'py', 'c', 'cpp', 'sql', 'sh', 'bat', 'm', 'bas', 'prg', 'cmd', - 'jpg', 'jpeg', 'png', 'gif', - 'zip', 'rar', 'jar', 'tar', 'gzip', - 'mp3', 'wav', 'mp4', 'flv', + 'docx', 'wps', 'doc', 'xls', 'xlsx', 'ppt', 'pptx', + 'jpg', 'jpeg', 'png', 'gif', 'bmp', 'ico', 'raw', + 'rar', 'zip', 'jar', '7-zip', 'tar', 'gzip', '7z', + 'tif', 'tiff', + 'dwg', 'dxf', + 'ofd', 'pdf', - 'dwg' + 'txt', + 'html', 'htm', 'asp', 'jsp', 'xml', 'json', 'properties', 'md', 'gitignore', 'log', 'java', 'py', 'c', 'cpp', 'sql', 'sh', 'bat', 'm', 'bas', 'prg', 'cmd', + 'php', 'go', 'python', 'js', 'ftl', 'css', 'lua', 'rb', 'yaml', 'yml', 'h', 'cs', 'aspx', + 'mp3', 'wav', 'mp4', 'flv', + 'avi', 'mov', 'wmv', 'mkv', '3gp', 'rm', ]; break; default: diff --git a/public/images/file/txt.svg b/public/images/file/txt.svg new file mode 100644 index 00000000..bf3fa7c8 --- /dev/null +++ b/public/images/file/txt.svg @@ -0,0 +1 @@ + diff --git a/resources/assets/js/pages/manage/file.vue b/resources/assets/js/pages/manage/file.vue index 16d923fc..99ed7a56 100644 --- a/resources/assets/js/pages/manage/file.vue +++ b/resources/assets/js/pages/manage/file.vue @@ -296,13 +296,18 @@ export default { uploadDir: false, uploadIng: 0, uploadFormat: [ - 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', - 'txt', 'html', 'htm', 'asp', 'jsp', 'xml', 'json', 'properties', 'md', 'gitignore', 'log', 'java', 'py', 'c', 'cpp', 'sql', 'sh', 'bat', 'm', 'bas', 'prg', 'cmd', - 'jpg', 'jpeg', 'png', 'gif', - 'zip', 'rar', 'jar', 'tar', 'gzip', - 'mp3', 'wav', 'mp4', 'flv', + 'docx', 'wps', 'doc', 'xls', 'xlsx', 'ppt', 'pptx', + 'jpg', 'jpeg', 'png', 'gif', 'bmp', 'ico', 'raw', + 'rar', 'zip', 'jar', '7-zip', 'tar', 'gzip', '7z', + 'tif', 'tiff', + 'dwg', 'dxf', + 'ofd', 'pdf', - 'dwg' + 'txt', + 'html', 'htm', 'asp', 'jsp', 'xml', 'json', 'properties', 'md', 'gitignore', 'log', 'java', 'py', 'c', 'cpp', 'sql', 'sh', 'bat', 'm', 'bas', 'prg', 'cmd', + 'php', 'go', 'python', 'js', 'ftl', 'css', 'lua', 'rb', 'yaml', 'yml', 'h', 'cs', 'aspx', + 'mp3', 'wav', 'mp4', 'flv', + 'avi', 'mov', 'wmv', 'mkv', '3gp', 'rm', ], uploadAccept: '', maxSize: 204800, diff --git a/resources/assets/statics/public/images/file/compress.svg b/resources/assets/statics/public/images/file/archive.svg similarity index 100% rename from resources/assets/statics/public/images/file/compress.svg rename to resources/assets/statics/public/images/file/archive.svg diff --git a/resources/assets/statics/public/images/file/text.svg b/resources/assets/statics/public/images/file/code.svg similarity index 100% rename from resources/assets/statics/public/images/file/text.svg rename to resources/assets/statics/public/images/file/code.svg diff --git a/resources/assets/statics/public/images/file/image.svg b/resources/assets/statics/public/images/file/picture.svg similarity index 100% rename from resources/assets/statics/public/images/file/image.svg rename to resources/assets/statics/public/images/file/picture.svg diff --git a/resources/assets/statics/public/images/file/txt.svg b/resources/assets/statics/public/images/file/txt.svg new file mode 100644 index 00000000..bf3fa7c8 --- /dev/null +++ b/resources/assets/statics/public/images/file/txt.svg @@ -0,0 +1 @@ +