diff --git a/app/admin/service/initAdminData/SystemConfig.php b/app/admin/service/initAdminData/SystemConfig.php
index 2efad4a..fc836c2 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" => "doc,gif,ico,icon,jpg,mp3,mp4,p12,pem,png,rar,jpeg",
+ "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",
"remark" => "允许上传的文件类型",
"sort" => 0,
),
diff --git a/app/admin/view/system/uploadfile/add.html b/app/admin/view/system/uploadfile/add.html
index ae1d0f1..18aa4fe 100644
--- a/app/admin/view/system/uploadfile/add.html
+++ b/app/admin/view/system/uploadfile/add.html
@@ -6,7 +6,7 @@
diff --git a/public/static/admin/images/upload-icons/xls.png b/public/static/admin/images/upload-icons/excel.png
similarity index 100%
rename from public/static/admin/images/upload-icons/xls.png
rename to public/static/admin/images/upload-icons/excel.png
diff --git a/public/static/admin/images/upload-icons/mp3.png b/public/static/admin/images/upload-icons/music.png
similarity index 100%
rename from public/static/admin/images/upload-icons/mp3.png
rename to public/static/admin/images/upload-icons/music.png
diff --git a/public/static/admin/images/upload-icons/rar.png b/public/static/admin/images/upload-icons/rar.png
deleted file mode 100644
index 8d5e449..0000000
Binary files a/public/static/admin/images/upload-icons/rar.png and /dev/null differ
diff --git a/public/static/admin/images/upload-icons/mp4.png b/public/static/admin/images/upload-icons/video.png
similarity index 100%
rename from public/static/admin/images/upload-icons/mp4.png
rename to public/static/admin/images/upload-icons/video.png
diff --git a/public/static/admin/images/upload-icons/doc.png b/public/static/admin/images/upload-icons/word.png
similarity index 100%
rename from public/static/admin/images/upload-icons/doc.png
rename to public/static/admin/images/upload-icons/word.png
diff --git a/public/static/plugs/easy-admin/easy-admin.js b/public/static/plugs/easy-admin/easy-admin.js
index 049d7fe..26c5cd8 100644
--- a/public/static/plugs/easy-admin/easy-admin.js
+++ b/public/static/plugs/easy-admin/easy-admin.js
@@ -18,9 +18,43 @@ define(["jquery", "tableSelect", "ckeditor"], function ($, tableSelect, undefine
table_elem: '#currentTable',
table_render_id: 'currentTableRenderId',
upload_url: 'ajax/upload',
- upload_exts: 'doc|gif|ico|icon|jpg|mp3|mp4|p12|pem|png|rar',
+ upload_exts: '',
};
+
+ var extGroup = {
+ // 图片扩展名数组
+ 'image': ['jpg', 'jpeg', 'png', 'gif', 'bmp'],
+ // word扩展名数组
+ 'word': ['doc', 'docx'],
+ // excel扩展名数组
+ 'excel': ['xls', 'xlsx'],
+ // ppt扩展名数组
+ 'ppt': ['ppt', 'pptx'],
+ // pdf扩展名数组
+ 'pdf': ['pdf'],
+ // 压缩文件扩展名数组
+ 'zip': ['zip', 'rar', '7z'],
+ // 文本文件扩展名数组
+ 'txt': ['txt'],
+ // 音乐文件扩展名数组
+ 'music': ['mp3', 'wma', 'wav', 'mid', 'm4a'],
+ // 视频文件扩展名数组
+ 'video': ['mp4', 'avi', 'wmv', '3gp', 'flv'],
+ // visio扩展名数组
+ 'visio': ['vsd', 'vsdx'],
+ }
+
+ for (const extGroupName in extGroup) {
+ if (Object.hasOwnProperty.call(extGroup, extGroupName)) {
+ const extGroupList = extGroup[extGroupName];
+ if (init.upload_exts.length > 0) {
+ init.upload_exts += '|';
+ }
+ init.upload_exts += extGroupList.join('|')
+ }
+ }
+
var admin = {
config: {
shade: [0.02, '#000'],
@@ -373,18 +407,18 @@ define(["jquery", "tableSelect", "ckeditor"], function ($, tableSelect, undefine
d.elemIdName = d.fieldAlias;
- if (typeof d.fieldAlias == 'string' ) {
+ if (typeof d.fieldAlias == 'string') {
- if(d.fieldAlias.indexOf('[') == 0){
+ if (d.fieldAlias.indexOf('[') == 0) {
var fieldPlusArr = d.fieldAlias.replace('[').split(']');
-
+
d.elemIdName = fieldPlusArr.join('-')
}
d.elemIdName = d.elemIdName.replace('.', '-');
}
-
+
if (d.defaultSearchValue.length > 0) {
if (d.searchValue.length == 0) {
@@ -1659,7 +1693,32 @@ define(["jquery", "tableSelect", "ckeditor"], function ($, tableSelect, undefine
var parant = $(this).parent('div');
var liHtml = '';
$.each(urlArray, function (i, v) {
- liHtml += '
×\n';
+
+ // 获取链接扩展名
+ var ext = v.substr(v.lastIndexOf('.') + 1);
+
+ if (extGroup.image.indexOf(ext) != -1) {
+ // 是图片
+ liHtml += '×\n';
+
+ } else {
+ // 不是图片
+ // 遍历extGroup数组找到扩展名所在的索引
+
+ for (const extGroupName in extGroup) {
+ if (Object.hasOwnProperty.call(extGroup, extGroupName)) {
+ const extGroupList = extGroup[extGroupName];
+ if (extGroupList.indexOf(ext) != -1) {
+ uploadIcon = extGroupName;
+ break;
+ }
+ }
+ }
+
+ liHtml += '
×\n';
+
+ }
+
});
parant.after('');
}