From e693d15462371eef795a093e44e5f38fb0710565 Mon Sep 17 00:00:00 2001 From: raofuzi <2641346316@qq.com> Date: Wed, 17 Apr 2024 16:22:54 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components.d.ts | 9 +++++++++ src/assets/images/not-pass.png | Bin 0 -> 3889 bytes src/assets/images/pass.png | Bin 0 -> 3571 bytes src/layout/components/Header/RecycleModal.vue | 2 +- src/views/home/content/Content.vue | 11 ++++++----- src/views/task/content/Content.vue | 10 +++++----- src/views/worksheet/components/pictureCard.vue | 6 +++--- src/views/worksheet/content/Content.vue | 2 +- 8 files changed, 25 insertions(+), 15 deletions(-) create mode 100644 src/assets/images/not-pass.png create mode 100644 src/assets/images/pass.png diff --git a/components.d.ts b/components.d.ts index 298dbe9..6458938 100644 --- a/components.d.ts +++ b/components.d.ts @@ -11,6 +11,7 @@ declare module 'vue' { BasicModal: typeof import('./src/components/Modal/BasicModal.vue')['default'] DataHeader: typeof import('./src/components/DataHeader/index.vue')['default'] NAvatar: typeof import('naive-ui')['NAvatar'] + NBackTop: typeof import('naive-ui')['NBackTop'] NButton: typeof import('naive-ui')['NButton'] NCard: typeof import('naive-ui')['NCard'] NCheckbox: typeof import('naive-ui')['NCheckbox'] @@ -21,8 +22,11 @@ declare module 'vue' { NDialogProvider: typeof import('naive-ui')['NDialogProvider'] NDivider: typeof import('naive-ui')['NDivider'] NDropdown: typeof import('naive-ui')['NDropdown'] + NEllipsis: typeof import('naive-ui')['NEllipsis'] + NEmpty: typeof import('naive-ui')['NEmpty'] NForm: typeof import('naive-ui')['NForm'] NFormItem: typeof import('naive-ui')['NFormItem'] + NGi: typeof import('naive-ui')['NGi'] NGrid: typeof import('naive-ui')['NGrid'] NGridItem: typeof import('naive-ui')['NGridItem'] NImage: typeof import('naive-ui')['NImage'] @@ -31,6 +35,7 @@ declare module 'vue' { NModal: typeof import('naive-ui')['NModal'] NNotificationProvider: typeof import('naive-ui')['NNotificationProvider'] NotPassed: typeof import('./src/components/NotPassed.vue')['default'] + NPopconfirm: typeof import('naive-ui')['NPopconfirm'] NPopover: typeof import('naive-ui')['NPopover'] NPopselect: typeof import('naive-ui')['NPopselect'] NProgress: typeof import('naive-ui')['NProgress'] @@ -40,7 +45,11 @@ declare module 'vue' { NSpace: typeof import('naive-ui')['NSpace'] NSpin: typeof import('naive-ui')['NSpin'] NSwitch: typeof import('naive-ui')['NSwitch'] + NTabPane: typeof import('naive-ui')['NTabPane'] + NTabs: typeof import('naive-ui')['NTabs'] NTag: typeof import('naive-ui')['NTag'] + NTimeline: typeof import('naive-ui')['NTimeline'] + NTimelineItem: typeof import('naive-ui')['NTimelineItem'] NTooltip: typeof import('naive-ui')['NTooltip'] NUpload: typeof import('naive-ui')['NUpload'] NUploadDragger: typeof import('naive-ui')['NUploadDragger'] diff --git a/src/assets/images/not-pass.png b/src/assets/images/not-pass.png new file mode 100644 index 0000000000000000000000000000000000000000..dc4d19c53beeabb885ab122dd0115ad3150ca80c GIT binary patch literal 3889 zcmV-156Px@>q$gGRCr$PTWO3HRT@3@UPFthxGSP!92FdtL_yrf6$C*@V~;QsQ9+C`iqL?~ zqRxZ=APgm0E ze)aCXRdv4eoo}hz9$Jr`f`I2<)vvAH1G(Jg@clCQeplrDeF5Kt?<4r(k;|Fi@|nN& zISvcHvvXu_FkO$epOfb2&E;A$->xn95X@KC)8~V0^RnumWvqVq;C=~*4|txL6MR(X zc|xDl=*c(_TLEl>?=_+%^C;%eU*LJ31unW^40yk`b|`YWdyvcR6M?KAk~i!E8W_R> zB5j;D0D;hkiy6_qjxtaPWXipS*U(0H=Ev^Yf-RtGLWv=GE-;40PyZc`u|~=X$;jauH9N> zA$CsI(y}FhS)+q=0{d}M08g$>gU@U^w4AeVbJ5Ac`~lwN9g)j=!v zz{0#j;95Bl10>FOyiI#io{S{~f38Vf33w=j7ECP{p=LXB!Z|TLcUUa9WUF!H+r&(-aa@s8f>^I=Bfj&ZW0Bt~YkK*s}tb?fr8k(m7HOvYh*p_tIF z9kBP_z=n+}8H{4S3+Po>0d3jaZ211jc*^DI ztpIsoN1)dU;$u;imouT!#6?xg8J-dr+Y>Ln1gu+c9)h4>JqkGbXyC59fVba{m|A%a z(6wuH?PC6V=po?AC(TH*zWr`MO*PP|6L9_Yz{(HIbz_I4{UNwMP*+FbfE#ZF8XKeZ zw%GY}zig(z*U+%k^Q)@s;OB-I;H~y*0CiC9)(sdwyqHHWe$3r>18==$#_zHVaMdWF z+aH0ZCg8sNfLC8N4>*1t(4|YXZYE>z*8z^el$4lpx84fSuySfc2vIV&5 zCg6=XjBrbSC(jyRVxN+Z+c(>LDHpLAQJ{*9jo&wgajX=z1fDt2r(@rzz=F9<}emV}amjT9% z2HNck-1~Rn%P)bFHo%YzfI)+R@4ho0LxYOW%QY!AlO_Sj9cPS7!$0?Y#C$h}Ok@1A z#)JaP8YqCnEyyfEve}_t1A(71r4B#@e4eH|fmIBYsOfg>z(K&d{mg?+n+|;Od2+E7 z1U+jsop$onC6@rbdjmiJ3{02^Y~CDI!u#(JR8#marc*B1|E6DX(y=C-v!%E_bwd?y!0aQ(Z@h(TN4xo zOg>PbK0x1o)J+4zf9cW5A^5(TyxF#0rUO$z_4LvPEz`)*~s-}Oxjf@Pc~W2ym`QfADU6$ehYm3 zaWo^==izCU;|Cvo3;cE08OG}ZD6K*)1Ulyo83LSfMsyR?r$=d98ovfB^W5RE?CPyLnA9jl3#`>QrzIvKn1DB^6hJ z#hvR*a24QV-9@)rP3Z7xAi4foX94BqajpcwZvaj@2{`2x;GTPcAAX3WAeL|YK%d^g zKKn*2;rC?I^5ur{1b*X2VC>k)GygW-q@Ocp0*%Ye`J;{kX3dO%7kw=&GjSjcd;nJc z7kJ?Xb8h$Df#D;}HJ^Ff62h{U#))M$jrLjHBFm;nVV0!k^BQ4rCGc)mlVpUvwy)|g z_UZ*(L}q!0bxhlM5O~h3t~P<|i!XpX?f^dfEUG4j(FCk&Y9v!)LS{V=J_sD&1DH^0 z4EM?_5!+5Y5!h=llfiIZ9{har$rkuwk^bIti}3_~FeWhVsDaO6yT$e z%t+B`oyRksG+)O1IeC??(~5vd&16aq(@D3yx0Xt5IH|D%1_1s0n|oNh7MMRj(qaP7 zbdro`{?Fh=;O@NBJe1C8XrO-mEF%GQ?E)Njm`OJuc)&1z!h|?z&3y_r-h%Vz3xNGC z<5?3>rU?9Pw?$qsbqa983Bcz60prG6`Lgq4z}s|E?jbLIOzG!mGd7)^Jh=`Gt`b<~ zMMX^KC2LWElvxW|PVMEfdbP=&$+oI0b8gx+13cF{<{040D@_5yRE%T)vm#0n_4R0M zu05bXuyiT#z=J?f3p~?5rhbwHj2I3aa)=3dAFvVyzAmc0@z~@@yR+E%@ zgjq+<rgiRY#_^%%&Q*;pJHKN`Q&8~WZ%R$zIjU3Hr7OUu7Y+H|d&Zr^bk^qi7hfC! zfB*eJkDdm2dI~co8Baq~zCQmP`0+<`E%tnPA6nzp`-@<14ES3kIf;3P+_+5%3rbCq z{rphlCrmIc0~hd^5v;b;h1nW?e;;^24lrw$ zktnwxPbm<_&z=qRB=D0=I(hZg)|ftU!wn{#WU(gwlOUa(3PvCzTJdHvxV$Hx}j?FWshq}`!K&DEKVlLMqDOj}8)33O~ zJPZ3g@4olj`te~NPvC<*UcaBq+!W6DrkCOT~kxYTwYWPFg-==Bn$OwvkWJ*9)? zIhoA1?W~(jR>O1jAYnYmYv4J4@Zd=27cB;6|0CYM<;}2r%FL^KcO!NDTRdJHi3tNU zBz>?&K%)g7EbP$(3iR`h=G)*}NyZo1j}L>dGE!^@f(@?IEbvtX-o8l+-%6!a!Q!@j zS;1VIIlLT9`Pf%yCdDF*GD4up-pemHY-BTz`p=qz=_(ny{0-ozpW^z>_34q6BRTlO zg+ZR63W*33Gb`rwaxlAj{@=idA0$hRJVP*E8$j#7NKIvB@%{KbsgP!tVl)}g6psg) z#8-H7Lj~vCwHQEI8+`pW@Wd0Qnq>OPI^mgTfK{u2FE<+rU~0?OGntp$)`F%XC^f8- z`O~%(*rn9O1-Ulk1SNzZFIWH!9B8_ptPh@j)-=Dq`pUGGY209a)xhI5_`|nlT$|b1 z`VGLAUm^pC21v+iLa7-){UJC zq#sYPG4|-9DU_?cJ`L~4YCM78k$!xv zvh@upXZJP?qcpH-=C&WS>$*i7wRg=LlS%0Bv|PzUvNz7xfb?jQ7q=fy2_P%QNNnh_ zFrxPBe!Q?;&!?Qo+BAZ^q0%64*&4}AAnkhJrDeLD=kJWX>>f9+1^V$$u#L%zy?9b! z4vkhsKRz^8f^HVuPY+yZC(rjvyLk(_y+eTC(SH06&rf*+=6Xk1(5QxYUQ58@8xl?x zIXid0+R#McceEexN(Zzt*Ygk(BNd+xP7iA*%NKRtY#pVANCdGno3s}&W+ z_v76_>IO{-fJN_*cl1APevGv`QwYAW9k|r}=}~?y_nXwMEWV$f%=kj{JuiQowlBbM zPd{D*q`R8#4u!OFIz!RzhM1mP50bHNza>2H8p7GTxU=Vb-g0Cz`Tv;Uj~P?AA1^(L z-)nz-S{owFg_B+;TfKH=BbcMMUAOH1cAIcEvp?R;Y=xiW*11M_C68i3%D>|H<>jZM zsp%;I?PCR7He2r1*EeiW5!X7lcm&LUgp`-}K~vL`ZCj8^!>OJ(z+14uZnZ6b!Pb$* zAt1>x{Iaq^0O|plt+ts=Z?B<&yE$8r-vNOT_<;FkWq*O^Jp$k7X2esyg$rN%9j@8B zq^j>iF#Pk+zZALLY-F=Nz505)alI9*mPR1Pcv;*ZJa{zPw0VyIGSbo)Y+cVFkO;g< zeSI(KKayL4YZ(Mmfp3}RTUSX#pcVL?#Et(0bh#4p!E@W;00000NkvXXu0mjf8%={( literal 0 HcmV?d00001 diff --git a/src/assets/images/pass.png b/src/assets/images/pass.png new file mode 100644 index 0000000000000000000000000000000000000000..21c87eec24bd370d8d58770fab0e4bd8ccff18b8 GIT binary patch literal 3571 zcmVPx?tw}^dRA@u(T6=I*)gAusKJwVzgd~K7ghvuW$Ose!F^Gais>n;lYJrYgpB)B# z@leOw>5NXbZR)fI2NP68jDSEv1*BDmf=C6$`XVF{5|R)@Ad(l!CM28ep7x&CJ@@Vs zvXK6R++o?9z2}~Le&6r=J(dx&3ZMVbp41f1Rf!TOw|Ym2N3W8g#P3Ife-@Y zMtXt%#!o;ms(;fv#XUrh6?4#g^^bZVd!T$49Ye3{p8z`-2Vrxv%i>!fqW{jtzlLQn-@rxUhS-kfKPR7~V!hLcSZ)n&fF5|9NXKx_gGDJWa60uFn)Sd@NMo+|>Y zU@{O50gSmhxC{|0r1cuZ&OA<47=1nmSRE&yuUyl|8DkXXYY5n&L z2n04sW6c0Uni|)xV1ekXp3|+kbZco^M7M+x(y0*KV?SU>P*xY3o0d#iWhV{a8V zeS-G~Psc=e$^{>-4tTESGrV4ZNQU}2TLj)8G8@^E@wlseD-N{P1Tn>6rm<$h`1&!6 z;j%d~x9mM^Z7hLCeIQr9D&vJ$>D4?XZ__6jVU#;LmLq@!xS1(oHrD3Ax&b%iCeHwL zkpSkO`~(}D%cy{x2H%S7T?RmQXb7-)V>;Y62b`Ln{&xR~kFdGv7}pU&vLl)TbhRr9 z?SU@bSMecsG?yz5Sjl%x0yBSDKV}JBb_1Xw`7R8M9HDuRzAZwK$!ST4rurD=+yM_frZt3P~~f;nte8D9G>iVHR`+CvEch% z__*bSAv_NdZrHItV-{|XO^2TZu%K!u-l;D#-QnQ zz7X@`hG9@d4Bl%h#S_(g(BN-Z@+~#85IBepn=^06)YuHv_`Dc< zQS@@F--k|aT6>!-F}G|>7~Ek)HBZSJo{uv-RWoBYfP}*+Ar~Lqpn#-UY#Ljz9z{A#$Ki1=^9ruOaO7EsI^yc#0vI1YF*Ya_9^P5=ag>7HpnVKLT!ERf>DZJu1En2Jxcb;S3H+|iyD-6>f_arYu9u2q!i}M0{zLPu^8x#QKTaHrmYt1>RF+kV2{Kf22RF7Zw=n8`_@P*`5nCs z&}!+GMIIp&Db?(hI%s#sY>am$o7AF5u%$KoBtT964s2{>p<4(0_C7<<-|5EA=1Nrh znyE=7J6xC@mqh{6O-wNJ-`V$ItY!WU4aIn{Vh8nGk0*`8p9f8WFW|@2l6CmpTf@t1 zmI&7ODua%$=2m6xr<|_<1r{cZKzc+h6@H>C1*4)9v9hiZOHb{?%$Rg)V&NQ&L3y&> z^K|mH802L0=eSca+LZ(b(1+ap5xhV2ZcLBMM2)WnA2gI;-tjFG;D)ii2#~w@O`ZoStpZDb zgh{CsqP$Yo7n_?R06JutSo%zqbu=O8*m|k)k1~Ib@$MAdSNRW`73=q2>q^GXtU25V z<#B&y?nnLJ0+8B1wPUpKVNq*1GGvc zLEMIWQm`5+es0PQ+{6xH>8Ve-51NIJfFC8a(r3re$T(VNoai`Jf+rR8Dz;;5QyEPSa-#d=lk8t|fL2IW3MT2_ zFAe-DXHXFyDBmu7Pez|dw2TbJHjaA+(YD^ogNj%2W~xXQMH0reWHik}RnWQ*nkX5x zq-HN>#bjVp#w?V!H)3?jJCgPWK-*B(-Uz2=!ySFH@NCL;sP?sB*x}dAO?l3a7gKM< z(v<74q23ITk^KXA#%H57(22Hy4>zYRBdQnCH)am=mUfmyLb6o3jW01d$0@@<&lPQ{|+adOowe)tMcSMLex zM@4CNyq9%1Zi-FAzLqLXJGvfz1b05a`^kJ{M<<$4sOxM)+BeJK@2;)d1Kdmi@sMMx zYeKbR^>K-|NNgK&J4Q$MlaG0~@hJ4q^Zh5F%GZK>PVA7Z_{)IF7#Wp_7fyYKPU6R} z6GzkUy)9MParQW6fJjjF?|4Tfwr0&ijyqM(zq`2-zdHT_>blxYV7@SLGG@kQ$#Dn0 zC$YBf5cYdn9d;>)<}P|&#BaH4Ve0jUa)g9nOZrSqi%myuXB%Fv`xa018-qkgG`?;7 z0c#qH@O9g1oa$_)Z4SL*<|lsmc~PnRGrc0$drA&XLzK-9w=Dw4+Ku+=`XP5v)6to* zto9%tO&W)k2oFyBT2OH2I~?$Sk5fJ`n*8mwX{UeG#+>e>Y|v;2LGK8}*dtMLt{&~A zD=fTB0CBHl+F?+e^K52ofl@S%nI zlo<~sjzWI=blL{FrDPrUw^Sp^;lkgu?#6h}fQy=6FH8D;^)fn$Kdk#1K%&m#?Nzm@ zZH;jHwHYz#SerHtublY?FVuc6Yp4j=aDU$slv&x43FzyHLX0hfwETgsX5>bRv?S9>m%sd(ZIvIuSbvUQ{4t5j$-MX!-&!tB!y$fj52y`LsJVjv5 zbe5&J`#Tlw65JM-g*|60(Guv8o2kM_TBX#@m6?+UJAICxoR|+E@#9<|Jo5tJ)m(>H z(mY5U)F}(JEDiCHeQIT^S_q&5EZZig%|hcv1aL zy3kT^X{>xYg<+b7k!%Fty}3X?suyGqXA1f9g1azZmKvsgZ0?6-uSjkjs;|Xx0fnGa z-tOM-QJVh3kQJuUfYIZv;c!Im`B>BIFRsG8;9^zCZEBLS2LwkrDW&qh4vS9Ae5|jS zs10|<9@EPYAp=Cug}bDYpG_%PXTiRAucGr)( zB!PQ&vlq~+plP9B!OL8>;H3b;bLw0gw65~SdCs2Ae|e9hR*wEBugdFKAXj}$1GhCEN6w-qd}T}KG!LDOm~7Uf-B zRd|^JX)0MJ?|I&F;=9@{AQ)M(I6w0;ll7v+vDS1L`pV;x0lz=Dd~x2Qi<R5J@Wcpfwlku002ovPDHLkV1noPxZVH& literal 0 HcmV?d00001 diff --git a/src/layout/components/Header/RecycleModal.vue b/src/layout/components/Header/RecycleModal.vue index cd0f085..83a3238 100644 --- a/src/layout/components/Header/RecycleModal.vue +++ b/src/layout/components/Header/RecycleModal.vue @@ -732,7 +732,7 @@ watch(() => pagination.pageNo, (newVal, oldVal) => { > { return { imgUrl: item.imgurl, - thumburl: item.serverThumbnailUrl || item.imgurl || '', + thumburl: item.serverThumbnailUrl || item.imgurl || bgLoadingImg, upname: item.upname, ocrPictureclass: item.ocrPictureclass, uphead: item.uphead, @@ -726,13 +726,13 @@ defineExpose({ @@ -926,7 +926,8 @@ defineExpose({ width: 182px; border-radius: 7px; margin-bottom: 10px; - overflow: hidden; + overflow-x: visible; + // overflow-y: hidden; position: relative; transition: 0.5s; @@ -934,7 +935,7 @@ defineExpose({ width: 46px; height: 22px; position: absolute; - left: -1px; + left: -3px; top: 10px; } diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue index f507af0..62410a5 100644 --- a/src/views/task/content/Content.vue +++ b/src/views/task/content/Content.vue @@ -811,18 +811,18 @@ function sortHandler(orderby: 'similarityScore' | 'createdate') { flex: 1, // flex: 0.75, // 'background-image': `url(${taskDetailInfo?.ocrPicture?.imgurl})`, - background: `url(${taskDetailInfo?.ocrPicture?.imgurl}), url(${bgLoadingImg})`, + background: `url(${taskDetailInfo?.ocrPicture?.imgurl ? taskDetailInfo?.ocrPicture?.imgurl : bgLoadingImg})`, } : { height: '92vh', flex: 1, // 'background-image': `url(${taskDetailInfo?.ocrPicture?.imgurl})`, - background: `url(${taskDetailInfo?.ocrPicture?.imgurl}), url(${bgLoadingImg})`, + background: `url(${taskDetailInfo?.ocrPicture?.imgurl ? taskDetailInfo?.ocrPicture?.imgurl : bgLoadingImg})`, } : { // 'background-image': `url(${taskDetailInfo?.ocrPicture?.imgurl})`, - background: `url(${taskDetailInfo?.ocrPicture?.imgurl}), url(${bgLoadingImg})`, + background: `url(${taskDetailInfo?.ocrPicture?.imgurl ? taskDetailInfo?.ocrPicture?.imgurl : bgLoadingImg})`, } " @mouseover="overTaskHandle" @@ -1000,7 +1000,7 @@ function sortHandler(orderby: 'similarityScore' | 'createdate') { class="img-wrapper" :style="{ // 'background-image': `url(${item.serverThumbnailUrl ? item.serverThumbnailUrl : item.imgUrl})`, - background: `url(${item.serverThumbnailUrl ? item.serverThumbnailUrl : item.imgUrl}), url(${bgLoadingImg})`, + background: `url(${item.serverThumbnailUrl ? item.serverThumbnailUrl : item.imgUrl ? item.imgUrl : bgLoadingImg})`, }" />
@@ -1226,7 +1226,7 @@ function sortHandler(orderby: 'similarityScore' | 'createdate') { class="img-wrapper" :style="{ // 'background-image': `url(${item.serverThumbnailUrl ? item.serverThumbnailUrl : item.imgUrl})`, - background: `url(${item.serverThumbnailUrl ? item.serverThumbnailUrl : item.imgUrl}), url(${bgLoadingImg})`, + background: `url(${item.serverThumbnailUrl ? item.serverThumbnailUrl : item.imgUrl ? item.imgUrl : bgLoadingImg})`, }" @mouseover="overTaskHandelr(item)" @mouseleave="leaveTaskHandler" diff --git a/src/views/worksheet/components/pictureCard.vue b/src/views/worksheet/components/pictureCard.vue index f3b37a2..cb616fa 100644 --- a/src/views/worksheet/components/pictureCard.vue +++ b/src/views/worksheet/components/pictureCard.vue @@ -70,17 +70,17 @@ function previewHandler(event: MouseEvent) { position: 'relative', flex: 2, // 'background-image': `url(${taskDetailInfo?.ocrPicture?.imgurl})`, - background: `url(${taskDetailInfo?.ocrPicture?.imgurl}), url(${bgLoadingImg})`, + background: `url(${taskDetailInfo?.ocrPicture?.imgurl ? taskDetailInfo?.ocrPicture?.imgurl : bgLoadingImg})`, } : { height: '92vh', flex: 2, // 'background-image': `url(${taskDetailInfo?.ocrPicture?.imgurl})`, - background: `url(${taskDetailInfo?.ocrPicture?.imgurl}), url(${bgLoadingImg})`, + background: `url(${taskDetailInfo?.ocrPicture?.imgurl ? taskDetailInfo?.ocrPicture?.imgurl : bgLoadingImg})`, } : { // 'background-image': `url(${taskDetailInfo?.ocrPicture?.imgurl})`, - background: `url(${taskDetailInfo?.ocrPicture?.imgurl}), url(${bgLoadingImg})`, + background: `url(${taskDetailInfo?.ocrPicture?.imgurl ? taskDetailInfo?.ocrPicture?.imgurl : bgLoadingImg})`, } " @mouseover="overTaskHandle" diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue index 9f98217..99a9ab2 100644 --- a/src/views/worksheet/content/Content.vue +++ b/src/views/worksheet/content/Content.vue @@ -800,7 +800,7 @@ defineExpose({ >
From f94169ec20a93d1ab4b87bcf8f5430b896485e3d Mon Sep 17 00:00:00 2001 From: raofuzi <2641346316@qq.com> Date: Wed, 17 Apr 2024 23:09:07 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + pnpm-lock.yaml | 7 +++++++ src/main.ts | 9 +++++++++ src/views/home/content/Content.vue | 5 +++++ 4 files changed, 22 insertions(+) diff --git a/package.json b/package.json index f2cd289..4ebe340 100644 --- a/package.json +++ b/package.json @@ -37,6 +37,7 @@ "sortablejs": "^1.15.1", "vue": "^3.3.8", "vue-draggable-plus": "^0.3.5", + "vue-lazyload": "^3.0.0", "vue-mousetrap": "^1.0.5", "vue-router": "^4.1.6", "vue-types": "^4.2.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3dde4d4..e1125a6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -71,6 +71,9 @@ dependencies: vue-draggable-plus: specifier: ^0.3.5 version: 0.3.5(@types/sortablejs@1.15.7) + vue-lazyload: + specifier: ^3.0.0 + version: 3.0.0 vue-mousetrap: specifier: ^1.0.5 version: 1.0.5 @@ -7320,6 +7323,10 @@ packages: - supports-color dev: true + /vue-lazyload@3.0.0: + resolution: {integrity: sha512-h2keL/Rj550dLgesgOtXJS9qOiSMmuJNeVlfNAYV1/IYwOQYaWk5mFJlwRxmZDK9YC5gECcFLYYj7z1lKSf9ug==} + dev: false + /vue-mousetrap@1.0.5: resolution: {integrity: sha512-mDyPBBTnOrpUNDZ4vjd7X8emYwKFG2/Rsi5coZKDmF+dM5XpENrnvdmef4xHq2gcZ1HVmHqeI5jQP17p9fFpzA==} dependencies: diff --git a/src/main.ts b/src/main.ts index a146104..82bead9 100644 --- a/src/main.ts +++ b/src/main.ts @@ -5,6 +5,9 @@ import router, { setupRouter } from './router' import { setupGlobalProperties, setupMousestrap, setupNaive, setupNaiveDiscreteApi, setupSvgIcon } from '@/plugins' import { setupStore } from '@/store' import 'virtual:svg-icons-register' +import VueLazyload from 'vue-lazyload' +import bgPng from '@/assets/images/bg-loading.png' +import closePng from '@/assets/images/close.png' async function bootstrap() { const app = createApp(App) @@ -19,6 +22,12 @@ async function bootstrap() { const meta = document.createElement('meta') meta.name = 'naive-ui-style' document.head.appendChild(meta) + app.use(VueLazyload, { + preLoad: 1.3, + error: closePng, + loading: bgPng, + attempt: 1 + }) app.mount('#app', true) } diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue index 219eec4..7e6f6ea 100644 --- a/src/views/home/content/Content.vue +++ b/src/views/home/content/Content.vue @@ -719,7 +719,12 @@ defineExpose({ :preview-src="item.imgUrl" :src="item.thumburl" :fallback-src="bgLoadingImg" + style="display: none" /> + Date: Thu, 18 Apr 2024 08:14:28 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/content/Content.vue | 43 ++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue index 1f2a046..c346723 100644 --- a/src/views/home/content/Content.vue +++ b/src/views/home/content/Content.vue @@ -115,20 +115,20 @@ const layout = debounce(() => { percentPosition: true, stagger: 10, }) + loading.value = false + // _imagesload = imagesloaded('.grid-item') - _imagesload = imagesloaded('.grid-item') - - _imagesload.on('done', (instance) => { - (_masonry as any).layout() - if (!el.value) - return - loading.value = false - }) + // _imagesload.on('done', (instance) => { + // (_masonry as any).layout() + // if (!el.value) + // return + // loading.value = false + // }) - _imagesload.on('fail', (instance) => { - message.error('图片错误') - loading.value = false - }) + // _imagesload.on('fail', (instance) => { + // message.error('图片错误') + // loading.value = false + // }) }, 300) useInfiniteScroll( @@ -295,6 +295,16 @@ const gridHeight = computed(() => { return height }) +const gridMinHeight = computed(() => { + let height = '' + if (viewMode.value === 'masonry' && loading.value) + height = '145px' + else + height = '' + + return height +}) + async function oneCheck() { const asideVal = cloneDeep(configStore.getAsideValue) asideVal.upUserName = searchValue.value @@ -699,7 +709,7 @@ defineExpose({
@@ -726,7 +736,12 @@ defineExpose({ :fallback-src="bgLoadingImg" style="display: none" /> - { + previewHandler(index, $event); + hideDownload($event); + } + " v-lazy="item.thumburl" class="img" :class="{ 'img-fit': viewMode === 'horizontalVersion', 'img-full': viewMode === '3:4' || viewMode === 'verticalVersion', }" alt=""> From 7e2365a6aeb962a826ddcd443f90e71aa41dac8d Mon Sep 17 00:00:00 2001 From: raofuzi <2641346316@qq.com> Date: Thu, 18 Apr 2024 11:01:52 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/content/Content.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue index c346723..179c3fc 100644 --- a/src/views/home/content/Content.vue +++ b/src/views/home/content/Content.vue @@ -116,6 +116,7 @@ const layout = debounce(() => { stagger: 10, }) loading.value = false + // 暂时注释，请忽略 // _imagesload = imagesloaded('.grid-item') // _imagesload.on('done', (instance) => { @@ -962,7 +963,6 @@ defineExpose({ border-radius: 7px; margin-bottom: 10px; overflow-x: visible; - // overflow-y: hidden; position: relative; transition: 0.5s; margin: 0 6px 10px 6px;