From eb60d1ed7d56b49d83af11190c84fbcad754f138 Mon Sep 17 00:00:00 2001
From: ko1234 <ko.ko@mjmtech.com.tw>
Date: Fri, 22 Nov 2024 14:02:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=8F=9Bfavicon=20|=20=E4=B8=8A?=
 =?UTF-8?q?=E5=82=B3=E6=96=B0=E5=A2=9E=E6=AA=94=E6=A1=88=20ppt=E3=80=81zip?=
 =?UTF-8?q?=E3=80=81rar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/favicon.ico                 | Bin 9662 -> 4286 bytes
 src/components/customUI/Upload.vue |  21 +++++++++++++++++++--
 src/fontawsomeIconRegister.js      |   2 ++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/public/favicon.ico b/public/favicon.ico
index 8b5965f774a6367a8a0ce1a10d225579da0eb468..20ecae75b8bac2351e2bd501122c333ad1f15af6 100644
GIT binary patch
literal 4286
zcmc(j>2Fk37>CC%N<b{OfR;rT35Y?71~-g^*kIVy5J?GAAuQ40A0TR?(Zr<RT#@DN
z3`<++v?JYjhC)lH+f3~+FqWdw;?zo6N=1fl(4X%)cbPlanNAyxUUJ%*d)s;X+~0f7
zdoC8sef)3sY>W76u}`vCrdlkPCwTBF%W@v#ygc|?`~+nvCzP*EU%r&cBb7&>{_E%A
z`eq4EfA<Vd?Ou$k?-#+jXCW%~EkN1+c_>bsi$d!x<Q<rSV+W_farhBrr%%DrjCf>b
zPQu}%6LBzW0<78NKson=es}<MY&<A$BB)>zs3;*o#ZywLG%-=oRdxn{N5fYt`&+?&
zI>g?quuDi`=i6o~>_aL$U16sm5$y4>*;TefW#_8w!gw$nRPrdOY<dP&%+$Q0dDlp9
z16%i=GYaqVBY7+AQppBYJ_b5IN8a;)<{gLF-U&u;P=#cJoR8~y>)v~`yyvTVkK`Sv
z=56%mdmo;6ByZ4(d7!HKO0C7rTdlRQyqO&{?`Yl%n@%mnSiJ3eosZGGe7csm?oHJT
zK{bo?IzPUb=a^dO#d@8Gyd_)Kc^t|rl5ny%1y!z1aMo>vv;J*38&cqG+Kgh?TG&bw
zLwO6fo_EMwu<10<Z_Zn?_eIZJ@lHT_c@kRN_ThN-dJGK(5$PDZ8$|8dT_92CBY0Eo
zVvy@ug*^&y!S3ntVQ}bA)VkkC>&3K4czG_^-wk`s%i-Q97eM5#c?&kxFX44<bl!b^
z*L2?C&@GhItVY+h8vUI4#g&^LWV>Ef@)m40Z_S$;o&z<$pv<vodGng8d7D4K?Q$ln
zJUh&%_4oIN2hrM@4T|C|*wnO?*Ym&6Z<%*y0?PQF8@=@p=NEVH4WPmQDg5m=3=iKm
zUJ83%-S!F6xX#Sp<X#H$ydu}se4DAx*;}wh-Xk5szAGqg+<+Um{84|b_f9)<TQ<mA
zqk83@3va=uAD8QWEQkA;J$<t5V;PxoQN7Kej_z_ey*m-?zly$r8|WJ}jvjvBgL7S3
z(DK&21)ID{dLJ{g#kw}yqc?a7xeaSk=uSpa^ClFvY(|lH3yOSOd2C0~xp$G{T`z0R
z=q=cEW(9Qb%y<az!$%*KJ+vc`AM;P>8@P_r=66INGt~K$${bVYcQkMEtpJ@}8FtT&
z>v_qkmAHK;5cO{m>}vl9u)CJS(XbMZ#x-!bUx&l<CLGP{;AmM7$C+d}d>e77nOSPy
znzvxnxivUq^0sF4o<Z(g#^I!UdqloqS9;$=-TBWWUN@igU(J)XCfUB%q&NB3fLh-`
z#*t7Tv+Da6(L*P|RxlaeJxyUBr+Eu@|6p&}wMcJ*gV#}Z@k3c_B5%!Gu<86dJ#VA8
zU{n4>a=(^alZ0Er4*Ahz^%lQW-?;~AXV}@~O>OHy7v7S!7UrGH>^y}{g$b~hPDkVU
zFWB`aPXF`~kB>*?E!f?+{W##``>c7Z_gr`jHvOE;`?XNsB-pAq?^C&lPUU@KB5aj&
z;cefGtlDL=|A^0yb@cXkBKN}1DBe6De@O;i+Nji;gY!0dQwg(6xsR96kbO+B3p~lO
zu=;gZ=WbYitHWwd@n$xAOLlt-@6T1X(Oa<DTe6jXD(}^J@4&sJ`w#Dk>-{i>(b4OQ
z?cKrb%Ufc4hpjE#zwPc-IMKEXp1^({1W%_Gp5JWnbRC4}_d{sxN<&WDj@aIU{p(gW
z?}x>62|pJYy=N)wn(9r}hIOru_YSguzX)>kKBJj?NsF?cN3L^2-kNt{8%T@-W^<jJ
z^A7hmv1K1)c9Y6hdkKkoc6JrCwIyQSnzzOm&tw0Zw}CC^xA5lPE9%_rt?&g~JPYb|
z{-1d({8TENHiPRtiz*}K{gkqAiJAA9y+!sJJmfPl@6Qw2JC&b_0?K|(<ZWPw<-IJ_
eOQPki-E%R&&3Om51(=(vu|E_4J@7vrg8dgEgF%M?

literal 9662
zcmeI2F>c#H5Jg8Z5C=#A6DfjpVUYkS_XgGxbOarNH}IYy&=FLo<Pr7&DR=}HIRJ|k
zE(9_ElRL<QkSWRBC5^yik3Kovo&RR3QX(t-86)`2<>xn%Pa^UiiIQxQtatHM<m3B3
z`+`W@wy*hroI#0q=^~_=@jGDyuMMtaM1>|9GWGX*?_t9k$`}Kn2m7StS9ZlU-jC<j
zXmO$zzGv(?hU~<w0<R4Vk;0%)O#V~sifRL|Qi~I{#{MkmJ7tzJcE!~5qGzMUiCSX+
z6mIUlgq@gG;I(BTQWWU(oEb9gb5}Ch!0Xz*V^${Ud&w+huf`gVJX5b6YnqXD*F37R
zm`thJ$;7$Ur(hvcl<1><pHj|9|EXcoKt0^lX2E`*hxQ$6EOxas-YbVTT8yCDH{_4a
zPRt6a9z_IhZBgTbyxKbjyL#Ec$7wNwmcDOFcEvQ_D~C2(jGzU2>?8C!*P_A#@k!5E
z5%Vn0F<C6o8Qi(WFZ8+bGvrXtGd0&U&dGPJ{DSLPS<Ns*Dt4Yhk(fUvyS~FZ(F}92
zbB1*S{<+xo9qb~`FgH7A$dFZp8HVfzJzb*QqOYDmm0nZg6gz7vBjo3`eWuwG?DQP+
zXQ<Uz&aebK5jV&oKkwIkcwsEXUV`rwyViCW@Gr$)gDpG5&*xnCR4m0#o;6a>c}%(P
zR4mE91JD@r@Y#Maz>@40Sh6emxt`1#TU_XjIj+NJx+ayHz*`wE(TxYH2m7m3peOp;
zf%hfc;TnhiOs(-O=8Di){jb#=uq9IW*_q%Q_|RK@r)YsbneVlS&JpyS!aUq-e81fc
z@MUE7aF%Ui{s#TCg#7GHk5sWi<M6yvTpM`Q2?p5Dz#g6l&&ncQge=h`Lx%lduV3zY
z@Ky2scy)5i`=gT^>S5dKV=gP+H~3W%wf-#f0Cn$rwI4+8MUL`T<cr8b-iX|ZJjzX{
zjjXKPiqs;OCCC32Z}1Z(C?fAZ`=2fG5(Ztspo=?lBEERNr&_ps?fB8uD@+hIc@T|&
zuhYKmBYzzQ-vjJ>bwaKqFv;0+JC)lpNBaYcx!PaQ`#^u={sH%Ypx|i_|Fk==Bigdw
KV(d<V7wBL2vwuwh

diff --git a/src/components/customUI/Upload.vue b/src/components/customUI/Upload.vue
index b10c5f8..b5ce62d 100644
--- a/src/components/customUI/Upload.vue
+++ b/src/components/customUI/Upload.vue
@@ -9,7 +9,7 @@ const props = defineProps({
   getFileList: Function,
   multiple: Boolean,
   baseUrl: String,
-  formats: { type: String, default: "txt、doc、xls、pdf、png、jpg" }
+  formats: { type: String, default: "txt、doc、xls、pdf、png、jpg、ppt、zip、rar" },
 });
 
 const acceptFileType = [
@@ -26,6 +26,13 @@ const acceptFileType = [
   "application/msword",
   "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
   "application/vnd.ms-powerpoint",
+  ".ppt",
+  ".pptx",
+  ".zip",
+  ".rar",
+  "application/vnd.openxmlformats-officedocument.presentationml.presentation", // PowerPoint Files 2007+
+  "application/zip", // ZIP Files
+  "application/x-rar-compressed", // RAR Files
 ];
 
 const loading = ref(false);
@@ -237,6 +244,14 @@ const revokeURL = (src) => {
                     :icon="['fas', 'file-powerpoint']"
                   />
                 </template>
+                <template
+                  v-else-if="file.type?.match(/zip|rar/g) || file.ext?.match(/zip|rar/g)"
+                >
+                  <font-awesome-icon
+                    class="mx-auto mb-2 text-4xl text-white"
+                    :icon="['fas', 'file-archive']"
+                  />
+                </template>
                 <template
                   v-else-if="
                     !file.type?.match('image/*') &&
@@ -266,7 +281,9 @@ const revokeURL = (src) => {
           </div>
           <p class="text-2xl my-2">{{ $t("upload.title") }}</p>
           <p class="mb-0 col-grey">{{ $t("upload.description") }}</p>
-          <p class="mb-0 col-grey">{{ $t("upload.formats") }} : {{props.formats}}</p>
+          <p class="mb-0 col-grey">
+            {{ $t("upload.formats") }} : {{ props.formats }}
+          </p>
         </div>
       </div>
 
diff --git a/src/fontawsomeIconRegister.js b/src/fontawsomeIconRegister.js
index a2eae5a..84069cf 100644
--- a/src/fontawsomeIconRegister.js
+++ b/src/fontawsomeIconRegister.js
@@ -38,6 +38,7 @@ import {
   faFileExcel,
   faFileWord,
   faFilePowerpoint,
+  faFileArchive,
   faFileAlt,
   faDatabase,
   faBuilding,
@@ -97,6 +98,7 @@ library.add(
   faFileExcel,
   faFileWord,
   faFilePowerpoint,
+  faFileArchive,
   faFileAlt,
   faDatabase,
   faBuilding,