From cb3c30bfda36f7ddb728ea601e0b63934d715f1a Mon Sep 17 00:00:00 2001 From: zack Date: Wed, 5 Sep 2018 15:46:02 +0800 Subject: [PATCH 1/8] =?UTF-8?q?REPORT-11091=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E6=8D=A2=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/com/fr/design/images/bbs/bbs.png | Bin 350 -> 272 bytes .../resources/com/fr/design/images/bbs/bug.png | Bin 560 -> 352 bytes .../com/fr/design/images/bbs/center.png | Bin 217 -> 199 bytes .../com/fr/design/images/bbs/demand.png | Bin 505 -> 379 bytes .../com/fr/design/images/bbs/help.png | Bin 348 -> 225 bytes .../com/fr/design/images/bbs/need.png | Bin 362 -> 326 bytes .../com/fr/design/images/bbs/question.png | Bin 543 -> 600 bytes .../com/fr/design/images/bbs/sign.png | Bin 340 -> 388 bytes .../com/fr/design/images/bbs/solution.png | Bin 407 -> 309 bytes .../com/fr/design/images/bbs/video.png | Bin 450 -> 449 bytes .../design/images/poly/toolbar/Chart-Map.png | Bin 423 -> 473 bytes .../images/poly/toolbar/ChartF-Column.png | Bin 185 -> 143 bytes .../images/poly/toolbar/ChartF-Comb_Chart.png | Bin 381 -> 379 bytes .../images/poly/toolbar/ChartF-Donut.png | Bin 527 -> 643 bytes .../images/poly/toolbar/ChartF-Funnel.png | Bin 314 -> 314 bytes .../images/poly/toolbar/ChartF-Gantt.png | Bin 204 -> 156 bytes .../design/images/poly/toolbar/ChartF-Gis.png | Bin 800 -> 638 bytes .../images/poly/toolbar/ChartF-Meter.png | Bin 559 -> 629 bytes .../design/images/poly/toolbar/ChartF-Pie.png | Bin 424 -> 576 bytes .../images/poly/toolbar/ChartF-Radar.png | Bin 1002 -> 808 bytes .../images/poly/toolbar/ChartF-Range_Chart.png | Bin 237 -> 188 bytes .../images/poly/toolbar/ChartF-Stock.png | Bin 221 -> 172 bytes .../images/poly/toolbar/ChartF-XYScatter.png | Bin 329 -> 405 bytes .../images/poly/toolbar/Chart_BubbleChart.png | Bin 503 -> 581 bytes .../images/poly/toolbar/FR-Chart-Bit_Map.png | Bin 423 -> 523 bytes .../poly/toolbar/Plugin-ChartF_NewArea.png | Bin 439 -> 422 bytes .../poly/toolbar/Plugin-ChartF_NewBar.png | Bin 3856 -> 144 bytes .../poly/toolbar/Plugin-ChartF_NewPie.png | Bin 424 -> 718 bytes .../toolbar/Plugin-ChartF_VerticalLine.png | Bin 548 -> 580 bytes .../images/poly/toolbar/Poly-Report_Block.png | Bin 206 -> 125 bytes .../fr/design/images/form/toolbar/treeMap.png | Bin 269 -> 181 bytes 31 files changed, 0 insertions(+), 0 deletions(-) diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/bbs.png b/designer-base/src/main/resources/com/fr/design/images/bbs/bbs.png index 4fd2df684a17c4a4afb897fee8df67bd58c41f10..7fa4a98993ed89d2494f2d174fd81792db57a77f 100644 GIT binary patch delta 232 zcmV0+0fbFn<8bNkl8HN09vY??3i4Ffgt;bLLb7x_S&3AZtE+`0(pTj~;zfR#sm9=g*%m zY%W1D09`Z8HhhM_4Zx+DkRf0L2x-P=2&0LKNx}dB4E-QQXJOBt!5XMA17NhVvB`fB zn~{;B5GKX|6NC%kVIZqz!lRBTDHdF+kZl2}!R0-?E&yr5r4eQ^UISo?@X-_-fD#7i i{zkSLpB%C}lGy-i=yD=Y*3Se000003m{l5()&CJSJ^{8L`9yXY#2MvrrkoBM#AeHmN4=6c-;s1X{WJPc` zBjbG_yWrUriA^vuumQ5UFO~oO`!@+_qZdp99}U#BjfsgV?|<=R@w<#tIWJ2X8UD2Z zoy?9;6S^GGOFtPHnW}*Xy!Z`tG7Gu_qWFxAf0)SD46*@eF%wZX;Za1f0l59n$Z(j6 zk?9i1@_+yT=`s9gu*K#O>;^D0ev;G`cRriW_#33jc;oe>6M;n{Fnk zAQzAZ*&+z#TLS6ZXjl&_#|WewfY=zy2U8$}wgB;2AQl3PU?)JDK`wa!#L_^F0@#4O zoj{E4baehxpc(}r1_PKEK%8GdycH~pAQl3dsR%BZbsk7QfPaZ08vqkSrau5V&yfYt z*(^|jDj+Qh#QNw8u<*5kVv~XRHxReMT<{Ob`3uBwvicCUzLe0J#PqIDjmPZh#X|5){|?fE+GKXQ0G4APxlLY9M|C#4s=X1hN+a zu`dvR1ma>K#xVe!fg)*0qRc=xFA#G8F*}mD1(1CYh(XDpasU9xCq6T^m83%e0000< KMNUMnLSTZ9N_buX delta 522 zcmV+l0`>ji0m)QqB%{j3!pvP^es?E#f9g-l}lVtsUs9uIM&(0e6I?151N_Sc;wX~9UBkv}Csv9PGq6#x@rIVF! z*9#kpK_#lB#38W{LrzXpz8hw7$-`#yQiMjZtg00000 MNkvXXt^-0~f~TMTKmY&$ diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/center.png b/designer-base/src/main/resources/com/fr/design/images/bbs/center.png index 1d464ba9bf78c8a4d75ed85ca61e30a938b3367a..c5ccd688d85b421aff358284d75d639b4d3bb731 100644 GIT binary patch delta 158 zcmV;P0Ac^x0mlK5F@J$cL_t(I5v`KZ3BVu>L}TejW{P%RJB1VV#~L9J)L4TGLQL+C zrwFind5||E&DRO36R6-nsKHLS;(Gcg5`jdu<2hjlHnS`pcmDpAL1@7@^6GLlK=n! M07*qoM6N<$g2=E(^#A|> delta 176 zcmV;h08jtN0oehNF@KXuL_t(I5o2IL1B!Xic7rgQFas`e7IcL_|1!Fui-GvK#2KZt zpKtxoz~F^V6Cp8128L}+=$cu9BCO1qTCs_P^kR77_dlSySO6|@CM;@65<)TH*;GkJ z5QdpRh!0YSVgO7dDKw*0_H$rZkPj$!0g3^H{ERLSayN+ diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/demand.png b/designer-base/src/main/resources/com/fr/design/images/bbs/demand.png index b237026fa19ab0919af7d6885b79ec750ead5a2d..cf115b543f16255f2d3da7e4e8d3de9d67e34001 100644 GIT binary patch literal 379 zcmV->0fhdEP)Px$HAzH4R5%f(l0QpAQ5eRhnuI_tXl@J=H$kE$T1v>ImcYruPayQi$+e+R&}1$x z4lNagEzRQIXUM{#A%pxqa^K6j$19ON@bkRqT%PCL>-#1W|J0)A-(-IcCoqIpaJ9!~ z0p8q0tFsgjkcK6=ffAVN6hH6*c{{XK=6jIYq_-;vn+oebe1byWVI4xXsJ7q|mSGJ{ zXB0BMfQ5Wf=OEN7RS!;~0}7MOtN=IUX!6wiQAi&Sf^*-jfD!Bl&tsQla5~Ezd$XVP zo4Ja??M}qM!>$4L&Gy>v&FYR?T!e^L*nPtlT!3%ZA8XywoZLY~>b2dhkaIW&P2M4> zI~yQnU@G92Lkk#CTc10kn6e7I$GAWY*;VSqgcAxy&>tHl5S002ovPDHLkV1k}ls9FF3 literal 505 zcmVPx$vq?ljR5%gMQn5+{K@gp}L_I+pAsS60LK?BNv$3+s2Pk5tAYzkTKtY1ooQ;TG zAe|xpfR)xFSZgCTB3NiJcZ#J3qujW&$($E*v9NL>H@h=$-@JJnfIqAWo6MBursXQi zCYh}j2w{r=F3m{a`h9WeL2AL6$T>SiPynFFXe=JPvhm$u027$TKm`ErfFSen)lmDc zYeo?aBH}d@FiMlKf;zpOsPm-0iZpB6q-*-z`XnrOSv8pkG!6_vTWV3>@CZPZk))E_ zTYhm5iD*rARAm57;L#pMBXdv1*sWkW>Tc`-0-hm4Ly8{IYAWZJ6%qbMz2AT*d_grNa~mqK$-;+&P(hJ|gf|en7@?wKTjaqe)(3hk2<@Fcno&02~$Jf{Yf- z%f3xXa)bJ*;hqxEoB)DRy-4M;G~$~rHD5^>fq}Tq7X=(NTXG!r6L%x1mg4*Dks1ZW z>=qGw=PPO|`E;z{2&{k!xC@)fBXlUrJ2uyOX%dX|oU8vxT_*wr8lgU+L>|sd-H+qe v>r^7|gc>R!{rpyKcP#7NsNa(0|4;k|hXT$$t6Mr)00000NkvXXu0mjf!kO18 diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/help.png b/designer-base/src/main/resources/com/fr/design/images/bbs/help.png index c13f2f1926471fbce07f6f9037d63a3b5fcecca5..796d7da6c9b507d265ddbd5b96c2df2f3ec78440 100644 GIT binary patch delta 185 zcmV;q07n1Z0^tFWFn<7>Nkl0leN^>n91;1J zvWzXCCV<#PzV;^6z;*@M*O(d7BlIGBvDGv|OYZeFfqyO&*D_kR{|08%peKM3NDXdD naOEXRMr0t)c|^&_*^iSIbiFS7L1#+m00000NkvXXu0mjfFg8;^ delta 309 zcmV-50m}a20o($RFn<9SNkl`;E$|+I?V#IVg4o^Bj|4HV`DDxf?zJQrK})QoDUy00000NkvXX Hu0mjf+a-zg diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/need.png b/designer-base/src/main/resources/com/fr/design/images/bbs/need.png index 486ff9846a97e1f055c47597dab82dd6bdbd4b8a..2c95e50ee47a2e9ae5f61040cc92a37816fdb899 100644 GIT binary patch delta 286 zcmV+(0pb4Y0>%Q6F@FF_L_t(I5o2JW5HN!D8ylPaC&iqzXU~B3!S#@00J>ThxG6-q z1jA;a9wuZ1$YGj-GAtsu~~p(05%2ahM@CN48Z0BOhXy3Asd2X0H$JO zr4Tj;2b-&@sj1b!e+)|*7?^`m48T;5DiRtR%6$L+{T`sG9Df4?V;2+CUsa-`5vqCd z|Njh;Ky1y($S8FB^y!sE8Gx)AeZ|N zg83iRYdLKjyD0Knx_a9tw2@c;k-07*qoM6N<$f{D?9Jpcdz delta 322 zcmV-I0logl0_p;gF@GdUL_t(I5o2H=5~vk_5|Pe%u~#Plr5>^tMq~~yHc0c=AK&)= zXZR1&{Dz5z$@$4d@k=1}Ot>_`#L+Z^ghl@U{ofCh$7=u<%?ykTjF-6Cxx!%v;Pe7c z%^Y0Lw|e>Bzzl%9;Q#;sD}mS^BtfiZkXpC_K=w2sUUl`+AAdij00XIkI2+Aoumq5R z8^FlOc<|cezp0W!jBCwRSm03w_A?I6AVZj8CV`wi@8HJ;=N|l$oRuudaQ@*hhNtiT zU*g828Kf5;h|<|FE<)p(!9spJ#9X2W!i*Y=T*WjfQ&xrWvH@z>% diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/question.png b/designer-base/src/main/resources/com/fr/design/images/bbs/question.png index c8c6fd8a1bb4dc0866dca76639c331a1ab39d8a2..ffdbdacb8fd1045344c1f85dcc9d5c84000b453d 100644 GIT binary patch delta 588 zcmV-S0<-;}1lR~41^@s6AM^iV00001b5ch_0Itp)=>Px%5=lfsR5%f(Q%!3W zK@jcknZXz*Cp|=S@emA(AhBmR6FfMGIf<;`A5a7pMDXiZgqUa`#DfmQyolg5P=|#~TF#RkH51pZQ zYzs=Mhv@koC4al3`5Mju*FVLWxC3qxRnHNZWvw?5OkECGm%tmI=RJ3}-4}!qtIcNf zTc@+Lg@li&db;F=V2I@n^8Eog?fd?RG9b%#4rB6$eAjP(1_I5J4}xH?+x=x<$ld@G z7Wf@31IlD6<2hrBEzIUxmSuY-4*`UmF8Sp%ekqD#wtoy5p2d<7d>OOZ7-E=eo}YxM z6|@3yUTdwdRD;L{{t1;fM{%v$bzmvsRsaKBMEIpBny(W`OUj!8u%F;Ohq%37uU~+5 z74QlnR-n~teTRA1nBFS{%oE}JyEK#Y{XUx_pH>{l$F(*uAbj8D3}-;^yN!NtAmF8x zwI{fGWJS#ES@-Tvpw}}eV2xwQ__*Bq>(7MGbrRG)^m!RGn1RqAEe!HBiao$^pAP(g aKYjxQU(qh^PTJN00000Px$*-1n}R5%fpQ$0vr zK@gtVcTe=L38Lp8!9!9Q@G7emu}`BA5TamrMM5;#gftdfN*WCu2nG^NA$GAA8x7bB z5fnL4ksNo?VC4@yZ^v)m`Q)AM37KYR=li~$*_mCYd)D>7{C|Q;a>Dddh&mN!q9O}z z3h~!J`L?aN1X$HFAOE%omz7x&9wUO>X)Mh0!*B9F9ez%iloArVCr_UTL9l^+OHB8R zjafwIa}hg)YH;wKo%+5%a5UGl%b96u3{J|wh2&WTGx0Vzm|+{(?>OKp;U^}puY(y8 z8jf)aersFSOMmsfn}B#E0(3RZ^CY$(0?pb3|B{(^uzwZfHQS5xe+dNM#Dbw~iKdX* zug3M>yk^Db?(@)qkp%A6`v4G0As!m4d5g?xH1{={TSHZ?R#4xVe-hb!OS}%TaS;v1 zu;&6a2J8%3#!1{_)f!Z_T<-t~`+#NZBT2aGNNGvAs?kvRl;fP}Gg+2V^r!I_Ll^nmqn{~$i26@I zl!hu5!5BlkDCRp-w|>pyoUJmBzqGG*_2&Qp diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/sign.png b/designer-base/src/main/resources/com/fr/design/images/bbs/sign.png index b1556f7ed13d46cccba615faa4fa305437010f30..c48caf0152dd4e8472d054ae7bfebefedd168cdb 100644 GIT binary patch delta 348 zcmV-i0i*uZ0)zvQF@HWuL_t(I5o2JW5HN!Do0ynv{r{iAi;!82j11e(oH^r-q0ZRY zQRqbAhR;slmU03=7VlJ#9dg z3lLsoY`3(ul>YVW&lX0;|8*cQp%{Qrh|RYQ48p>Kt?%BwKYt9AT?CBIc_39x*p*_6 zHZ(Lay?y(B1u(tbK6B<&HB1Fg1B{K$GCVy!*p|Q-47E-@d8W` zL<7}$y?*^V2uGPW1$mTzBHE%bsZzeSW0000HhR diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/solution.png b/designer-base/src/main/resources/com/fr/design/images/bbs/solution.png index f092306746f5119954551da83e85afd96e3b2efe..f22f85d2385c66585f608a7eb6fa618f387a102b 100644 GIT binary patch delta 270 zcmV+p0rCEq1GNH>Fn<8=Nkl=^jT<-tBQSv*7>zE$ z0P^gkaSo*Q+EUwws|iX%diVc-KYD2Z`13)%zbsek8>j1TCdXwyfK(_2kMgMy_eHHu z@)IGolhN}~n+wuoh!7Ce5&(}uKbA%#&p#{xQS9lxj&#GAOHXW delta 368 zcmV-$0gwK*0+$1jFn)?v=;Y(N?8NO<+YhkMGPy#$P*^7btE|jT zF1kPEn8-GKXlXSCVHcI2vV09th^|q@M^$y+5RF}gb{x%bbswvgzR+T5*k>8tXgnVx z@;w4gp4v&+_an(nv7W8rRnf#Fu=`z2TDJbz&jeDtkuAtx)+LNXx?w;6fqcV3Vvzg* O0000bB diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/video.png b/designer-base/src/main/resources/com/fr/design/images/bbs/video.png index 1971f2615664186ab99617abff9f0a6a2eddd73d..7178b11a02b5ae9c8a2a6c459b37c002aa758a49 100644 GIT binary patch delta 410 zcmV;L0cHNe1Hl83F@JkWL_t(I5v5bTO2beTJ~zR(gBctP=~O2j9Fp6?Y~mmY`V0~W zAHcykaPblB4k95J?HyA&R>YuJfhC` zJkLtg>7@{KqLkW3TnO={6g_l0t((zklvFuJ^)VO>4knZ7n}7Col`=0ZYqN_FHhhQy zQ{|L40*>RxD*+nWgegiu+E6zPaUO=@OR3smKx8&kx9xUo59Jgkpk`g;bDiwEGIX5% zepLq;V8MZ(dvHo*4y!=ex`~n~i=>oC%Q16^Cd0Q7P<_kld@O_brM7g+kB%d+*aIw2 zh%?~W%G)rg9DjM1Wu?6k5Z_6X?l!Z-Fr{IF5hduOI9HFs5mo1wrtMc-ag*cu6p4 zjFl%d?@#XQ(H+*8ZAkzk{4;4&?}jRt=)a!{oVCs$DicV#ErNSc5dZ)H07*qoM6N<$ Ef;`i~!~g&Q delta 411 zcmV;M0c8Hc1HuE4F@JnXL_t(I5tWl)O2a@9#%H!kL?|furxa-qU_}r-fuP_4>Iw8g z5J6AS6DUH9FW#UB5Pa|um0lny)nY;Mr8P~)`BGDwZ33E??CgBM-JShrnXIpR(W`}H zJ{FM!60XK+7N40P3Xa_Q*X8ak!bwnTi1#_@UqvFPBw~{J)PJ8jGR(J2E9;lt27eX^Iu`C2`w0m88wds?%2m>;(%DRB3giO?$dG{ zSGG+U@QDpW%nt7^a=G(|L5@APoEo8w;Pi#bQqdjfW#Qz*v#b9CPx$lSxEDR5%f(QqLwD+>&Ufy;=N_VeF8tOXj;6K^lVgXh zv1AXNZv_V9T(&cW=X{03QFn&eTl~;)0>fv;n%EU{JJKF6-9Ng{Jac#+@KnnpybEHD zxPzHOM#FT56U5xc%Vh}MwmT7yI#+V6x`2@L3xXpXlqe~M_la-|%bGbH#=U`|SrzkP(EP45 z>KP{CoBcT3gM8+EoD^&*0>7wcN~`TX00&C^1Tz_));zP{hnJFCtB-(H`R-IGgwoJP z)pG_(x{OH7Z8U^R_Pi;1@?K30qMUg7Xw;tcxts#QBzc{ryiRwJdpCeCtIF-Bho^MQ z;fQsdoy4z+G9=Rs6iL%IWuImc4=|f`i;7o1NB#J#r(hh3rdkUo{8fAd&W$GbM*7%PAdv;(yQyn<&-5Bc{%3a{qx=e3;^=q;qT;( RG~ECI002ovPDHLkV1nT{trGwM diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Column.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Column.png index 33af5fd2fe22263f74ebea943ea403a298368791..d5e0cbfa7cff6b2fd37478f119999cbe053b5f89 100644 GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|JUv|;Lo5W7 zQw}iNtrPv(uX9xXPn+OO{$%5W5>GBM=QD7x^edn9S6DTN?H;$t?grH)Uy-i)VJ$j` orS9)I)RiROBX!__!3UtZ(xFVdQ&MBb@0QXTXRR910 literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4foCO|{#S9GG!XV7ZFl&wkP*AeO zHKHUqKdq!Zu_%?nF(p4KRlzeiF+DXXH8G{K@MNkDP?4Lbi(^Q|t)xHy|JyU$eRw@V zHHHtxEU!~8fyqF>4;>qCIC cgu(%a?B~2E%M|!UfF?3{y85}Sb4q9e0P;0DtN;K2 diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Comb_Chart.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Comb_Chart.png index 9ff66acafd2cceee3bc61885e6482091515711b5..e92444ceb81a998432688a3326e300975b996dca 100644 GIT binary patch literal 379 zcmV->0fhdEP)Px$HAzH4R5%f1V4x5%lBz#+)qmzUpMEc8U}V^~KbdV26DbD#|Noy6sCh2K|NjCa zysRrgdRa&@z1+93>3==KkmX^8eRm1_s96KxaDsXJq&f^y6xf;{OZ`{@h$__M4*^ z-@r73XcRAe`Tx5Y=*^w`Q`yo%k}h+88UADZAI9*HL5G=%%@w5CarRH3SqK0(z z*Z&Ov+<2MTbYap^FTlM46Gx`O20)!YoAEzW>ZTON&maXK*NULn#2@?y#k(*=z|jcQ zAqDj9jJ>I>yI~T<(qI?tPiDLc)X+h!CS-Li5o@AQoVp@p8CItvYeHs|loF9O!q~&W Z000TYW*s^UgWv!F002ovPDHLkV1hLqu|NO- literal 381 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4foCO|{#S9GG!XV7ZFl&wkP*AeO zHKHUqKdq!Zu_%?nF(p4KRlzeiF+DXXH8G{K@MNkD0|O(Mr;B4q#jT`2|Nq-FFLfw< zmdvQIm7zoaj{kIBhR%%vCoeENtl>Yxp7_XzXG$|?fU`YQA!8^H+b*$`44Wy^3_NYz zBGNo2CX60Wop*LRIP)uTlV Y^^8PW{oP@~z@TIBboFyt=akR{0G#@PqyPW_ diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Donut.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Donut.png index 8fd08de55395ca6267562b755cfb5b2ea32bed8e..51e16365800510e7fbc15764ce474f7c928279a9 100644 GIT binary patch literal 643 zcmV-}0(||6P)Px%JxN4CR5%fJQcY-6K@gtVw|Qx3X@o+g9#jNlr3cZTrP^9SC z1<@u7A{6S$gFgp7Xt9k3q#}Y8MDSD)L@$DuD2PRiiGld?`gWYzcFUuhxy;Tt^UdE5 z!X`OnzJU}M*3ejlrRy?@-lTtGCA;B@tA zrU+!NSR!HoUSgk;g*mcRZbcSSdUSb;)hl^(7fCW!=mc;d%cA{(_n{DI(Hby~5UBLCosv zepVaX7HqSutW<}10kRAJ82q4s&@M&n$k0X6t%MgRw>07WieORsIx)kk8V=08olCiQ zTnqVZ`P?-gb4YNW+@OYg_LK+ihL;HGNXOPvuA{k7;#j_Ab;DEe&P#f#*@zApFx(v- zbV>R9Zaq5r@I3DTpewDX|D#ads4Xel=)nn zeY-x@xEfgT~5ZI|CC=aub7$@8ByXCRQXl`TEZ6 d$b*mZ_`d`C;i2NeXp{f|002ovPDHLkV1klhEHD57 literal 527 zcmV+q0`UEbP)7h-IsGBL*Jo`9`PYz&@2EUnni5{}>zpxn-_w%j>^AvPvf>D6S!1XuVXRh!_Y+C%^g79-Ts+Cbdi1}qE7^FSyC z{zVMO4Vd#b;fb%y^X&$k6sze|DsNo^{}!!U!SzBB^z8I?h0hbM2q`UF9QJ7-&e{RG z_*H~7B?P%28N7XM0l4f0Gh9}>zDDNDT4M$?y!C4`DBS;=YM%}U|F!)HFaS}+qDLhw R*;D`k002ovPDHLkV1j^u;luy{ diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Funnel.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Funnel.png index b838ac93b361b46b17bdeb3a94a8ee2c69ad8476..32cee18154a983fb5ff85f8dc3d19e5c3151b80a 100644 GIT binary patch literal 314 zcmV-A0mc4_P)Px#^hrcPR5%f(kueIwKoCV|2BTFZ2o`qUK`-C|1R+>xBer^2V54ynUFDcVUDP?iYYU!W{CxZym) zKWsiVYBkwS6K3e;-3kRFq}y=QC-q9ox&l+OSjGedtzaW+R&snkWKRZ6Ks1Old4`5m zTjDj0xJ`gkMAgUm#ryR|<`=B%wr|JGJhSI_I|9bd@H)3zK7uxU&s)g%9IW`dtLE3e zWwBohz~SkRR2u{0y=XGE^i)$%Q7Z+g;Eyf`nQKurX)U)eReS9}05=Fa{j%82UH||9 M07*qoM6N<$g1Fd$ng9R* literal 314 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4foCO|{#S9GG!XV7ZFl&wkP*AeO zHKHUqKdq!Zu_%?nF(p4KRlzeiF+DXXH8G{K@MNkDP| z9@ld?S1G(A;{(f%gAU8>8G@u&CcJQ45vh@SlqGAYm~tqCvS7+=o0)BPEW5%O!(U!= zXv~&=F}-i%!S&A5#2cpAbv}zp*=(KXuwnr}gKANb5laaFKPi@s&&)Yo9~&4}$Q=q5 z4p3ZiL|f(11*a8Jm$(!YDw;Q?+wi??b#N9gc*)9P!0>#pZTcjgzyhF`7(8A5T-G@y GGywq1^=tb8 diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Gantt.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Gantt.png index 6b651248c31b99ce7b233b9aa23925fbfdc0a58a..f1c6de1854420a9ccd5760f226dcd5b8c406a590 100644 GIT binary patch literal 156 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|!aQ9ZLo5W7 zOXmFjY|kupWB#dg9cnF;PqzfOd2}|KGaO!c;}DCp;3S5laR)eZWAqM)8jI{sc);tx z<$uQ~<{{H1$Bp6!NsP0tFT@6@Y~)_olO)cwhmqmtW5HYTFF$_=+Q8uH>gTe~DWM4f DE(kR# literal 204 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4foCO|{#S9GG!XV7ZFl&wkP*AeO zHKHUqKdq!Zu_%?nF(p4KRlzeiF+DXXH8G{K@MNkDP*J3(i(^Q|t)!3{A79urixt?% zPMg@sbl`}CvO$)?Ti&!E|Nq;wu`LzJd9);9*3KEM(_0>$IsU)!q~PRZ?!iY3ypR7d x*qAxz-%APk1JjPFd&kT8iXJ|i(7?dVka(l-$NP%7LqJOyJYD@<);T3K0RT&cM^gX* diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Gis.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Gis.png index 9435a61d7ac083e362e7ebea59f6dd7d7946b960..d4bf13edd536d5a254dc69fd66bf58276e78c644 100644 GIT binary patch literal 638 zcmV-^0)hRBP)Px%I7vi7R5%f(QqOA>Q4pTD`_d$vv`|ZGEK)>h)kvk_p+Z3j!Gj5cNEI!JhhC}& z5vynOALzND_7tJjL(DHoK@Y8mmKZcPO*Er{+&`aTPc;{~<9Kd@>3;=i> zwjbJGtJU7Ne)_um{`#Fw&&HPiy}hlp8ag#ubGr+grj>)ipl%a0+ejo5J+PNScC+tU z_Mrb=d5pYXmH9eItbHWiw~yvVhRAd|QAex;w+MVmu?ZAKvAUrBAJ*p%6w0G)a6olr zV&s?{C;sq0c{es`;L+15B;JB#0M$TrmD>cSX$BB5`eM&J5NP8!t`T!NWmq|JjFix6 zYR$Yj5{X1E**TWxXub5SogO59{?dE6)3>lpR5coLM25Wo<|IPr$~=(WNVa~Vt8hLv zQT4dR?t^g>XxlpG%U6(D5(*`yqv0cmh-7P>)?^=paJqXof3Y_^bA=dF$fFT$>$KI? zDdtCpR!q+Gz`Oxgikv|_@FrmE@;b{~fw-#K|E&V-1GZJnDg*V4l9xe4KL97V-` z6ubbD4^R>qh9Nfqr?nb+oUf;+K!PUdwyQ-w8yvp;&5jj|#gjES_CRC%O>ld<kc6_V^`ch+~}Y*^Dxqir2{n3NsZWf-8S3JtCBkQa1Evx0b}60Sy5Z$W=O7nqwur5QQr~p zySHTgP#4bx_S^JAv7_AsIZM%KRkyRh5b5m-Vk|NYqcMoV09g5*Y#`OPlN(F>Y4Xa< z3$oMES+jQpE7@q1hxDR(zZp2CXVR$EB$`*Z>v~4xixA8buYEsKZuz)W~xwVFNwpu{cCJn ekN2wm5?}!D;|`-?%x%>G0000Px%FG)l}R5%fhQ$1)DQ4pSax4TJDasdNDi!-2wAQ&qx<^Dt)I}gN0^iB{&(8ki( zS{RFvMDH%K(IRP#jbL(jSf`1Foq|cFpd=@VX5Ze9^KIB=6Hf8LGP5)D%{M>qG3`6~ z=Q}6aa+O%li|{zy%<`Fp--;`Z&b5ILu*HXCc9l1v7wS8cknP$)Bnu5WN@C|>JCt=V zB8h_^Fe6i|>XumRg$+mbtzC^sNrn`#AtI$>!>&fv65VF>OqSP}Xp`dHJ&VER1^;vq&LnhbXxPbrN^vxB zbNi<~uD12kqGY8@gJ5zz?|$I>2bF%%A-Mxgu`XkrrQfI&7+_iZoFc>9e;Zemzvui1e|;XC9ZWVp P00000NkvXXu0mjf)^Z~D literal 559 zcmV+~0?_@5P) zK~#9!v{gM$!%z%vA_lfpVqijm!~y6Ha)jKV?Zn#LAgo=|4KX#{87ej=GO)0P6F|k# z2`Sx?!e{iknAaDm5Vd5z{{&6bbap{|ZGzM5*Dj8P9D^f@R^Spm7k<7ts(to> z&trg&aAXFojpQR4z$dOC^neyPa)K_vDYz#x00ewaDHENXHtil$q0iUUdIDKPV0}Mf znsQ#vARlaa%LA@GTx6Y5WAe7xj`hV~eGI9P=z~*b0i{ z-f{kcdKEoh+bWiN92rHI63^Ycrv{b93b&ZfuIH}acBEy3A{L{jmj%alV%o4{Izfw> zFb#(WYwfY-=SHGpp1LMPnYK%E&qXpU%oIHG4CT0qL1D~}mmY)b1(j~_nt|By{ zNeBnv!5=_J1YK#GLWWzL-pv`owx9#EFEWibH0>fqn(=jN=l&N@r)CLFTKBQD;TG(Q xQVYgTkm73i8=GyXi#}-k=k4Uz^dIygzyS24*hWrHBlZ9Q002ovPDHLkV1nQe@)Q67 diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Pie.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Pie.png index 055502cb224920965188d61f01810a7e39b7a2b3..e204e065959cfe7e95687367b4283872c8fb6ba8 100644 GIT binary patch literal 576 zcmV-G0>AxPx$`bk7VR5%fhQcX)#VH7^+^_|;*(>N-P8DSAPDK1?21ELHe`k)V$mIk^IcWzuZ z2CW2JNf0e+A(4*E5Ca8?> zq2o>C%ZYli<3x@~;7=Icc3gmB82B3&7n{KGBK=mMN^8X#mj1<%UEiT#I*v#2szn9H zc4LfJy>#ipXmD{XhIEkZh*(sw!0V0#F~3QsOT(Fl(qbTVF2aQ!<`0I1m%|t)U(K|X z2UU#D{w;>c2(1{;CT1b}yO#vw*7B{S6qXJXWAcD4JvOiI@Mk#p32mp27Y6@Fti|v` z59hDXzjv3|+GJ-^ZH1v!tz0;)vJ*3{oedxW literal 424 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4foCO|{#S9GG!XV7ZFl&wkP*AeO zHKHUqKdq!Zu_%?nF(p4KRlzeiF+DXXH8G{K@MNkD0|TR}r;B4q#jT`2|Nq-F>oRcb zaUPx7FWL~oC}7R7@!#K)$Yb&CI*IFca2#Q8s9>6X_apm_FUAiIN|+|>;y?0J!Fi*` z#r9Ko*`v%F7j!qWaXG{;@^4!Ixv{Oe<|#wTU-lS1wW|Rs@-hrj3Jr+{SAPEzIU??n z&)jwJLdU7)PDu=`-AtRhxmV1%#5IApY{8;~d?(mm2VYFs5b1M4#cltbb~Zb=d0YVz zdF68^Ml?%0rm|kR`h%;d|I?+{msO8`JIk`^XQyGw&YNs*YD@O`i#jK!87e-t$dceP z=T7^;q9qBWa|||ku!z!Cfw>awB8Liy|Z5y&NW27_wiol~giZxZqL5 z<9dE?&y7`T3A5%pI4xxPRL6L&q=&b`h^6Ri%hA>ct2o7$xk&qHGH@6$SSM66<{S=a Q0ERMyr>mdKI;Vst03SD>J^%m! diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Radar.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Radar.png index 754781f9fd9af3545d79eda9c8add80f3cd1eda5..e2c400e63ecfb869ec0dc26d305d4613a340413c 100644 GIT binary patch literal 808 zcmV+@1K0eCP)Px%;z>k7R5%fRQ*B67Q5e1-`)qSlHn$~d7ETs9#@H0HtRERF7!lczObsh2sGy)C zA+aFn>t_W;Dky0}{Rqldp@vihu@7RVD^$>+wzcWz+_!hP=ctK+b>O|{z3=n!o^#K+ zH1&_+@p!VL(daz_%Ve@s27@887L{46=yW=*5IcFEZv-AEIjOD1{mTFX+HSX>$J|fT zbPEw!ES3`_C$(jaUTw7U;&!{WsZ^>9L^%lcR;zUy0$wN-YE34SA9(@ly)c^>i9|r~hi{TZGbK2tp5fuI-$6gb~7jRjKD#+##h%kA=U6BUb%;3H}nkT}FZB9W*j z7Gzjj`MY2I#Lku*c*ptJB)8eP! z^W-;14etIQx@VCzI}f9Zk&q&fVi|IrgiAEkqJcyrd4+rr02ccy(`U`QE*rldD^-Wv z$HIz*YhSi#9!?a7(mYd^pTm;QmCKr?i$t8raYB40lgT^)p%(jdkUAMPk9dWSp1H6= zo;#pDfGnFq_RE20se?bQMMXuUo9RefAhlw00QtP-;JyDNhH^Y$$Fg0q7M3cOx08&{Y>Sv(CwEPN z8HBZpjMrwCjq=&eiE+?|X#{Wq86a|OJi~h#d}f4o{urW?Ja&s*KLXT2xm6t&Obfsm zV1dk~l92~3KtIbo>%SH3Z5Z<2<4DU0BZrwhf)3PCS zWK=v?ja_s)on+Y!pcAO28#C|Ckee30BsT^lVsfe>>@P|7M|ICeHyR|lVSZJU7^{tV zy=zhv5q_yobFo*%bso4xBfKv&D;PU-D}K073fWjav~l%)6#g>kDdE}HXBKvBk} zB3XFn)yJj@pRUpI%b*QJL=DdN9Y_dH)MYJ2AU+2qY4I}%tWp>zeY$#(#?)soE+0w= z#$fLe(6})%=A^&_vk(w2?e*RqTF^&7oi&yXx(xz|n<4%H?4YXX0t#V`Z8o4OCdC=Q zmPm(yR4yqO$8vzzl!HPt>R>|9@A7FWjL(RJ_q!zSsyIpjVnqsdPre(4H*SLm2TcIQ zt_oNIC`nbc2T;NTY?y^RlH_r;mbe0@SSWzJHANquc=*+L3`tZv>lEN5qj{~2@}9Zq zIVQ6+#}siY4dPIUY1E{9FZjZegv|G_6;?H951`HydVfTxP<>NnD3+@`k8aCXdf#f! z8>mkA&ZC@6FMmcor!u0Z;Kpd>nkV8hPe?k-VTk94%C06>+IHRQ!-;{u(q#Y2{pr}W z)6SFvgvG+`Y~x0_Jh7sEhdG@uvZ%QvKJ4L^G^yhEx^mC5@oL7BkP{m!$9GR|+q8Vm zJ}#pQh%B{x)~Lh0$Vn&Nex;?=kC0t$F~%9AM(%7V%@unqv#2pLePOW~F`a7olql4^ z-{l@()}2&bXI*72XjMe(Wyh|X_yrTVS}4901{=a+T3nN^Xhfl+I5F^9U1op1ZrlK* z{1~Vp0=U(&g?|^DqJ#4p|9X!dTvD#hNI5qh{3ct~)@}@i5@&jycGIIHY;V}rAHM|{ Y00yv@$D4zJ>;M1&07*qoM6N<$g4>+GWB>pF diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Range_Chart.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Range_Chart.png index 0d0cb9e063dbfb09cc6eaf4069eae1cf3de07270..9466e8326af83a93a46e1c61bfdc227ac130265b 100644 GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|$~;{hLo5W7 z6C^%0d_2}G{oirlggsfz-_8`jRW9&Pl?!9py!`gP^o$*sSkla2TrpJWHa-|S`J_Yz za|EB94M$l`3&#ypBwLpwhJcxUhkm8bW*vS kzea**54XZXlO>)Ee?F=v7aiOt2Xq00r>mdKI;Vst09OS||u)kUW^OGryAf2o_xzbxQL!UG=Wt~>ws-wwFC=w!c}+*{r>8Qp$& f-eU|5jBE^6*Raz^BIC+y98%{PGGQozVNj?Z}J%fxhPx$Pf0{UR5%fxQawupK@goea|q!`BWG=It(8r@##&JjYas}+vI_(oLkg?d2p*&p zAtZmn+P`Aw8N^&9P3W^Ro!cyPQKX5O2f56DLG&D$`3*9iak0wTBspvd6g3aU`I zDA?860Rr3s;MkxMIOx+>l1|%6Ki}~s3Fv|gGAgE@p#A+ce<7k>M9em7VLUj&+~#GY z%_}9+K*0Oj;p=V11|$-|2m1t{+cC@rBB)8q)jxlMH6%vW@HjwhtX0Cj>pFhPm~Xol z>JJmO1=IuWJ)f_)Wa8=YtfN|Ls)l<{M~|hLXo1O*5rI+?lK~>&jX_Hmb1ei&ybXi0 zzLG>#F&OI?n8>`CYoSb8?j`A@Gb3y+D(0B0UZ`uqF$-hW3;k8VTxR(~{UX}u87y0q zB+2R9Rr3qHHA#+V&!=w#EMV7EppE^&MXUY>0_Ko@{q0&p00000NkvXXu0mjf8xFBF literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4foCO|{#S9GG!XV7ZFl&wkP*AeO zHKHUqKdq!Zu_%?nF(p4KRlzeiF+DXXH8G{K@MNkDP|-C{7srr_TSt>Wf1Q9 z_(Pl|M&1+a;`6pGWL$sn!i~1<9rN|PbKaOg zxOCbjQ|j2#>76|{(hrDFe395=`fTA&4#8zNCaZ+)tq5k-=w76%?N)S(>(-RKB`unU zPuU|SSyB{?$P;}UQiC5tOL+hiW Vlj=7`gMmI|@O1TaS?83{1OPtYe479O diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Chart_BubbleChart.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Chart_BubbleChart.png index e1ab5c31315627b1a2771f42f686865d92f62b6c..d2730204a0cea5b1c5d258b59e1718afa17b923f 100644 GIT binary patch literal 581 zcmV-L0=oT)P)Px$|4BqaR5%f(Q_o9OQ4~Js^4^^pNEe2i2*E!<2!e3gjI?mkVx&dQs05m|8iF8# zz+I57#8v)UB#pTcXW_zyI7+KX1hZA!kX%TEKZ1Eb;+^jI9=CbpCZP+L^WE>9@7#0V zxsRLc*Ls2=SR~?pBKf4X9?RYR@trQY9Eh2CyQ7PW=MAnT$>@&Nmuuz0D55!>m7F^8Ltc!u-GzhIL}S|Jd#sK-M5#3pKaO;VJ7-k^$XcVB_UIUVpXtkAQN@|bW@YzU+O{@1|9ZSOEW@a^AA9trx{8V8fjD3bHfyd1vyaL;n z0A=fp`z$4np__4*0x#IJeCN>dOM|g7h5uV^6_^LL6Z*eLP0Dl&lyLm9u;9NoeZ!A7 zmacZ{$#@E-TIq&FJP<~OuRl+R-!Z9al#M`$g`%g5c+Irfo5|{Ul)e|>bslgcrcDyA z5lb;gYPq<)AB&j2!Qz}2T8s~7@Bv!E1_t*BVhrt` T8I8V&00000NkvXXu0mjfvw|5v literal 503 zcmVF(q^})1U>-^Zb81m(L&cUl zD4PJaT~XDkq@oWvVpZ&8cu|+!j_=?3Faw_={7Ihe)<;&*^=qJ1j2!|lXkm^s@*H7} zgGvHd==4JjbVb0CqVmur!}qx~jGZiropX9cb| z3?6sgT)VYXqVmN5Kq$u*-O&GykRq?Q{7&3=bKwiK1L}}gpxb$jzcWs-NXBf5ok7A6`}SmzyO=nzYE@aotOXs002ovPDHLkV1n2^)aU>J diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/FR-Chart-Bit_Map.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/FR-Chart-Bit_Map.png index 2f68dcf8f93961ff2c35ad672f12f4fe2ebbd134..a2499012496145e372b7f340389f979831816404 100644 GIT binary patch literal 523 zcmV+m0`&cfP)Px$#Ysd#R5%f(Qaxx>Q4~JkeLoqDS^@<%OGYQ5i*B|FNU@TlLj@-XLA0v~Djm8+ z=-v+EYZL@2tspjH2XWBF-Oa(D#X3lrwutY&peU5_;ir?)kp^efQk+j>sVw zhSgV-Y{gL0xE$Twm_quW!OSX)Yge(mmvJ@8?+fk2e;nS!@MGu?UTEgyZOetN?L3_) ztMh>MTsOjg5&Dedq?C9xpZ{#;v-;LKH7|Ky<4+UE6R0NXH!Z8uL-cJSNcDn(0|BfY3!>XQwml|c z`03qsY#A7N(5Dzkyx75kU~#*hJyY=yCw5r32QE2i*?<{=6Jqn@{;WAN8o$!g-g;oz zXj*mrE}V+$`oKr}{o2bw8`^>iro=>F2l>81(k`Rc%+DA>$+GR1<-rGYgKU((PVcLd&O?AGjLC@ z4)rfQRio1(_(D;!qxC^W_p=N_dPf)@fT>7p{|?~^9ld} N002ovPDHLkV1n2)@$~=z literal 423 zcmV;Y0a*TtP)W$GbM*7%PAdv;(yQyn<&-5Bc{%3a{qx=e3;^=q;qT;( RG~ECI002ovPDHLkV1nT{trGwM diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewArea.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewArea.png index 473baff55833018f762c200b9beeda6b4437b732..6bfd8bbb9bb900432ab3cb7088f32f7a878c2126 100644 GIT binary patch literal 422 zcmV;X0a^ZuP)Px$U`a$lR5%f1U>Hd7d97$JBR&Uw*&wd_@892_d_iw+p{x6}PQ-`dKf^{QbO{*$ z(*|+hzkmN71M>F+6|2F-LG+jPq6Yu}GcNznz`%snfKThi${7Cs-N3-`pXdL71}S7i zzHOF~{`c?y7LXjsFcdHRzpBml`R1!x|NsAw2T39WMn;Bb%>NmD|1dJnW%&Q!04B%y zWu2%8&?&|s3^dgoY9m-4X!49HiXITFJ|Gyoq8jbkOAaJ+g z^D16m#&_TAcw@Mk{{InyX=Y?#{66zr`~7V{VojK~|4O>_^FQZvn0}D0yMD%Aihp-W z`R;FRu?xR!<g=d0K^yA?2aekQ3sNn4`LHE z7^v6)NNoUOd8p7rY=%SCohK@cfr!1#rm4n zo%f^=K6SI-`hVB1Yf2-t`xuiLqQzG4;9$^y+v{+C%U>n|CzrvyhveO z{lOU=)=V|e)4$*QCH)kaD{XJj1Q`k!18U?9xZlO_`#;Nfc%1xa{Soq@oeLxf4`YQH zkHE1f&H9=lPjuB&Z@!~K@Bi|Cg1Qo?PxzR>GHg^Vdk13s-|rIo^p_ho@?ZuJi9%@9 h;8BC=Y%oB80RZ{Bh?i|%ZOZ@v002ovPDHLkV1jyxutfj> diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewBar.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewBar.png index 1f28a094360cc67022c38b26c4d6461578d3e52c..e0e124def5fa69d752c8abc7bc019b7c92691848 100644 GIT binary patch literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|ygXeTLo5W7 zdm@Ct&S&J05Zu%w*l)rtZ0DKugzX+fQjBM`X^;H%t_QuWPS^Nr6oTF`ImIp6YqR+A qoB1k75B&=%o3h8TP=aRTpXLKiW$<+Mb6Mw<&;$VD^)0>t literal 3856 zcmV+r5AX1aP)004&%004{+008|`004nN004b?008NW002DY000@xb3BE2000U( zX+uL$P-t&-Z*ypGa3D!TLm+T+Z)Rz1WdHz3$DNjUR8-d%htIutdZEoQ(iwV_E---f zE+8EQQ5a?h7|H;{3{7l^s6a#!5dlSzpnw6Rp-8NVVj(D~U=K(TP+~BOsHkK{)=GSN zdGF=r_s6~8+Gp=`_t|@&wJrc8PaiHX1(pIJnJ3@}dN|Wpg-6h_{Qw4dfB~ieFj?uT zzCrH6KqN0W7kawL3H*!R3;{^|zGdj?Pp5H0=h0sk8Wyh&7ga7GLtw0fuTQ>mB{3?=`JbBsZ3rr0E=h-EE#ca>7pWA znp#_08k!lIeo?6Zy7)IG?(HJI3i#YJh}QRq?XUb&>HuKOifXg#4_nNB06Mk;Ab0-{ zo8}<^Bt?B|zwyO+XySQ^7YI^qjEyrhGmW?$mXWxizw3WG{0)8aJtOgUzn6#Z%86wP zlLT~e-B>9}DMCIyJ(bDg&<+1Q#Q!+(uk%&0*raG}W_n!s* z`>t?__>spaFD&Aut10z!o?HH?RWufnX30 z)&drY2g!gBGC?lb3<^LI*ah~2N>BspK_h4ZCqM@{4K9Go;5xVo?tlki1dM~{UdPU)xj{ZqAQTQoLvauf5<ZgZNI6o6v>;tbFLDbRL8g&+C=7~%qN5B^ zwkS_j2#SSDLv276qbgBHQSGQ6)GgE~Y6kTQO-3uB4bV1dFZ3#O96A$SfG$Tjpxe-w z(09<|=rSYbRd;g|%>I!rO<0Hzgl9y5R$!^~o_Sb3}g)(-23Wnu-`0_=Y5 zG3+_)Aa)%47DvRX;>>XFxCk5%mxn9IHQ~!?W?(_!4|Qz6*Z? zKaQU#NE37jc7$L;0%0?ug3v;^M0iMeMI;i{iPppbBA2*{SV25ayh0o$z9Y$y^hqwH zNRp7WlXQf1o^+4&icBVJlO4$sWC3|6xsiO4{FwY!f+Arg;U&SA*eFpY(JnD4@j?SR-`K0DzX#{6;CMMSAv!Fl>(L4DIHeoQ<_y) zQT9+yRo<_BQF&U0rsAlQpi-uCR%J?+qH3?oRV`CJr}~U8OLw9t(JSaZ^cgiJHBU96 zTCG~Y+Pu1sdWd?SdaL>)4T1(kBUYnKqg!J}Q&rPfGgq@&^S%~di=h>-wNI;8Yff87 zJ4}0Dt zz%@8vFt8N8)OsmzY2DIcLz1DBVTNI|;iwVK$j2zpsKe-mv8Hi^@owW@<4-0QCP^ms zCJ#(yOjnrZnRc1}YNl_-GOIGXZB90KH{WR9Y5sDV!7|RWgUjw(P%L~cwpnyre6+N( zHrY-t*ICY4 zUcY?IPTh`aS8F$7Pq&Y@KV(1Rpyt4IsB?JYsNu+VY;c@#(sN31I_C7k*~FRe+~z#z zV&k&j<-9B6>fu`G+V3Xg7UEXv_SjwBJ8G6!a$8Ik+VFL5OaMFr+(FGBh%@F?24>HLNsjWR>x%^{cLj zD}-~yJ0q|Wp%D!cv#Z@!?_E6}X%SfvIkZM+P1c&LYZcZetvwSZ8O4k`8I6t(i*Abk z!1QC*F=u1EVya_iST3x6tmkY;b{Tt$W5+4wOvKv7mc~xT*~RUNn~HacFOQ$*x^OGG zFB3cyY7*uW{SuEPE+mB|wI<_|qmxhZWO#|Zo)ndotdxONgVci5ku;mMy=gOiZ+=5M zl)fgtQ$Q8{O!WzMgPUHd;& z##i2{a;|EvR;u1nJ$Hb8VDO;h!Im23nxdNbhq#CC)_T;o*J;<4AI2QcIQ+Cew7&Oi z#@CGv3JpaKACK^kj2sO-+S6#&*x01hRMHGL3!A5oMIO8Pjq5j^Eru<%t+dvnoA$o+&v?IGcZV;atwS+4HIAr!T}^80(JeesFQs#oIjrJ^h!wFI~Cpe)(drQ}4Me zc2`bcwYhrg8sl2Wb<6AReHMLfKUnZUby9Y>+)@{ z+t=@`yfZKqGIV!1a(Lt}`|jkuqXC)@%*Rcr{xo>6OEH*lc%TLr*1x5{cQYs>ht;Of}f>-u708W z;=5lQf9ac9H8cK_|8n8i;#cyoj=Wy>x_j1t_VJtKH}i9aZ{^<}eaCp$`#$Xb#C+xl z?1zevdLO$!d4GDiki4+)8~23s`{L#u!T7DPP<));D=YL{!{i{QVLUpa7%c5@eB{q*fw+rS3{ zQ)U*Z-T>A<1ibpV18s1dGF;1SLKAl&lAB24Ekxa45O~+%wbs#YTt>Tk1x2HPRs-lX z3CeB=-2NH(?%aOk()OMMW>4jWh!KQgA6?1-LFB^^eR!dVFpd;u5==-%e)Urzp`(MY zVFr&;+I~rtra|L18o%}#5OyB^<&g|h#MB!gqP2)&4$$RVVi37Be)Z!=8y~00Na4(6 zkt^geRXmJC#X01kdKQJlE}lH{JdPfH5p#1dLqBBV=5N4{pD>t*&@!6OUKhPlTCTjG z|J^0kEQbM+vYXgPLV<~DIt)Jd<6UfS?cDKO;+AmK9vWVP=46VLB1!Zp4%hY^EG?g^ zTy&4Q8rvdCW9muG1gWBhpETi}{4zIAhWn8jr@Tppd?%~UwU$zc3ULfOKa0)F-*<)% z%FC5Y^LbZz9^cb}LWCq4u6xhfMU;t>gY~$6+-xHE%4@iBx84~ka=#=(V=#n9=sG1K zrA{^^3`TECSb)VLFo4aqoguiTGY$m5BU5|8!DIC5zf>7_Kt3h!f}U9?<;o?u=nAPkI^NWz>urF9j#W`*apjsH zU1N_q6G+%$F~e1)98}~|sZ@Dq+HwQGs|?6?kzLns9MwJjA{giF)TAR?nYZ z#5W(U9#kHdnll-gSa@#!bpC~tg>JQhu(6Av(L%t{+^#p#syB!lntWHQ)^TsAf!lvq zp$9EIgKhkkJN~7eoBAWzTHEJiSY&cbIw2&dgydGj)H%j=O~EEIh6abHPL{B_R`uW+ zHLf_i!Ge1_dt#*^3o5zN>BzKnIJSjJ9>UW(3;CRl z;-rnIpRjRk*1?e}2e)cnRDq&;uPEp0&|l#`sMM!7Jg;4s z!=l%ovM7?}(W6FnY>yb0%h0sDrVyW#vD%Ou*3+3pYwc_GsQ0rapZ{New%i9Ptn;B; SPx%h)G02R5%fJQ%y)zQ4~Js-uvFXnNeqaP6;81E{deucJF(=;T3is@4oxK^L^)> zd+xmm|Jbz`Zii0bVp7L_6d?E0qNgs^UO0{DEmB^&trzaTjZ0Ycb9Go4DdOF$F-TEx zP5?yU;sEogr}F?>kt1|hUZ1~X>>cbv#DE})07_iTys5MfM?!HFR?0M(L!?=S2muIM z{Tb`cynN*V$=;C&(fj$T)=^NfNUZIHCj4=T<$Lt+Z7WLVdoaLt2ml9pBz(SSoRcb zaUPx7FWL~oC}7R7@!#K)$Yb&CI*IFca2#Q8s9>6X_apm_FUAiIN|+|>;y?0J!Fi*` z#r9Ko*`v%F7j!qWaXG{;@^4!Ixv{Oe<|#wTU-lS1wW|Rs@-hrj3Jr+{SAPEzIU??n z&)jwJLdU7)PDu=`-AtRhxmV1%#5IApY{8;~d?(mm2VYFs5b1M4#cltbb~Zb=d0YVz zdF68^Ml?%0rm|kR`h%;d|I?+{msO8`JIk`^XQyGw&YNs*YD@O`i#jK!87e-t$dceP z=T7^;q9qBWa|||ku!z!Cfw>awB8Liy|Z5y&NW27_wiol~giZxZqL5 z<9dE?&y7`T3A5%pI4xxPRL6L&q=&b`h^6Ri%hA>ct2o7$xk&qHGH@6$SSM66<{S=a Q0ERMyr>mdKI;Vst03SD>J^%m! diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_VerticalLine.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_VerticalLine.png index 63c460d69ea6c48bbc987d0e27667e74f91b159a..6bd4ebbb7fb81e82f4e3cd88a719f85c81996258 100644 GIT binary patch literal 580 zcmV-K0=xZ*P)Px${z*hZR5%gEkWWYyaTLej`_1f3Yq%bA#;rsmi2isKHj0Rv2(m8b7C|hLBi6}- zw+b@zWJH(9({9_*SaK&bBm!5GD9p@)x>;RXvQ~wiSw%ZcVRX@XxIuHQ<8osz6t>q=mxz5U=*4iMfnNFn2P zjouFg-y-qCl|K?VkD`sGA-%4WtcQp}KzBf*Hm-f%h|ewFPgI9%`UJDgzPH1Ip7JgdKrv^k1L~HLnW(xEds0rk!{amdG6N@Drw6|Om?3r{N@oKK?&Tls zxXGB`69VcKaHhO@-!5s=PA&FsHX2+5}^GtEKpTnmliuFFS?A&*@lt28ez{;&bQ3u&BdHw~0S~cwp1+^ad!I zeAj(~;6UVLVJ{+*k#b|aOJHZUK6_AmMjslL-=hE*UQ>u0yfp5*=Y{52(L=>S?V~fK z9jq{wjzvrBkA&5$c literal 548 zcmV+<0^9wGP)Oggwk zhYC({auP#DT(h=I{4U%JAwLCU3O@MA%W?hgyYJphl`ss&C{|63Xw|DG96T*+qf+bu znjnwMKt1befS!!?AD2wPrF|*I^XH#UR_0)@u>}6nNdWzDD#xObIhbJzuF)-6T}qvKpMv$?sj|hTx*@q z6%w;oahvQVt@gs(H5Ig}6A%ZSuR`tX`n&bz52jxbH!>bGX+#EheHZ!?sX&Rw6e#e)3=&KmargE`tMDiHl$XA>bEXpgNRNWh+l9 zE1vR7)7qNL-G7B5E%X~W^eW2s)%@>IczPvs?tdWKu0wNg( zo)We~%!1F#C3^LFB9yMVEL^flRPnUL#G?*1GaPSZh~+fBNctUovrx)u3geGG1|K|U cCW$jJ%$=mNXxUOzHK5fDp00i_>zopr076wf?f?J) literal 269 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|&H|6fVg?3oVGw3ym^DWNC@5Lt z8c`CQpH@+2u$DqB_b`ZBbhKY7Yyk0WJBDTtpeq?X MUHx3vIVCg!01hT#rT_o{ From ee5c24ef12a66c4d2f8f4f2c3517ea2ab89ca8b0 Mon Sep 17 00:00:00 2001 From: neil <459208047@qq.com> Date: Thu, 6 Sep 2018 10:05:26 +0800 Subject: [PATCH 2/8] =?UTF-8?q?REPORT-10719=20=E6=A8=A1=E6=9D=BF=E4=BF=9D?= =?UTF-8?q?=E5=AD=980kb,=20=E6=94=AF=E6=8C=81=E9=9B=86=E7=BE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/file/FileNodeFILE.java | 3 +- .../fr/file/WorkResourceTempRenameStream.java | 39 +++++++++++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 designer-base/src/main/java/com/fr/file/WorkResourceTempRenameStream.java diff --git a/designer-base/src/main/java/com/fr/file/FileNodeFILE.java b/designer-base/src/main/java/com/fr/file/FileNodeFILE.java index 04016c503..c7c6bf2b3 100644 --- a/designer-base/src/main/java/com/fr/file/FileNodeFILE.java +++ b/designer-base/src/main/java/com/fr/file/FileNodeFILE.java @@ -14,7 +14,6 @@ import com.fr.stable.CoreConstants; import com.fr.stable.StableUtils; import com.fr.stable.project.ProjectConstants; import com.fr.workspace.WorkContext; -import com.fr.workspace.resource.WorkResourceOutputStream; import javax.swing.Icon; import java.io.ByteArrayInputStream; @@ -381,7 +380,7 @@ public class FileNodeFILE implements FILE { if (!envPath.startsWith(ProjectConstants.REPORTLETS_NAME)) { return null; } - return new WorkResourceOutputStream(envPath); + return new WorkResourceTempRenameStream(envPath); } /** diff --git a/designer-base/src/main/java/com/fr/file/WorkResourceTempRenameStream.java b/designer-base/src/main/java/com/fr/file/WorkResourceTempRenameStream.java new file mode 100644 index 000000000..576239b35 --- /dev/null +++ b/designer-base/src/main/java/com/fr/file/WorkResourceTempRenameStream.java @@ -0,0 +1,39 @@ +package com.fr.file; + +import com.fr.stable.ArrayUtils; +import com.fr.stable.project.ProjectConstants; +import com.fr.workspace.WorkContext; +import com.fr.workspace.resource.WorkResource; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; + +/** + * 这个流会先输出临时文件到服务器. + * 然后再操作服务器对文件进行重命名. + * 用于设计器本地和远程修改模板. + */ +public class WorkResourceTempRenameStream extends ByteArrayOutputStream { + + private String path; + + public WorkResourceTempRenameStream(String path) { + this.path = path; + } + + @Override + public void close() throws IOException { + //写到给定的path上去 + byte[] content = super.toByteArray(); + if (ArrayUtils.isEmpty(content)) { + return; + } + + String tmpPath = path + ProjectConstants.TEMP_SUFFIX; + WorkResource resource = WorkContext.getWorkResource(); + // 输出临时文件到服务器 + resource.write(tmpPath, content); + // 重命名文件 + resource.rename(tmpPath, path); + } +} From 010ebe46dd4e8654219c1ac4bc25dd815929adfc Mon Sep 17 00:00:00 2001 From: neil <459208047@qq.com> Date: Thu, 6 Sep 2018 10:21:13 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=94=BEcore=E9=87=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/file/FileNodeFILE.java | 1 + .../fr/file/WorkResourceTempRenameStream.java | 39 ------------------- 2 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 designer-base/src/main/java/com/fr/file/WorkResourceTempRenameStream.java diff --git a/designer-base/src/main/java/com/fr/file/FileNodeFILE.java b/designer-base/src/main/java/com/fr/file/FileNodeFILE.java index c7c6bf2b3..d077a342e 100644 --- a/designer-base/src/main/java/com/fr/file/FileNodeFILE.java +++ b/designer-base/src/main/java/com/fr/file/FileNodeFILE.java @@ -14,6 +14,7 @@ import com.fr.stable.CoreConstants; import com.fr.stable.StableUtils; import com.fr.stable.project.ProjectConstants; import com.fr.workspace.WorkContext; +import com.fr.workspace.resource.WorkResourceTempRenameStream; import javax.swing.Icon; import java.io.ByteArrayInputStream; diff --git a/designer-base/src/main/java/com/fr/file/WorkResourceTempRenameStream.java b/designer-base/src/main/java/com/fr/file/WorkResourceTempRenameStream.java deleted file mode 100644 index 576239b35..000000000 --- a/designer-base/src/main/java/com/fr/file/WorkResourceTempRenameStream.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.fr.file; - -import com.fr.stable.ArrayUtils; -import com.fr.stable.project.ProjectConstants; -import com.fr.workspace.WorkContext; -import com.fr.workspace.resource.WorkResource; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; - -/** - * 这个流会先输出临时文件到服务器. - * 然后再操作服务器对文件进行重命名. - * 用于设计器本地和远程修改模板. - */ -public class WorkResourceTempRenameStream extends ByteArrayOutputStream { - - private String path; - - public WorkResourceTempRenameStream(String path) { - this.path = path; - } - - @Override - public void close() throws IOException { - //写到给定的path上去 - byte[] content = super.toByteArray(); - if (ArrayUtils.isEmpty(content)) { - return; - } - - String tmpPath = path + ProjectConstants.TEMP_SUFFIX; - WorkResource resource = WorkContext.getWorkResource(); - // 输出临时文件到服务器 - resource.write(tmpPath, content); - // 重命名文件 - resource.rename(tmpPath, path); - } -} From 132f6d3062ff4ac466cc3eee37cc8efec87e81ea Mon Sep 17 00:00:00 2001 From: ju Date: Thu, 6 Sep 2018 20:36:52 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20FineRunti?= =?UTF-8?q?me?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer-realize/src/main/java/com/fr/start/Designer.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/designer-realize/src/main/java/com/fr/start/Designer.java b/designer-realize/src/main/java/com/fr/start/Designer.java index c362916c9..31b16dd42 100644 --- a/designer-realize/src/main/java/com/fr/start/Designer.java +++ b/designer-realize/src/main/java/com/fr/start/Designer.java @@ -41,6 +41,7 @@ import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.ComparatorUtils; import com.fr.module.Module; import com.fr.module.ModuleContext; +import com.fr.plugin.manage.FineRuntime; import com.fr.stable.BuildContext; import com.fr.stable.OperatingSystem; import com.fr.stable.ProductConstants; @@ -93,7 +94,9 @@ public class Designer extends BaseDesigner { * @param args 参数 */ public static void main(String[] args) { - + + //启动运行时 + FineRuntime.start(); BuildContext.setBuildFilePath("/com/fr/stable/build.properties"); From f4e429b0ff67dc1ea4b795c4d77f16db0c330eb6 Mon Sep 17 00:00:00 2001 From: ju Date: Thu, 6 Sep 2018 20:40:28 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20FineRunti?= =?UTF-8?q?me?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer-realize/src/main/java/com/fr/start/Designer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-realize/src/main/java/com/fr/start/Designer.java b/designer-realize/src/main/java/com/fr/start/Designer.java index 31b16dd42..b0d4b398b 100644 --- a/designer-realize/src/main/java/com/fr/start/Designer.java +++ b/designer-realize/src/main/java/com/fr/start/Designer.java @@ -41,7 +41,7 @@ import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.ComparatorUtils; import com.fr.module.Module; import com.fr.module.ModuleContext; -import com.fr.plugin.manage.FineRuntime; +import com.fr.runtime.FineRuntime; import com.fr.stable.BuildContext; import com.fr.stable.OperatingSystem; import com.fr.stable.ProductConstants; From 620b061413c6006a473c10199137ead7878300a0 Mon Sep 17 00:00:00 2001 From: plough Date: Fri, 7 Sep 2018 09:48:51 +0800 Subject: [PATCH 6/8] =?UTF-8?q?REPORT-11110=20=E6=89=93=E5=8D=B0=E4=BA=8C?= =?UTF-8?q?=E6=9C=9F=20ie=20=E4=B8=8B=E9=9D=99=E9=BB=98=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E4=BA=A4=E4=BA=92=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NoClientPrintSettingPane.java | 42 +++++++++++++------ 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/webattr/printsettings/NoClientPrintSettingPane.java b/designer-realize/src/main/java/com/fr/design/webattr/printsettings/NoClientPrintSettingPane.java index 4dd9fa6b9..a61cd7a3c 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/printsettings/NoClientPrintSettingPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/printsettings/NoClientPrintSettingPane.java @@ -8,12 +8,10 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.utils.gui.GUICoreUtils; - import javax.swing.BorderFactory; import javax.swing.JPanel; import java.awt.BorderLayout; import java.awt.Component; -import java.awt.FlowLayout; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; @@ -23,6 +21,7 @@ import java.awt.event.ItemListener; */ public class NoClientPrintSettingPane extends JPanel { private UICheckBox setMarginWhenPrintCheck; + private UICheckBox ieQuietPrintCheck; private UICheckBox inheritPageMarginSettingCheck; // 继承页面边距设置 private PageMarginSettingPane pageMarginSettingPane; private JPanel centerPane; @@ -35,15 +34,16 @@ public class NoClientPrintSettingPane extends JPanel { private void initComponents() { JPanel printPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - setMarginWhenPrintCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Set_Margin_When_Printing")); - setMarginWhenPrintCheck.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 20)); - UILabel tipLabel = GUICoreUtils.createTipLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tip_Use_Default_Print_Margin")); - JPanel northPane = GUICoreUtils.createFlowPane(new Component[] { - setMarginWhenPrintCheck, tipLabel}, FlowLayout.LEFT); - northPane.setBorder(BorderFactory.createEmptyBorder(8, 10, 10, 0)); + printPane.add(createNorthPane(), BorderLayout.NORTH); + + initCenterPane(); + printPane.add(centerPane, BorderLayout.CENTER); - printPane.add(northPane, BorderLayout.NORTH); + this.setLayout(new BorderLayout()); + this.add(printPane, BorderLayout.CENTER); + } + private void initCenterPane() { centerPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default_Settings")); inheritPageMarginSettingCheck = GUICoreUtils.createNoBorderCheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Inherit_Page_Margin_Setting")); @@ -61,11 +61,27 @@ public class NoClientPrintSettingPane extends JPanel { JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 0, 15); centerPane.add(panel); + } - printPane.add(centerPane, BorderLayout.CENTER); + private JPanel createNorthPane() { + setMarginWhenPrintCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Set_Margin_When_Printing")); + setMarginWhenPrintCheck.setBorder(BorderFactory.createEmptyBorder(0, 12, 0, 20)); + UILabel tipLabel = GUICoreUtils.createTipLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tip_Use_Default_Print_Margin")); + ieQuietPrintCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_No_Print_Settings_In_IE")); + ieQuietPrintCheck.setBorder(BorderFactory.createEmptyBorder(0, 12, 10, 0)); - this.setLayout(new BorderLayout()); - this.add(printPane, BorderLayout.CENTER); + // TableLayout + double p = TableLayout.PREFERRED; + double[] rowSize = {p, p}; + double[] columnSize = {180, p}; + Component[][] components = { + {setMarginWhenPrintCheck, tipLabel}, + {ieQuietPrintCheck, null} + }; + JPanel northPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 0, 10); + northPane.setBorder(BorderFactory.createEmptyBorder(5, 0, 0, 0)); + + return northPane; } private void initListeners() { @@ -86,12 +102,14 @@ public class NoClientPrintSettingPane extends JPanel { public void populate(NoClientPrintAttr noClientPrintAttr) { setMarginWhenPrintCheck.setSelected(noClientPrintAttr.isSetMarginOnPrint()); + ieQuietPrintCheck.setSelected(noClientPrintAttr.isIeQuietPrint()); inheritPageMarginSettingCheck.setSelected(noClientPrintAttr.isInheritPageMarginSetting()); pageMarginSettingPane.populate(noClientPrintAttr.getMargin()); } public void update(NoClientPrintAttr noClientPrintAttr) { noClientPrintAttr.setSetMarginOnPrint(setMarginWhenPrintCheck.isSelected()); + noClientPrintAttr.setIeQuietPrint(ieQuietPrintCheck.isSelected()); noClientPrintAttr.setInheritPageMarginSetting(inheritPageMarginSettingCheck.isSelected()); noClientPrintAttr.setMargin(pageMarginSettingPane.updateBean()); } From f7081a10959ed41e0c3ca83236dc69629daf3bb6 Mon Sep 17 00:00:00 2001 From: rinoux Date: Fri, 7 Sep 2018 14:12:47 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E5=90=91?= =?UTF-8?q?=E4=B8=8D=E5=AD=98=E5=9C=A8=E7=9A=84=E6=A8=A1=E7=89=88=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E5=86=99=E5=85=A5=E6=97=B6=E4=B8=8D=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=85=88=E6=96=B0=E5=BB=BA=E7=A9=BA=E6=96=87=E4=BB=B6=EF=BC=8C?= =?UTF-8?q?=E5=90=A6=E5=88=99=E5=85=B6=E5=AE=83=E5=AD=98=E5=82=A8=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=E4=BC=9A=E5=AF=BC=E8=87=B4=E9=87=8D=E5=91=BD=E5=90=8D?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/mainframe/JTemplate.java | 1 - 1 file changed, 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java index d94ac661b..1235419f5 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java @@ -591,7 +591,6 @@ public abstract class JTemplate> return false; } editingFILE = fileChooser.getSelectedFILE(); - mkNewFile(editingFILE); } return saveNewFile(editingFILE, oldName); From 381b5d9eed96c0df545b90341c13b7df028b6e6b Mon Sep 17 00:00:00 2001 From: rinoux Date: Fri, 7 Sep 2018 14:31:58 +0800 Subject: [PATCH 8/8] update --- designer-base/src/main/java/com/fr/file/FileFILE.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/file/FileFILE.java b/designer-base/src/main/java/com/fr/file/FileFILE.java index b9c4f7bb0..ee92205f5 100644 --- a/designer-base/src/main/java/com/fr/file/FileFILE.java +++ b/designer-base/src/main/java/com/fr/file/FileFILE.java @@ -194,11 +194,12 @@ public class FileFILE implements FILE { * @return 输出流 */ public OutputStream asOutputStream() { - if (file == null || !file.exists()) { + if (file == null) { return null; } OutputStream out; try { + StableUtils.makesureFileExist(file); out = new FileOutputStream(file); } catch (Exception e) { throw SessionLocalManager.createLogPackedException(e);