diff --git a/app/admin/service/curd/templates/view/module/image.code b/app/admin/service/curd/templates/view/module/image.code index 6ea3f3d..f735437 100644 --- a/app/admin/service/curd/templates/view/module/image.code +++ b/app/admin/service/curd/templates/view/module/image.code @@ -4,7 +4,7 @@
diff --git a/app/admin/service/curd/templates/view/module/images.code b/app/admin/service/curd/templates/view/module/images.code index b30a8e5..4bd8de8 100644 --- a/app/admin/service/curd/templates/view/module/images.code +++ b/app/admin/service/curd/templates/view/module/images.code @@ -4,7 +4,7 @@ diff --git a/app/admin/service/initAdminData/SystemConfig.php b/app/admin/service/initAdminData/SystemConfig.php index 30611cb..4b39b26 100644 --- a/app/admin/service/initAdminData/SystemConfig.php +++ b/app/admin/service/initAdminData/SystemConfig.php @@ -24,7 +24,7 @@ $ul_system_config = array( array( "name" => "upload_allow_ext", "group" => "upload", - "value" => "jpg,jpeg,png,gif,bmp,doc,docx,xls,xlsx,ppt,pptx,pdf,zip,rar,7z,txt,mp3,wma,wav,mid,m4a,mp4,avi,wmv,3gp,flv,webp", + "value" => "jpg,jpeg,png,gif,bmp,doc,docx,xls,xlsx,ppt,pptx,pdf,zip,rar,7z,txt,mp3,wma,wav,mid,m4a,mp4,avi,wmv,3gp,flv,webp,svg", "remark" => "允许上传的文件类型", "sort" => 0, ), diff --git a/app/admin/view/index/edit_admin.html b/app/admin/view/index/edit_admin.html index 622ac8f..61d583c 100644 --- a/app/admin/view/index/edit_admin.html +++ b/app/admin/view/index/edit_admin.html @@ -8,7 +8,7 @@ diff --git a/app/admin/view/mall/cate/add.html b/app/admin/view/mall/cate/add.html index 8dc76f0..8f52860 100644 --- a/app/admin/view/mall/cate/add.html +++ b/app/admin/view/mall/cate/add.html @@ -13,7 +13,7 @@ diff --git a/app/admin/view/mall/cate/edit.html b/app/admin/view/mall/cate/edit.html index e7bb1fb..caa1781 100644 --- a/app/admin/view/mall/cate/edit.html +++ b/app/admin/view/mall/cate/edit.html @@ -13,7 +13,7 @@ diff --git a/app/admin/view/mall/goods/add.html b/app/admin/view/mall/goods/add.html index 5225465..5e559d0 100644 --- a/app/admin/view/mall/goods/add.html +++ b/app/admin/view/mall/goods/add.html @@ -20,7 +20,7 @@ @@ -31,7 +31,7 @@ diff --git a/app/admin/view/mall/goods/edit.html b/app/admin/view/mall/goods/edit.html index 2f8d164..1da4cab 100644 --- a/app/admin/view/mall/goods/edit.html +++ b/app/admin/view/mall/goods/edit.html @@ -21,7 +21,7 @@ @@ -32,7 +32,7 @@ diff --git a/app/admin/view/system/admin/add.html b/app/admin/view/system/admin/add.html index 48f55df..5b8d8c9 100644 --- a/app/admin/view/system/admin/add.html +++ b/app/admin/view/system/admin/add.html @@ -6,7 +6,7 @@ diff --git a/app/admin/view/system/admin/edit.html b/app/admin/view/system/admin/edit.html index a1361ee..6dd1adb 100644 --- a/app/admin/view/system/admin/edit.html +++ b/app/admin/view/system/admin/edit.html @@ -6,7 +6,7 @@ diff --git a/app/admin/view/system/config/logo.html b/app/admin/view/system/config/logo.html index de8d031..9cb9ae1 100644 --- a/app/admin/view/system/config/logo.html +++ b/app/admin/view/system/config/logo.html @@ -13,7 +13,7 @@ diff --git a/public/static/plugs/easy-admin/easy-admin.js b/public/static/plugs/easy-admin/easy-admin.js index 316948e..4dedd9b 100644 --- a/public/static/plugs/easy-admin/easy-admin.js +++ b/public/static/plugs/easy-admin/easy-admin.js @@ -41,7 +41,7 @@ define(["jquery", "tableSelect", "ckeditor", 'miniTheme', 'tableData', 'citypick var extGroup = { // 图片扩展名数组 - 'image': ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'ico', 'webp'], + 'image': ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'ico', 'webp', 'svg'], // word扩展名数组 'word': ['doc', 'docx'], // excel扩展名数组 @@ -1975,6 +1975,11 @@ define(["jquery", "tableSelect", "ckeditor", 'miniTheme', 'tableData', 'citypick if (uploadExts == '*') { uploadExts = init.upload_exts; + }else if(uploadExts.charAt(0) == '*'){ + var extGroupName = uploadExts.slice(1); + if(extGroup[extGroupName]){ + uploadExts = extGroup[extGroupName].join('|'); + } } // 监听上传事件