From 81cfdf7c0f435f85f5fa5505a621909ff4f73222 Mon Sep 17 00:00:00 2001 From: "Qinghui.Liu" Date: Wed, 5 Aug 2020 10:29:31 +0800 Subject: [PATCH 1/3] =?UTF-8?q?CHART-14924=20=E6=9B=B4=E6=8D=A2icon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/van/chart/box.images/box.png | Bin 918 -> 1607 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/designer-chart/src/main/resources/com/fr/van/chart/box.images/box.png b/designer-chart/src/main/resources/com/fr/van/chart/box.images/box.png index c0ad22d3cf7a7da3667d2d229b0a885ed433fc58..743024f720d1c44eb2e968afaa4db7e8776f21d8 100755 GIT binary patch literal 1607 zcmV-N2Dtf&P)7%Q6vyA&b&^6Uh0-_`LM?(22_X(hfH>8La^MnyR0xqc6>;E@lr&C4xkC?0oT3m8 zk+^U`qBkTEJjgt_>2=ZDMWJfVS7-%8aMWO-)whhcdfrKQS7%nGymVb zH*aRvVhq0aPGToJ;`J1FeCX)9F%0mR*uf zy;GfI#s$8p0>b40aRZB!4(L(0+A#p z@KA|Lx7r}&3N(X<3Ph5az(XY}!9%rGf`@8LR{sKcsJ@WeW2oMKAs2F)jzjv@+Pnfl z^_9~GTCa$pLQ*pU9r=Ca{u|5OEkeXC7e098-K!$oT}Gh;?avSAohq&rwGvU1nf|P2 zqZF+rm|uRsYxGwyjh9~IM~7YSoNMLM;Ch*gctdwqw4aEMDyGjj{wJl@|0Zny=&g3bpI6^Ily4^55FZe*BVU(9xQF4O*n&h0Ak>A0pwjwg_t3tXku#1C zpy)m(dO!_mW|e@mT6oD>15v!sotE&chCA`^cp1yXINNIjLX>A22* zZ|Fe#^TYos#S>l{OiVAe*z|@@gPqC=u){7YqPM-Y&&yhM=s^4O!zCh`_0nJ>zPH7u z6oBri7e3G{!$x~BJT%~mcOQT{2B&z2+=u{8jsLTf*kga^CG?k9)uTjKcfI{k(;XHe zcZ*;uJ6qhdmp=0Xbfw785LrC{N<^l6Fvd`fp{`EbXdY_1!y@E1S%(Es0CkN(H3m@% zNf<+$tOo-qfVzgHC`BOo7&<YCWQO&n;1j49T*-84;2RUTC)Hjw1$VmLpK#bmh0I+iQu6c;zj8U0<08arO37G#&RB- znkf8xPX{}H*Resfm*%L4*?RNhz`-9~)u}Q-mK$J}o5~jca)QC6T8QXwMSRV{Mp+iU zdihj`)>jPxG(ez@JnME2&A?i2NNc$O>a0M+G1Tx8?Bb=rpn;k?WZ!g_Yx+kLA_LUa z&tRAaYI;bC3{aiyHwfFH78U?B2wH-Brn80hvmWLIrZpx?(Oqow(cG!zFFMx;k;TJ9 zw+K8pwRpsFTDDSps7#eJR$FUtJ)5>lqImw~zIh#(>$U)@tC&yrahjIFLj}+QR3K8E zOaL@av;=hpP=QEsG6B#y(Gt`ZKm{Vj$pk>-L`zUtKY$L*oKBZ2<+>++*Hpo#-l@*9 zbAqbXm|)r>P|XjZf?|9z(FXeb^uqqqQt9#P(%GsUt|%U2#V4!Zw=8S*(%``#e5q-O zH)(F5*|{f5q(ncltcVuA&UCyOA`4%NZfc;uC=|1s0BFpBxm6cH-4u%1=KvZrU~bg~ zP&b7l{CRrv+5@z@cKntso~c6-zd}k)Rljeueg0ymJs+j!XirpoWAtRSbZdQrb{C{{sWDQ0y#l4AB4p002ovPDHLk FV1jTT=o$b3 literal 918 zcmV;H18Mw;P)sRV z6$OT2r1iltXGEujd2k?1KZ?%}V@EgNPaGq_POT}XK`)l9IB?!2X9IyY@AanEY%E(l zRM~8FeX^&x<*m!Qt);bR_R!SF3T87}U75{Bjp{U=LsnOIJ%4MELw6}Gu-Rw<0ME=F znSN7!GPDNm@C60{`R6C%T-XOWcj$iM1bJSP@me9?6&)w@VzgtWTAvi01|6L8B3E)$ zWB?3@*v%Y+ebu&%`6lFDDtb@YxtIY|FN)q3Uhc1EDGjKr83A*VsbLd41Q8Aath%6Z z3N@W8A0ze?Q8%CHCqT;c(-7m2YYba5FaZ}?RsKNBkY?*6JWVtIvhal5>{!=4kMf7a zosBdPBkWuzJ09B>5^T4q>9Wk-ttXd#j4aboiQ5>xghVMkB+E|SEevY%BqJmU;|#DS z#1pd{w`Hc#dG>s)!^{>2tf&AhZ2PEBHwhj{mdnfHovW$1L}aEg$FevU7a0x3Ydmzy z{Ew;D8Pg==%I}OR!AInC){p<~b<+j)oqO%Yl9hO zrW9!WVI4ulbauQuv_P|Mr76pw>^fu>)H~TqTLtx8-^?Pn(r=}e4tn5-R$9X2QjpFs z-U22bes0GfI6%@XX+6nB{xDxz29!!6-ygM6E_=1>YlIOiD746@@026bMz6$9aTVt! z<-+kB=6UG1+SNiyaS%zb6iSG&8Vc?JU}V`2*f&i2iu_5=xnUN_fCDL>ms;uFb!Zu+ s`82}A@E9O(mG(X(jW5fsbd>z+Pl(bHYsk2^^#A|>07*qoM6N<$f=2|7_y7O^ From f9ba3d5093db497027128414a82912e792e45bec Mon Sep 17 00:00:00 2001 From: "Qinghui.Liu" Date: Wed, 5 Aug 2020 14:47:19 +0800 Subject: [PATCH 2/3] =?UTF-8?q?CHART-14936=20=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B=E5=88=87=E6=8D=A2button?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../van/chart/box/data/report/BoxPlotReportDataContentPane.java | 2 ++ .../van/chart/box/data/table/BoxPlotTableDataContentPane.java | 1 + 2 files changed, 3 insertions(+) diff --git a/designer-chart/src/main/java/com/fr/van/chart/box/data/report/BoxPlotReportDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/box/data/report/BoxPlotReportDataContentPane.java index b43af6690..01da59960 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/box/data/report/BoxPlotReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/box/data/report/BoxPlotReportDataContentPane.java @@ -37,6 +37,7 @@ public class BoxPlotReportDataContentPane extends AbstractReportDataContentPane this.add(createSeriesPane(parent), BorderLayout.CENTER); initDataTypeListener(); + checkDataPaneVisible(); } private JPanel createDataTypePane() { @@ -52,6 +53,7 @@ public class BoxPlotReportDataContentPane extends AbstractReportDataContentPane }; dataType = new UIButtonGroup(names); + dataType.setSelectedIndex(0); dataType.setPreferredSize(new Dimension(100, 20)); pane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{dataType, null, null, label, null})); diff --git a/designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableDataContentPane.java index cb2de668a..2c5310926 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableDataContentPane.java @@ -63,6 +63,7 @@ public class BoxPlotTableDataContentPane extends AbstractTableDataContentPane { }; dataType = new UIButtonGroup(names); + dataType.setSelectedIndex(0); dataType.setPreferredSize(new Dimension(100, 20)); pane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{dataType, null, null, label, null})); From 64524368490011729f7adcb374ff8814e95bfafe Mon Sep 17 00:00:00 2001 From: "Qinghui.Liu" Date: Wed, 5 Aug 2020 17:17:22 +0800 Subject: [PATCH 3/3] =?UTF-8?q?CHART-14928=20=E6=95=B0=E6=8D=AE=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E6=94=B9=E4=B8=BA=E6=95=B0=E6=8D=AE=E5=BD=A2=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../van/chart/box/data/report/BoxPlotReportDataContentPane.java | 2 +- .../van/chart/box/data/table/BoxPlotTableDataContentPane.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/van/chart/box/data/report/BoxPlotReportDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/box/data/report/BoxPlotReportDataContentPane.java index 01da59960..a2cf8628b 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/box/data/report/BoxPlotReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/box/data/report/BoxPlotReportDataContentPane.java @@ -44,7 +44,7 @@ public class BoxPlotReportDataContentPane extends AbstractReportDataContentPane JPanel pane = new JPanel(new BorderLayout(4, 0)); pane.setBorder(BorderFactory.createMatteBorder(0, 0, 6, 1, getBackground())); - UILabel label = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Data_Type")); + UILabel label = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Data_Form")); label.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH, ChartDataPane.LABEL_HEIGHT)); String[] names = new String[]{ diff --git a/designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableDataContentPane.java index 2c5310926..92b554d0d 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableDataContentPane.java @@ -54,7 +54,7 @@ public class BoxPlotTableDataContentPane extends AbstractTableDataContentPane { JPanel pane = new JPanel(new BorderLayout(4, 0)); pane.setBorder(BorderFactory.createMatteBorder(0, 0, 6, 1, getBackground())); - UILabel label = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Data_Type")); + UILabel label = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Data_Form")); label.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH, ChartDataPane.LABEL_HEIGHT)); String[] names = new String[]{