From 425e59f69d7b7cbf026e649bd6d0594cda6e9779 Mon Sep 17 00:00:00 2001 From: richie Date: Tue, 8 Oct 2019 15:30:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=A4=BA=E4=BE=8B=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.xml | 130 ++++++++++++++++++ lib/finekit-10.0.jar | Bin 227149 -> 230748 bytes plugin.xml | 27 ++++ pom.xml | 27 ++++ .../parameter/slider/design/XSlider.java | 9 +- .../plugin/parameter/slider/fun/Slider.java | 25 +++- .../fr/plugin/parameter/slider/web/slider.js | 28 +++- 7 files changed, 240 insertions(+), 6 deletions(-) create mode 100644 build.xml create mode 100644 plugin.xml create mode 100644 pom.xml diff --git a/build.xml b/build.xml new file mode 100644 index 0000000..70e7e4c --- /dev/null +++ b/build.xml @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/finekit-10.0.jar b/lib/finekit-10.0.jar index 6b626db8088032f2f872ba509c5a790bf5e24b82..0916a8edc9aedad688bab6729d0bbfa8f6282547 100644 GIT binary patch delta 26608 zcma)l2|QKb6S#Y?ec$&z`@V!^OV;cnglv(>9_@ORt?a#W+k}#(Qbb-_s3>ic_9&5x zB1@^X`k(uF&%J#AzyIIo^S-@%&&-^eIdkUBnRDiSJ4U%)?d2A6b3_;g85meu8T_}| zyQ2Ln5iSf23~q(y`c`Tk_g8d%bGY-2OUvGwnay`R!C2&^Qc-!u(9%`Ds#8iuCqJkz z5mpQjEjlTzDmr{9rC}lgV!#Np1A+_~!9p%Mh!xdhM1(ol#zt$?+Rz~IhRg&BFat2( zZT4hoNCo@q2fjK%+7K&w2V_Kh5zVZEmNFrn95lKZ)D*Oo*3QYQLJoojX^-1rYueW~ zcscDWCt^wa+6EhtA0o`;JcI>%g>`=fSwZ{y39+XEZUcbPj6Af*nSPkaI!&xxG(l$2 z0f*!fMm`!K_NdN8e;neJBfE*Sk~c7M&>(g&8PL84aLbW-KXVDJiwKJfr7LJg6+4(z z$g<2_G*FDt!ylaFAZ8Xu!1yLI#H29_nU_FyolTAeOLL z(FmrpSkS)SVp&G}%E@X<`|84~LHnA*s!RI{_(0uGLY(smPq1pzAQag2XROGua}{}h`#4KEq=>Ee&zHIE5{QBPr~Q!iqtTa6PWC%AEK zLPT8RJffg0vML9CC`y3-{WyeZ{b2m@u3o?&fTF%en>}FmdAv`s%JD~TjE$Msj|it0 zjwm^blip=Arw*+Ja7n(#%`%VT5a(hVz!0Yj*@26b_UO-LPWxKQWk<1<9eMf(R#> zmz!=ZJD8}HQSE$qz6Atuo6s;zxD9DvXA#KeJoDiJd5lTW!cPM(;Z_k0+Y%R>Fkic1 zK+uPg2pc(thi;RY^00U4*an1Yo~Xe5=i10qJakEENc>3~!|-;2O;=l9`Y>b4kI-GR zQ2BD`v70b6`86+{4FFmci!hOS`RK1wA$hU|AKiQa1lso!p3h?{P%n5rf84L}(Pso^ zopHZlR)=P%oKyZ&HIq{4*Qm0FT@RXmNzt1>J8T9MQ z_WP?K!pOkzl>>Eeg@jRFJw&SBvWW{%VQl0qp2ExNXUrmW&RtzcJKkRf6ePGA7?zMB z76sH|DZ)z8;DH|Eh)`E66hw3Bhyg6PNa~Nfx%FUfx(z;$t*+3_lM4N z&Iv-{EQZK<3Pp9$5=MbJB^7&1QmTNGj-dS)AbphA1!1AAz6+h9sS4|Lst=OF$%0<~ z2~FU-nBszy@Ljm7!E5p8iqYOUB{i!wVJL#E_0cfzd3V&_yE1Rtm8JQ!B=}p{ z?!%G6&NqS0&gCRY z)1Ew{U-BmlLwz_s6-v0aX+{L>C3)H3URl~BZ^~<{I3{&hj~2(cooMyzE=_>!Dut=u12oM)ge3hI(fFNZUIl zq1SNxTHx(}vJHz`UVrMp9euE0CcJgXBT0elH`IPgH@Q7-+GRxl2*yN z-d*Gvapi0MmM4E7q>c4X9{;{4wmHJ)@^8;J)!b}n=5y676`I3pW#2N9%O$nHFQ%;) z@iQNNE8Y65fzx{M#4a_fpUd^t0)sX#KG4wRW-ayaN|JmJqh`(zmwSJCJX))6uhS41 zuDn;BGj`d<8`YfpBkq4%Ms(4GeWk5I=SijS6dnY>Se6=N@l&!kbf1FRw)jUmlTM!( zy~uoGYInY1SN8adUx$znb<4IDJ$$P(rMcCl+iuW!D8 zMLB=R-A^Zb@3mdnr-z5K$<=qk_ z5CDnMLMqHOe)Ls$tOcfV5(YL-p5RiXtl9%_#~at@BDe_uYzxMHUd^cybavGvU#~LRJWZ}9o357mB*r9L5ZDTAKZX$Z8 z>FTx0x2-?V?(b)3fJTBNTX~ObHHwX;y^{F#?aT= zX|WH>55;|}LfG|?;W**+l5JWcsjoBk+vylClhl#c(YdV{VWn`O)LErh@eyQv2>Q0~ zkY6{+=UkB8&np}zX`5b2-IgjaQ))e$?$eQ(e&p6&cXOs3-=7gRJ*O#+qi_5!7>@OJ zzxWfHd=FCetcW>&L5lB9y&_xfT^ru+=v#=&>(pO0HCvA%F6m+Q5z8XqUu9YG{>7fq zH;|3>YO>x*&j|HZs|uVpn6^M1!trU|sv!ZA4Zlf#lo|=Oy_LaEL6*kn^D?cR%$(eH zUyS)alMIpMY5AG(;Cuq2y0d^y*)g-{yyHdhQ%3~-PRXc4sH4iw@OZ6?%`KkZ8EX$@ z=l=Eju!6_o){$SwJTCH1U)Z%w&AHA|ZlVskKVajY^R;__@$~?KkmNHCEvog5rfVZ7 zmP(kJiIdFCC8aD5ZL8brw!FUg$ob9<{;9m2E!)2RdM=Ymx+1=F^WtPd9r-$s+_eR7 z&#g#yb$s}CN$8d1cAfH%Gc9ttcbXV)TVnbz?2}Wwos#w!3GeM0ElP)u74_xlujzh% zOsd56&xXYDkg3k=PpXwXL*6J$rAJBUnn!dtcfV1x%5ozKTK_w+WYdtR#kTk_f8LLG zR-PDZDPH!Oh#pPwn}v#pl-n&G+f43kwz z@ot}c|N0K|avU5b9ltbLbWXN@OD1oib-{p2!^@Z*d<{=hg6=zC9b>(}J$F;q)UKhB z_3ss47VmB@y&X}V%=v3`aLPsz)kFEepS}CGcNJ;tKIfv#W)q8^Dq8Q!Dilr^NZRjz zPHe*+Qv<$|tV_*%9UEO^#NPiJ649&mlpt|gzJ&hs zMik#kX>jTM4CL~39)0shrsZG%VApe3PTndH4zGZqPCX^Yl>K_ufBAoodgqvi-#)1^ z+Vg8n!7`5B>ZE63lcU2Rw<$^K^QC{~sm=*(#-H{DIKu|=Df=6q%2#C`++#YnNQRwn z`OBo9hawYQs@kV13@%1|q|6hy?wmf_Aw4O&G|*P$^O4x*r5$zAX8VE_ER_7CV{&-> z>rY9#nfaQLm;SsdYSb_PR`a=i?_$2SEB=KX90)B#_qTsxKM~-tEUx@imRrGt<40>M zE5&zf>*k+3rpz{{fq#sx^~ZO8;p0iX=dU?7m^KC0mNo?K+6oI(cZaepOw>TEKK3^+ z4wVur4JF|yQ*uqA{cLk$P&A{V%P?+LQ3#a_Fa-WWa#@=rrZYG16R0YVi zlZ_1p6NHoUQxg8kI>&J37E2g643t;)@P3?{DeNwA1{031ar|KM9iS^V1T8oZR>;r| z@DQHuTU%j-2^W{1>nbTb16Ir&kjyYd%XY&mB(LD8q%iM@(D1NCt+i3X8#kU@wc4Y{ zOVrHU@HT7R6S-wWu!4dHv*5nO-D$%2`Nh|=8ZHS{ZL+_?n)d##o?PSJ6=~5uP5E;YPx!3jpLc!9krAQA<>uv z`@S6YduN8Gbak4FUaj06^n~~ubm8o0HSLGBoXQ%Tj zJ|8LCvB)d9yVkV*Tho^NrK0P4?~5rh1&M0gX>B>arKa?<@Xg$fe%jqfUkR@Xf39c! zPxV2Z=@0N#HCu>cNiSdoc%cG>i zR{OlsOS&FeLy9W6#5z5BOyzY#0+U#v-tDt@a_zn*KJr*|zc;U@YtKRLLicMI|$ z)K$DSKGvmpYRIaEoy%y&gh;eRMxNSM@2bF?nN#-6?*r`4u}cl;aSACJdWP0jzxBw` z^EY;}tiBl5dA>UTbtHIPzT$0xTw8h2-N z#4Af_ue#5%xWe6QiPi6k8%q9Y3+Jc3E}hyH-p^NlJlXVaq`U3Wqc%0GLF0WD=u@>e zBh4QBU#`cOzpvP8cxQ84y7z#B?vX&DrrVpE#zNQb9W0ky-||Sf^|SsZYf`z$aGi(5 zm9J3{<5R;}pT=bWpQn|N-Q2rD{I|s#zEP#FhF#rxJNNOL{{5-CSo!bcA7;K0i}y9U z>Bq4)x(cw3J*GT+6LpK^eK^!1u4>Pkl9*WPC6Xs>wE-`ogs! zZ>9Rb80DXdKlywey(}4ZFS{gVwULY-O0DlNFHQgsjMjPB;@dSMus z^6*ceOx16wKemkXR=^3{T`Fpx(1x_2*I%qQ9e8!Owp%Afl&Qw@35yD!N}~D#ldgMXdxzNh?21 zuxDICRQMdsm+OB(vQn5b)_$o#>KfzLZ_%k@i(#;qisSN^ zsE0|gFBaI_=;>(WA$Qnq_2QELuh)_$?JrpjBwYCMSU=RHe|UHBBTD`>H3384#Z%07 z!OnO$$gv-G#6R<1g!K@d8&$p2TeBXx(F7RVY>0sL2^%G_3nt-l1|Pw4Fm88z-*R;# zwn5*H^7O%S6sdP`6CT{;JKTnF&#<%_te}Br2`XegenWx9I<yz&FjGJLf%#z1@1EZ#+rQkiurP-oW}aL0B4-b)QoPzO z=Y#z9k3*ISSc;439u+z_n3lBEsnyT@O72(p`+ZWnS0rwv>-fgGM_p8i^1pvRq)4Ft z%6Ms-j>K}yE1i2Rx%v}Wy+wEJK2_ms#rbc`595q$RmZ$VeLYT9IC(j&Cf&R}9#!bo z?XfLSq%+=1Xlyj(+F=jpjH}g01NMbCt@FI7^!2>jppb{=`h=J~i6YaA`(GTo?)s~% zd-!`Wi!MEV{dONL?IZ9gNJ(GEISeR%I_$^Vb>4B5gLY6wQ0gbjYtruIHJmRm-UlLc0r|`JGzj`Kw|w z;iPFz3%Hx6Y)!3TM>bCvb8F7dC@7Cn6Zb0<+Gs(3pZ&$4lQsK-gwIbcf zysCCU)z2nIbrJjXW7!s|X;1mJU%U@r(%`A;t*Cf5vYuJ!nT?94=gZ>>CQlu;q{>7q}92T08CS%H_A6%U3?wUid4UJ$JY|@9k7ofZFik{P%>|ymhsMq2~%CZCY&4Cw8*R*iZ4wxOXYMy5`I# zGax|9*xh-Og{|amQCh%A;kcMNI?mK+KgA!oVo8cQ+al4h^{21CeDdR2ktbVwob`=h zNx9c&PIl^Y{ws-e``WnnoKK{?i|^j+ny-UitjYZ-wIZ@1tY~mQ+gbNr>%;e_6+Lmv z-e3$5uZ}60PV!8Y@Gf6o8ojAr^JC20^oGst!zSxU1J9)R)->!(Dwhd-Syt>mZiHG* z>>8{2IM~^3*5|Jl`?BGP=Lv>kKD32DjbC0+`O%u(2S#thDa?gZcReDT0#u(0rf5D@ zZ&>q<{bkeS%WAdStdP7TgYbwWqH`pt}0uY^Xl>UcQUI3yrVK#TyY{THnjTVd%ex3GG6^E*JE;5y=uJ7 zh?eu8EqiX2UVV`lz1ZOa^R6xF$9hhCZF;CLyEK)^4A&#QoUg%+FD z(XAKHEL2uFzJuR#j6|B*sK4E!)3s4X>Vn>LZ+rbAW1bMs_BDffeY=nKxo$D)9d`Iv z@^CeW|LQPr@j$6p-&|JRxZ3}ELQdpCdt_bAnQLF31~;L#(FYm#CD!F#Hs(~`COvS| zCTfcp5BGD+471yV zCO$ZVX>K<|xvUPCLcH@Y{-$l2RTk$JYehB z{(d#{W%)vrTMc@y-Ah~VYV;^?ynZp+;FRq-?^ymo)i>+5)IBv9uH2>GVN$JMJ-k%? zX4SFBzAZ`P8o``4(G9&eKJs5?A(TD6L(WE#@_Sx5F*E*yhoalLO^B zNf{q3d?ne0zUFryOYksq$P|nqKP%&ri`u%a!g8ZO&=9 zL6V6}SeX&-eaSAPefqg>>!XJBJ^r<+DdsWLg4cJPZt%Ljflu#7Q{`Y#N&V-ozJFyH zG~BxQUoO*hyr_0>JHyq7mp3*h+Vyq zaxeG)a0^u&-?sVoVQZCXt(QVfuUh|d%KU-nCJAQ1x0>PacmwBq z3M2UEH}B!=v}X{tp=%6a6;$UJEIem?^<^UIG!QIUOV`HdvFoqe-lWYCEOvAAK7oJy zwxA z(ay54_N!YVJ^VCJ4Aux|Wny4B%T3MQV`&x<%Jwr5KRy+4usuyIAEY9JKuXCFtve3M zPy%m4H8_1xqF&77#kn0zaCRF(3E~ zO?C|CXf(V8w=<9oxum-XXzCPsVnS2iey1*5@z;TnVG^@ z3QOXXQ4x*sF+5(5Y>oE@%p04~&PcE;(v0v}>6o2ekfALub?VuCTbX~b}ci(QH z;V&p(KG=Hke&$2-jS!yt!Ldx7jFgMakS;D!M)|D?Eyi_1DX@pc5!^1R<7r2}Js@iV zvVDf&Aa@aEw+|G8Uo=kq2+2(X23Ui-2Z6N+T>fB0UF{HFib)c*6{iGBb0xHc_KXcj z?qjGMrxnWh2q6iHx-i3EXNQAsb(P)-uQ)>7_PNRqh8$D`JhH=7136x{ zuVihDv)txk>N6o|?e=Nw;iv(J^L`Z)*E_!`Y#B%XsKiSw+QJ{&r#sfMy;Vo1BzBC! z_JzyC>$10Ob2>y@Mg8EeLx$bO9EsfA%5eXS4-P>Ektfa$N1mF>t2pVMQQc8>ly_J$ z_U1#gq4aAi9Z}#`73reVqKLDKr<=l*!;91p6?&w<4?pC4_k!wZQh>^4wSrgOhxL24K6h-2{;{9qC)m;vx_)veIt>jdfkhNZx7m7t_zgeT`3VeY4`i9P^Ck5 z-D90henY;Os*3NINTdt4E{fM`dY$R}XXoJ~q|_ZJ&wTh5>z=Ramm zM$t`**$CtMGO5ztYcf7e=Q-~1cHlXoZ(RDQd&Kitb=qd0HKY!EzRm3+*6byJZlasq z`DOIaMv0ILc`_f}4#{|M@tdpuXQ!^P8qRQ@ZL*7lGjhc4jO5?gcG_(4gJ3zA8DINN zv$G8!NX`}!B|(Vv-<0pFsjH8u22=`F-dE91)VgMFvZT}}>88Zwu4iYVB#o74gW2vq z?*CC$>SX*U65Q1Pw8vDT7Q7U;#&UskwgBw z9ah)I^{@N&syX@B(PQnDvA|~dn$j6B+0;xSm1_xN(g%W1a^~|nbRO^`?c^w{efG-A zzPrMe^;_Pf27U3#+sy~A=IC=sk?%&i`U*9F4Sk!x-|EFs`8rwd^2SBg>5^)}5$n&0 zBnr23d|bcT-fLT=oTuc^#;#)xcBK~{)Jfjc@4ua=|K;uN-(_2FI&R*##Y%ZmLUU5Y zAqnx%>sKo4RrA<9_dChs_dEFPF49SXG-YqW>~E$o-hW6~mG%-j(3L0IR&%KjDm(Ma zFg9EU`oY&b{k3j@&8L6I60vv(vo6KK{axp3#7>*PZ29c;`fosH?Y8uFtl5WMC<8wm zor~N*{WQ9fIUQ2_!L>+FzW9;=shbO}+hA*W5>@jb{28eAss3RDv!crLAnvn^NQ=+y zXm9FjI`O(!H(O3)Fz*IKbzR$}j>(>*`_GKGIx&>p&Ns03`jAxA!f5x-$A6l0s_;6e z|G))7@>jS13x=vGYKwyI=WR?d`p_?5$G7JQxx`qvbSb4RE9M%k5BsJa8PO_bezkY> zL*FK?@jR3LOT3;N9n(_GeXD%X7(LZy!R#nGX4_P=;-lx;r3X&CygwC}DVCnKD~{it zS4-)3@~F+CA17|@o_7NGz)Fh&0qc=JBUz3|nDXH|EJj;Luw`B9IedurjIA@(L$Evk z+4UFPgnOAH+pT;DnQLBq+ZXVR{gSv5=|<;}19~z54JbJbbDhyb}NX zI}9$uDTH#V0Jg_3(j`mxo_-6iD0`B1&rtWT;9epJsuhXwp?l82A7=B&pl8?SV=CLx z-y zZzYJSbDl&FsBFLO_Tts0b*y=h{O;&ZaY4K}G3mScqGbk$IIPgLsY?$-JnzD^e5=qwCS-+3uZYOmK`Dd5k>^%HK zukl;exsWX$q5A?~*l7;CH#}w8d+hx&$CWnP?=}8D3S!N@zp~ixfD)&MeBy`wqU-(@ zR7ShL?lv^D@;l|#!#^$G;jEE=U?3+sFsQxQ(~|F`o|k%6P)_jQ5=VWff0ONQ5(hdEOx#8P7@Wg(n_3HzxmbQ|Z*(Wc*GGhGjpu(pj&tu*G>3u4#%mPqIjRauAXshr;6v*8v!!u@lIPftbc z7|l%Boc4Wm>!wZN;T9$)CiOpmm;8`ncy;R@Y>sI6DaCwTSCO*%)w2#MvnzhrBtLLm z%q&T)FU`!}JtgM2?R#@73p1%m?3ajCr@JF()7v&~tFcpog`9&L?c^iw7c_Q*+@9wvJE~qi zVrHiG(>+Mw?TW5#n%|i=r&I1Zs>NM-oxUecWU+2+*r8`5CXMe36JF``XXui48^t$R z1$1sXE`E8(E+?(wtr@448+i-6zan;0U-r7mXYAV={P|jufemw6s!&G%n(E0Xcl#T6 z2;6bgHFb80yLKV-tmh8bYVkLv75i0I-uqRzG$Z1)($&Nsf7v%f7uO;BqSbz!*~J5g z!Uq0T*|t~qISbWmJ&GW|Jea4XCX_+Su5LY&=+VEe&-?kQ8}VYdx-ZF`p1is7-k#1L zWr44$`|5|;gqYq_n7Ah!-Ed;Em9Y;{ReqBBB+9XeM{UwKM9^xo|Ct5i)S~?)?_m}>RN=SMG~;%= zV(FumjTT;ceei{KAt{~lh3^=&`Z>-&$~Ln9ULa|1+xd~?!(4Yt@y zliswQaol6p+~%$Db+W~&K4)EOz`i&9)9lTTKR2k7RQiATd9>@8r;}U@x`d~ABW%}h z36z-PnW{50eJ;GSSjWhG*K@O27Ma$kg3Z?Z6btXj1gA`;x9Ggsy}4w3a7gWg-*Ho? zCmR&}st3X=v;>mg3#uhc7GziJs~VIr-iW%TC3^=xoxZ<4bjLrX2(`v$m%kG6vA+W6 zazNM|zTjQC^(pZ8<})`7v0Knwjc>v2L);o6`VAJxJ=Y&vl!0Fhdt9AqkJw6iGU@L+fr;aq?H-VgFLT)<8JxgW{+lgNu%kHzHya}OXat0Pa5m4Zxgj8N98 zLipqkrB)4Ejw44=vxU~+dZWCLge+*!*xFcC3enRY*mEak?w$+w%+di(;QKo>1P$V! zTmC_W3n@dwurG~15Qnl}3zo-+9f#bPxc>zq&w3`5FA3bp2IUTdlt@z;!ZUry19qlu zVd*>OWRMcUjmXQrup7RkoP)3nF6lu@KMzae89h@EH{f$pH8M*CIDqGtXCZg7h@f6E zV5=Q<7v`byfeA0&3-{t^RJu&SxGw8el+WT?>vcT_XpaE7{z5?v{=`*IB>UwA7|1kq zEE19?yD9UaT3QH4z1MMijt?9DYKl9aNdN5+T4D`r-8?acV}Q~x57pA3F=ZcCfYR{K z%1Y2){PRRC#7WaD2Csb*%D~gRet9ku0wTD+4&m|4-3nC@$i0LT@aV_J zp%wVJ&5RZPM^h)(9g_-dNrRsqR&(5l+6BR<@!TC=4eOzTcFFAu;C<4jz}9*js* z1|nc@JWK3Ja6Nw0-hGRAJwF)bGvKV-1l&uOp-k_D4e(5{?UalE~2Ht}SP2Py`P%=Nm%`<%%?gt2<4;T@)*&-M8HFyonLF7V4F?JkbDJDb~ z_QGCEqJB(s;N~0vJdgTbI4XE+Y!X%*L+h4W(1kWJ0gw(V2-!l2m1lmt85dxL3+-Y? zlu;+3YZ@nh%;3E%^*#9<%&tnH>PpuS_@YLC;AQx1c?d(HRrsJ>EPzTs_DV%NHZ*KL zcmIQq3Yx+)LkCmW6+j1$L&y`mHBc=Da4f~iI>Rc~D8ULETd+ob?s?KvrQkv>*$^pm ztu{NTtz+jRNP<%3_nv{!YGNno2P2ND7&?Tt(@M=|UcHz_VPcy{aE}1sMuds%&LmsJ zK2z@prW?w|4qm%6VIxaD3?Oub0R##GfSehC0t19|0RWXk2NeL6=&}Asx1jEkmjh9u zRq6?#t{ezEC`d#h9%vD|lVfglv2lS@sSWDt^Gt#;D9VJvysSx@}uxxk{ zD{6TY5?-LpF064CwNYY0BXtOKsEyJK8jpwq%v-Gc*u>NcmPAmS1cB|JtPE(pCnAZy z;htj;;{eh_uX7^;;KC`#yy3){haymSo*CDJ83^^&5h{YfOyMG-f3%4Qpmb2%(IFm$ zR@R38;|K5m&Ai9z85c-I)x~0Vatyna8i6E1BpHH88!&JQ@-_DPc8GZ}s0tnDMHbOq z36=5Jr~%)cEVaPcAs*D79|-Tq!3&b|b2Ehs?nrH;7CIxyW(r2pI0R?P2LWnFmhkO2DVw#2%xiQAk z4?=Tuj_QhPsqeAk&Hw6L5~4M8&6Af(RGkMSDoiivB-kBFwa9QD;4B5nwLC0nr|{go zp`st7wQ-|TB6BLE`p|A#8z&krf^gHUkcub4i_t_&qYzGl+X0@QU>!tb_oiZDoRH&q z=j(`SXZukdQAAGR|7mCKybNezG$MlLh|Wnw^(eowJ_OKvq6n>?7VX76jTRsF9^84H z?;)sI>-fs)11TV0B6>)?&7zl<% zN%T1bzVOf=uw~zz9~Tlu2X6|)%46pSbv`mtzZ>|e)nT%l{|kk<5>?Hh&?W}`vL?Dy z94PHGKTw(^N)boo=0aL@r!;8F5JKH$L9C-A1L|^@8q!vV83NdX-zx{8{z;JCt5nFt zjy!0oJi@F*Z+5lw8hYgnBFs%dB|&r*Fff#-N=SnU#20;|h;ZZJPlg_!Vg%=yfdJlz z0RKS_)m1}+a18F%1YHLyVO^u0ng}1RsZ0kn-BF=(^>7gvS+rgpWQq}5Vij8-Qgi{x zF-;)35;^B88+uOi*zE19F6gfnhO$uT37<+AodP z+9T4lp*|*vdt{387(h6~F&}{+g%p6r)9Ow*^mS*BjqrkDo`PQe3#jN5y7cg)c3I?t zNa6TDm-p)(a4c3ZfF>hItq0L91p@ zv;x?WJp!M(kQ_72PixTtHCSUow{d=eqE{HID++`z^+RNEEK3A{whQ6p6&$jtPXHp0 zGX#3!F_2!BAiZq_=G4Iw$GjvsJdA!6i&q~u0EF^X0)agnP~AQ7k_DXRt_R#Ki>9ta zLMY6)0H7=q0KAC-#yzuOyo^MIl;>;&?Y=*v2K4e1d^8C?sw7Yy@?xCmT5*6@@kY$C z%AlV?5&nYSMiT%;eiGI7qMbu9-(tOmhT^xd1eV@&d1~+GnSxk;;D6`o2kpmPm`XC{ z!oZeIbiqhp=f3;H4Q!#?u_|~vO>CqukY*hO=YKH-RPXa) zA31~<=e-D(WdwNREa2^e7V!4{p-ovQ$SCOo{)oJ-&!Kj3R09#k8Pno@uejI&LzUoT zKEry;)tqZZgN)KzJOUafp{pA%O)-9QU^Q6A2h{0=KkG2~3Tj!1>X*Xo!6Q?pzHW z1A`s`x1nOj9X>ox-w(|&g{^w89060ys%hSf7gcsbxNv$eKKqh$30TI$u=`*Hvc{)p z$jZ1Pva>qE2<~wQKJDf?FuS}!xYO*82;vl|z7q5%b{_L(fh!RK+)TCpIowMT*36 zi+_cAWopQcT3m#=(V!?o%+VDCsGfNPfUqc+4F#1w0t-~H5et9<`{_Vov4kawUhM2l8i3cZ6>7fchr;+4~B0QwcMXY8nu_E(;|={?=A^P)qE2Uob4lLR%{D|ri7XjnJiFWKNcFE{|(fK zg@(clv_UUG0{sx3M$WTTcX1zEfl6N0l&1u-BZ&jHA?NTJgPklgHsfbKh8_vn8)Dh|x-Bp^;C z9L)uxP#lOI*=-2^xY-Vf-p_+Vu80Jh;tD$bYe$cZF-KM61ORl@FaT)~xACH%fak;M z^%y{el{M%DSkYcrgbO$8U++A1SQmKeRp1w877+%iN*lu5pBj#u{1GwiQa*lSri1{ZKTW`)6i7&*ln{h}mOaddeiiFWR|2-i zz=!A`DW+5m4IFz~Akad}%)l54AfjmI0azSuUPBmK`elAFd5E#Ew#5wEivM-FAMc1T z?v$M$)i;0vtp^GuMrP|RG4m3@cHKqMh&WE+(-Zd5*MZ}D16Uy9gj++X+*4RK*=P%)bqQcYn4CZ#cI-GL-WzDbYy~i?5U_q}|N4)h(^3L}q^*F+bs`1} zdh}BMQ;8iFV%ACwZ1|lZa=)`O`dNw)qvo#tbq)NM9Rn+n%A8 z!hm*QKskO8dE&MvS*?9x>|Fr1u}I1q2z56^q_G?Ic+21`{TPVdoNom@5!Y1CK%Czp z$NuIbcm8ET$BhZLO}Knd5NS;?=9J{IAGc#i!G(NY0^^vwcQgZhJqe+MF{6cMh!Rf2 z3@NT7*#6813>R_Y_=jRxQt0?H!me?|3Q+6{qq;SH)XbXTwPG;07MFl|C1JG8ju2g~ zaR61BicHXCT16esOec1wj+}pEx!+03WLhe3}A56a70OGQ=i~ zZg)e3aE{{*i0F{$-Ox;)8-!@=Xe)^9a1ckaP41GcS%`5@gbN-01u-wQtD`mVOThSf zgSCS=ahB&$k#Rp|hKgacbaBB9OU~e7wnO?14kORb;3F3QF@wzl0s0vLGVKE^6F9+E zdrWRHSkync*?+Nr%2O*3P^qfmoYGt=0`=F9=-}n4LjaiSPC;dY2s*Zopy;{kg!ysE zRdfaoOR%B|5r`nJvtal00jq&6MFaMT+c@4bY<^*0lM_AI2oon5W~VzqxP?%TQ~e~U zGmAk)adb^i-!;hsbk%|WiE&hT1()fC*yAx3~&IulIm5wq)$e zo<$--VyNNG1TTnbYQXMw8C^}7R=-sPGzr8GXEY-qh(gxZVg5uB)s{gP;o2@V+oQAav0HJW%|$o(yn%;)3!!HV_je+T0!8< z>n4V2jYg^lt4NqCau8WEp))#!NRAbBKL?REN0O$iaHK)qiAN zfQkvlB?J{C?=b3eC@3}|CVnyUl9)>^c|YS)L8%E%NX#JqtpIIapQsKK1c^MTy#sw? z0B~I!ME+!S6AVUh~Nxpu8w8?q$UB3LOl?N{#s3l!zFzIb05FWHoE%K!wyVT@h82U zSe$Ylh)ayVqJKc-Saxx6D9DTsTfoF=g=x4DbGK?gA@p1z-IHJ>m)w441cTXR24<5i zL3^41s4@u@#lYMPb}jVU8NdxO*VGQM)`9QvAV!T0)<#`av~hg= zC6$|>0mLkUZCewFX)L1h0q&!)q7T&x^NU{um8t+p832j67hkG~At|G#8iZUHpElq? zN15724miU_Sj~V;=n6dmP^1Erp;k5W!E2%m0DKJqfT}u7jj72){c;N+)?gd{pV}~W z!!OIsj2>Eo$jnNLS=}4!u8Y#ZjIgUG%LtO@>jI>i$e9^ECkoLH%;)AKrv;$RVK@Wk zWPvE)G&mKq`=&EcMiDSL;wFP)gds?w10yYH}6Bt=-JcF<~0uo&? z>|s;QZxcYuS{ATH3_2&5!f2TbqJol&AfiXZMqeDHO_3%`Dv0KPo&o^n1V;p_odLXj z1|Mw#Pjyza#G_mgZrr>X#tw{5S);lj)rrcuBYe17OD~835)#9%B@P&ZR1rwH;%JHa z02W6aVRAH^II5@w^DPj5ZP2|^QJ}N?;6sf1zB|L%0 zEV=r~4K&)p%JcIFOr&J_K)|{t(6&558Ja6$lw%#dXo2zhV|mB>o>ZTS{kSv_S{6>| z@N)zJkn*7d&`LA#DPpWDBNYg@5%jA_=+kZW4As(_|478lFDIa3mZu8(0b7E=p;;6n zgBzN;yUX((>PP^}mk7r4N<1Qs8ylBIz&K|x)+T{wBogug%nX`$jerk04-~bO);0LI zJXJdcMs?+YNj4Kb>NzYRZVsDq5@X;xD>^Mt4<)f#D##f3-U!T4A+hlVQ25fhPLcTpKLMB{8BmIb!_5gcVBtJ7!b zgTo&#RAvLjO3(~8Qacu%V><;b7OUST2K{B3GtNeM$wJ1kVcL#)q@#OgfFuq76Ug;m zUc6{En(BxMAqTRlpi6O9X$)dhI6rsB`$W4V0yq=zjkf7u37FaqhKv|9kn*YC2hH_F zI8k%(9~@TJCtg))psiIvTSN~dNk;p<5N%xVQCNnQbYRxCl&mHUkBmQH?NkvqX~FGA zkP5{ic4Egf9}i)ZNdTP=Kn!NvXt@B`qNFGUWHon0!+Z;3$pilU8CWdD3pgZt)r=CX zH))hP`#*w29f$D6g23K4g2Xw|v%D#r@hoD*o%{WS?{9m7sT+a8C7wHgtIo4KcNSE8 z1L3^UZ39rrnp3oPPBeD|VbPnrJwJcYb8mFH(5IyWMcI8FCqVVz&Yj4KFK=B6H7;1*%l^f!iwfq>X4GjS2-Z-l`P)POK8 zFn$iJ0gC@9bSET;{#7G*%8%e`43czd*70d;A-p(#B*F0pa^VW*WE9arUApct%6(Wu zk*663o7=^NZZS_#gY8|n-Nh6uN-mjLcr)V~met$d0b^$t%TZZyTNT%>wmE2A+(~WJ zK)0F`7%s&cuRp{lx(XVo1T8otIb~L2a~W7$Eja%pdJxY?R1acC@CumIsgTUFG6qK4 z2GEEbo`~n*xA886-x={g2}x3uc{o1JzzGL3^^yug#h{~0+~Q0(dTr*D0NP|fddhozd@cAr6mBSQO^14%jcsr z{vjd=7FeL)c8Sq@cfjP70=7$(H+vFBPpyZQs0Up*)%FAdF41r3R1ku{Lb78mc)j?? zjNnopRo z!*_h(&e>Ol6XDafMM`$F%zZnqnfqBx6c&135w=6o?4tgPv-^DQ(tOiPOl#$XKW>s; zd3N8XU^&0wkc+xo1vXq)sTRGkVL|mu(dNwN%wp*;Cg zaSRt7)4}+PI!y$jv3B3_+c9JE8+3tgiCJNM^f{OlKly;}FK7zh$q?f78<+rxr3)L+ z`8ptEOb^nOpaml3$c$~on>B$632->HwCVV*LHexF0 z>nz-X9>_1nDMDjla3LWf#)$&@PC7{M;FsZgOP3Ik;Rv*d>(HMJ3Df-r#5j-U2sm)Q zdPwTfwQVIpata|xZx`SOFh{@`SX$$PNG*}TKxH6ViI5azR~_9~(4C`ctDvVi8@@pJ zA0HnG^1;+Vj547@mlEQ_rYbavmy4b(C{x_YW2{QZgQI*v$d&WeTG*WP)l*c5?h!7+ z>mz(BKIZ9uX&ribw7{6Bf+BXPvKSF*PSILeM`rngxmKevlkvl+z$201r?-o6q3RMb z;|N7Vc#dTd!egv>irR2ER){)rzFJ~BAV`A{q4$V#;eq<;Vq)Bi%7L}xCZ@oVAgL>< z)T5(R7@_Rqw53bNxco!R5|s}S=W34@x8_htUoL7vU;Yv2`qCn9&mp&n8`B4Gj0MkK z!d)7zaaOH&xME7cLkBjNV-j32yP$gbOkRxB;z=y$2(EVP#Mx~$7Sjh4CJp5~6euSphNFt3sax^ABizp@;T4%GKN3_Tt<=kk#cf ze#&mc<;lL7-2+eUb`NmFVH4)3cmB};J$8f|W5sGuT!hQQEb_tfQ4#E9&j)ECKE7H> zfbGE*fyXpV9<+oK>dcTMn7j}oIiP@l!jQ7-T)col%8O3obr|BzCCQd=K@i!ik|5_k zTeBhvuqR|0VrymyB7$1eutY>LqqOfAKcZ({-?~6msArV~;^8b~LY?tkK@-)Jd>kw1 zNA$i?!iQ0ZqRz?=YGJV3#ek<7t^u~m5wc8kReT&`oSCGC%b@sdnfLQzDijhX*g`?R zgb}mXAIm_57>f$-qQ!#)6ValWx;$C~DyK0FEw?Vf{ZSmXPUF3ZICGr_Zi*|hYmiKc z`4_%6dqa;_!HS+r$8;^g4PQc&*${~NqGFQMF*8IhW8i%+Qkx88&C3XtsdolDg<_`@ zkM9&luzcExsiSnkOV|vwJg*7ci3W8}3(r9GGrZRu@{hy-yO2PI$VoM42tGaoVLrYY zAf*ZO2Cw`G8Rp>`SR*R-NhgJ41%}QPJA*Gltzg%%?P$!-dbj{epJIT&Lo?v(O|Sho zAZ#{*NJ^GEz?8hO`8G$8H1tmjeiBujI1~GVlo?5eF}NJJQ3dKKZF=wlR!JU6&c`+B z+X|$a=gz_8Ljc@&9eaUB*7dC$DKg!R@Yx7EV^84>wD@h?Dzvz2`z(&P5KYEC<2HW8 zn>VL5CI~`rYJjvguF0BoFuyh8>ZpdJ7JeLHNe%xD{XydiocD5yJ;VtEMH;vs^QJLA z8?nb+m4;v8lu5J}M`DH?$-4_)G2bb~hwUN1`AK+Cl5;8X< zQany~mpA;ksoy!aMCA5hnEcY-Rq~7#Q^emFBU+|;6CSVLs$+fRm3+ay9Y;*)FXnpFY;L)Rl<)kyqx407 zT6a)WLxXbt%TRjkQq!YKFP!UC7SvsDtY~p=n(=ARzLHl328AYRjkD@+-S=&gzrO=3 z=vZuRduEN$y*&F}0aD^Jvl8YUzrQ_V_TFdrTqjLw%yL||JNiXxPQuESUA8kU0$rlI zOX5%2U*EJb?T(j*f~9iC6Jw>REfH zpW1ifqV&Oo68kc?6~F@Js+*-STNBXnAdX1-t<}NLnUi-sl$%mW) z{YfGBoX;<+mittn!9JCO zm+_n8j!hffUVA}Wv{gjMsVLRtmDd|9WBawIU6m? zR@hO+%zR$X>^q=lizf}fL`F`qej@hxl_Uposo~Wo`1NDDpMAoI` zr8A1%uUdbn9r0{`xb=KuwSaTHi6ApQH+H$hq2>D3oyE?jp@wI?MGllqmyHazv#47j zQWIC{`RD%h&ZJpIqB*A@w4bhO*r0UlvBt6YyJ%aYmQPOaOl>a8Zagu`<=~U0b$QPO zdZKRMC_9yP@$8JpwzCH(Z6RhgDd|q08gQ~fHP-&wBBoH0PD|+G%7rF(<=YQdX6Bzh zI>*KZOmGYJQk>qFmKGdw@~zabl|SbveD(WsxFtz($NandY~^pCe9^wBp=|2{jD`a7z7$_1*rB@2od~z8lR8*GHS}I`h_kNhLEj(>Bx5U?BHV zcY?p_F4z>EY&cb&8*_ znaX*r-gc4ywaSU_ulqjH!gC$w&RaG7=k1gVOC)pUz3r46dxXrdnzG>$RG=(SXiJ z>FEU<9;ViR> z_5raP0d&WXpqxV{d*fT~N9?<}c}kp7^%*U~@pww%f8zubJ~|C_$~bzys+w&x9KA>? z_H|%l*Av-QC5cyE*G_2QADX>(^`C>1O-jlI=T5KM^zPZIgx%NNPCi!brkyL6ZpdoA zI^g=Fw)nQdvve7?lntLRRcEUl>GAsL6qn|E^RaN#zz#j{Uj^}o|9#1N`?H_*ui1ZI zPlwfPnos}n^ocZ7l8%lI?>C8*xthD7bm(=}&a-oL+RIZnRF@8eGFwR+wv8Jg^M>G5?GWsxmGH_jF zFl0R4QHc%@TV`XqNSQHgQ^y&7$kC(nHk<|^qszJ${5wil7r=I*bU|x;3tCQJiLXYj z7Z&@X;wsVDRHV!}ZGR7)bY|SeY=n{7YT!Woi}P@;pvIo{((8*=7&lyQqT!ww#Ns(+ za=6@QgQs!IWI#Vx;fpY2vJ?@S?ym;N^9gW7_M)c<>4Od%ToC+nA~YG}c59)rERMyN zpyj7?F&bK4-;UR#WzQRU9$N0WiEl*9%8vL!w49KQd!iF64aLU;AE8_C;DqWfrVFGj z2xaC^8vYwWj9LE(v*!Rz#v4DMI^VDIQ0I`z@U6tKiHJC(eNq!rWL|N?cOxz_V)pD1 z8Lj=(xzwr3yC;|`s{HW+tQeh&NI%Euh&E=X1eSnUW9;?rLD?5NK!hC!J%KrOc z15#wh-onKNMxA5Uyuj)>HBBP1Iu)};`3IyhZ&idJbHN)0k>rv(oNDX~r_FnXK#DW2 zNbZ&}>O&TC0wh(|t;0Ve0WmHe%0(??+{X(z%NxiZsQk`#E6OF zIsnPw!X$i9YIF_Nx-~_)8XVhzJ287UQKtF~@1waKJ*3{(16UV6A_>cZt*wFgU4TU` zu14-)fqy0wLd*r`*c473kTSHVcq$6|KsJWzWJJu?K*`L>cs?g`QheVQ{1pc+GV*cD z)$(LvBTMH8GOm~+xf=$2#uHKup?XDBPwNM483GBz@PrXc{@IKBppj+fVwaIJofiE8 zNjd_G~HM#br2C*O>gnA2Y4e+VRx7mDW#ErxYjh|^VU}!aOt$vwh<@fND=Z!b$%KwaqS1M7!;Crn5HwISfE$CP&zRz<8w{UQ zR!CRD{NaaVoVGw#ZSnG3fwxPi8hSBzZdSlz%5GfK7o*9x&%-bY|NNIoV(>P z5}!MQ=(#PbOO>GSv-#=AaYaVn0teKqJ5HDhTA9pZ+>r;Yx?nj}bxk?0s3uk1jpdGqy6|9HaSigCCdr3g1fCBYeMLY^V8$P1M+x>kVJ?AP76 zKUzLZ$Iu>)>GT7eA%KKV+$+vYg`EiyXEhI|zuzMfZ|2ARdOp8r|*Xw=s_Wb3=f<;{$NfV z;9>OxL09b5NP?1juef4Qk;u9p)lB^ZJ!>IAj}xXukC70hXT{6YT9@4Rkaz2?uvzxV zP=0EwS&~S8#m-&+%WF-sV8s~i13`+j{kwIh^{%M7UQzW+I%?*JZ60s8eK*WIlc65e z<@KiNd~e!~eM5VqX&17E>hli?DcyJLzUZ%X%DE=yZquGkQI>DSD>W3%8d`%E*?&{n zDD`Fkd}ATg;=pykx7u4xrWxtZx4F50{nz~IeKbkMcWMqXGo>azdUebzu|W5w?)2_! zlhs<~I(IhuzdU~8p}5)X_=mbh3j-sMK3h^QczQwl@J`3`LXqE;H66Tz3%=!V{1GLZ zZhWz<^^*08d5<$b#Y}6p`*lB2ZFP-g<^J@oeZP(-ZPY#`JKaWn=aZ@GV(uqtrqAM6 z%2x+uWN+Wx&@;a2(e62SEc@EuN636FU9V41N!fep;q6IsEycbIey@u87Q9SL$+~~; zqbVxOmBS7%(00~Z-WgL>mf-y*Eph9i?GCCN&a{>-+d6;h&CB!Oi=T3hvXow|7vIwN z!=UK(PJ6@U4-Y6gM!tMd)DYI=bA>i^Zit276jhYlCdrn_{hi$``G$^{kv_)l2#SSCH~0^|6Xu8YldUUuz;7) z1nW;Z%1zVmw*Kc=acZAQ_!MS}%%+Hfqi6D3D^?ra7(ekydSr|AD<@OSVgl%Ho*RGa z{vVvXsm-2Edw#nkzO6oY&cgJmi6(C*PUFf&;LXDlXw}=>R0jG z>xz~HABwniqHLE@LOO@U}BzsicXtWOJf?Jm5*T+TOdv+w8Qp)oUK8ZK`2$X-|? z@e2Q)`|k#ijJ{Jc%J=T=?yoCRy>PJ4)%0MO*`C1l@0_AHM69Uy%SowSWfn(!en!tI zKGtAw{wwXc(x__VUCo~uHE!|!d$NwI$pr|sMD-lE4bN~G4*&AKsI=-b-`R`Thu4X{ z9lo3H>Gx?~x4(Ds9^5C`^Kt$C65D<6_AAj83O5(Z**vqA*>r9Gvx`q&D?BqWbgS`d zqtA?Wi?uDk;=TCT_JmKIoqa*}Ry)&)z@1UlixViD-#cf?7D&PVSel>JsgUngm>0`% zJx(t|j`Lr3Vr@t#!(23sA3@6xX5dqi&Vph3&<`coxncQ8nc<&Qj1-w~_u~P`hA*=P zV7}<+r-l)Nh<2vwOxzUBg3He=>T+P7q~Yw*5WcGs2E$2&1TBAhE6f0Sx8t|Nt}Z@x zq36tPUBN3m6`a;u&zv!MJe9un_?8O0?bm1gGMjB;`HOFYZ=+AYw?JG<*{gl~=DWN1 zJjUM6b(p;7hqTyC^Lf>q7ZlvO;Jd>u#yBx?jt&31zAf{s97A;jKQ8gxBi4D#zS`mT z%-3eIJNkwGy_hkhx&AS2^KHw26gFJ| z%F=@?jWX9J6rKDL-yhI?TINfr_|gs2KBf&-EzsNOIOOpm=IpEOGdlg8{r<66o~Xx| z@hYrRgxDlp;%rb*J>hx$Q2CO?b*20DLL267pq0KfES}Pm(tN?H{$0S4a@zV}6*Gky z*3I=_Z&a!nX8)X5B{faF{`j3Pq1f7|DU0;F%P+FV%O62 zQ|v!Rv{Z=skEhn&#$iAC@{}uGpNUIdyKiq1EZOfDWoCEDte`a8cv@EeBX`l>s!TB* zL+ie8I*WJd792ekA2xVbJQRBuCv(25TZyuuX1rbEfj05B)UVGT!v^ex(J!?tvfiF0 zRpXyWXF|-yNAQzqDr)SFWg8dLA63?N6?;8Q zTR8sub8vmW;qMQh9xmsT`rw%3_}R#M%?`zHvS$iCEzUTulT~ic<@X*8+BBt0J*i1q zQ%%`vFmHeSt&Bv6rl7L7(eoD3cBL@3?{`abNj+O%QuH{h=z8bWxUN%^m-w$Zefr=f z!Bg==;>&LrH?-f+?^VeA*X!}ii1-H=-i>d3;#Wx1{?HXBcV#wc>ALgvNYtSDM011N zQFEsZ?n`$3e&l0f+`I!5p06}$t82TtN8{o4#`3rOv{HYsx#TylYk$OzadTaSe^}9M z^J`wIWDa*tl)rPR|H0z2xO`b`N4H#BR&kqI>Y&87N5^$`mS!Fw4#+m08g0`k5m{;^22*sAL$(luGYCS`AyalZe=NsOH7~lec#bI z!*)P-w&U@VzD2rwD;o=x9GCXn+8)GJ?iA7Xj?2v;=!T_pTdvr-I$76lQ8HX;op3-b zP4K0E0RHmY_^DJ-}or=aTXx=vS#63yPaY`FKws|U3_?DtjYa{ zamuwcjm(|PPDVw^|4w1jrZtOxqG_&q5pueBgG&FV@UG7%-)8FGs82m&*Brk)=S^c@ zZ?s+A!RML^?_=^CjtoSH#b#bfOLJbmiqN}u|qhGEyJQpQ5z4S>D?Y|8_ z8+I*RZ2i;e*@J0QOAI~)MAm`I!y=EY`=o+tdoF&yO`CWk*F0cP(GvCVc!tM>H_48v zxO4h;`$?;&&nuOzw$HYYZu07%!V=Y!?6WOXWiR~-weO9*cux6e zudF3~$)WcOdluM>*>AfL@XNA${r5DPe=MFmRfbHl{*%|Ef34Pbh1!;G(I;CJo;*4; zTV+nPOsQ_$`JN|}t`>!_{q`h)zf8CNa+|%@f&A|qjxDPF_mbAH>F3rTKViOH`V>fa zKK1_2omZ1f>U=8CiQm(wVWVvq&iRcpLz} z>6QTNrV>)j6O*wfP6t7{VJ(U8M!h_e*2f`}L)#N!Vm^mVvahJeA9EJ-#EG&v>06C z92mVa-gFS|)tuGfy(QYh1CmJ zygS`xxjx+KL)#huw=phuE)!Qr=19+tHJEwig}}Ri53JsQD_g5}uz4KfG^uJqvxO4fub{O{Kw|<0tA2$Sv#@&T^ZZ*69_s zS8Wlkea;D>D3SWRv_d7*TKT`+&@E9Bk&)hIOS-!Xw(6WVrivg)X% zDN<%F5n{*0{MTpQa`N`;O2b9WJUor!D3!kOc%=G)cRJxTdo^gh$|q|2@i z%0`k^xrP#g1@JJ$TNCSaW4){y&Q&pX<=Nvup2(oxv-**<>svB7QP;33KlkI+lM#dK zFRqw;E}~9-y~*=7Q^|zY$)B1Z6~6C2d3tHje_el)Kh@=$Ry8(UzZWo#=n1peFZWV@ zpkX<&rd#KiqvNU`&%>8LcG_!y`q=!c@1NB|JEM-cDGMdn7S@<~Oj8VUkk}fidwJF6 z#?*y#m^A{0G%?$sFEygOv#UyasD^#%IVZ`hzD9+Rt$~i0y|$!nA@H*4JZ0gMd*1MhApfDPsD&mg zI__-$miX)SqF+yvSN%$U3EHoU`e}+CJ5|@D8LlmG(5md8?_X$FJGE|1>CtE}6?oRE zUvDE8ayCN31$cx}z0`rFw#TUi>VfNyRhthm+SY*w=DHOl}W~( z=-#4|^si-8iBDYnoH@=VIcs}wR_03`p1U{3S^O;X{#q|dH~O_BzYm@NwQ=|4RUVW5 zOjYi!{nW5ba&GI_sQY;{uPsx!8?yABsI6a^@Q;Yi0vq)9zBgbx9<>lQ?4~_w)Z6fy z8L6}V;l9@Wq4m#~Oa2T#a8vA_je2*pPEMuCc`L>z>@#)e%wwC&rH>XtgZf|M{?I?Xx+PWe* z?MqMm+Sl?0H>(YY+PBL`_kE7MHEqp|u7c~whUNryq`kfqTp412?wrrVCa}xOyixO= zQ-zP-#I{93bKWdmuX62Mk68TDQe+GTZ_+3xLCV8E` z|9S6p`S<*HCQ15^56h4dpK{{r&Ke)3*cC?F*?VfP-?q2hy2>~@N`001Y<2NL>2zb2 zgqP`sE3#}QLoV`(l}FlyO|BNX>v>mP$^3`+)oBebUsOX?hr{0(n1q(SGHFnp@;-k1 z@54h{a4;2Mokj(drHFH^DK4uU1wPV*S_JG;`TV_Rcv|=bc*Em$aJ!EfJ+;9-uL_yu zNzRc^MUD~t#ufAT4Dj*x3YlT)?>(xa=$N89n_Zgkoo5sLI&WzbVxg#0QEZg{3Uo*l z%47#mjtXy~XSfUoL}Umx@);cBfQ|-yHUXn|(o{f<3?afg#R|tV8A23KCm*XzjT&c* zTvC7{H7pt!lp#20_JE8IeBRG`PLEkF%p<2w%9+6}IhvvQ7@h0`plrYS%t!u*i&z+9 z5)NdJV3s`Ej>|!9OdMdUxDoJ{gC|T!B8nsl!z_Z?-=(|>kP?WQQ-~x!BJxmjD~o9N z|9WUm@$eA=rq94^|6d7eOlI(y9L*3O(iN59WCj~r7DUVVL1!aw$m1RhcP1&S4vs2} z;?8>hmGzu1Eg&*RrKb|1hB<&sii9fgRvd*X7Syh0X#^A9w4GI1{Ts~Vx0&dz`O|so*HEZbQU~OBeeCP zAs8d2naWX&_lp1z>%S-|GK3YWE=n(wkOTD@gb>Jv?_4R+1cO2Kzd#eC4{_K)(m02u zS$!4O4BRvbJ&p#_M|?<>-WjLJM#)`vT9OTe3 zd3umIKX8YKmpMVQFiaMwFA-NC69lXGJ|qs&RpAMr)gT|TXh2+hwBfU!D@Z^YO%SC$ zS{aMAA(Vma=S#lfqTm=pyg(A^B++Dy3#?xM9$Rc0Jex0|=2s9^cL)DyGd#jZaSJfs54}b%1)^zjR(KheV{nab1FQz8a8i z5ciP+Hn3KBfMVHO!zPlay}2U^%ge@50(sh-OJqs?W)V%un8^Wzm9x&kTAxq{WuCAZ zmgEn(lzF^kW!fVUWI*U}PJ+v^hi7RS(CH2>)f=WWS6^(x0aIKsNgK*&X9DIBgIZI?& zBO07Z2+_^u#}TT~%_rF_FiM$8(_<+jO8pV_=|&%kj7&$Y;^w1XtxJAZp_&DmUvv zDSJShiwlG7rGy~jN8bE3a~Htvh0yo3j;zL25bn-yv_Jh+a8x|9SodnzQE(8~)% zzy$~@LT)2Ln&nGM(z^y!c&h%^oU{ckFt}0}92NA#ek^ls#)JYA+myv>eKnAO0_69g z#CFA>#UFGUQ{}1kElZ&n9f2%{TT2NgM4@ngkK-PwP!%eqrjdRKi@!FLkVgV4BC(PV zWzB*?*L*@_L>KJCsHglX&P@s@1$=oN`$Yo#ekM5y_6E^@ga%^C*%Q+AX0ay7bgMx_ zQ0Ga3_6?b2QuA4Ka4ekA0L~7Cn7zJ@<-Ek$G@f4M=!DtI9x(4JMELk(D9&}oAv)Z{ z2^9n$dH&=VPB2pyRQULOC{nu;IiATW{M90e35O0kF5@b6UI0m9YuIW77Z6s6SUZ`GcXPQWS(u>JO}WHCiHCnZDHX<( zp_TIweCLO_MMD&3QY0)lv+TgSkp~Y=2+koeax`nngnm?Q8>Ppb!Fju1xmh3MePQl7 zz#hkrqFRg2$~}_^LJp~n-?R#MGWk7Wu1==#pW6ZX$yJds$k4;lk&rzQ{2(#AR?JfB zzL1bbAd7H-qzk)PBzUcYQwd}g@yU?XyO%|(OD0qiR{~rUE>}ZW_@OIK6j#biSp3tb z5lV=aKPFIBX&H+&$&`>mRB92^GZ0h=q`(TEo_`kdQ-2|BxW9sb!J)9VtE1ExuF*OA-lK ziOv-FAJvikbju<+o_4>%5$c;;&(hc7NI`10DI{Gz0ZI0t&Xh8Aa4(5KbB+{K`?}gNITvH162o=(+I5*l_aU1Bt2ak zYc=fs$72g1Y#p$#9Nm5(XIw|`L4H-Bbpw;<0h@aTMv9NmmQp>D51|yC%PSIs;Mzn& z4MEQ&4u)F$bd(M+2aAHGaTI_4sU;LUV0Adagr`mcR==c38Y7wq$Q-Nc@Am0x3EQ5yX@X2CK593e$QnB`ywfW$P-bUHRqxG z>TrGsYmED;$XWb>C3LI>m*R2lEd&Zr_{?G;w@rYr04Bqlx*#6sY;YH@Fp{3AWzCmH$Uq;pYU|jEBg55pdI=PypplgaiWcHWIt6-yFIw zLfTEj);3I%;0}#2ebAn_54b?0b`&1M4j@?i<^M-p96g=R$2X3P9hr|ff|#)9n|^kDsJ!xWlAQ8`VA z6bnSOwXK5M?&y+_^?>+l!VsaktcJ8L`YamU=n@61Z~SGbtRcBn4Ov`p!%Jgq#x2_m{?08P}x zZ33#)^QBxVbg!J9-LbRa9_kPBRmmX*uwxc?$w_8vIfRy|U&*H34kYA_Mzf(QXCSNej)@$Bz>?EY>cnbqIXr@yPFMi{bjoNk2vd_NK0s=;vlzR@b4Y#tBxeZw z6$m1=kJqha`2fymb2kM@`=fV2##Zd{!{FvD!Wl`lK@v*G8dmi1_e|0;bQ7OFqn^Ha zjnR7;N)4PRQfJf~fJ_+N1ojBmr(`BsMSn$8}U7(tbEFyXZ1%qj@b9v*-$ zGg%VjM?54o1vx`a4QEF*?RDmAB1e?bizj1!JJ~>DW1*z~mrjvX`w+G;V&WyXT17kF zsV>RnOM^_#|Bl#(S5$bLpkEMVF=%2}#JEgMb!;}2gsU^jVE6I_E8N0XOfQMz)f>GS z>V@Y?$+R@F|I50a1d?^_<*z{ggp#aGlUhc}wBsb2pF7y@zI7(Fkz_xq^vk>iCR#0Q z-^P?Kc+G86fYo$_{)#9$^1FIL)${I+a)K-`LK4Zfqa>QoACL?R;4zJ|vN=Y=7~PG5 z>D%Bmf=Jum*G~ah1Iu zk%(AE$RP#+JP1ZHeH@sz8xm#x1NF{3LpgX#d9dV z!sH+Q7pkGe3;0J}qPYo;nw17a<0)cCLQ}8&1LK(wM-x*h%K22}SPPGeN&Sy$gJ=Q_ z%Sn8cQINa`rG(^&T~A`T3)FuHE}RWG%HjVNIsFoBF?v~yG*AEkDEr7B8`va6;i6WL zA{H+*V(p<7#=D(;a~X8#q2dTjARVVpR2>Hs zLg2h2@iQjFlP5ARaCUJT&h=sFz{iDo~NAnPhu=^V-y#zjac2CYYg)xKi9yK9YP zTBO^Ku)wQe=&q7XA|!U&v50yUcsUgik*4icL4K+U!JaKx_1v9YKmYa@buEs*F@boEU?#O{6SU|jO zgo#Mpn2Lig7s3d6o@EW6Cr-oZ=3-jpRW;5wEU8b_73%x#4~mvRedA#PN#2gDK||l+ zbSnh*1RfNqHixhT=rv*zKx#RG?y0oH#)Lnc$yWFq77&FmB`k1d7_A3v!$uT^k0RLu z5kD|Ro~6|2Rk*R^(D)d(nBaR{jt5%-+G^cs*eb~PwA5BHumA_;nuH>V3C1OO%w1I* zXuS@-Be%m0C|+(^1UhpF3nZe^TXtjn*xm6YuQG6j7w?d|m_y?2n82dZAGIr>8!w!6 znhH-PvAUaO%emovP6vN!#9+8#JZZL7sZ5nU#%=~%uVqPS zkoUwus~e$+NR8eT8@tdb$mL40ZjGURSau8y`F0+{kVN3Tqu946)$Q|OURA=pr0!2E zY+%cRBpb?fbo9#A*bHmiI3jU#Id@%1HtA%TCYS;6gp)bePtgI5;=k--*g&j^pIcd# zNFJe30c&z8RX;K0dh{@Kvlik_UGUUy<4Q>Z>CnHtLw@51mH(l$+29cj^u3nV6zEHn0h_FfNOx#~IK$-- zqE~hEo@f}od^I)(_l8kX;1@L}2C^f34^s#~dx6cSJ(bWwns3J>OFjZRJPYPQEM)}(y4v2F!YIj2AnJT*=wBSf*b??5-8X6Z9hoc1O|0iiKsS%_#;;au zoSYc!p>*NQmYTGNEu^nBboeS}$P90<(lLG3XXeCzwX5r{v93Fx1J!}DZKSu&+hEgiyRQTbQ zccB?~7$4QIrl+Ko0|Hh83FM1jwz7%|6zeLRvhrv!J`tYyZoMD{l*p?*=phjc@&wSn z*Ib&6-Cs6i$hfl71OvzyspM|~Q$76pW>gwD*-^A&2iLHb-35Uq+J~OCX2X7dFR)Se*A=&P5U}%dadBdi4uMbYcrD zn6=It`Y|%`aqyv>Ksmb4_$&FlklP@d)P^UXx zOqs3l-fH3)Cs(-)wurd|yx%lx6}-zMwDI>ikjf_}NKV2gVVl$V_>K}Vd-?tka7Ycm diff --git a/plugin.xml b/plugin.xml new file mode 100644 index 0000000..300bb7f --- /dev/null +++ b/plugin.xml @@ -0,0 +1,27 @@ + + + com.fr.plugin.parameter.slider + com.fr.plugin.parameter.slider + + yes + 1.0 + 10.0~ + 2018-10-20 + author + + + ]]> + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..213f2cc --- /dev/null +++ b/pom.xml @@ -0,0 +1,27 @@ + + + 4.0.0 + + + com.fr.plugin + starter + 10.0 + + jar + demo-parameter-widget-slider + + + com.fanruan.api + finekit + 10.0 + system + ${project.basedir}/lib/finekit-10.0.jar + + + + + ${project.basedir}/../webroot/WEB-INF/plugins/plugin-com.fr.plugin.parameter.slider-1.0/classes + + \ No newline at end of file diff --git a/src/main/java/com/fr/plugin/parameter/slider/design/XSlider.java b/src/main/java/com/fr/plugin/parameter/slider/design/XSlider.java index c332c35..b4d3bd3 100644 --- a/src/main/java/com/fr/plugin/parameter/slider/design/XSlider.java +++ b/src/main/java/com/fr/plugin/parameter/slider/design/XSlider.java @@ -26,6 +26,13 @@ public class XSlider extends XOpenCreator { @Override protected JComponent initEditor() { - return new UISlider(); + if (editor == null) { + JSlider slider = new JSlider(); + slider.setMinimum(0); + slider.setMaximum(100); + slider.setValue(50); + editor = slider; + } + return editor; } } diff --git a/src/main/java/com/fr/plugin/parameter/slider/fun/Slider.java b/src/main/java/com/fr/plugin/parameter/slider/fun/Slider.java index a478017..6c05e12 100644 --- a/src/main/java/com/fr/plugin/parameter/slider/fun/Slider.java +++ b/src/main/java/com/fr/plugin/parameter/slider/fun/Slider.java @@ -1,9 +1,12 @@ package com.fr.plugin.parameter.slider.fun; -import com.fanruan.api.report.form.BaseWidget; +import com.fanruan.api.report.form.category.ValueWidget; +import com.fanruan.api.report.form.value.InitializerKit; +import com.fr.form.ui.concept.data.ValueInitializer; import com.fr.intelli.record.Focus; import com.fr.json.JSONObject; import com.fr.record.analyzer.EnableMetrics; +import com.fr.stable.StringUtils; import com.fr.stable.script.CalculatorProvider; import com.fr.stable.web.Repository; @@ -13,12 +16,12 @@ import com.fr.stable.web.Repository; * Created by richie on 2019/9/29 */ @EnableMetrics -public class Slider extends BaseWidget { +public class Slider extends ValueWidget { @Override @Focus(id = "com.fr.plugin.parameter.slider", text = "Plugin-Slider_Name") public void mixinJSON(Repository repository, CalculatorProvider calculatorProvider, JSONObject jsonObject) { - + System.out.println(jsonObject); } @Override @@ -30,4 +33,20 @@ public class Slider extends BaseWidget { public String[] supportedEvents() { return new String[0]; } + + @Override + public int[] getValueType() { + return new int[]{TYPE_STRING, TYPE_DATABINDING, TYPE_FORMULA}; + } + + @Override + public void createValueResult(CalculatorProvider calculator, JSONObject widgetResult) { + ValueInitializer initializer = getWidgetValue(); + if (initializer == null) { + initializer = InitializerKit.newValue(); + setWidgetValue(initializer); + } + Object result = initializer.executeResult(calculator); + widgetResult.put(widgetName.toUpperCase(), result == null ? StringUtils.EMPTY : result); + } } diff --git a/src/main/resources/com/fr/plugin/parameter/slider/web/slider.js b/src/main/resources/com/fr/plugin/parameter/slider/web/slider.js index b39862c..bc2a335 100644 --- a/src/main/resources/com/fr/plugin/parameter/slider/web/slider.js +++ b/src/main/resources/com/fr/plugin/parameter/slider/web/slider.js @@ -10,14 +10,38 @@ }, _init: function () { FR.ParameterSlider.superclass._init.apply(this, arguments); + var opts = this.options; + var normalSingleSlider = BI.createWidget({ + type: "bi.single_slider", + width: opts.width, + height: opts.height, + cls: "layout-bg-white" + }); + normalSingleSlider.setMinAndMax({ + min: 0, + max: 100 + }); + normalSingleSlider.setValue(10); + normalSingleSlider.populate(); + this.loader = normalSingleSlider; + BI.createWidget({ + type: "bi.vertical", + element: this.element, + items: [{ + type: "bi.center_adapt", + items: [{ + el: normalSingleSlider + }] + }] + }); }, getValue: function () { - return this.options.value; + return this.loader.getValue(); }, setValue: function (value) { - this.options.value = value; + this.loader.setValue(value); }, setText: function (text) {