From 226cdffea788a8d655a948d1301697ba4710f381 Mon Sep 17 00:00:00 2001 From: juetan Date: Thu, 29 Feb 2024 23:27:11 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 64 ++++++++----------- image.png | Bin 37787 -> 0 bytes scripts/vite/plugin-info.ts | 8 +-- src/components/AnTable.1/index.ts | 4 +- src/components/AnTable.1/useModiyForm.tsx | 25 +++++--- src/components/AnTable.1/useTableColumns.tsx | 2 +- src/pages/home/index.vue | 13 ++-- 7 files changed, 57 insertions(+), 59 deletions(-) delete mode 100644 image.png diff --git a/README.md b/README.md index c1d4e24..97bf2f0 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ pnpm dev - 以文件夹为路由,读取该文件夹下 index.vue 的信息作为路由信息,其他文件会跳过,可以包含子文件夹作为嵌套路由 - 在 src/pages 的文件夹层级,作为菜单层级,路由层级最终只有 2 层(配合 keep-alive 缓存) -- 在 src/pages 目录下,以 _ 开头的文件夹作为 1 级路由,其他作为 2 级路由,也就是应用路由 +- 在 src/pages 目录下,以 \_ 开头的文件夹作为 1 级路由,其他作为 2 级路由,也就是应用路由 - 子文件夹下,只有 index.vue 文件有效,其他文件会忽略,这些文件可以作为子组件使用 - components 目录会被忽视。 - xxx.xx.xx 文件会被忽视,例如 index.my.vue 文件。 @@ -76,7 +76,7 @@ pnpm dev 目前支持的参数,如下: -```ts +````ts interface RouteMeta { /** * 页面标题 @@ -140,7 +140,7 @@ interface RouteMeta { */ link?: string; } -``` +```` ### 嵌套布局 @@ -174,8 +174,6 @@ interface RouteMeta { 用户登陆后获取的权限,应存储在 userStore.auth 字段中,在路由的 beforeEach 守卫中,会比较两个是否匹配,匹配上则继续,否则会显示如下 403 页面: -![Alt text](image.png) - ### 动态路由 相比于比较流行的加法挂载,我更倾向于减法挂载。即默认加载完所有路由,在 beforeEach 钩子根据权限移除不必要的路由。 @@ -190,20 +188,11 @@ interface RouteMeta { ```html - -{ - "meta": { - // 组件名字 - "name": "MyPage", - // 开启缓存 - "cache": true - } -} - + { "meta": { // 组件名字 "name": "MyPage", // 开启缓存 "cache": true } } ``` ### 条件加载 @@ -218,7 +207,7 @@ VITE_EXTENSION = my ### 图标样式 -基于 [UnoCSS]() 插件,可使用类似 TailwindCSS 的原子样式快速开发,同时默认安装icon-park-outline 图标库,只需引用类名即可得到 SVG 图标。这在路由菜单等需要动态渲染时非常有用,同时所有样式类和图标类都是按需打包的,示例: +基于 [UnoCSS]() 插件,可使用类似 TailwindCSS 的原子样式快速开发,同时默认安装 icon-park-outline 图标库,只需引用类名即可得到 SVG 图标。这在路由菜单等需要动态渲染时非常有用,同时所有样式类和图标类都是按需打包的,示例: ```html @@ -262,13 +251,13 @@ enum MediaEnum { const media = defineConstants([ { value: MediaEnum.VIDEO, - label: "视频", - color: "red", + label: '视频', + color: 'red', }, { value: MediaEnum.IMAGE, - label: "图片", - color: "blue", + label: '图片', + color: 'blue', }, ]); @@ -288,7 +277,7 @@ media.val(); // [1, 2] ``` + 提示:以上每个参数都有类型提示,原组件每个参数都可透传,封装遵循扩展而非限制原则。 ### 自动导入 diff --git a/image.png b/image.png deleted file mode 100644 index f5970a842a9ecbc38b12cc730c940e7502ad446d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 37787 zcmeFZ_g7O}6fVlKD}oI~x+owWrAil(5|G|Y;2^z*-UAi{1u2H!d#EAwKp=piAfZT) zlmJSvp_f3CyE%8<_r|#Ihx-S-%g7jkWUswfnQP8(e)C&=*3nX>xxsXUii(N`r1naW zis~Ykit3-DYgd3z9_ihJQBggl0=-f+2*}*P2L>1%;K@6ueaX;^9e0y2U5|eI_PtTj zr)!@y49zN-$KF%tx8?H~ARf(KsE>*=L*!o=)*F&1J`}oKr1y$lQs>2|>kr?DD=S@# zmrG0AJGBu>NU*IDNw^f!R>{xMlU5tz@DkSaYq|Ns?8Z*&1)u{|R4`6+4axt0dpjPU zd-MFax0e+e|NDgcy~uy>_b=J~_b$LfGtm>j;Kk%Mp((Wi8*%?>sr~&hpvWt()GN+l z>zRR(J0IPMOSdXxl#jZu5HHs0r}eFGpnue0(`==U(*~Yt26{rQg0wq@#}T%v5wA!5 zEor3C7y5r&w9IbM~p{iL(jtCScr+C z=t_*BpH!jN^%kisW*=g&M`Xq@y|*@qm62Cz^$uUL1sc4Ndw*pyyky(R!!3fqbg(+v z75|OdCfBfvQ4d!bL3t5jPi%Ewwyip!{B*?_Vtj9&O?G2B#~F^d+zytz@(KN9D`@+k z(?GGF>EkC?y(fxJ2VnNJZquGrAqpu&mFQ*0rwi0|e;Ruh6;Ohg!07X_O^%lE$ZYl- zcOcfyfJ@@s)YXzhy8BM*cDn!B{v2C!y2Ga-|M8uo8eo?%QZJYCNY1j}!qoIh@pK#P;UOhAK`u!iin)1pojEs_( z2C~X`=DYa?1qHXC1s`rmALU594oeI0TZ+Dd$2iK&%f>K?p}H27Mq2OPUyl{ z)v^s?5YTHT`H+AZXm=dDFo;Puz~kSkPj?>I+4nOETDCM|8#AcZWFhzQLdZP_)=Ac#`Io~w{(C~DVHy21FMTjPI zmR+D&J4Xn#hHplx#IYeh-+SUb(-Qbjf+)AwCu*3DJP0&Ha)6j6Tn8(`&56m$_XAiJ zNc;MNW_4<&rlw}ier|J8k=R6D{rx`CUt+8EGM2JO)85hn+qw1wnWlE9A8yH)_-#(E zj+;Z=wwp42@wZ(EZU~Q^+jKZ6p?EWB86i1}qEKax7C0nr$}~7QncGJQp%-x7(~a=P zMFS^DYn^R$-TvLx#0B_OyRaW(f`W)H8?qbu_WJBBrD=9!qEsyo)F9urJk8%!0^k%U$^ng7@;nDRo?rSdN6{Wj!RT2I@M`mUa0fX6Jkg+mDMXO&8Zd1;Kxr*n8$25&02k4ub zm3^dUz%F{N0{!{AK;1*lAT+v(nw{xDoI5kK6zTtj^lDsF)<^(VHEZvUj-1X z&Slvj9r$;QPe5SMw2h^*uuy`-%@qoJR5TT-R^0ZesOz-h!1>KR`(N1zW=M-}X=&*@ z^@93*-cohLu{P~09YJ25yex&V)~;CA@}UA%m$T!YcW)i!2G}J?^u}T0C^Rt4qf~xu zQ&W@kY%6B6!L1y6dU(0goD}#vOWF`H7{g}2&2y6lwPsu*hmq*5!o*J!wB?7!5$58q zzpMCu{bDLZ&@Ywh7hlQN_8s5D8R^bcSu5o}vLu~y@;Vy3uCGh@ZJ20gK7Y2&6w4+@ z48PIuKkXUGxmsGBt@rBHtB22LLr*u~b;nBfOJNXQYMiN|2i(-3LrbzE|iZC&T-zM3~z#LhE49mCbcdXWdv0uNmQdcL|pQF$=6Xj)df*fmw zp7KqR-1d!6vODL zs$-2cw}Rwcj{}4LrZM;~CuWG9M7S*YH7BL`t7*&b<%b3ie9~#CR)ptp;GgRRQG%Uz zAI^ShR9@7)g$<2n5Uw0T;Fz>XhGSj8&M%3eWi@lTY_{u5e|U8`Pbt#*c>9lG7f)n< zzO2v6;ENaTpFUi@HGVDC*D!GkSZ83fj7`d!l~vT7esDT?hJ|1bjMTb$Ab7MPiFlx| zrKL649elKf7#%gRv$GqUI3NYsrNh5?2zX7ukU>H9Z8GpPH=|L2{jw}yYwur9oyj8a zX5I-RLZW?65jYK4HhJn%R^VY(yjVqbvb~z*&G^s*1-&L5YBPGh@Sn|f`AYeF+^-#V za4rgAz70f)wv)YO!x zZ6{z=_yh&V^tI)$wRn?WlQi|q0SVV9e(y$=8%TH-d<@D7Wt&u4jE z_0)xa!?zcUz47Jq;ojAMT^P0_Vs+2MlC!gOOuHqiiI!d70=U~a;D6Vqj{^SO>PdK_ zO?zp+rlw{)e9``;)_G)Z3@>b(AGBVM_$$`UIk`&Rg9P(wnhM%2Ysl<|#Ko)%$+cDQ zEKj3-T?RedH8+D;1+I;Yhf12v?fYN0s&_U_N-HISk<8`5Doob980VH*VE%3zLj?}L zeYkqjtzxEVl2|X^ex;n}bc+2;*q0jdPsX>}$r7X8VST%cz2c68xza~?6eQ=ou}vCs z-t^V0@X9tavHc4Uc0of~`PHjBgIZvkw?&5rcg7IPF}WK%60>GlHpt3AeNf7Nu_$z% zd-?up143c$^vIu-em`+}Aj`ZcpSfbaJ}l;6kh+#uWvvXdknf(Yc-QyO_v-EY)6Mw% zG#7JZT>u~a?%?Ze&^p3w>R*}zUS8gGF(~^s z-l3{3{AR1EI*Oz&2ymQ(`#<^x`L3dc64eoz)@&}DhiXli;Vp_YgvpzwkY#%&9-7=C zk;9-5GI`KhK{4jdZ{kCowlPw%_F*2nVSV1se>c!p?xx^lK5w%{Pf z@^1VgH{dvO87~P=B?lLt!M4F-ZQqS`D>V}nBs*WY+@F}s(S6LBRoEZpJ@j8+`}4-h z{U3|qv2>*~TS+m04%8!~LzXKwZuX)tAj~?$RQhdVQAv2j^&X%Hj%?z|ku`jLqJ~Rf z@8;iZTAQv7wcCo?8mBRlk>Z9$i43Nn*mpq!JnB!5-1{ER|G)Xb%<+1TPp@@~g`bj8 zByUP*JSMxTLDsUg&#kP_t)$Nli+}r8095@o;!*6g#EaLE*NO=a^|^)CcOmAv4ShAdMH(|;Mep?pqSwG$xmeo9KKrl={H$!>D{GqlNtQ^ zfSHHCT;%qtA!X|ER?^_{zE)N_xnG zzDSHddzWJle3NNn79v*F&+Y4C!;^fyG$b@DUGeNrOX(FYI<4l!@c|v{QUen{ zpy!Kh`ionGmEE*JlW_BgJgUt%xl~S*p`U%m+s^J$UAlMAnuoiCLND0~T;Or$`5W~?KLSgaf$|IyERal0VRWQGe=xoi?jBCZh|5=uhFVBmE{wEn`2gr_Qu2$iO( z^1pXcSo}<~JCH*^xm4T9n>QZ5PaW|rS&C$SIomG5)B}LC@ z4Oz7Z(v>b-OUFA0A8nOjy^9&2zPn4>)}ElF0x@t|wh_q*<1|$cOs|a^9G7@gDWWgR zh>B{^1pb;)Zv5R5V)@pF$g*Q|$0_ui?kvr8w+$R^_ngL^~XtC6fj7z?PY1;Ccq+^(O-VeU6 zucv68hQ+4cyh-&oLWGm+yXsGOmyf(`&uLktyk5DZ%z;qjwhGVmI1CHbi4=+BfvC3b z`YrT6E&RU!oU5q2T$2#sOH^*ILcPoVV((j+`+DnPt+}eIG#!1Q>*If-)TjA`JlRL2 zfISuy6&=M1(j6M&kVB4G>xWeE7cO54r6rRHVe6~KImw)wX(GxDU>{v-)XI0A#x@fx zS+rr(EL*8}Tf>tlD_@$4yl{Pk-;*zO$c(3dBH1}Xcpx4nuQ$nAvi2Y+7NtAvj9u$Q zIdMEZe8x^`PdJwW3#d0aA)xFYM08nfm&fPGa0tD(D@fO!n1YnAtQH%#2KmNxXE(d& z$+PcgdIkoDn)R@p zd44fpZCbp?=K|F@XIv#XMw(ktP;+Nzhr{K=*b)Dc)BN7l0!M$byFV zS4Ym#c9oT=g4)pvddoHgUV096tink34XzW9kht=HE?xoRuA=nmM(stUwXZ5Q)+B+E z%A@0{roR7-yeVw|yZ$d6@d#OJL9dka(r&3M%*kfUz1}y_cY##EHy!`@hqTzip^NXI zK~XLcA&mGjJ7A3<5|_+N9Q9Lgd8pXro}mR=DU&J&GuAX5r@>1BxVFC2&5oPF1g}q{ zyq5>kCEU{CT3JlHI5U`6@L{5VcWiDP6i;~B-}YzBEN*jXrqZFSJEBf*cBbhC)Gvu2 z2NsCz6soPW;5+*H>GSsH+zxjCc*dAfBEwd4VJ9GI?#pN_XB@FbR=jYt8Y^v)8<_E- z%_wx_YGJwm8%L{q{HQ5}(+HfGpTAtU+m|o{{w04};o2~GX-aUSm7quw%9G0Jo*(L$ zoUPc{*id1`0dPc)a<*49r6j{RH{gG?R_-8@;j`hSPh2UCmWiyB)BEIr30+JwUht9j z?H9*|@78H1fBniaA~uG!YP;{!Iglk&Z`*ShdN|?m&h7K(&*=SOjf1IKvXNED&c~%+ zIY@^bsF7UI{S++RKfIpWJCe<$iZsw<>C&0Dggmw1rp(E+*xUZU4L$iN({HW=N@)Z#{q?bytkcGjK}& zOR=d7e0Rm_iQvq0P_fuiy-U3^H8MSqVi1xP+Id0lDH@t2=Oy2$p>H)~v@`YqkJ`9@ zKqK3zR|}U#w&zss_oP#{FPH6pDccnFTJi$V8Y`X^j)`(R;kVP>p1a$fY0k47jNvMD zwc2r)UKF^U1$_u5uBw8D;W1WDgQXvog2**q5Vd9IX4wM<;&Hb?QjlCt4)-Edm-E*@ zacpU*r?(TA<%zHxyEkkbT}7@uDQ_$^v9oOMD$2f-Z)9+uzT*RzvuGv(go$|vB{a^* z#-oZF;srpY286DyQ=a;xH}B=icG49?^R#z?(c?8Dt3mg5_{)0gEPqiqSMpBDG|3wRFZkjAs(>LF8oPo2Z zqXHu>WgT>WPgaFdLV?VtR69qWNw(2iA$T2!GzO>>T9)UziHX|=GI3*Z3gi;Na-?%` z0FrgNv?>>TxYGXa;@Y&7&$l`ct7-|s-$r&BPU(j320)sLb{l!`w&vl?{G%|uVdX(h zZj0m4Bh2BX%i8big02|m;!mGG>13fn)9xrg!VIFL<0Y_*$fQ%rVCDwMY^4HuCytMo zcL;dE7$(?1DKXJ;Z>is`#`d#3apiHAr%C|%;U(|wIYqhsK_x5}tLN-ow$(-nop6a!UZ8OqnB-3G^mt4HSi4uO4vFv6qJ%^O< zl9$||G5xn4A>ZI7-I%h_u!r+Bf|Jiwj^tS2F9Q1V>Z?PC*TO3Gh&0sct3gy+2IWSr z_e#_;ZEN`Wt9Bqh;iD_0jA^=yF!XA^(1(4kLvF4gNj$_9R-Xj~yTO9M@UHm!g2!*e zR4Y!1V$)yYRd`7Na#xlX9PbsS#}+am*8*5QzBtHCi)pQW|L{7p zZAM`8gt(3r_usNuTwY#>X$TD!f)W;dh+U0m2gtCoXyMipdVZsoWOMf+($OsYF0QPu z!d_gegRvzDiUa%e0@f8LyZh-}vo?_pZn%BIA))2<* z>kWFRj7l1%{V`b!o)=8A;>>|tuMVRz3Lxl|#$-OqY6kvQl%3`hrZq*=h?sb*o_F~| zjJi8g_m+aQlzDIr8d@`cnJqY^ZEDsmxz z!?BsjI(JoJn&vF^r*Gk>JKYzF_IoN>pT)XRj5=0WVmkeJUt(Dm=nR;Q|0{ zfWZ91twGIwM!y(sq}lP|ACwPY{E>c|N`N$=eiwXlua1(FQBlQcHQiJSdwy~j4{k#f z(dLnBsa~=8x^?S!>~>2UR@i_2;}>wyziR9xZ`FpsnY7@98RdjiI0%;g z>vs`JnQJZULHX*%VR08IJc9EH-vHzAK#d`QCB%rS9zJ-5Ar`E(p50%ek^ReayBAO_ zx_%R2i6j=G1paZ}5wS&~!=GDqJ#0=XsA=Ya7;n+o6`k=r^-@wCwr(;@6wP09N0~+y zCV2oJSphc9Ee-LS()|2MJM&O+!cdgQ!OqU&6>k2 zZFBKW^2Rs3X0Bv6IGz7CS$iHvk6tA;Y@k>~tq1SD+f=}a8F~9%US(r_t<~UHo)Tf| z|5{$Nb2#S~laC7#bm|9M?L?f`Kr$Xv5anRo%f*)W=vAGHOs198aCp^Z?f-& zrEGusck`ENsj0sFXjK%SFQVJfHN$(Xj1T-Ku{~k|l9S9XDM74>Au!F-+@wPCv<1W^ElE7f8R>k!veMozh+lpLX}+ z_$Vv7i_7duoH0$?#(K&+*`eKtsOV^8i;$MTfBz=M$LEHJbHBKzv!V-B? zU&KvsD8s5u)*Jbz^0|g8TcCzpcG^RIxNLJM%v6VaWL|gl<3+pZ=)@z({40c5&SW0M{p8f!hzl0F?`bp1!{CR@1UkU`0j6 z>+^ER`a${LuR%%Y(Gn((i8X+X8%=#?v%i!9kyx!X1-B^LYt>D;%ru2AXZdr2Bxggs zlQy+wcV5i}9^*YaY0hKr{#G+#{2Dg);c{gTWO^GDWKk|*_5s2!SQ9=1xqmnm4k_EJ zb*>e&e-Uehh$q)Q(~r9v%L-TK75~sM8%AJ+lQl%@tqb@r5Dd-4zPE*4ob=uXYc{(l zEL9GSruro}Smcz_C^`FK$fcFVR+x3~fuqU1Ep*MD>jLwL<@(1^uZJw;DkXIcoE+sm za8+YJ2LN}F)m=FUoNd3=(ydzlq&(`;qm5_7YuKoI1M&Frpy`<2`u&Y`F!JKJ;E95y zyudCj-#72>UJbF0v_&&BPjcz4*s(A%l_NoO%L!IeX%f@1$JiVJ*=24ezupu=bDYto z(5U{H1RmiZFfKX`qHk@-@N8NOg2&suC@E;i)tG*TmP;>IzJLGj+}^H#(5D|)T32TP z^I0oZqRWZTJ!F+$TS$QJAuNI>o^MV!DNRfSCt|u$K>#rr?w%23oS;-g=ktEv<}hP) zIn2`aB*w}U8(MzYiKOpa zmRkos=~^4Ei$(8^2&T(F1yiQ85i_5wqr9c*mVF$pbU%}u149qSh=B8AAC|~c^O9J; zEH8PpM}JM%!uiX7v#$B5$Uygtk%m<$wE;)f9|7S} zWxFWVu|0D8yvqO50^sso%o9HB*8Y+&N6m(s!;p_oQrgan21pJ-IVd%C?%q9?^9%_9 zv5f=JvjhX^5#GOM!jObGe^Vs!mB ze&?m8J^*sjTI}I@QWIhA*!6|+om+9HS5&4}vEQXMx&n|KSb~Dw0*mT-8ykn~ft>xT z$@@QpnQB+S;N68E&i>nA!BF&)yv-y?ucpf)%yaQ%GAnOSRgFOC{d#2-CIK-wV$8pK zX6CIbtJ@T&G+7HllFQ$v4_5B(JoBAK0@%RIuu0PfVGlRH(g*)}GAGn;Dj1VF@!R{X zP}2p)3q9U%_mpZzft+xcTeS|2b6kAzhpaNYOjZy3OEw#GX)H@|Mn}Wn9fYbj!m?Ca zTME^0<4V>q6T`lG&ad+5b@(3SiI(gqvh&+>O)*DUI#+@*xoM% zB(jZc1_XPz?Hyz*u}r9WLxhW)JE9K!Bx)KGXB29kFwMp0`yi3C^XaIYt*S5MjG{zy zUZMPT5ji-myHo{+ol^Kau_WplHi>Y0%P!*3p|D4BVscqtMy7eD^oNr4N^{blcH>Zd z5=#DTTWJ&DY}`iLgwQii$bw_D1O8seP{^l-4OwC26Pj$A8eYCGJgzOr`VzNh753-P zl4k>*PrsO1&BI^&d3wxpJAGGXvJiA^&|u_2Oq7#gb!0h`|954gKEm3k;64pnJ*?hU z%K!ByPFAw$kntk(aJJvYfkAekB<`C*`HJ`!7q!+Gw*;Eoj{*nO`_ax7bhbq|-7GPd+7C~tSDLD`!I}t`9S*8# ztZ8Z^PRt7ZDo+ne-CBIdyifSH9wSRFue&4N-&Ow|OK&*}22F+FyUSOKpi+8PM5~M4 z7Vu{Vc(FybJ`Wk5+(%w{RGomjyZry8dqp_(BPS|kK+Ufl||FVmc|Aq+88 zeoZWH0FBHw;1BG!gt)jEc*?Z%7sTnOz7@!7Ctl(59b4V(Xj_Y%1@i7<-2xRS3Ylb9 z=lJ!;jT@XGPfySE=brh}zH5cIW_~nrQ|i|SuPRbY#GBeSqBOsSW4Wp(mafGA<#BR|^!>5m z=Mv$PKX1Pp?MQUh%21C>UY{F(9Hr*5)*Hx3+*wyz6R*s;+05Zk(J4vYT)g)BclJZ? zN37A@R~OA87(-ayn;$o5n8efo2JS_)=HJDf#&U@tKYp0i+Q)E~s>ZQdBe*s6P7gO1 zeWdFF)G2+m7la7{C>ldc%gR{*FIu}L7zBEEQjlTX+k)l|qiF4t->wm|V_QbS7`W@$ zmdfGEkP=Yj%?8vW1wb`;+%e_6C=66$KNxLc1gm8OejG2Hhv{#_zC;o+R)+h7n5PY# z+ubtv8;)jVF8F<1seAka^?rLFL7e`u9nOdiAOyzj(ZewWH_WS-jjX%G4Fn_A%0p?QxbtM$vB0dT=0HV(N*j}MEnqW zaXuNxE?cp)3LcetX2kpKt6}VQAm^PmZDwMf-hWoJsc5}W)_mMk2_$F z+w54yLpcPRqV?+4bL>pm%1g+8)US2KJ0%;QJN|Y>CW@^pP*6W=5cwIt&US-j*Ltzt zjk&xU0s!KCCOVm%+*EfjqrFBY5L1nMIf$*I&naWF5-Xl#T>i#E;5f;zVSW4UK?xNE zm5wdUm};!?mrYu|dabQ#@Z?UO#A0|^J(U@M=Tid{lUz#-@#m)B`X*{-bP9su1+YUl zhFFsOP@xV-ZKJdGAgRQ&)S+bBB_V%P#Abu(aQr5%4u&cGHghpi;jwPaJ1 zN6T+3y?k7Xe|{w`uFP28SYOE`zklBuP`|{aC#?Po zBiC}jPQASgps~B!QPd&s>9EJxN+na(`oM2~G{FJ!LIEcNS%;LMUV4H-Po5tAVj?j) z_QtN!Y*3}n^CkIvsF|Shb3*T2M3Nz)3Ai8xCD&e0j#F}ZSI5}G^COTh@9&Rjy8ucG zLpFYZ)Z<6Cz37==li@6ODgo%%`kDigEiRAekeEh(k<)z)RSh?b{kZlKl|#<4K+Uhd)px1kQk zq+h6=vw4KJ%Znc}!RVOHYbO(7uzUdPGELdMd1F>_Bb9xsAyC-yr{pu^&{El})O5b9 zs{p6W7Yy*A=}~CgPuPaD+fi;E++_me=@YoT(j4h)E2QUX1a)i_NT zN#~Ft2Ea7=xTN*wN19jQ^~_^3Lq~Gp9B-5PV881c=4V1J+Z`%x4v?vaw6>J)yzgvD zf5xANtUqpk!#YWB3*OI}Y8_39vvcgvT3_TnTsaLRj2LS>VCmOyO2bD0W4qS##zqqF zld$2}Y#B!KJy$FN?2JWi3jvv;Tyc!)eH# zSbD|N8C|FkBYwbVbzljAaf#+#3Bem8 zU6LMbVg6g~@?*(X#AUvs*{WO>aWugWFTP$@{f;XEpi(S-TRdm2nMw_Z#SN8$vbqgl zUutkXM`J6k(??yG(;Ho2c6~@BRFnLwavKbJrJ&OAcPB5{VOe|o#LXP59{ZKcvj!YCZpa^W>2D6hK#r5ny@)Xu>ga} z7q;b<6oS@_u>LuQjLug%FrHYR8mnS-WD*`&9qfmW?02AAdz#$Mnsqh&ZLf0g?PdT; z?Vbc-aR1$^HCV}1FCpkbI689aGtXk5UzB$A&=C0JJ2#+W%|F1QU9Ecgvik(Mq1~@X zL0fmMCwN}pCeh2tQ8dXqVp|5N83^;q%Uc4>on47m;A;_)5WDnNsJXk)Zy4JB(kWd(zlPo2-F+ZVgJAz96Q!=CCe0x?)P9j$TQ5Sl>ve`L{h`PThxYOtK3MOkta^ z0JdBgwm%F-4her2I&gQfgYcd;|zO z*FG{>4!R&Q@OKxlmgVNYIIju=Yxe|{E)PYYmy3V@HgN+u_46p;-g;t>_v~infM~e= zGXc?`eHQe$3+D`#9R*jRtWFr}`8`Xf_tm-V^b$21Qm^%_Cz&pN{p0mhKp<&DA`Kwj znl&4EQd%x^?WV$|TcQ4HQ#St*XCP-)aQb9*mkqxk`ydbu&oPv6wkVIQ+s}c4@fgXO z62L7uZqI$Ak+ugS5Kt=`?iFsU7|3$TX{>+NV0#+%g47(obY%b#F8YuTaJZ9}@k%hW zPsfsuyf8?57y8af`{X6OdF{5&dO!b2MP_3!v5AwBR;eI|^zpC0Qger%8U!=#GoqO% zi+|?Q^LB%Qk+BqbgvGh6_Ljog!{QOfx@c|hpMY@9-Q7LOjZFCz7#N7{?JcjCOU$Ir zz?K^ZQAcBw9$4+sfh zVJqKFgfGJO0 z_dSyfwWXN@+eTUl_)&ACGWT?*v~L;bDqz9MQ=3MXmX=8q(aZfA#l<p2Th z$2OZw)$z{sOP{ua8m`ZuCXBd1D;y#R!;sTif9WY7R3q^}MDibT#_{fXRNFqNVT|a5 z-JM|Z>#%_6iF_Bt^M@E#$EqBq~&h0d-ll$)>j~4#* zmNdNHHO9v7p%nBJpvnG5iRduI;YR-y6p1&eHf}`4_+638-?%UW$?~i)><^im` zye76<9c}kzGD51P;XV*l_yiFr@)D_^K3xO!+A@VWihQ@R>smGoI)e-D#0OOFziC)D zSqPnf>6&nx5aN%Nz%+uhVG)=V|E}j^E6JAXtYf9*tc zrfG1W=WPa-kba7vP_bt9vr3g^BYnM4>okbhQ$VNlP@+@kO-OjU^+$Co$Hey=j}~2} zDl#FvKHC|cK+UM9n3MM;@m0MH7swNw-#K&Ty-0dix6PVI=yoMP(DZeke&vMDXuC(K?S5lX`8!qBL!NVK8r8pw|LcqY{a8`=tqFxXALjFms2s&j*v=0} zQBhH&E&mVg{`ccZ*MO5$z|a4qF8e<|`2XI3>i=`5>;Fz7mB9ax=HO#N5i`}?@*hXV z&o`pg4K4I4YrIghZ2B3Ikqd2ehU(cNRsD^V-9(2Csf z%eV<*LzeD(q14s!d;&s-p^BgL3oM*d=*kZ_|BjYI-=qE1^_){0)IUW#H!R;e7nKSF zBGTF-=6`bS7U|V;?A2#C4nNLkT@9If|2ZysVC`|%kiImRCST7i65_vMJU+l)FLN3{ zjBYSQB}%MKbLg_d=98wmjoj|q*w!-Axc~Zk_GWR3ex>`v3D8yR&54|1@I+HoOq9;A zgvs>rEJFs$KRO zK`}SJ$J8ISTib1(>CSHbMhcpqj-D3MO4o-;X30M^9Mbho{O{DA3gD6yM1eXg`Jj4# z57seUaT^_?YF}dCE4sCKu8IaxNq+uOaf(H5ABzy!EvmPCf zf%f+l*ply8CeIvmp5fMJzA>aCrHrFuZc+}SqI&nknElq~h5dOt76+Rg4u(yOv*^gw zfFGR;2mEp4qI<-XkY=iijh_RK=gBKjmC8gB-}u$ z&2%KYgB+jBsOe(N(C5>~p>+OWAxbSI#7m#^mBvMF7}2K^O>(SGv|2bln$vZfvh0~h zkYpKXzJ~f&j+T3Go`z3GKmdAbY_>%IG=LP;SL!?~RCyv~iT_Gb4`xfe(R%oC@!n@S zqbPZ0^(L^hH%J2o1f99m+rUD7rnW!na8;_)jwcqYlk|$d$%W)dhIg-*n>pBNSh=Pc zK`NTGU)G78JX%F5G0z<81RQlj>i&MvM4#n8Ao&!oky9d_U&L__gdz%YkyXYgv zQ80R+p*2qDcVIh1vN2>A>hAmJ-__*k!bFL@CL^T{IS&(LTeG5Hh9>Td9C#Dz$SHd^_N~k&G^cal9Cs`6M)c3mMsm=xPo@8ov^K)&^o^1WBpm| zOgqU+CPt66)Tc+Y!sovOCp75THBcxYYwgGW!E52L|6r z!egj!+yFGMFK1$tjm)a=>c)MCnn^rvG6YC|Nr@8(O1Ss{f4OQdn$cfFB1oeGg-6+)`?8(2uJbbyD6)_cpTZj~}m$0{hmJ>73D?NBqonxZiB?V=&baknTOC5aIhOO4*`3l?(00M2o`fhRm!`l7W~4!DFMLU ze+w&E2?*XSktm=GA4XOUY;A2xG7Vn6Mj@q$VAr4(ium5>u;#XDvakST*4Q`r^pex) zL#wB97>9tVDq!bDEuM+7bW;0c{=>#HMZz_O8`D_QlI4@E*?7|qX2wK?iE&+= z@Pj;P;J3JDkGWexJ6#k$4s?a?vfG{WBk3NQ08Uk|?{cm&G%!eHp`A@Nq!9c4nlT^E z$2|Due-~C{DXa}JtM<4n$g7wwES+}j2Csimm?@6-(NZW?eX_bxnP(o^)Yyj_-#fZm z=r4Z)nkCT{wZIz9j@l^dt2Ls`9)DFXEov&%jcrGEVdoDF0f|nt@kKrFB;yBp+9?0Q z2GVC(;WxbZ{vRm6ttiv+y3C;u@9NnVRDscqmlL6YW;W*>{l@BZWY=GD%p4vbPIiBp z1?-0fuOaad^@Bh~*owUs*| z{FClC1dqs)-MU%Yi|L+GgMjAGp>w-uRPLAi^E&}%b}26WBVr#S0#Q?ffD-5D&z~=T zG>P~8ZndHW5%}@Y-c%+Vw>SplGd(8HC}9DLx7+3^tL)mTqkA4Lwp_x0B$gej4;9Wn zvrak}G-eowH4#NOrRd60ZR#WQ1RCdn^W5P@L0zl=@$rP?CP$Mz+^MXw(PU_72vH_; z2*h(iGOid+j;bB2*VogKTu$YDqUIl)q;fN!T&-f(TvTLkz&omV(n|<2+>qyu6i0{o zAx<@$9TR5Ae3~aewCuJt3~~}X4{}<>%%#zlWYXHa8(!`O5Wil21P1Bda@DR4;2@Nh zmFs;(FObPg%f!W1IUh5MyC6O>Uh05zw%fsUc*;txyw!R2K8TBh7MpQ&e8v2T05e|> zB{drz-k~@fdv(6w%|nH-1Gja&4J2!QpYJBFn-?@mAuO5=-Q!eKV%dHVYhI5Q4L+5x zWa35~cQB;m1?x6^OWxNwsWXQ;7U#qg-5Xf=zKo(Pv}mOLdb1^@Q`t-XJoBtR03myB z`HLxX=nX)>Xs1?9GmTr2tqB~YlcuC}XgAl|VCCUNx;E!5Yy1p(njt;zzBr*?m_U6 zclGF%L{3d~`_T!-fiN&%P`O2lYqRH0u;r$n06n}O4vl=Jd-w94Bt9el&y%n^W5F4+ z^J>|2ka>J?`5dOfG1$BsgVAfgvvv7mrHSHv_FHW1r3r4%ci|iBu04HcDomTku=*U&`%JUGmSc|I2rI8|X6CAnBL(LI>`{k!UO7ClKKh7K) z#g?DO?R~fkVOxXWq_$=H z9Y+Y_fX{&NKH^rp#}zXdDvIFcT<6-|UURn+egmDM3{kq=o8j>Wr!2#%!5ogT*-6P! z^wnirW9K=&V8=@LI>?dj(+P_4EV*s|@k5~tU2(MvId^Z-8}t39{Ba5mz_BXry(1Qc zWRT7uc#R`S8R%`R!7juja6Q*j58)U#oWiC@trONx=9##3ef9%L`@@@!KIWX;ZefML z)}{hKKT9~C8#KK^YxQuR$x0xe>%ZGXFfZyzzWAh@cfc3oIh7k}o5LISkCxEI`KCPg zo=@9JcHR>d>meOUrT;n3&-*;o&vc9~(%HT2tp=`WugiR!FOZ62AKg*Hr(3(t^j&Wu z{b68{hR+j~d6n=ig#6Yk*W(()DA7|_k%BmIz{g_ znlQ>&VZSiUb=(RWsnXqA+D~h-3h*n*7?M%^e0Z|5#g?xfWf_+25M~$Vs$eo3E&9cv z1rm5aRe@q+THjXJT@b;3Lx$Ml7sZYw02Fq`u&QD~W;PXA{k<FE?+4QeTpY0QdAn+haXA~t%VUq*F|=~?VF)R~yUWT`>j#$e`; z&8VFXCE?vA2u@_mj`e)XR`{=DU*3GRs3Bi!e|lPL+T3!js3U^r^3`84#VhKZE-B49 zSIq;2vh54fX^vR7WbL0`t+K`)2&DNXUH>Xba@Vfix;$WPIZN28Nj22 zJk0ICrbusT@!LCm^T9eR5yv82iVa{a_>Cr=kz$=gpSCpyFeC5T=F&j?Mpo=J0WtTd zZ9?B23;iEleRWh+f6zXHfFRwCiUN|--6aUp-QC^Yp|o@hNJ)1tNO#AwG}5_r2n+9p z@B5zLIlpuGXW4V^{oILXW}cb3n*q63;63dWhAB3{Tm-zw#Ci`7G%u$ic%Z89uL!}v z;8PpEyRHrz&eos4Y^1Eb@j%YdA1Ek>cVQM7`M&m&%k{|)@+$FwM6Kmr$Zn(?=hHq*f(n7OrYH z;Uk%c^~Pdr6cPn;`1FPj?io2E-t{kr$3kH(`0dVznygA-<@qfIGdmtnYn}1E%K0p@ zeOR*!+@3r^74)0S4%VX1K=LB%ya(2sZ1h`R&Q-Fd^5pzOPZTvD`lMItjSZ2`gVN(~ z8{yw1l}p8*q&Bv)J!#}bW}Ei)r2fBY1dKsAd~_|Pza-vd`f)m9j;g75xcCOOAHB#b ziovX3tw|hOkx1%7iF93T9-9T;7ct2kN!;cidMr@<_~suqDkKesOp~UM8F#Eiff`U7 z?rn1-oBK*k1UISQBgl@K!SczEcw|HrD>;=3pKeTulNh>N*+5b$L2?nOH~g}cF;z=d zAV$CB^;^~+-?c1(+!(Q)terjz=5J>A+z8(kkHdA<*)2TnRz>|D$8=(kzN3)d$icDn zg^p0}6Wl}{+aGw|Fuw64&)_ok6k1;sY-p%FP5EbmLBBLYj-glcJu`-4E#>UvZvStc zlD$&i974R5YY_aiBfSyPjPN^vWGv1OhZmlm6)A(}SgG2xjZ=(@E#1(X+cb#3PHufB zc;AY-0sf_eO=`D>2_5TQD*UBKDZWyq-0Z5Cw&=XV&HGJ`nb}NFi7|HRUueIZW_h+y z4whah0~v5WNeBh!g9|2H+PJNWYS6WE48b{VC<|{wKib zJ@$e%O?2HSjbmB=ENn^igb?3uzivD`d1Rn*b;6Gs+k8j=<~W-##XYd=oifs@Yf9IOKGxhPD zOkhT$z?YJ@oPIx*BTJ^w27;jbWJidams$~mRS+9?PLAoNDN${0b}iHQGS*p(XMi{m z?aAf0h4j7{tBI0ZCX}YdE38t%Rc7i-%GHKZ!Y(EEwS$_V|6Y%zueGl%Y#X?!8fLbW z4Nm^m*p@Amz_ob$82K%eA)1=CM?6D9#5A8EQdMMOlg{rZDM9wT<^J+ck6@H`gkQ#) zwL;8&24hPWspp|RzA&$Lj@}oU$}zg4UE#awo0m9k3}WQi2fK(X&U(lfZx0D}Y8;i@ zVM?nDyF`7A0Hj8|hzDfOoHklMGY2+iP2-E*<7mWQs2SeybZ1~N+`3mn9q)B+;!f5L zFPt({#3^LK{aI&dp{fYR5tp&S#bjoFr?DJXL6@oD9{+uXOgLmtTp<9F6jipIZvQgS z0%0)~Z+c`Tg!kd{n5rj~l($k{2VXMyEmqQ$q-=5g%`4v=p@Rb{>efsyM)At`LWplc znkQDN^kb&JZg;)IdA(w02hGYttG}RZ)Hr(u3=$o4b;4O7N z2_V#}1yPsO$*m}J(8mBIu{VWk_%flf+n1 z27biJnN$?6ynHv8X*aQt^pFRn4OsklG)F6~v^p(e?Eh{s-k`4VkC$NAD@VuYyW z;4U-1OTWApYEPCk8bj#Cx9L^Y%f|OHa7}^A^%9GcZRQ9Ya85}~Ad-0~=qi7STv@A@ zU2eL3S%;s`aY*?~?KYOthi7iEgLvO8ia4xir#j@9H-oa>3|5{33x`F`BI`ebh?wth z*x&bn<;W6T_`pA!ORyqn?wUtUS|9h3M-T5-ww6g>M5$!b<+aI3J*@Cwff}>&t{cu7 z_R1D(gLl+1$3HUzB8p-MFw`OccOd~NC2mQR^Pgv)^<$C(j6$e!$lpd$znk|`UTisv zr919Is`70!vz66BHRKJ0O4pe%5vJYSB4fR?1n>EFv$)`$O%I)N7(R)fjP##vT!zuWqyCFE#W_Tn3{N3Y$iMcc!1;ETMdI*KgD?*ZtbZ_z>d^6%O8jko! z=~|9K`SP=bKkv&DvU_=t?0+g?x?1IMp{M5?4RXR-WoZih2w6J^fY_eCI5$?)PP#bI)#uS-%o?>km-<~2t z9w}%=Sl3sqW6Ty~a8qpA^<|w;k2-;BK6{qfq*|nJ_lHO2x@6-|4S5Q*uQ1#~^a}Ef zOFkhMi&i622bv)@RFPImEV0nq9w<09Cl9NWTG+7!!FP!TOGl7OorM&O*!C;1^gq0G zzR>EJ)z?(*zG)%~3J$t=i=Hfrum$Y-?gPT<=xtdC->T~*b-$7>qWq4-@RuXzZGpa+ z9W`wEPw5^%;pfY{55nX}U9;9XowbC#s%Xq>j`a=3D+7%A286DNN^0a10q{DR+`d%}(cq zRwYH3xKp-%AEfhmi1*t!?BKd|i`TGivoO=T#AzQ0CC8yf;XYbVRH*AJOWDZc1zHh* zUFAFd_25LW?X9emGX8HBity%An{*&;)z6rQy1;kdesmh0myROx>pQ= z+l9_foM5GYd1a;G@&kk3!|*e91l;eay!vBStGHp5vl;(;#^?3l~k1Tj66YT;d^h`?PUJt`Vb^J%ZEr$ltAB8rdr5ddmq)e z51U9AAHA!Q#)*F%*xwx>hgbyP3@&K5g>6;{Hn2M>8h4fjA^-lGPl+f*C^p1oGt>zs z=OT(`Z`=hD;A~^ZZ%b?yz{pwlPpE~ zn^9T`o%S46dmXES=i1&5(iA(+miJw56Dg2~1amm-UNzWSS@oHbX7+B1tDl-Y`p{pY z|B0#DYUk7JIH$cl@`PykCN5D{tR?G1yo085e3D%S2-aAYE*5!4vU9qVvqE?GTSJaG zsqoFOs*e`wQ_soo+|+u^YmdB_yBnSoqklksOLPukkK|~awYtr3M-B7iUV;PxTJYW3 zU)7i#rVZ^h-`9f#HcQ%WQLoLsF?a8ODmbMq3A@^|Uw)Z(98h_zV+iEn6y1iAZi$ zPNjnN=Tu*sRsRy-w^bhw2I!YW%>Ekqd;&1a=mPMPzPf65_F3L7%y}HYzt;zCcZ0;o zZKi@EfgpYOP9%PhEj;_i891yGrE@POI+D;It?EphN0{>76~Z1f^E0yA+KUQY#C3yt9RD+Zq@0Rb*lWy-sx2SLp_(N!5(U`6VJKjbwly4I@Pkfqt-D(VYDY#PxA($ZTeleCW~>>$Iw$0uHD0OIGjl+XvDr z2Xm%nPaTB@%s2xWC72VIW;JZp7fb1NZHhvH5!>B)h!pLNBTRprB(R8zsdJ8+Fc%plJx6_ zdcv)i_{Z4yvp*jGxSCiQHy+2(D2W+e^NA+!v*_Y zT0R_sD-kC0xN>J-{(D4-asp~xNu{S4EP4^du>GNrEOPeyBsUV_DalI~#ax|oE0g0W z6oHj#D+K9mtX^+VDOyhh;*L`Kb*qeT$hMPh4`YTEx}QpF51T%r%RgRF9JiRhfZI}y z?&%G|SlA&NMU$j5%&iD-dY0*{r#NpMqsI&yd|-7|V$j!X+rNVOKlDY1SipN;soP^! zt4odOk5xmV;Tk`9L-~@&4;TpXi2h(ww51J7Pr_x+>VEhz2zzIkca4TbMG%Q*{9JaP zhy&Q+JYpAy6d9<^?fp*bYtqEbUoVeJt@6KokT0GW>)M(v9wh44B${3@6+7*H&*6;x zBAHYn>pY=!e(L&$p+{su0Hw=3GNVu3cAg0Sbl*9l%XCnvot zag&IyG(#Yn@#Y@BTG86*4V$%An@~EhS^dxj!jt-5#Xi}DgjWJ` z|5WdEDxW~$DvT#bk_*&Jeyp1$DWOVL+2Ndbu949@MCs=9IY35wj=bc-?l{%h&Q_uU z`&o_-@(tlQ#xm9!7u1-^vyIGu0spDFb+>nX)CD^n-AmgI`$02?Z(uQ)B_-B|D`hBc z4UgQlg)ut^?z(&tjK>}1jH(*M8fW)vpEF~%ruoXt&EOGC?X8~Ar~Z6CwL5YheUPbO z0&c$NQ5J67-6`?Zbm1ra?U#A)GOth3(a_eCqcq!28Zo*3OMbN4WkFdqFr^OmnJ(^@ z@H?@CDH6-43K*WAcO76gSqf*kNGxoeK(6tX><6Rsl8Ub^ZEF?uAi~B8@pGK7=?Z@I znIXh))csWO5YW$6IjK*2&Ewo2bRWcaZwaQM#Y6294OaY!zZ-2vLV_;)HOfrl9~!}k z^vktK=PkX13hNnT+j<$C40-*>$Qr_*^> zT>a>0<;;jC2u?$yd|W|7+LMlWeP)^Uq+6`~(5Iu`8}|3x+#Q7bb&PcgI%TX@uG`a$ z>ul$bkDd2IoQ(2CzmXM5lw2AA_<|vdrqca%&+7y>ii4XkVmy+izOO*1ARN0?&UjO>oK%U50eiio?xHN< z{IAXBHv!U8HiL{Wt}<8tU80rU)RiA;Df1|!-Y`*A`Tf0mCFU|c zH3rt7B);7muSq4MTvr)0vD!%J-noUX3a!y|jhb#vLHuk}o^75;7pP+2X129KUzxim z-QUGR-@W;B*>zJ}*kfGE^0RFw!c~bIu0JZ;4|7OAHJvX9*~f!839>--9^oY-V%0li zf^+i^XVXRJ3Lo*8oW!8v;{Q?Q)lW{9H$5jrAzY$xR_of>iarSE$YLlSW~Go^?}D`T zL+x=4cI<~P;Y@GooWP$P8;!ap^ytd*SbfA8Rmgd)!!llZGvudmN* zo2}jNcH9d7fu8E5VT$b)McHH z9ruK>g;~${OF3U8Vhz$dC9mQVW(0`(5pCCN}$?I;VIxRjzgRY>1qs4Z4tDaB0n3 zF{{9zBUcAog`b|Te>PAfl1M86_GDmJ?{IDV+FKWh_3$x2%NjLd6LjWC)+yHW!sYug z0tGInY)P?%PRw$g{9vj!6Puvuy(3V^uQ*R7aDJnryB}uSw364{=@PaZf1;g#Ghg`2 zBDh51v17fujpk^RZ96KyNo|OTO0xXQaUF#SaZ6}%*JxHhy_;DxT3`$m>}&7+4|nU3 zyE$ozl`xmpm#Qj0>Ug~^pT=tt$)*AQ*Y)~FZ{=XVfgi>qW?>`paEuiA)1e2qXeB8i zMeldy7VZhJejz3!7$3kcGvALRh8fIm;Q{k&CxYy zUO+Z?vCa@WEjUD7`WWm)s#}o@7g>LOrz$TUv$Zikc9*M)aXF_ZI01ff5<1v^IgM>h zm3&2t>XngX71>-nl0pq#6hlNttUA4GtTvc?S!voUJm39=Gt@@WMA%S@h)%qbkCJ>X zg7<1=wk-T_Rw;K=R_5(N^#^#L)^5XgC7&147cIp-5W)bD&FKQ_# zbyC&UFo+qd4QX4>qlrjtl^Vc)-7mI;kBT|O&ZmSSASlp6{ZaF&Nzaa*5t#k&GXM8?`fS{vci3V zH|O<@t?1AI-)y`2ta#K=F3W!P`s%HFWo_>AfYQ*|?dX#a5-9Mrvu|>l(XD2S3^_kI z5-O_Esi8R1bTe+r>o?!GIv-fYRs`B}M4FH3ghm0|KVtTB~828?x=oLZk%O)`22Y6`zF z=&)SdHC)xPFb-y{Ts*bwtQpsNIla@8vgZVf!2(fZE~dv^AH5LlwOu=Wl}|3Rx1tozeiOTH63VIDmTTWu7~%Yf0d1-v3k$anZtykz_la!Jl!Nb>r=KOTndkHidB2Xf zpQqfo7g#6ko&=V$Ze zvRXzJ-O{c1r+J3(H=&_r1xGnevi;dHp7S8A4(f5s&yN3aIXM{|Df|wbK2G>8$t`-1 zbh_47sX}@5<-x{HO$R(fAg$uxvO8`>wbSlXm*%s#=g#iI!aKfxwaSaUVHM_8)y7T# zV9mR`%M;e_-8%y48HAz{lcGR0hS#-}qYT##UNJ$c-;j?`o4mX2g5j6#p3!_M7q@rm zm~yMpn&#PT4(1RH`8|A@$#DRiYJXLbo>3RS^efuLE)GU5s^#FZ!%_~!OuDM`%aNa0 z%pBiERFj9*)T-dCkc;8D6+YijF|cxNEfU7k4VxYm%1T+d;EaEtjk{L#c4)On-YVc5 za6zqGT$?=3?Gk*P@$97W4$$@&>~wu4JwiP`iuG48X)pSU;sXCj;CCo8XU#3AJt*B* z`?RI;#f&9IWvRq060ND6p0~vj>v-d0mns13x?Zk)qAqt12eB<>ZrSbC{i8TL3aeXu zUU&_zV;|j|6HEXYm7n+LTV|}-x)Gd$7z|VKRd0m#z!97~Ri|d1cMHld?0IKyFXlu7 zR1M-&uw_bCx#Xd3gxE}M6WNhhTs+FgR53Yss1ojfWGZ#lzG{furRXn1c}qL2?I8ty z;Ae5eZ%-6USB8@{@5bG`QccZS`rN17yeXKDphvK<;M_hOu-Sue65o9lY(R;TA-u9* zvD1hN%hF$SI<^ILZd0JS`QZ{R9-pt(UMwWve4^V;$XBhMTEwRqSG(qhR*--iC$ zz45P0EGhCbg~d#4-&V!sRQuMSFj1jp z!q>x^K>c7>`SOF_2|R%vwbuBDkkLyW`${hL!?*4BiyIN;(b2i{TaM@fc7sjBR_wvvpI4 z1V-PMk?-V$R>!1~G~Z6`Ecxs?`ziWj2Th2tvTYra5VN6ou@6LB> zalQBi`v%WxKlC>In4YN78j}|V!mS2EdXs&)9?E7p(=|Vooh5@m zBO0Ey<>dzI+4b=rr1s$Vwf#@f(3ivY$^bMxX`Z;&2Jm^9w+&@dqA}(&Xg;!W!+Cq9 zBNX^454Y>3Y#H|zMTWJ2ry|&a(DU|Y= zLnFnn=;--#!1~xS9K&MoG%0WfGp`J1OFGxH`s-xyS$_W+1GB-K?p~f?%U|IhBNPa{ zdeQ2vv19es#+=#mS|W#Tz?VI?j)rZ$y+UM3aA|>u+uKZEr9{AoZ0YNm9e3V=l>TWa zBQ2iY)!XAx0SJn3I^hzJ&O!+n#B=cj_=O7<@%NW!YL%fytn)XUUMT{%$KGkWA-eWl z=oof}!&2nntC{?zc3ov}?y-*1Q_n+s=}Ic|2d^4%nQ8wZ8kpiS(11l3NQPxm?qmF8V`TRp}J^+!B;#*#4azt!B5rTdJ(d_@5KH5EPQQ2 zL7F{~@8e2=lGQmN$PPIenyX0M`jONgKe9v)vj0Me-$He=`CYJ#+7=q<;)8q@I>sCH zL)qd$xw1T*(=V|<`${1zr6wy%F5{y^bz{}>uMAWmcRsH(a=Q*~0D6Z)DP0Q%Yal7e zvXKcny;f0uW20|{cZ+isgO5z$yN|I9DW#VE383Kz^45dp%lUkrdDlJ%DQLAXhL64! z5w};^;(_$)yr=Em{cTK3IHY|QD6tWMJ_gZ-%ZFLt>>Qtxvao*!JI2!c2H;R%+FWfS zF!D!k-z%A%{nT`_;4yg-%_!=l*Ng%wM$i{WXqHz;{x$_4Z7!?+)(AuqaEH>~$@Cvg zdhSJ^ml?a-ka}9zKn!XXv%N#mQp7BDnco%gL5&6)iVo^AiQR$6kDH&wJ;qx=ZDl^# zl(_q=PMnb$e%@C(XpQLtq})ZrobtNi=rnN~hD|=0rp+dLqEYD|?AW{SsnQ`3+Mzu*tnJ19<2XwzPtlv|#$NM*=jg-}Y&Y*X!kGt0$- zacs@>==ZBtFvWSk06M7Q8i_Au*j%D9170^g*4{X4`oyzn5)<${(T_F)Zq0;7L~NOX zUq}t-hGD#*_S{M69W5n~YG2Zj*~7`IG>h3hhgLl8w{lR4SOl8)zXPH&sXixDB#TZG`lp59Gj?ke`*1agU|J@v2vMv`0 z?5a~yyc6018c&E_*=mT=gKFTnmgQxWSNimAtb#^uZvpm&U&%fDl`33h&|&u^J)_yz zjC4&rGD-2frG2q5FVRH0ZN$(Q4h5qFnzh*go6?5EwrINCy239LAt~Xtu&L+Yw?afo zDCQ9NDD@&@y)cgPyN?>0g})I{0vlbNKkoC1-V7z_FN(1WTca0yS6DIp+x9qB{VD~y z`O=NA6x^*bL9y1>tfVPFEZ%>w6)n1V9fuZIj3F6lJih&%2tP>`)OxCD%5q+k8%Xs+ z?y$7Nz&9cAv~!0s?frp7e>Im1ZI zw~wM}<3VT3>9jdBRL?YI7&5>kdi?fBX0nBYeFQ@@1nkaez4mmZ@f)_3+miXLZ2lHk ze@lTgwZyGn=d@Xmxh+>l@Z}4EBv=M&t=L%t?FBS5`)`ZcO8T!TTsXK*v+ z$psU*rVk0%LOIWZ{kkOPCyJpCWBIx3^z&JJXx|D98Ql~^jG+>oNgmAf0z(LH)phCm zOtM?rwJ8prWji4yX}E>dF{ByXhF04_n$R?ZD%gSD^z0<1zKhJdYkNfYQno}j^zKCBiNHl*7x0-?ror=tn)jx zkuREoD7Zw7`y!R3*wpH0@~oj_78I<#$ZcrzH>BhnZl769Mmq4JOUby4Xgf1;2PqUo ztF=}COQmXFF$azSNBXUZA;T_C#13*ecA0~KgW3Ksji+=B5L(xVCw&lg%sn*Slj%TE zZPBxbzbH_A(zQf)Uv8N=y2BoVOSYuaER1&H%?6!A53}dzZoPhJi51t_cQ+!x(muNq2P4*-!gHHaw{eYGe6N=Y4o-`3zwx-(p10w1Y;ADhm9i5){nN^r2i*t#3xzP)1nmK6Eg6>WVycd(GSzVUhMs0RY=``b=yX- zPFh^wV06GLrt!3%>rt_kkxYa;o&1wSC(HQ0!qsNBpS| z=Bam_;$<#mDM^)ga_U;6iPFB9Ln-w8B~x^nF$HcY<-w*RRp-D)MEMVTbtAiX12asK0FLjYVk6JJ3&UkUyb@-$NF0$A>#G)pnUzjh_ywR&bY zR{c5AGi#ktIV7N8na;E*I6Fox70?3BF(3LxB*O$Yva7$T@qE6TQAom3ZqERIhQJIX zQ9O__u+>v`SB#e1>ijOwXQaW_I--vmSGQzITWrhRqkOIMmW*{iTw6P#oBI@ED!a`Y z1n>Q5E?1)P$yEuB@XPNs4%fDhbh>9JlOzHxF^Z+-hZO;{%-*@D>DHx=rJV>Y9b=*B zV+XlIcEJnEyQWZ(bMvftT<_AYmweKzF~iHYE9=#6JZT8^yF z$Xeyv^Ze1Eotji(V_0<~nWlBa&f+SIIr{lcL8% zn3$qXL3xSA`Gmxe6^OR=--y4l=wy(McWs`^rV~k=_0X!w?40=AADY?>*Ne@Ztyo&I zD6JOnI7yHLclk)$-ZeNSL$@e9)BjS5pyU^$NU*ITd&4KGU36Db+ZR>g9bKLiZE(kJZMx3<4khmv4f3RL5DIb+goF)V&Mc&Prs1xcS`f z)i|!T=qjiwuE;Nofe|?k2DOfQp*O;zvu54{_5DAx3YCN*E~t)UkrVn1TkVKW8&qS*p8Ow zBc=DqFZuq?nGNndxT}eVAqId%u_e~0TSq(q#?V8g=u|*p-9!>vjh?YEtg~Ua-u%0> zr%C>cK=xC2PExrPN^&R~!TH4eHj1Q~v86I#Z5qm(W}urEypSjebWD=O*)P{%=D;B; z%xzbc7r!~7&=b_bYb5d59U^S2taRn|16l(5q!lN#6B-Y!h7^i)mss@*Pmr4T2yp)_ zl0XBkhMP5=-oI5`yEr|)7;eZIzN*Kvs@JkQv;~v>yB4nPXa(UAyaFA*MbPXn`tk6M zXyl4`1ognt9cnGUX*ssFXhgnkk{4bQQV??^mZIIe-;-TS(vCVQtnm`yDD$Zviv+77P2C>Idmt!eB@|(Y_7D&-%`Uq4YA3R$Dn*LL|ONEDu$R#KL&QTPv z(PU&3=p{2H&nh_Vu@<407T44(k>}>|bHZ6?5@=^4X-5d~(_2T+lgQd3$VX5|5P$}u zIk}ql@5B#sx!MM!_CJ4E5az(fm+bmI`m0C636}WsYnH9ibgUYi^}Yu@yw??XBhd&u zC-E!H>6=sBD2!NL*p%_-V~2r>KmSVg&kk?Wf+y&njb#|R^8PEyHj@K1?+g;IW%0%3V!^)HHA$lrz)EZaAXb`54{1q7fp ztnzS*t!=fM4AH@6j-*YLtJzkBSvo;JJ=rMU2w>Ka3CQhyY`Bv++y6pvqo&%LgjuGJQV}Mq{o4!}n%(wo#$2R?JOI27B@|i}P`dRcc>Qi~ca; zPcHdwx$pQ@SL`*o$V(4hyIgH@VZR-$Gq0-suiZe~e~cIvXAY@Q#{LoGj%1#~pK_&* zkbvf4ke9K`67*7br>H?cEWMUbM*RF_bMBEt;!*S^fB{;WaYYVHoz0O$PQQfZbx0Uf}#dHgXKQ zKSq5UBJ_k0Q5Lltimhomi*Fr8U&kchA8e7RfeB>Fr>TTl>hgIZ0z=C&Z zON&3KkPZZ5M)GGDaW&+jB$r3EX_gU#cbqF`Jtzj>JgJUl>G`S(ACrJyjoxsYtnJI+ znUCx$v+UmdG~&48k%m}aiRjd#pqE<}wy+Bi7MjS4xNOeQ@vpjhEpxD)ClT|q&Y0Vh zmn+SX)O7V-x7-U!y~hz0^#a5JL_*%@>rYtB=z06<^Em{C%sb9-5JOth?)VS32L zi8`$YQ*RizO{qV8Ob_9{2BqsRF3el3eOXooW(iPii8A9-!SauwxmD+c~+BES6lUwBJm&y6nu~ z>O7_4*x89++3SzCw#EtxjRW?1KfSAH@m;ICeUp6~sTmsBp~n`(l`s{dGU(v;BUca#Vnh{ycDHetd!A z=yS#bqj_T9Hd`bTZg(dy$Z6|X0*i)yP-^CxPwvgHd$ut0glCb(Q z{~cPNTC%=S@XtSR$Cj&Szf0%TUIQ~f12A_zv8WOG0Jxt`U<@t3t*D zwp?RI8*^YDJ(a#L$hWW1(M;BCPd1v9wSOHrztMY4>^5p~Q&PFQJy!{$B}Yq`E77>$ zBO@bXk+Gi`HW!U2*BV@j7a3Dh@Qyb^TLV4WyfH?P6?DNPUs_R9IeC)tiP?~so+tBO zv3Na)T}4_vA6SL8ho$<9gU40d_kB{lpvMVcVg_kB0KxwTcR4?eceQgLw815Fa$^NM zu4#){a)?-PWUE&lqX$n$QO|oCek`4pG_LJ5_0+ZG$RY3O35<=rS+ITGWPH2yqEY0P zyWQ6?UMe!+XNNp928jnvgZTynq*B^(5<(*3CG$P;ABOCgmE5BC#>$ z&m5(gqIaACjC6>k4H} z#JzFS7ZBHxg5fh+8}q`998w3#uMK?swi+Q>^`SaNT)qOTdl+E|E2Em|*W zOA%D=|4vpqwKsi-OZxHW4_udM(6?xe%NER9tagVxJdaxng^$7|CweOx=I&jG;f64L`x9v$Tw}oEMS09bDdsAp+lTz2UvK-;Jw|!e z!T^}ySQF;pv`HPYm5p+zXevQho1Ql!JGtcO3>1L3^Cv~o?)f$Ge$_^=V-9gdKgL}(Ouq19!S}aa8Mci*fi)E{Pz!dU0*0*tNEmL zam~8~R61@t?to|lf?sTZO~Gc5XaYmLa^cH7ksZ%Nj1}{OroRU$9jyQ8V?mD417&5n z3DObvdLp1a`INT!S^E2WGvTTuUFGCUr}`HEMG+ow{xOS5i_oE1Wfp?Fsobji6hRl^ zaVos$^&hU)0QIpz8I)_;@Y>aCOxW@THvcuThA&pOdKugzDxv*MK$l#x8%dbJ_b_b) zAdcUUADtW_j`b&@-fTIg;v))qHC~GlJCJ%@U$CBdp>-a)0tp#W_S1L>ucaZ{w)%KAhj4M6 z6mR3_k}{?fGeTu6V&{{G$v=g83e`F8Yl=m}bCMe}(>o(Q1k9lcmV4ef0uahB#Oy7S zSkg*+m+QXAyl>&o9c5Bymry6)YJgB>5TE|BE~xPyNdwK5tBz6w4Mn)~t40S>gCK^r zyyz|3XMn4`^SKC=tYZF6&h_qZ-6t9|xFn7y3fAT2e=l?ZnC>~D0;X`*6|W6P+7~E> z)FV9ujkm0&6q0knMkn}Oe;6NMQ~FO+r24zQqR>Timv>L(QA82)LSAWE6%@abr}^iX z)n6zgE_a8upB1B8rJia4`%3AXid{B~`ubsWS3r&K4|g2iK|Y0P06V6@3UJ3TLI6`< z#s0pZ%O{&RwsZ7%)xT}=&Il!9kl?5~dt8HYOc(?ueROEYxXKQNOrAtTPR3uao8aHu zNIwRhEtt^qTKcb43#2A>mR} zIQ)NkQqAxU1Y!$iFY16z&Yqt@bss{h!%&iY5@Gkb!uQJPgH`?aDy)9a&mtn7u;27_ z??R-33QYZQ{-s(zinu+IN34@=aP~0%B|-)Ap9x#$t-X(qWP+MgP+@yk9<|GgGTXwk zJih_I?48I`4Q}nLL}F7=R?<wNpMj^vZ#-T{ge^4LjWyLa570hTsicyDG57nis{sJG2Y2@F+|a|^EV^6oC~(7Ib# zah^SN*79F!ugcAhcn`ZD9YtCu7=56P70yY7Ttj_fE7{O3UzAl3{D*7nI2P=y%u5}x zv9-a0$Gji@To|`nog01#1R0g93zq%PK7{qQb>Vih_Bh&)kC5el{o3bYR-_*J$Xzg6*ogF5IhH z^z!#<6^!f3K&P&6CE-xc7ezd~Q3%Siw2*}@h^CDT*IabeU9O7iQ2;{02u^A35yvPy{AW2skfMEJhkpcS9n4s(Q$BEUv^7&vAb5W+>9@F_@SjZ=Oe zmKuWF&2}47oQ!MZPd<%eHGF>6+Q`)6Z(o^`y@}Cy-*RYNGS1`edL9ZyE+K+i9`L6#UiE2w$80KSl{ zRaR&Kmf`BJ>D+BQu#AVyv2N3@js6sqhCNT(Cps0Az5#G62p&NJPBOt*u*TQAIB;D4 ziX*ss)^e9);Kcg5mYei{f)plKs9f0kV!q98Ln`6__Z1|Zk@UYXhuKYG>f3mf3zwdb z9wHt4-?Zp1GC&sgWjd}K`jrd47mw__xX8@ogRW>NWFU+5i-gg#|-XCtMk+4m9F#q4TSw>d{@hE2xq^Jsr_`<+f$+<%36;rbo3%Uj7$>YdvIB{+Hz|EK{6 zbfMd;QQ0V{xBQMlsr3vWr~wmnB^T=ir28!Kxy6Yx3~C1f`%|P^-Xn??zikbdK4s_o zEawgCG+MCU2{HT?()WlgQw3M;Z+nU@Gd$}h5a6KhkEgas^p^cI_ZO(un6i5BHF3jQ zq(N%Bi-%7SQdn5gOXKQ(0cXu&m98a=@OyZ6;-G=^b+nvhS9jPo|5nnlS*?ZLySuZF zwbj^zrt28%R4(Vu`u>U#e9!6kNY5m;D zF#~rf0zbZYTYMMGZ`V%CW(mttW&KIw$7(?$-C+nk#6sodN3Yxb{{r zaH?qf?hDP@uHEQ0S&o-965UkbdVa@)k;>CvF(tX6=Qs5gK}nZi$&~z6Q7BX%6g7NS zu5h@0QcmOQ1U%$9JRh=?hPMss7nU+1e7Jx6a#iSFG+7R!iHah%vtC{dI@03H6c$Cf zlYJqM)gl+Rwq6W4pu{MYkJ*yKT<-A>-SOCOw0G(sJ#RAKdIzNeND82Y6I7gUVYa3Z zaVTjj3j@@e-_RbK^u;`8A7rQRy@O}J?Y|DT_Mzc>stEnAcQAdGazt}?t7W+U*nTm0 zgp$AZb&6j9RiQZEem|{KVe!UVmBjM=M|g|$Gu-5d0dHhjmr#z32V-Qet;I){>2M|> zL&*isAvx<^Nrh@LcNz_ZnT^x#Ilok~CF_K?DDA9Weit@5Tdb_hc$K~UtY{F+VrIUC-^|8)wVd}eMrJn?K%DEPQTF=bOT}Y zzU@bTAV>L+Kq2@Hz%Y}K-(Q@{VpR09SMT*;vMDM1f2C+4kq3 z7OBd{<#ql7fD;jox=ufA7LUc{w(~Y;R`pDX@Ab_U*xo>TA8*Cu`ek`Jf!b>Je#(JB zgD01e&j~eqr_}?D%l@=$+onUueATMc)&Xi`aJwj8Fj|G2J9pb&B#K{nkL4hWQOIIy1^P#&5UND7SnH#1-Sy;n{1%X;YoJe)-3cnd-cvw zaMh-^A9#7%t1ls}+vw2G!uBd$yPthqWg?wbb?QbA$gf=+j`HZN<^BA4-2$g{Pt9VH;NY;-JYrb4L%CKh=j8oi>D0`j z7ZZA2?cCAw z>HoBM?r%w@TO6soYIU^b4nR8P4kwB_k%Yi!!%UT#F^5gnUjK7 zz#;FDnt)Mwt1+uF?+TDp?|Ps8Jo~fo*OCw$ zkjN`V#~r>V26t#fNU3nuv1S;r^`1L+-k{Xh08q!KwJ_bzIC?9qre6GqxSFH(jTXkK z_5@|y+Z<7+PqBk&IayYFM3LJ$cnNowEbr170m>vSOsX zTerh8?S!nPDMB7XKTVW8CI96=Qstej7*NM6;tLrmZ5JcJAqBb?mFRQM&zF-B#&BK( zE3m%eM)FLfE7B!ox5D=h?Y{empY)~;n_=-SwJsM{AA)_Z5*ik_sQZM;QE&AV=yG2H zcE#=((PA*bEk#~Rkp23b|Mk?x07!lB#YIv2YMUc~Kn346rQlyi%UYICPcZe{p)J>` zih}B5+rh(shjY6wb6J%g(YA$3WIqn8$itYs7w|`L+76~;;m?NJ|7mzum&JE_}FN$M%6)L~K*StgOrF6Lv zN$z2d?`ju6VmLVG!A`pEjQWf!pxzzhdNv(`Ii7UMliuRKGzjyKr#Rvpt^G{RDl=co zG}C{aF*fmDeVlpQ`e9RpAkZ~JV0GH4Wk#O)z$vOj5M#SC8;U#FU3}w0!kiIw^Hi`a zcNDJXwZ_o16onS8Gp<}$Td9H8S#5L6;EqA!?Rb=J;~ zX+KH>8lBYrWoJlKzf8QsH(L1Y%(pgd=(iV{k75QtGdxRI24iiGYZfR_b)n z?4uVD&0SVtr|c?EDLL&|XTU|25SBKkz%LC|lx(s0SpD-tPIVua6gvK_J@E&X#sI3M zxPmT~Df=g_I3xFxTUj2&K-+r-dbuQWV`-q-s8MCQcQG=Pk9{vNq2f^cd=))%;xnaE zmAh8`rJJPDHXL0v5nlAY`l~taPOrY!v;{!CH=`)q*oVJNc2T==wD41e5O;*}8@Ob+ z@~WYxbUwGXns8}u&d&8bS}-a1J9GybKMLXZ?=S6P9dxPS6z;{2wI(46owdQjakeDr zEy>Lm+F&7bs|7~kK9#pjwoF2#8|_e-$4`%90jmyJ1_y19M+I}EJ&-hQAIwazl^@8> z23Mw0RkbpF(p$tB%%UBq#=_i5CK*-h*QNPyVd@Sw32a$4Eb*tvGycf9CWWa zsa8EDTFzrHwd0AZ1$!94i3jiB+I7?sgUeTaoBth|RS+dhN#Zy)ZrNGH)+?LpX9_$m zP^EQ>It@a`Mg=q$Qc|p!JhW_JfAuaH>lbWp-c$ zAn=Yl9Srl~#V2}s1T=UAxq~+JDnqy1vu-XBSQM7oQKi7$K;`w4vEXlw<*i*s5YR1W zY{cyE{=DH|y2GR^J{oL8*uFc>NWi`Ox`zT%1h$=doVd2GTld!{CO}0339tYE`aiA1 allJvRjD($8;iRdx`#L+iovZ&PIQ_q_q8^a| diff --git a/scripts/vite/plugin-info.ts b/scripts/vite/plugin-info.ts index 6aeaa69..eb4a0ef 100644 --- a/scripts/vite/plugin-info.ts +++ b/scripts/vite/plugin-info.ts @@ -46,10 +46,10 @@ const getBuildInfo = async () => { const version = commits ? `${latestTag}.${commits}` : `v${pkg.version}`; const content = `欢迎访问!版本: ${version} 标识: ${hash} 构建: ${time}`; const style = `"color: #09f; font-weight: 900;", "font-size: 12px; color: #09f; font-family: ''"`; - const vString = `var __APP_VERSION__ = '${version}';\n`; - const hString = `var __APP_HASH__ = '${hash}';\n`; - const dString = `var __APP_DATE__ = '${time}';\n`; - const lString = `console.log(\`%c${LOGO} \n%c${content}\n\`, ${style});\n`; + const vString = `\n var __APP_VERSION__ = '${version}';\n`; + const hString = ` var __APP_HASH__ = '${hash}';\n`; + const dString = ` var __APP_DATE__ = '${time}';\n`; + const lString = ` console.log(\`%c${LOGO} \n%c${content}\n\`, ${style});\n`; return vString + hString + dString + lString; }; diff --git a/src/components/AnTable.1/index.ts b/src/components/AnTable.1/index.ts index ef10c2e..70f9359 100644 --- a/src/components/AnTable.1/index.ts +++ b/src/components/AnTable.1/index.ts @@ -1,5 +1,3 @@ export * from './Table'; export * from './useTable'; -export * from './useTableColumns'; -export * from './useSearchForm'; -export * from './useModiyForm'; \ No newline at end of file + diff --git a/src/components/AnTable.1/useModiyForm.tsx b/src/components/AnTable.1/useModiyForm.tsx index 0303225..077aecd 100644 --- a/src/components/AnTable.1/useModiyForm.tsx +++ b/src/components/AnTable.1/useModiyForm.tsx @@ -1,8 +1,8 @@ -import { FormItem, FormModalUseOptions, useFormModalProps, AnFormModalProps } from '@/components/AnForm'; -import { cloneDeep, merge } from 'lodash-es'; +import { AnFormModalProps, FormItem, FormModalUseOptions, useFormModalProps } from '@/components/AnForm'; +import { cloneDeep, defaults, merge } from 'lodash-es'; +import { AnTableInstance } from './Table'; import { ExtendFormItem } from './useSearchForm'; import { TableUseOptions } from './useTable'; -import { AnTableInstance } from './Table'; export type ModifyForm = Omit & { /** @@ -31,17 +31,24 @@ export function useModifyForm(options: TableUseOptions, createModel: Recordable, return undefined; } - for(const column of columns ?? []) { - if(column.type === 'button') { - const btn = column.buttons.find(i => i.type === 'modify') - if(!btn) { + for (const column of columns ?? []) { + if (column.type === 'button') { + const btn = column.buttons.find(i => i.type === 'modify'); + if (!btn) { column.buttons.unshift({ text: '修改', type: 'modify', onClick({ record }) { tableRef.value?.modifyRef?.open(record); - } - }) + }, + }); + } else { + const onClick = btn.onClick; + defaults(btn, { text: '修改' }); + btn.onClick = props => { + const data = onClick?.(props) ?? props.record; + tableRef.value?.modifyRef?.open(data); + }; } break; } diff --git a/src/components/AnTable.1/useTableColumns.tsx b/src/components/AnTable.1/useTableColumns.tsx index 5687b9b..7304272 100644 --- a/src/components/AnTable.1/useTableColumns.tsx +++ b/src/components/AnTable.1/useTableColumns.tsx @@ -182,7 +182,7 @@ function useTableIndexColumn() {} function useTableButtonColumn(column: TableButtonColumn & TableColumnData, tableRef: Ref) { const items: TableColumnButton[] = []; - defaultsDeep(column, { align: 'right' }); + defaultsDeep(column, { align: 'right', title: '操作' }); for (let button of column.buttons) { if (button.type === 'delete') { diff --git a/src/pages/home/index.vue b/src/pages/home/index.vue index 7e35cd3..c555ca3 100644 --- a/src/pages/home/index.vue +++ b/src/pages/home/index.vue @@ -71,8 +71,8 @@