From d3046f9744e6c84a7c74e9311da1edbb943ec500 Mon Sep 17 00:00:00 2001 From: augushong Date: Sat, 28 May 2022 15:00:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=87=E4=BB=B6=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=EF=BC=9A=E6=94=AF=E6=8C=81=E6=9B=B4=E5=A4=9A=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=89=A9=E5=B1=95=E3=80=81=E6=94=AF=E6=8C=81=E6=9B=B4?= =?UTF-8?q?=E5=A5=BD=E7=9A=84=E9=A2=84=E8=A7=88=E4=BD=93=E9=AA=8C=EF=BC=88?= =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E9=80=9A=E8=BF=87=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E6=9D=A5=E9=99=90=E5=88=B6=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=89=93=E5=BC=80=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/initAdminData/SystemConfig.php | 2 +- app/admin/view/system/uploadfile/add.html | 2 +- .../upload-icons/{xls.png => excel.png} | Bin .../upload-icons/{mp3.png => music.png} | Bin .../static/admin/images/upload-icons/rar.png | Bin 15368 -> 0 bytes .../upload-icons/{mp4.png => video.png} | Bin .../images/upload-icons/{doc.png => word.png} | Bin public/static/plugs/easy-admin/easy-admin.js | 71 ++++++++++++++++-- 8 files changed, 67 insertions(+), 8 deletions(-) rename public/static/admin/images/upload-icons/{xls.png => excel.png} (100%) rename public/static/admin/images/upload-icons/{mp3.png => music.png} (100%) delete mode 100644 public/static/admin/images/upload-icons/rar.png rename public/static/admin/images/upload-icons/{mp4.png => video.png} (100%) rename public/static/admin/images/upload-icons/{doc.png => word.png} (100%) 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 8d5e449b3b9c569305b4fd4462f2f94fd3f5ef19..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15368 zcmeI3du$X%9LI+$YKw*NFhWE0a*c|@-tN77+q=`!E4Ip&rktTf64~y~wF`H<$L*H8 zqR~U6APPRfV0{~TC0L^%1bh)uFycGL7eTFx4@5MI?}|EmcfH$Auao+U|I8+LyTAF( z@B7>N%=~8epS`iA`QplostN!=Wm99Q6`gC0-)X0y|1CGvo`p{3iN^UF0AnT^zfs_> zdnN*N@RlXr2v%VEhM)?fv? z@+YMz-x`{gPlv34wNuv4f%QiKgl(NL;Ojb4|d#mO0@WO#|Wk&=Q-DOu7>A0 zlSr;7rV&;pIofT~Kr)_)-N`#VywhjaF!jVWPz6bXE{sUU+}ETdiF{N|#sxhn$Au2a zCX^08TWmD-EUYWOUX7_qbXzd!^s}X!O;Opk#y2UNE+`^w3I$PvO_n9z>x@Q)cCU+R z=OhQ?^4i^uuf`r_98!&)^GVKjPC)8I!iPwQRI$sbm%Oxuq{V2|?ew^Pj7xMx8CQ)Y zF*OcY!w5**m$k{UE>E?^xfy23VA*rkk^Z0+)bXzXV}(I^Qh`Po6O#oH=G=ELNn z6F4%;Iek<3@HtYQP$3mmPAc1Lco9vF>M0=!>pIYy7+JOFbO#6G3H+?_1c=H1!Bl9% z(tkD)BdespHxVUwrT=pxiYr;{6qF7q1=)c`JkT(*xy#My;OZLK6oyu#-*_nTsFKmD z60#L!_p?LVikWl$+l-2gb!Gc|9UMAXyYZh7HM{Z9`Q%Wu8xJi;UZ%);(2>uEHJhT0 zCueR`pNn4dV9?`sJKcU3Z^k29ek@;X=iVFimHYqMLAIwW} zVL-?x#YN_Wc_}Uo2-&2#$b2v_#f1SOn-mwB59Xz~Fd$@;;v)0Gyc8D(gltk=WImXe z;=+KCO^S=m2lG-~7!a~aagq68UWy9?LNIX3+`J?e*gR#`y%V45+3tMVc0+3gyJFleD?VQyJzoFYgA>4-OvA!Ow{8%AIM8se zvh}qu(|2vN`?qWchrpFbdRjJCo;J0tY5kmcr#)IedG*fT&^!J}&r9!r{p`vWnd)t; zDq1pSlO6!0r(HA(UGAAW>v+%0{g=%A@VO~_uJ`>RZN2n_GGWoL`)d>3@VA?$xVp|g ze)jzfLl2!;{qx>=TfggGRD1cWPo3JoZ^x%A_er5xXsjd7- z?bxbK+XBhA9++8qq<`%4=Dzp#Z{K;iZp`hs{P^pJw{MELoBOUl@6iRUeChAPsFRPK z(0kWEUIx!Nqc8|Gp0%0L<94rlKePF)vQ1Ci`^C7bc-c?C@Az)?F6FVS_Iz|l!~Tum a`oMx07kschem 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('
      \n' + liHtml + '
    '); }