From cb7a8298ec5496914d6044f0b9014107623f05aa Mon Sep 17 00:00:00 2001 From: mtruning <1262327911@qq.com> Date: Sat, 15 Jan 2022 21:05:11 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E5=B7=A6=E4=BE=A7?= =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/chart/charts/bar_y.png | Bin 19075 -> 7976 bytes src/assets/images/chart/charts/bar_y2.png | Bin 7976 -> 19075 bytes .../{variable.png => water_variable.png} | Bin .../components/Chart/Bars/BarCommon/index.ts | 8 ++++---- .../Chart/Bars/BarCrossrange/index.ts | 12 +++++++++++ .../Chart/Bars/BarCrossrange/index.vue | 13 ++++++++++++ src/packages/components/Chart/Bars/index.ts | 5 +++-- .../Chart/Lines/LineCommon/index.ts | 12 +++++++++++ .../Chart/Lines/LineCommon/index.vue | 13 ++++++++++++ .../Chart/Lines/LineGradientSingle/index.ts | 12 +++++++++++ .../Chart/Lines/LineGradientSingle/index.vue | 13 ++++++++++++ .../Chart/Lines/LineGradients/index.ts | 12 +++++++++++ .../Chart/Lines/LineGradients/index.vue | 13 ++++++++++++ src/packages/components/Chart/Lines/index.ts | 5 +++++ .../components/Chart/Mores/Variable/index.ts | 12 +++++++++++ .../components/Chart/Mores/Variable/index.vue | 13 ++++++++++++ src/packages/components/Chart/Mores/index.ts | 3 +++ .../components/Chart/Pies/PieCommon/index.ts | 8 ++++---- src/packages/components/Chart/Pies/index.ts | 4 ++-- src/packages/components/Chart/index.d.ts | 4 +++- src/packages/components/Chart/index.ts | 8 +++++--- .../Decorate/borders/borderCommon/index.ts | 4 ++-- .../components/Decorate/borders/index.ts | 4 ++-- .../Information/Texts/TextCommon/index.ts | 4 ++-- .../components/Information/Texts/index.ts | 4 ++-- .../Information/Titles/TitleCommon/index.ts | 12 +++++++++++ .../Information/Titles/TitleCommon/index.vue | 13 ++++++++++++ .../components/Information/Titles/index.ts | 3 +++ .../components/Information/index.d.ts | 3 ++- src/packages/components/Information/index.ts | 3 ++- .../components/Tables/TableCategory/index.ts | 12 +++++++++++ .../components/Tables/TableCategory/index.vue | 13 ++++++++++++ src/packages/components/Tables/index.ts | 5 +++-- .../components/Tables/tableCommon/index.ts | 4 ++-- .../components/ItemBox/index.vue | 11 ++++++++++ .../components/OptionContent/index.vue | 19 +++++++++++------- .../ContentCharts/hooks/asideHook.ts | 2 +- .../chart/components/ContentDetails/index.vue | 1 + 38 files changed, 249 insertions(+), 38 deletions(-) rename src/assets/images/chart/charts/{variable.png => water_variable.png} (100%) create mode 100644 src/packages/components/Chart/Bars/BarCrossrange/index.ts create mode 100644 src/packages/components/Chart/Bars/BarCrossrange/index.vue create mode 100644 src/packages/components/Chart/Lines/LineCommon/index.ts create mode 100644 src/packages/components/Chart/Lines/LineCommon/index.vue create mode 100644 src/packages/components/Chart/Lines/LineGradientSingle/index.ts create mode 100644 src/packages/components/Chart/Lines/LineGradientSingle/index.vue create mode 100644 src/packages/components/Chart/Lines/LineGradients/index.ts create mode 100644 src/packages/components/Chart/Lines/LineGradients/index.vue create mode 100644 src/packages/components/Chart/Lines/index.ts create mode 100644 src/packages/components/Chart/Mores/Variable/index.ts create mode 100644 src/packages/components/Chart/Mores/Variable/index.vue create mode 100644 src/packages/components/Chart/Mores/index.ts create mode 100644 src/packages/components/Information/Titles/TitleCommon/index.ts create mode 100644 src/packages/components/Information/Titles/TitleCommon/index.vue create mode 100644 src/packages/components/Information/Titles/index.ts create mode 100644 src/packages/components/Tables/TableCategory/index.ts create mode 100644 src/packages/components/Tables/TableCategory/index.vue diff --git a/src/assets/images/chart/charts/bar_y.png b/src/assets/images/chart/charts/bar_y.png index 6a1c738d6a0482c5665b1e42576ddb157863d667..c5c0199501f0edc92028d993460995659dd0ccb0 100644 GIT binary patch literal 7976 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
  • nA8~mO`>; zV>-O8mjLX3M=uA-C9~mG&5a2Xt*L-dtZpyGgUHAH2*4bC?BhdIglMnR@gN1%jv0e0 z#c3}~?YFUwHT;wdf+B;1_{gzko7J{~HIL0DlV2f1Ix>X3UIOdmkup1BZw4r}=M(%0 zS!QC#u2cC*Z;J)7M+ULh*`j*IX}eik&(>m&a7|npF7dxVQe#Fp7?JApMdBpFL(k!? z<@ynm8a(XWbXf^~nZx^Urs}3x>q;xud;1K?(4_Ho74PlJ&)5vCYD`@B52jpNd3oP) zqgIMws8F?AaItF`(i1{WPF<$IJP^R{F&8`J?V5Z0H5mc#nZes5n0OSf7nTY~9cj-j z=h3qWZ_OxA8`8%@FYbR+`Kpl486IH&se6|9^3(QV_mnZ3#5f_+C{9m|&AnO_<~m;9 z+9}^-Y-9F=*z`E9;C;NKJ8UgzyH9B@+Iy8G6~9r~)u%n8p{ZyZ5 z*(lPOUFve|gx=I@oSxd^&^d(aQ#9;#iK^B05ET1Q@>=z))ZN=-ws2!QpMf_4E?gi! z)^$shs{w(}{^tBBcp`8y_27C=B+^^)*EJk+f#uH@KDswIJ&7X67J}n*Y_}oBHb7R>yKc{ZY!P z^nqsQKYbHk);of_e!Zb&Pe*}g3(rR(oopSK@qG~g-)7kE2DUSK)!#xz<(@W#TSQJ$!w>lv@b2i&aPU*yKQxEcigf?Q@$oBiHW<3a5>H!FU_8t zB&l)Y+jN4nTOUfcajM~Rdwi637N-JTN=ydCHwf zj!BLE*f{)(U5O1t>x<4=tRl8;5>fHbn$iOhH(IiX0tc`a z6`M1czPc9~43{l%Gv9@dQYA}E9Ggih%89aC(}7<$Gis-$Vi*_BZ`11Dp2%106R+!c z`)!%?$phOJ0}Svqx^9E0QbFSFIciD{YD(Y$<528MGxQDTJ~#URVIZOR*$8^r5M1Ad zJ`@;vfnP6qWQg$bQae?d!Wz8{-2a$BOIj*Qn(osm36<|$9||%M)c-RhT` z=eAtQ?!&9tAM#Gj5NE{xPr^rQDy4h`oR7;aKp^!*Tl7Zi)%lJqb70#*|CpJD`wDZx zo)CM@4kkSFq(aRagcG_a7lydj+d)&+$g%p<(NO&5O67ATd#-Q%>XYH28yeb}ZhnL? z-Q1;-q32ybR9xEF9~`#Y>Zn|mx1{swI{)2z{`<46fi>zF;j`4Lrql@df4BVBq635` zUvoUWrSOd4juGu=4vSmL(0y_6HTOcsuWeYH%|%VTkU-*o@AZi-meDDSQNCN4&Oo-i z;fW99C6FF*Y=*9C#(8sHe%eSC=17*+unPrjpqF*|b!f>bt{Se329?4_Ljhr+U|`V> zsbXP8ZZw;=_ z`qkN%&}+oOqI$~?Ug9GaPmY38AP@KR=KnpHWQ+5LGI5x}_(7oU&RZkW9*QKZFbFZi zr2?@Fn9_59JPJuiiL(MuFhsCHYDNrr#dT2%+H)YTraRWEc)qkvKzrE2Arxy}(IV(y z3t@rSwdxVPyANWo7ou#;eEYS6EexE6F`-J00aI7)7|*4i%_* zxD?E)z~DSlq-NW-+*oK9Kpqo4&(3}^A^?6R%*R*V zfw@=p@oWr|Hxqw7E~{Hbo9!>lBuEt(ZC&1a?e6ymuPT0?gDttBkYe# z&dt1FUP>k~eXksNHzo^y&Xpu>t3Ie8TN}-lpon^lE)+|KpE=>N2y$cWm{oPo8wD-z z+)#4Dp&_es1v;=@*50w(=5<4+R6VhxLhZeZzE$9LkoK-Nfrp8E*OEf3KH6bXbq(-d zk#`1u9jZlY9yJjF$KWn-qP;stMf5FbUU_Z(&ZmJOyiQ3x#xXTSmGh!lUGM7dhIM>B zeCth;vQoF6>l0T4^Li@Y%5Jfe@?J6s!Os}}X@1J=_|C>PJd=b2Z9nwY1!`z17v``+ z;ctHgxY`jsM0|9`x|4@aD=JIKbOlE?;J9-y_=w8izma=o#DQa{w_Kz%Cc>b?=UzgjLK9 z2wgACm}wq%pBmSy-m4b={w+RFpu=b+bT>f`pn!!M@lH!*(7e>?G4RSMKvGq5XNvf| zMRx|eA&OktdyAMvd*?PNq=Ro^$YI17+N|+KGT4;i(+|6(nOULhrOUa-()U()MKfbO z2ZWb%o7Qh7a4nPcmafPV#Z6T(N7@U)x;sThC1m%w0!N<$@rE26d&w&Zo8a}h@)$rS zX4puwKFKbd<4juSFC@2O2^+p^J=fr?X}7UjD;zkWW_fK9+B1$7l4XIf7i3en-;`j; zxjNnv$!h@PtHP+Te52^y4f0^I!6h-laL6WQJSzpET1R)!6dToqz0u`G?M%@IWe_^| z9>!R5163{&O&^<5W>e1B%Gwp9+$5_{Yb3^gfa4nxuIwmRi}LGZ@y%m5iBNT;S`1SmZIFp zKLa|Q4B~a6K1&Fi#LR_dRfBTdCO&r@lnK_k=5dO2c4-YZwhu-lwS8P2@%~e}X6P zp`}@+isM3<(EZgu!k+8T8CQ;Lrq7byRpY=KY@U7H?~O?3f}6ca<2rC_o+|Zp@M%?X z4F_0mtt)#nZviT(c2~MGt6>jLb3H9`ZB|4r5|IyejOX~qwx!{BI>s0V>0lf6=HdH~hqEJ3(p1W9F=F`7LA^4LJ_cvLYcSjuR-TCBLD$M7kUA9S;( z9$YV>sQb7nG(Cu_7!@Wx-7<#o-rlw1oZ83bow3Q=9V*`d+kmG%f-iVKHr^!L5QkCQ zc1ADHA%?8`6Xvyy)Agy(4y)+?Sc0_?aXgof(TYySU|tHw0!7_;JbhPAh!2R>4jeg8 zsFnDAAD`y_SxR+g^nge|J{QU!S^Waw#G;z={k&t&SO^a1#3%CT(2{pIh;zNL#_s9r z^>M`e`oS6DD4_6(s~pLCIjteV9ibZG!Of{}(`e$PVHRL4OUVFuC(3p4X`c@DPhGCn z744Ux^!k-$!i>5~T0riY5j2t@Zl?4!IrZd)nhjAykaVswot}_Tu3J_%);+bUdW`kk zUJh|tRVhBcz4WVWk)&RX2zz+C^&D%DFZ!{}+ah_(5?QxAv39AFVu z_D8StZagb|+()n3UEQC4koKmEBm`x&>SeM_@zu80^a9## zxcZUjF_M1p>UCC4*F<|2VvGjtqf=8NNy5>j>~Tt-UIsovKFfdxMaXAl1E?vO^)R}* zLs7HS4l1$U2g_#*daR7l*v_*_*v91m-1ddR=p#u;VkZ$0o9A`hfye(E`w{+_D~xsf zN4PAVMoGmaP__3#Qe~V%U?~VSKke2(lW>h}u9?W6Z_U5!XsSR{+Sg& zLECaAj6O>Z0oZ)DhIf4C;rDNurFIRs{YKLl3a|5qJru<4NkaonJvNVkh&X2`yzHq{ z{4??*|d&q zdV&t9$?gseM!Fy4?k3v?B-6aqSec}`-b9>Fv*o|x53;Ka1Xm>iW`dH;v0c231S>RH zcM7N)AjCDL>C%Yl_QJt4n-ePYQYF>}OiZ4Nx=(5Lld5onuI=AtO`NfseiK>4dh0L0 zd^ZxskF&PMGsE5rETbyGy2o{S%zpMdPU%M`8`;};$zta3TWD9kycy?yB*P}B-z*f@ zs21UvO%APvJIa0nQrj1dRM9^IGJ)!GGR!%J5>^uuGA5iz9tQ+kalEvk?U5LiCo=Zj zS?j&QNGRiXH6o6yW*#N-kozTR83&2%>ieGNut~bCrMcrbxFL^pmyCxv=xA7U7*Bk~ zwa4jo&I{>UpbJfH8JtqwVVwYn)YX(puRYGtBQ!M{P7;i8GJ2jI1ma|4i4)_vyJq%{ z>3-I)ct@9W+3J9o4{b!*3%Z2JHTL6iJ=XlNdS=TA{L3f`jY)eDcA`qxi;x0)b-+{$ zAFla+?7%XMSY;a{dMrMuM`%vTi1W-Gr8l^J)a)BDXeS(f=jhql+8c3gB9`XC7Om!Q zXA+h;s);l+8s&?o?TmIRIR)VU4`|2lk-@=8=EVoo($bww@l$I829clGMN$M_$|p-K?YFFO znw^;7Sy$l_P&AivK6&{$9clKMJB0p`(Sw&b@CjTQNq^^OYQMN|0-k|}rDBXh%G?|P z6hbNEx7c_YKO_T`9Id_4Mb!^tHF3SEv2bTNH&S zmtg%1Mt6Y?FQ(+6Cj)?AzTh7(d*T{c5qbC~w9;{aQzr`d=!TP#Y3QMrK2x-K$e{_* zk9vK*C5&3OZtE>R_5t62tRy8+N4lyj07uHC$tEi%==SzZN5yv$FI?>}~A zR4Tr;sAurGK9=b7zrlrwcYMV)_C!F7UpDafM6H&SN)GWECO@f+4M3}9|3+_mIlcDG zyf`f#V5JoGem!!c^0>!NE7*Vu9Ugr0^!lV}I_|q~)?x;3U;uKozh;XiI)24xp{JQW z;l=fIj@O9%S|=f0I#i z)4crKvp6R%n5pD$y7)VvsXIWeBeIhZQf&0~9%0uf6{H$d(sDxe^jbeS!>Y8B=2Lb4O-t zBa~fzv99;JzBlElH!$1hL0N-VlLTCTY-`gk09ZNa!c&v0Pe`nNKKMs)G1=T<=D(#r z0q}16nP{;SJIh0*u1~{EtX%F;cNJtyswz+tM|$1R=Z)I_X}D1pta(_MlMJtGyDHN) zK*|oqO95~sCW?o@e?PjFi7Uw^brj*Ws&jJmOvkj4nCx+VQ};$DXLcg175YmjI)C@8 ziSczX&pY+a@%O0b1CM$#fOv=D zeD2x@l;u*?-_1IkPTi<|g%fFUs~E{zXT=P=>_hES`SZfID3l&=AB{QFnvp)w@FzT3 z-YfDec#Jm3R=Xb4tEf9*vNBbOPQRM+$K4boH8B9<{J3)>F7{A6EE%q^;#=P}6~4sn zy?}1Q*gvChSot?C=_04vZLW}5%tu;?8n3T+yXFjzkE2ccnvG7m3E2XC=gmi4n@sO( zr4Vt-8Fw)z2%5N0@DfUHF@6Cod%y|sG_e)%()XzuMhWZfHu|;=OSG(WG6!c54Bl`< z5_Po&Go6%o%No?4cj`AopHcR%7hyxSfhV-Hd_HODt_}l(n7=$) zP`&r`B^h~VFKq?tQ$mS?Mdsp<%~vwzPXUMT2h-b6`R?pYiLb{ZS(5~HB;rdQY@Y`K zwywBS`XOs1WwVKzMD?sj+GwPeu^b?z#iC74@m5UMIegzR3Wd0rWWl49nIq@Rl^?mY&C|)V|jof)g$Xo1nrNXo=@5a z+2!Z%^ydhEV7CW?4QsZKS+!`*K9lD>{SkGl^5IT&5Jy3-I?8mxVTGgpoxlU)R{?M= zK$RTfn?=|lL*~Dm0{~m~C!^Z0oj`uImpbbRyEr6J+^c>u)W`<4=%YVg7*oehlQa=1 z>Sp0WAW6pNJg;R92B%)tJtHNJ*ZdI8adE+!dNFR&X@ocHa~&$T#(EVyhgw|zEs^;& zd=%ldm%Jn;9EsjFxU$Aq9%@#X8mer}Om*zqov+j{>k3Z=iWwLyaon%t&)e&E8|7qv zXcqSS%rDU(qm@wGUF~5nzTO!~yFLjDn;r0k=^o!Ep9TzGSJkd6wR%Wl<1Fl~LS%Dm zOO5Cd3Z|&LFmq@)0)_sdd+R}#*Tf)l`6n?BF?#n`A(wK`t_Rwaz`(NrlSEgmU2~zJ z2Ib9FU=uLjb}tt;nLL}^2Pt3I7SbbzX0+A)weFg z6?>2KC*Q1xshyhQuDd!ncNDpyEB1F39674r`PT%Nj=?`E=l>lfATIESoc|IWCr7Uy zF<4`Q;cUX5^1!)HUbr7%{W*B%q-eZNT*5%(4>dk zOFSYV^@5`7Y_=D`4fR%tToI@;G^X7Fg>Gl24|Ww-P@ls^Q0o=EjDc+rcfoGeO(BLr z0b_h21)M#X2XwMr+7$y+R8u>`!>%m?fAv^630f*jO-xBqwTV7#+8V+!!uwl$9VFRY z-1!zy3P{*pzbC3V>VAx1D*D7IG5CtgQTWX#UsSodE zmVR<_!kwv;&CsTQ7aRD~xRvX)&(!6tqpi)KxZq)~S=7B^B#@Hl+Qfe%KkdD?gG}`Q zbAc4BgeE#_xmP{SCjX<8>c7$Xe`Yd(3EH`9ioy^FfcpMG5v3*$DD=h1}#l538Z#E?#ND2`ERuciMaz)QrUn(X}t0q613?o-;?{2s`7MP zIlh;9DYeSLohdRX>duH^-;5xxEw$D4z^}fI*)sI|%M?{jtFS5vY-z9t7rj!2;Ny2t zF$b80?H`q(hoVNBAMnOTN2V+FUn%2#+rhQrIos8{N|FO=SQ2+PH z^ZUN5!-Bdf>^~E9zGcSVz(Dy|NEoigjQ_xGmaDeHu)zTA51VI;W$i@1LOQA6NFc=v zH{P+~MH>V#*>A=H_4=ble-#D+Wo6;1Kv~(jS^a&D6%p9(5n!@3@I%vbU!k{Sv>G`Y z_WU*)>xMyT5eo9y?bt-OG&U{K8*(`5qFlRfS*L+$(Z6ek2(AWbV8@dbQDRGX&!~l_ z=Ox&I;GX|RJIPV3}`>sl48UR7!tpx1&M_h&^%N8NFDm*I z`L}sTh2i$H|H$qCYFYopajWH{%oQ>Zd2#=jxBQ`#PtdM#86dqZ(1N7_Na)56%GIN` zuF`hybXC_Dwq;9ANkyeW|C2ss@K4heF{V48mh%-Rd-&|#D|NrE-oV{ zi)zfyl&+_iduI+D;!?=3^5?*3YlsNXoTJ|GJzb?@N`}PFR=-ou9BdPP^&2Pl3c;qtlDAvmE{oOGc)u)XN%HRRr6ka zu3Fz?U{!%_z`2=`wDu`()7US85#38@y}2vw5O-Fe@#Mtx3Yg3HZ-g3?@s5=sQ- zcKJL#ul*_&vQvNg{-DnhcJgbw$IZyYqx5K%psfoy5;0d*5}F1Q61yZ8$rndod6N5} zzj#sqO?@Qe8Ptn1anjjvc>~d1VVs2YgCq%EJJchB2p~%&JbMCs4vP^3Bs5(pZ5{^$dSn!pb_4`Jm5KBx}2r@c`dK@rigKd8uU>n|2i(|9fGHZS>~ zo0fVi6}Cl9ZM7;XKTUg;*&ZP0b2>#Z`ewDTNac` zOSfXHYg>um0r#IOaPkA^2Hx38m7|t&mN%EH9mN+sv)Ieza0`M4B|jR}&qF}`1I zm*4cVb=P`m7n$D9WWU>0Sw7|fn351si^%pLX%G7_z|=28TYgVfCXuu%u; zb9@iGlPtYf34C6;dISO+<(uq{)a-rASO{;*$QnA2bMf%ts1n+Th}2zXqjpSEJAFQW z??W8*?xDAK319-koelf*dmH8-Ys*_ne2Z}1otziJ3JbmTg%9l28}`p(YERQ{{A$lZ zI(j-BIXJ=A%@Qm3g2UBgy{)e@4>sB6QW5c6<}#^UV?#GFl-GKy^_0H1o_f#I#e1=A z3Y|^UGXp!YMZ3{?K1=I$A>F$|A;O-SH|knzlV&@~(%?YLr3IWz=Xq5_~Q2vES?{hHT~V;b%E{$AR_)k0&K3el0J{KClGeJbH|yEfUFs) zKV7_^keHBuJ#URPJz8Kuzw~hc{!fIkTmSq77nnycPT_rxZNPw5>I<8l^Pdb$dtW(W z`yq1jOxVL)f9|S$d~qUq(f@pPI9@BH_d$==T^i0O+0d`siyJyRMfJ`HO*@53UOcF8 z9ewWihchz~54?chfe_k_GsML3@VDeSA6C~k5yy6#6{gnZdEH!nYzOb-8pW&T7p)&W zh+&(KT3Gj2+c>$cw|bQ%gszrTGy4!jfZRH^R~?*5cFpD=Me3}DyB&d9n&e4(7G+kV zIETe*wGS~$;R5556qbqP?%!URZpHB@rk%ZY;x$hb-f*S9kW_^{kPl(-y0OU@-Zpnf zrIg>*@nB3s*=}Ux7X-iNE(IG=W8VIy*}+P|M;)1m8;;i@*rY56{_|V!z`+0SaE=2! zu$*+E1ZAKI!|LgOcV_-CSiHX+x&MVp{5KQ+_L=@a*v2sO5E_*NIC>zfM!g3Lx5)rp zJ`}JMibql1d}w+#OkM9E2%Nb^Zakq6lY*C)9mr{e=;ro w^NTY{KH9+30i#lp(Wv#t{Vee-@dq26KAV^tJ3J-@I2LuA)$w-T0!0#?zRt7|)H zE65AHx3y+9!pvcHv$g|PgFr$eZgxiRElr%ByfZN~w*k}c)gfq~m>Yv>wYU}773{=J zpytvZ4kl_Iit6t@EZ_4R(~1Z`5poj%09czi89i~cwz6>)a0Ao+fhz#~jQN<2_Q{_q zPL^QWzmU>aP<|q2>tOPPo0W&<{VPtsC%pWuueka7IJjOu;b4Eo!^Y0f_KJ&z{gnVa zzX1EIC;#}O1$J{VHWg46m;A?Gz;9q$sFRbO02`aDt1GK3C#$W48QUv5Soar;n zR(1kn4kkuUwhrpHwpM@NqB7Lh$<`5SYxhJ<40CI|PZ+h#ZH#SQ9bf!eqo5!lW8>&# zWb@ucMjT8FKw&jEHx>|O=jG<(m*nB)=H`0!NQZ#cCfYsb{02rFn2LAmUOVSe)8wo0_Oi27q0&Z?;mT8|1&P! z|8XrFfD9Xkxc@@zzdr&v2=n7VSr_=_pUiJ!18}?pz}g>+U$ufjl1DP)qUvsw+cWp< zjMt24&d+LZa24{~^)!*;^Dlp;q+Wa_6#IxS?}v16XUt3Yu@XwpvLM15tD-2`JO?Y} zIMdq~Qki+Jr=2AQeEGi(Iw%AyfBX(p=%|#A$RJC37U8(Rx=(I*hqU`6#k$WWIUW~z zs7(@HTKJsOv;C8xz&-DoJ#^!q_Z+S(#Kj$uQr+j>D+BBi_a7-3mC6KxK*i}9$4+14 z!#FmOLgax1#WflOz=!U+P8LEWGA-cCA|lBfpz%EEgu9O})`6dJI7PV@l2kyTN^#cD z^hCD-h|<(ppx6HxAa^3rpRo)~!Hlm`H~x(OXC@ftb8FbDDn3ti(I2Y!c6HFT&2ZNB zQsUx{A)`sD?HA#x+-@suX{ysX z)2lib_>$~lx;ed-#{p6f;UIjb5i6y8O1WFV>n-QYEO3! z42n(}NwAumsJ~3uklQnE3uLaqry6T4x}HyFhWQMg>i2-Lvw9JP3Za@-R5s_YFF)#P zmEb2g^nkS#@fsc~DCLZTUgHG~s%bDu>wtyAqx#rXN=WGp&?Svz$MimBRr0($nBc{-9LKg2A}GOX8@1=;c@Kp%u^1r&0_ zdJ{$J4{a_Usk|Ja=Ap~(ZKyeQg-$hIkJ1?QK_aYnzHr2E;AW3C;!`zD&7Jsdji;!T zdYf@^zw$nyilzYNL<{K9vryYiGKUc#Nxc$S_g+>xGvHO3 zXPqa7qV$pS&gDOxsX!p|SK&No`Wm@a784b1HTek_g@wZc-(9G5mO9T2R7xDy1#?Vq zfezP$kDzBL*#-@ck&;T*%hla3fJO>a9%G{>bE-8C(A~+RE^2`DwJ7HWJeZI+$(Cd( z(bJ<^9UME`23`4+bxd!6SnD(Kf}VsIN{ zB~xHiu>U|%MEAG^aD4#o#uoD@!3`t*i7Flz3T$3*->u>{lES5T+0i=Kpbr7va4}o0 zynK(V<0DJYh2;q?CTE{~5WGl>jvFJL6z>hzW z+bEICZOk8i{JGu0{S8J=rK3{vVuTVx-@PZvVy&N<_I@%jT$=ZU&*5+?S|^Y%ToK}y zook8C8-0rJOMDMrw#6>=m73aW16-X46+S$C-^_@iw&1rg0;PIyAuCyK>$!^U$m~FD z$rKp$Dij_a{_C2-PhCpQY%h3hVWP88j536wx1N-zst`)WnoK2pz`I4(g#{}1cjub+ z+_xhxd4NdB}SBU?kHk0Nb0OpOZ(> zH!lFi>HoJ%|9@VsV~oT9upIxt-6k!8`^C*1eil#sY#058NiCBshOFL34)@dOPRg!I zYo*Gaau&uYYQa>py7i&uA@TP<3Ck)_A}U_5w6#Xqpa-(Y(kC#2gqqrG-L*{#T(Rm3 z-L3s$vWKTYHN%4)q7a^x=yo}Nj2seH5LV#o%{ISoZonp(T2>}>X}pBZow%Y$E`$#_ zMd0%VMLrhG=a7O0Je`X|i@HPnDc{V{hEwCrNqp~wee=9SrJ)NGddVaaoC=J!+M4n1 z-4-lE`x^GOqZEdE8}hxKGvH&pkV~ozdobMD9cuVrLC#U935liOPnx zlvM2#gR4?8p4-gBrCa2w^r`flsG;ZKZ~UleA&wCLx&7L+qEkAB)H?gA>o*laE@g@#_YIV;M#NtW3hqy?pwh(~Z>IO&}c)%9$#BHamifM`1qYjELxUA(1v>nt~6>|;{CaSrH z2^yGNznQo-c!s`e9)jc#*Cl)I|KXuYtx$yfbih~fSea*{JjUW18y%c%G546ae)AAt zxE^@URquC?F`w9wP$Op!cvIf)lf(V^#;#;qb~0#05LS}$sVsa;rbET+ zH6ir0cygnkmBG0b04rPGh0D(oK2^HsEKC8i&gU7N$JlBM2r4|j2+*-D2g&Qx}}TLLeWHdhGeH9T-2GZJc)uO08w zAB?5U@`J)6nyhHqG?^fGVfqd;PL|yFL5IKQeqh(3|MJ+ShomZiHBywWE3XLOva85{ z%9|(gG1d@AZn?Zzt~68l&Hl8v#uMxbav4a&665>&v@7Ct)N-E=w_=#04>;%~;S!m= zvg#QeFYjjg=aw6GJ?4!nWc;RDHpjb4gJr0}0?+)mKJ8FlN-7X5NZ6%UokZT9ry^>I z2hU7xoR1pfSc^85trucKr_fsLyrK~XZQX^d6nj0=Clw>X>bDDJmeDZjr%QPp-I=8l zubv=M;j|N>PF>I;l!u`HaNzoZpc}D-bd`tSEH<9h6(!YY3Sxym(0`!t_;$aE znki8**@(JQ#vwQ3OB$s$8rkO=)6!X1A?AfOTnR;TWq6q?e1g5^bOqmaBrF>g&1tZ{ zz9#W+#tMZ4?4_5GL;z=o60#(U%Hich%tK!2G6ZLs3|f>QN0yzvgfg=XDA!ss=h6=* zmk(cE=Xz-kr)z1tQ*CCAqkTh=W|SI<$p%ReMtXX@yh*c+jDYlhJ*a&NP(?Wu{M>o~rsudLbDW_B<@9 zvTMMRL%y3NN=vA^6Md-t4L9-FjJ*#Jnz(GKsmoY=UdtE2DxKEF9nqPopn?mn<+ zB>)`Y`=D3Ln!K2KvD5QpIrbHRFELzXXH>3EbFC`Fb-&A`-$cwTr^YE?LXN&(mA`^7 zE=DP{i6g?vr}es7I&Z9z^)Tn)1Qex^ha8SaAgWEu)k*OPJFc-$E9etrkrF|z!J1My z1Ndz%=-^RT&(-&F|(S9m7!{kk%p+t=Z-TqA$ z)0-ZYvHmI&Cw4olkA9$0-#hgjB7AY{Y%W!v(O7di5q2~`hPvdPbK5yV?p~HgIN9V~ z)tp{-AM&g76+{$0zdiw+^efc^_N?jKO1Pezas-Arwspu07%De)Z+AA=>ut0X{W-#C z2Um*5`$t-OdG(TyXwh})twg7Zu_!=S-O>gD1Q5w;R9CvrU?&eSDy5_QQp(dIz8@lj zR=RLG@%PUr33OZ|isgG89L#J{UHnF{9X<-!M7)BcD%ZWnYwred*YmOFOId}T<0X+p z5nT9>x0XyN2Q(MT#fFap;w?1UyRCOWGwPWv6DeALIFh$6Sh`ztgul|^QGc1@>9Zz>-fNycnRbWc_TB7Zi3Nv5C4BcL zN>lM~nsJ>?L1R%Yh7-B+_YDE0P?V%!>-Y2X})>U0?n#ByfSvnR}D^#oW( zXE;H2C04DVplQ%7Y&8M?IE6=mMm7B=aVeeFP%|>$ulHnu}nIa@AM5dR@!Kk zEhWojQy&+^fAwyrYK95hXhmh2bcEE696$*cyF&O%eGVK+lKBOAr-t;D8rWs&n4vD; z28z?hgyXDfS@JS*6QyGdmx22lo@Y&8wh?A>Zt9I6{ULqR5Y94TlfXzOJ|YXCwnmU~VEL|Inh;|}%d(z2X2OPH*$HQtzzD{p*QA}d)!9R13PTn$ z=m#@vw=wu^tiLTR6GoI5+Y|9TiF(WvA(>y)y>N)F4eYJ%m)UpulJi?GAKy4&CR^Zx z?fkg4+gRinIa0h8a)vy57LU{W91qv*g_ezaEiJ2JCYJswGuU6fCklX_IRi7|^`2-r z_cHTlpQ^VA?7O4hR`XE~SBg6*5ilL0Y1`{xA9?y@hpQrSNLf`XR%^Glbj&em>Ew4u z1U(YlByk!IoXj2n>_N_&a6@Fe)uWHz!eSo*^XR+Y=n~;;Sjv*WY)s1qUsecSC0N|} zA(eI1d2VL5HLOuLn|G+OQ|oEA(8JtJlhBvu_>?O$NS2jkPw|vWnl39(cusuAdMFP% zauJI_A$b+?zTlt0uH_)qRAhL5&{aFLRkXxfq%n=mCzULx?O{V5$98H@0&1IXgwTxV z+Id9ZvI_->m}G5W%LZB)tPwvGL81^qGe_2F2D5V>+ooc}!+S1o3 z^s35_VCgk)Sro$KdK%Xka``$=Ruip-Zf%^6>U>+#D3a2F)s5@7CVZxZp0I2W?^7?f z%1rEntDKURjj;b-9e`$W^eNzSCn~`Wg(F#iXZc!aP`4<3;ex`vGvKbrvvZFnKi)YT zpBf;{_KOYlZCAopI>wgMZ)>zFliUrQ5h5lu>q_Ya>{psR1u^#}(b%^Xn~FH=bS!jj9MN3#v^@kP!-8#>!&7@uo@p@`-o)pjYi;BH}-1F zy-kDj{`{uY`u=`h1dL1fW*-4os*tK>KDB>-a`YFbwP}hEZBf?VwIznN2YT!*$nwDm z!=@98F$#QYk%k!dgtH#4vW6>W*K))_3v{-mtcgZgD>|N&u%O808DLUz6C#f;cVi0b zCfDTF%04d1$32ikT^UR_gBK?%9RR8GxEVIS~s5X zoZ73*O){ICA`u^T(X$WNVo8;H5q00MDnRbj0K$v^oOh4FW+oEcu)s-Rw%46%P9D3k zCqhCwLE*LDA2Te<5I#zQ{RpJ~B(<<--}tyyH(D>*?6PcVwM@}|`l@%UiNGKk4_hoMXahQgQd2Z$JYIXlrwAmm;PsnL8A9;S$;WtECpJKSkP9vHgO zZ;9-y?jLW=XWQVMI*qo7J_OFLk<}`V#G9T<<*T}}=RT^bSHuUcWl>${Zr!KaBNr8x^2g`N$QLbC6%SYS+QLOBl;4S+zai;%cy8XZER%l;=pJwJ1l;Q`lIF%Nn_6_W;Uj&#O_?spM+- zJMj80wgB{%Qc^GdK)aGztQNB#WHaRKwU%|!6^*l@Xa7WoRuzW>_$1aE*Jn}R@hyVW zZSSMi8}Ot^qGot9p3Q7@astt4_qoT1Htq=gFalFYBccK}9m#=7#qBzKt^Gx1e{@a@ zn8)gu*KXZJ$_1p+R&@GmIl?M&oz2Vh)YQg86-X!K$nc)r4tKhJ>lv|UOK;44SVL#U zyH17W@&!Vn0mI|5TgB0{Wr%NkE_;nDu2$CRWpW{zN%KI=;B`xFE<<&C5r?g_f|lJF z4!P8sGcM#;;biW804&syrjcp9%(}sLaOAPq`6e;9mkSTJ>yFCikwAjq6h7k}Aa+2m z%|v!}?yO?lJ~@|OMt5F9q50|u3eFn`cbb*L$0|tp0vN|}CjEjYlyy^YB}?x!`>3mq zEx2Xv=;7q8DL(|dFwK_x2m(MBaeU4$edu_gXMvXsQPnXJObrwe5*bbJfh)bunQ;sA=kQF*6=_d zV1tx<8V~ni-iGr@4qv6VG`pA~<^o4KJp>?)tv;VUW*orcI9i8aIc>I*41+*9Jaeca z5#+(to+f@MJiUFaD(SrEeC{~ql2e~o(n!@B!~`vU-!~tRV$zP7CQ{7ICZU?~kvc7@ zd7IJ;K0aPtd!G1hW5dbDCPgfyg1iny&EgK%;I_jcHI_~o#M5X8H;_V zj~UOsyeT*h-Sh;7t*inB2-qWYQ=V5sUtOk_B>LFUhxe}jc7$E)ipDjF;1HH61;svc zWcy6hiDG+ol*FD;Lu^XZBW!e$9WI}(I)czo3f1muL}jvtE6Mj#i4RCa;(|ej&y4dJ zzuW{ow|^JTdMzgCvS{pstcmPneqbmU2O~IM7ZSV=O=p$VDWKv*J+n7&pl69 zQi+2@v2dY_{Z~K_lo6sqx zNHb7VuM7B;9ARJFDT31IPZfDyG@tTK@|c>RmCI92xF3vCk*Et*CKcj?@|p*51yTD2 zVCMU9cfZJ&*V0%U(qW|! zW?#Lu@R9WwbqFC6QeP&=59qo6e#OwrB8D%kt;oaH%wA$)q;24*0rx)rZOS++6@06w zYk+t~55~`bpjB7qpzy3mztp- zVY~m{^AeZF+bU-(-&XIGFczU7@zeyssMv&Bc+4^VP0JL+V9;L57OJkU@8xxQdWY#R z13h}Ro{*OHmRtHFp8LZmQvphPn^)mQ`qXpr;ot4E&}|#~fmL|8aP?0p4^U}osVCsm3{=B8?v`qwNHD_*uF|*c!!u17< zd&ucu);KQ7y^7^uG6?}<9-g&!tz{=Tx*wOM7e>Ykz})uYXJcgkTHY628A@P+W~o6+~XqqfZB%9G
  • nA8~mO`>; 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 +
    + 柱状图组件渲染 +
    + + + + + \ No newline at end of file diff --git a/src/packages/components/Chart/Bars/index.ts b/src/packages/components/Chart/Bars/index.ts index 56544510..82c295c6 100644 --- a/src/packages/components/Chart/Bars/index.ts +++ b/src/packages/components/Chart/Bars/index.ts @@ -1,3 +1,4 @@ -import { barCommonConfig } from './BarCommon/index' +import { BarCommonConfig } from './BarCommon/index' +import { BarCrossrangefig } from './BarCrossrange/index' -export default [barCommonConfig] +export default [BarCommonConfig, BarCrossrangefig] diff --git a/src/packages/components/Chart/Lines/LineCommon/index.ts b/src/packages/components/Chart/Lines/LineCommon/index.ts new file mode 100644 index 00000000..4d1ad1f3 --- /dev/null +++ b/src/packages/components/Chart/Lines/LineCommon/index.ts @@ -0,0 +1,12 @@ +import LineCommon from './index.vue' +import image from '@/assets/images/chart/charts/line.png' +import { ConfigType } from '@/packages/index.d' +import { ChatCategoryEnum } from '../../index.d' + +export const LineCommonConfig: ConfigType = { + key: 'LineCommon', + title: '折线图', + category: ChatCategoryEnum.LINE, + node: LineCommon, + image: image +} diff --git a/src/packages/components/Chart/Lines/LineCommon/index.vue b/src/packages/components/Chart/Lines/LineCommon/index.vue new file mode 100644 index 00000000..850cdeef --- /dev/null +++ b/src/packages/components/Chart/Lines/LineCommon/index.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/src/packages/components/Chart/Lines/LineGradientSingle/index.ts b/src/packages/components/Chart/Lines/LineGradientSingle/index.ts new file mode 100644 index 00000000..2efbe40e --- /dev/null +++ b/src/packages/components/Chart/Lines/LineGradientSingle/index.ts @@ -0,0 +1,12 @@ +import LineGradientSingle from './index.vue' +import image from '@/assets/images/chart/charts/line_gradient_single.png' +import { ConfigType } from '@/packages/index.d' +import { ChatCategoryEnum } from '../../index.d' + +export const LineGradientSingleConfig: ConfigType = { + key: 'LineGradientSingle', + title: '折线面积图', + category: ChatCategoryEnum.LINE, + node: LineGradientSingle, + image: image +} diff --git a/src/packages/components/Chart/Lines/LineGradientSingle/index.vue b/src/packages/components/Chart/Lines/LineGradientSingle/index.vue new file mode 100644 index 00000000..850cdeef --- /dev/null +++ b/src/packages/components/Chart/Lines/LineGradientSingle/index.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/src/packages/components/Chart/Lines/LineGradients/index.ts b/src/packages/components/Chart/Lines/LineGradients/index.ts new file mode 100644 index 00000000..75e34a6b --- /dev/null +++ b/src/packages/components/Chart/Lines/LineGradients/index.ts @@ -0,0 +1,12 @@ +import LineGradients from './index.vue' +import image from '@/assets/images/chart/charts/line_gradient2.png' +import { ConfigType } from '@/packages/index.d' +import { ChatCategoryEnum } from '../../index.d' + +export const LineGradientsConfig: ConfigType = { + key: 'LineGradientSingle', + title: '折线面积图', + category: ChatCategoryEnum.LINE, + node: LineGradients, + image: image +} diff --git a/src/packages/components/Chart/Lines/LineGradients/index.vue b/src/packages/components/Chart/Lines/LineGradients/index.vue new file mode 100644 index 00000000..850cdeef --- /dev/null +++ b/src/packages/components/Chart/Lines/LineGradients/index.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/src/packages/components/Chart/Lines/index.ts b/src/packages/components/Chart/Lines/index.ts new file mode 100644 index 00000000..7ff11929 --- /dev/null +++ b/src/packages/components/Chart/Lines/index.ts @@ -0,0 +1,5 @@ +import { LineCommonConfig } from './LineCommon/index' +import { LineGradientSingleConfig } from './LineGradientSingle/index' +import { LineGradientsConfig } from './LineGradients/index' + +export default [LineCommonConfig, LineGradientSingleConfig, LineGradientsConfig] diff --git a/src/packages/components/Chart/Mores/Variable/index.ts b/src/packages/components/Chart/Mores/Variable/index.ts new file mode 100644 index 00000000..4a0aabc9 --- /dev/null +++ b/src/packages/components/Chart/Mores/Variable/index.ts @@ -0,0 +1,12 @@ +import Variable from './index.vue' +import image from '@/assets/images/chart/charts/water_variable.png' +import { ConfigType } from '@/packages/index.d' +import { ChatCategoryEnum } from '../../index.d' + +export const VariableConfig: ConfigType = { + key: 'Variable', + title: '折线面积图', + category: ChatCategoryEnum.MORE, + node: Variable, + image: image +} diff --git a/src/packages/components/Chart/Mores/Variable/index.vue b/src/packages/components/Chart/Mores/Variable/index.vue new file mode 100644 index 00000000..31fe77be --- /dev/null +++ b/src/packages/components/Chart/Mores/Variable/index.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/src/packages/components/Chart/Mores/index.ts b/src/packages/components/Chart/Mores/index.ts new file mode 100644 index 00000000..9f12964c --- /dev/null +++ b/src/packages/components/Chart/Mores/index.ts @@ -0,0 +1,3 @@ +import { VariableConfig } from './Variable/index' + +export default [VariableConfig,] diff --git a/src/packages/components/Chart/Pies/PieCommon/index.ts b/src/packages/components/Chart/Pies/PieCommon/index.ts index bbb19251..6b41e4ae 100644 --- a/src/packages/components/Chart/Pies/PieCommon/index.ts +++ b/src/packages/components/Chart/Pies/PieCommon/index.ts @@ -1,12 +1,12 @@ -import node from './index.vue' +import PieCommon from './index.vue' import image from '@/assets/images/chart/charts/pie.png' import { ConfigType } from '@/packages/index.d' import { ChatCategoryEnum } from '../../index.d' -export const pieCommonConfig: ConfigType = { +export const PieCommonConfig: ConfigType = { key: 'PieCommon', - title: '饼图', + title: '计量图', category: ChatCategoryEnum.PIE, - node: node, + node: PieCommon, image } diff --git a/src/packages/components/Chart/Pies/index.ts b/src/packages/components/Chart/Pies/index.ts index beb6f3dd..f5ce290b 100644 --- a/src/packages/components/Chart/Pies/index.ts +++ b/src/packages/components/Chart/Pies/index.ts @@ -1,3 +1,3 @@ -import { pieCommonConfig } from './PieCommon/index' +import { PieCommonConfig } from './PieCommon/index' -export default [pieCommonConfig] \ No newline at end of file +export default [PieCommonConfig] \ No newline at end of file diff --git a/src/packages/components/Chart/index.d.ts b/src/packages/components/Chart/index.d.ts index ab81fa27..c6022f2c 100644 --- a/src/packages/components/Chart/index.d.ts +++ b/src/packages/components/Chart/index.d.ts @@ -1,4 +1,6 @@ export enum ChatCategoryEnum { BAR = '柱状图', - PIE = '饼图' + PIE = '饼图', + LINE = '折线图', + MORE = '更多' } \ No newline at end of file diff --git a/src/packages/components/Chart/index.ts b/src/packages/components/Chart/index.ts index 5a1a777c..b3caac9a 100644 --- a/src/packages/components/Chart/index.ts +++ b/src/packages/components/Chart/index.ts @@ -1,4 +1,6 @@ -import Bar from './Bars' -import Pie from './Pies' +import Bars from './Bars' +import Pies from './Pies' +import Lines from './Lines' +import Mores from './Mores' -export const ChartList = [...Bar, ...Pie] +export const ChartList = [...Bars, ...Pies, ...Lines, ...Mores] diff --git a/src/packages/components/Decorate/borders/borderCommon/index.ts b/src/packages/components/Decorate/borders/borderCommon/index.ts index d5945afb..43375c1f 100644 --- a/src/packages/components/Decorate/borders/borderCommon/index.ts +++ b/src/packages/components/Decorate/borders/borderCommon/index.ts @@ -3,8 +3,8 @@ import image from '@/assets/images/chart/decorates/border.png' import { ConfigType } from '@/packages/index.d' import { ChatCategoryEnum } from '../../index.d' -export const borderCommonConfig: ConfigType = { - key: 'Border', +export const BorderCommonConfig: ConfigType = { + key: 'BorderCommon', title: '边框', category: ChatCategoryEnum.Border, node: BorderCommon, diff --git a/src/packages/components/Decorate/borders/index.ts b/src/packages/components/Decorate/borders/index.ts index 1ca71c3f..1a05dd61 100644 --- a/src/packages/components/Decorate/borders/index.ts +++ b/src/packages/components/Decorate/borders/index.ts @@ -1,3 +1,3 @@ -import { borderCommonConfig } from './BorderCommon/index' +import { BorderCommonConfig } from './BorderCommon/index' -export default [borderCommonConfig] +export default [BorderCommonConfig] diff --git a/src/packages/components/Information/Texts/TextCommon/index.ts b/src/packages/components/Information/Texts/TextCommon/index.ts index 6b63d6cd..d1117c08 100644 --- a/src/packages/components/Information/Texts/TextCommon/index.ts +++ b/src/packages/components/Information/Texts/TextCommon/index.ts @@ -3,10 +3,10 @@ import image from '@/assets/images/chart/informations/text_static.png' import { ConfigType } from '@/packages/index.d' import { ChatCategoryEnum } from '../../index.d' -export const textCommonConfig: ConfigType = { +export const TextCommonConfig: ConfigType = { key: 'Text', title: '文字', - category: ChatCategoryEnum.text, + category: ChatCategoryEnum.TEXT, node: TextCommon, image } diff --git a/src/packages/components/Information/Texts/index.ts b/src/packages/components/Information/Texts/index.ts index 328b89ed..60f9e456 100644 --- a/src/packages/components/Information/Texts/index.ts +++ b/src/packages/components/Information/Texts/index.ts @@ -1,3 +1,3 @@ -import { textCommonConfig } from './TextCommon/index' +import { TextCommonConfig } from './TextCommon/index' -export default [textCommonConfig] +export default [TextCommonConfig] diff --git a/src/packages/components/Information/Titles/TitleCommon/index.ts b/src/packages/components/Information/Titles/TitleCommon/index.ts new file mode 100644 index 00000000..18b7fa18 --- /dev/null +++ b/src/packages/components/Information/Titles/TitleCommon/index.ts @@ -0,0 +1,12 @@ +import TitleCommon from './index.vue' +import image from '@/assets/images/chart/informations/title_diamond.png' +import { ConfigType } from '@/packages/index.d' +import { ChatCategoryEnum } from '../../index.d' + +export const TitleCommonConfig: ConfigType = { + key: 'Text', + title: '标题', + category: ChatCategoryEnum.TITLE, + node: TitleCommon, + image +} diff --git a/src/packages/components/Information/Titles/TitleCommon/index.vue b/src/packages/components/Information/Titles/TitleCommon/index.vue new file mode 100644 index 00000000..bc3b4761 --- /dev/null +++ b/src/packages/components/Information/Titles/TitleCommon/index.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/src/packages/components/Information/Titles/index.ts b/src/packages/components/Information/Titles/index.ts new file mode 100644 index 00000000..0e69df00 --- /dev/null +++ b/src/packages/components/Information/Titles/index.ts @@ -0,0 +1,3 @@ +import { TitleCommonConfig } from './TitleCommon/index' + +export default [TitleCommonConfig] diff --git a/src/packages/components/Information/index.d.ts b/src/packages/components/Information/index.d.ts index b956a06b..1bc0cb1a 100644 --- a/src/packages/components/Information/index.d.ts +++ b/src/packages/components/Information/index.d.ts @@ -1,3 +1,4 @@ export enum ChatCategoryEnum { - text = '文本', + TEXT = '文本', + TITLE = '标题' } \ No newline at end of file diff --git a/src/packages/components/Information/index.ts b/src/packages/components/Information/index.ts index ad5a347e..f4f30d55 100644 --- a/src/packages/components/Information/index.ts +++ b/src/packages/components/Information/index.ts @@ -1,3 +1,4 @@ import Texts from './Texts' +import Titles from './Titles' -export const InformationList = [...Texts] +export const InformationList = [...Texts, ...Titles] diff --git a/src/packages/components/Tables/TableCategory/index.ts b/src/packages/components/Tables/TableCategory/index.ts new file mode 100644 index 00000000..b2b48dda --- /dev/null +++ b/src/packages/components/Tables/TableCategory/index.ts @@ -0,0 +1,12 @@ +import TableCategory from './index.vue' +import image from '@/assets/images/chart/Tables/tables_categary.png' +import { ConfigType } from '@/packages/index.d' +import { ChatCategoryEnum } from '../index.d' + +export const TableCategoryConfig: ConfigType = { + key: 'TableCategory', + title: '归类表格', + category: ChatCategoryEnum.table, + node: TableCategory, + image +} diff --git a/src/packages/components/Tables/TableCategory/index.vue b/src/packages/components/Tables/TableCategory/index.vue new file mode 100644 index 00000000..ebda1e9c --- /dev/null +++ b/src/packages/components/Tables/TableCategory/index.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/src/packages/components/Tables/index.ts b/src/packages/components/Tables/index.ts index de7abe60..456db9b4 100644 --- a/src/packages/components/Tables/index.ts +++ b/src/packages/components/Tables/index.ts @@ -1,3 +1,4 @@ -import { tableCommonConfig } from './tableCommon/index' +import { TableCommonConfig } from './TableCommon/index' +import { TableCategoryConfig } from './TableCategory/index' -export const TableList = [tableCommonConfig] +export const TableList = [TableCommonConfig, TableCategoryConfig] diff --git a/src/packages/components/Tables/tableCommon/index.ts b/src/packages/components/Tables/tableCommon/index.ts index f03a6061..d565c9a9 100644 --- a/src/packages/components/Tables/tableCommon/index.ts +++ b/src/packages/components/Tables/tableCommon/index.ts @@ -3,8 +3,8 @@ import image from '@/assets/images/chart/Tables/tables.png' import { ConfigType } from '@/packages/index.d' import { ChatCategoryEnum } from '../index.d' -export const tableCommonConfig: ConfigType = { - key: 'Border', +export const TableCommonConfig: ConfigType = { + key: 'TableCommon', title: '表格', category: ChatCategoryEnum.table, node: TableCommon, diff --git a/src/views/chart/components/ContentCharts/components/ItemBox/index.vue b/src/views/chart/components/ContentCharts/components/ItemBox/index.vue index 6547c4b9..3d260d1a 100644 --- a/src/views/chart/components/ContentCharts/components/ItemBox/index.vue +++ b/src/views/chart/components/ContentCharts/components/ItemBox/index.vue @@ -38,7 +38,16 @@ $centerHeight: 80px; width: $itemWidth; overflow: hidden; border-radius: 6px; + cursor: pointer; + border: 1px solid rgba(0,0,0,0); @include filter-bg-color("background-color2"); + @extend .go-transition; + &:hover { + @include hover-border-color('background-color4'); + .list-img { + transform: scale(1.1); + } + } .list-header { display: flex; align-items: center; @@ -53,9 +62,11 @@ $centerHeight: 80px; .list-center { padding: 6px 0; height: $centerHeight; + overflow: hidden; .list-img { height: 100%; border-radius: 6px; + @extend .go-transition; } } } diff --git a/src/views/chart/components/ContentCharts/components/OptionContent/index.vue b/src/views/chart/components/ContentCharts/components/OptionContent/index.vue index bfcc6864..3f6af633 100644 --- a/src/views/chart/components/ContentCharts/components/OptionContent/index.vue +++ b/src/views/chart/components/ContentCharts/components/OptionContent/index.vue @@ -10,13 +10,15 @@ @update:value="clickItemHandle" />
    - + + +