From 1ffe09cdd21dffee9ac336cedbbbe4aff96aa184 Mon Sep 17 00:00:00 2001 From: "Wim.Zhai" Date: Fri, 22 Nov 2019 15:21:28 +0800 Subject: [PATCH 01/11] =?UTF-8?q?fix=20=E9=9B=B7=E8=BE=BE=E5=9B=BE?= =?UTF-8?q?=E8=BD=B4=E9=9D=A2=E6=9D=BFNPE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/designer/style/axis/VanChartBaseAxisPane.java | 8 +++++--- .../chart/designer/style/axis/VanChartTimeAxisPane.java | 2 +- .../chart/designer/style/axis/VanChartValueAxisPane.java | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java index 0949dbf6e..8b309840e 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java @@ -118,7 +118,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { new Component[]{createLabelPane(new double[]{p, p}, column), null}, new Component[]{createLineStylePane(new double[]{p, p, p, p, p}, columnSize), null}, new Component[]{createAxisPositionPane(new double[]{p, p, p}, columnSize, isXAxis), null}, - new Component[]{createDisplayStrategy(new double[]{p, p, p}, columnSize), null}, + new Component[]{createDisplayStrategy(), null}, new Component[]{createValueStylePane(), null}, }; @@ -326,7 +326,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { } } - protected JPanel createDisplayStrategy(double[] row, double[] col){ + protected JPanel createDisplayStrategy(){ limitPane = new LimitPane(); return limitPane; } @@ -385,7 +385,9 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { protected void checkAllUse() { checkCardPane(); checkLabelPane(); - limitPane.checkMaxProPortionUse(); + if (limitPane != null){ + limitPane.checkMaxProPortionUse(); + } } protected void checkCardPane() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartTimeAxisPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartTimeAxisPane.java index 74dbf7221..2d408c905 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartTimeAxisPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartTimeAxisPane.java @@ -73,7 +73,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane { new Component[]{createValueDefinition(),null}, new Component[]{createLineStylePane(new double[]{p, p,p,p,p}, columnSize),null}, new Component[]{createAxisPositionPane(new double[]{p, p, p}, columnSize, isXAxis),null}, - new Component[]{createDisplayStrategy(new double[]{p, p,p}, columnSize),null}, + new Component[]{createDisplayStrategy(),null}, new Component[]{createValueStylePane(),null}, }; diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartValueAxisPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartValueAxisPane.java index 3b271f2b3..2b90633e6 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartValueAxisPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartValueAxisPane.java @@ -54,7 +54,7 @@ public class VanChartValueAxisPane extends VanChartBaseAxisPane { new Component[]{createMinMaxValuePane(new double[]{p, p}, columnSize), null}, new Component[]{createLineStylePane(new double[]{p, p, p, p, p}, columnSize), null}, new Component[]{createAxisPositionPane(new double[]{p, p, p}, columnSize, isXAxis), null}, - new Component[]{createDisplayStrategy(new double[]{p, p, p}, columnSize), null}, + new Component[]{createDisplayStrategy(), null}, new Component[]{createValueStylePane(), null}, }; From 59cc56f41d13291ae4901b28da1dae384008c164 Mon Sep 17 00:00:00 2001 From: "Wim.Zhai" Date: Mon, 25 Nov 2019 16:32:35 +0800 Subject: [PATCH 02/11] =?UTF-8?q?CHART-11424=20fix=20=E8=A1=A5=E5=85=85?= =?UTF-8?q?=E5=87=A0=E7=A7=8D=E5=9B=BE=E8=A1=A8=E5=8D=95=E5=85=83=E6=A0=BC?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9D=A2=E6=9D=BF=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/chartx/fields/diff/FunnelCellDataFieldsPane.java | 2 +- .../design/chartx/fields/diff/GaugeCellDataFieldsPane.java | 2 +- .../chartx/fields/diff/ScatterCellDataFieldsPane.java | 2 ++ .../design/chartx/fields/diff/ScatterDataSetFieldsPane.java | 6 +++++- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/FunnelCellDataFieldsPane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/FunnelCellDataFieldsPane.java index abf40ea52..5d9aaf7b0 100644 --- a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/FunnelCellDataFieldsPane.java +++ b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/FunnelCellDataFieldsPane.java @@ -54,7 +54,7 @@ public class FunnelCellDataFieldsPane extends AbstractCellDataFieldsWithSeriesVa ColumnFieldCollectionWithSeriesValue fieldCollection = new ColumnFieldCollectionWithSeriesValue(); updateSeriesValuePane(fieldCollection); SeriesValueCorrelationDefinition seriesValueCorrelationDefinition = fieldCollection.getSeriesValueCorrelationDefinition(); - filterPane.updateBean(seriesValueCorrelationDefinition.getFilterProperties()); + seriesValueCorrelationDefinition.setFilterProperties(filterPane.updateBean()); return fieldCollection; } diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/GaugeCellDataFieldsPane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/GaugeCellDataFieldsPane.java index 5df78ff2b..b125516ff 100644 --- a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/GaugeCellDataFieldsPane.java +++ b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/GaugeCellDataFieldsPane.java @@ -69,7 +69,7 @@ public class GaugeCellDataFieldsPane extends AbstractCellDataFieldsPane Date: Mon, 25 Nov 2019 17:24:11 +0800 Subject: [PATCH 03/11] =?UTF-8?q?sonar=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/layout/FRGUIPaneFactory.java | 2 +- .../src/main/java/com/fr/design/layout/TableLayoutHelper.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java b/designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java index 0c3a067a9..80efde739 100644 --- a/designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java +++ b/designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java @@ -562,7 +562,7 @@ public class FRGUIPaneFactory { double n = (double)(width + WIDTH_OFFSET_N ) / (double)WIDTH_PARA_F; double i = Math.abs(((double) ((int) m + (int) (m + 1)) / WIDTHABS_PARA_F) - m); double j = Math.abs(((double) ((int) n + (int) (n + 1)) / WIDTHABS_PARA_F) - n); - double x = i > j ? i : j; + double x = Math.max(i,j); if (AssistUtils.equals(x, i)) { w = (int) (Math.round(m) * WIDTH_PARA_INT - WIDTH_OFFSET_M); } else if (AssistUtils.equals(x, j)) { diff --git a/designer-base/src/main/java/com/fr/design/layout/TableLayoutHelper.java b/designer-base/src/main/java/com/fr/design/layout/TableLayoutHelper.java index 1be77c849..d394f43ee 100644 --- a/designer-base/src/main/java/com/fr/design/layout/TableLayoutHelper.java +++ b/designer-base/src/main/java/com/fr/design/layout/TableLayoutHelper.java @@ -372,7 +372,8 @@ public class TableLayoutHelper { double p = TableLayout.PREFERRED; double f = TableLayout.FILL; JPanel jp1 = TableLayoutHelper.createTableLayoutPane(createTestComponents("jp1"), TableLayoutHelper.FILL_NONE); - JPanel jp2 = TableLayoutHelper.createGapTableLayoutPane(createTestComponents("jp2"), TableLayoutHelper.FILL_LASTCOL_AND_ROW, (double)2 * TEN, (double)2 * TEN); + JPanel jp2 = TableLayoutHelper.createGapTableLayoutPane(createTestComponents("jp2"), + TableLayoutHelper.FILL_LASTCOL_AND_ROW, (double)2 * TEN, (double)2 * TEN); JPanel jp3 = TableLayoutHelper.createGapTableLayoutPane(createTestComponents("jp3"), new double[]{f, p, f, p}, new double[]{f, f}, 4, 4); JPanel jp4 = TableLayoutHelper.createGapTableLayoutPane(createTestComponents("jp4"), From 8e0aa1fd292d51b3673114e483d7632f8c3d7bd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com> Date: Mon, 25 Nov 2019 17:29:12 +0800 Subject: [PATCH 04/11] =?UTF-8?q?CHART-11513=20=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=9D=A2=E6=9D=BF=E5=B8=83=E5=B1=80=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fields/AbstractCellDataFieldsPane.java | 4 ++-- .../fields/diff/GaugeCellDataFieldsPane.java | 2 +- .../design/chartx/single/SingleDataPane.java | 22 ++++++++++--------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/AbstractCellDataFieldsPane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/AbstractCellDataFieldsPane.java index b302ec863..6d1cf932a 100644 --- a/designer-chart/src/main/java/com/fr/design/chartx/fields/AbstractCellDataFieldsPane.java +++ b/designer-chart/src/main/java/com/fr/design/chartx/fields/AbstractCellDataFieldsPane.java @@ -47,7 +47,7 @@ public abstract class AbstractCellDataFieldsPane { + private static final int TABLE_DATA_LABEL_LINE_WIDTH = 81; + private UIComboBoxPane comboBoxPane; private DataSetPane dataSetPane; @@ -51,11 +52,13 @@ public class SingleDataPane extends BasicBeanPane { protected void initLayout() { this.setLayout(new BorderLayout(LayoutConstants.HGAP_LARGE, 6)); JPanel northPane = new JPanel(new BorderLayout(LayoutConstants.HGAP_LARGE, 0)); + + UILabel label = new BoldFontTextLabel(Toolkit.i18nText("Fine-Design_Chart_Data_Source")); + UIComponentUtils.setPreferedWidth(label, TABLE_DATA_LABEL_LINE_WIDTH); + northPane.add(label,BorderLayout.WEST); northPane.add(jcb, BorderLayout.CENTER); - UILabel label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Source")); - label1.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH, ChartDataPane.LABEL_HEIGHT)); - northPane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{jcb, null, null, label1, null})); - northPane.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 8)); + + northPane.setBorder(BorderFactory.createEmptyBorder(5,24,0,15)); this.add(northPane, BorderLayout.NORTH); this.add(cardPane, BorderLayout.CENTER); @@ -70,7 +73,6 @@ public class SingleDataPane extends BasicBeanPane { this.setLayout(new BorderLayout()); this.add(comboBoxPane, BorderLayout.CENTER); - } @Override From edf727b27958a972554fd4f239dde493b4855825 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com> Date: Wed, 27 Nov 2019 15:45:14 +0800 Subject: [PATCH 05/11] =?UTF-8?q?CHART-11242=20=E6=A0=87=E9=A2=98=E7=95=8C?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/van/chart/designer/style/VanChartTitlePane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartTitlePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartTitlePane.java index 01610a245..92df8bc6b 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartTitlePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartTitlePane.java @@ -160,7 +160,7 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane { initPositionListener(); JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components,row,col); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Form_Layout"), panel); } private JPanel createTitleStylePane(){ From b16381acf9f4ff57bbf261337be849658825e6a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com> Date: Wed, 27 Nov 2019 17:01:55 +0800 Subject: [PATCH 06/11] =?UTF-8?q?CHART-11446=20=E6=9C=AA=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E7=81=B0=E5=8C=96=E4=BA=86combox?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/chartx/component/MultiComboBoxPane.java | 10 +++++++++- .../component/MultiComboBoxPaneWithUISpinner.java | 10 +++++++++- .../fields/diff/MultiCategoryDataSetFieldsPane.java | 8 +++++++- .../chartx/fields/diff/MultiPieDataSetFieldsPane.java | 8 +++++++- .../java/com/fr/design/chartx/single/DataSetPane.java | 5 +++-- 5 files changed, 35 insertions(+), 6 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/chartx/component/MultiComboBoxPane.java b/designer-chart/src/main/java/com/fr/design/chartx/component/MultiComboBoxPane.java index f1716a0ae..2ed4b10ff 100644 --- a/designer-chart/src/main/java/com/fr/design/chartx/component/MultiComboBoxPane.java +++ b/designer-chart/src/main/java/com/fr/design/chartx/component/MultiComboBoxPane.java @@ -14,10 +14,16 @@ import java.util.List; public class MultiComboBoxPane extends AbstractMultiComponentPane { private List currentBoxItems = new ArrayList(); + private boolean hasUse = false; + public void setCurrentBoxItems(List currentBoxItems) { this.currentBoxItems = currentBoxItems; } + public void setHasUse(boolean hasUse) { + this.hasUse = hasUse; + } + @Override protected UIComboBox createFirstFieldComponent() { return new UIComboBoxWithNone(); @@ -25,7 +31,9 @@ public class MultiComboBoxPane extends AbstractMultiComponentPane { @Override protected UIComboBox createOtherFieldComponent() { - return new UIComboBox(currentBoxItems.toArray(new Object[currentBoxItems.size()])); + UIComboBox uiComboBox = new UIComboBox(currentBoxItems.toArray(new Object[currentBoxItems.size()])); + uiComboBox.setEnabled(hasUse); + return uiComboBox; } @Override diff --git a/designer-chart/src/main/java/com/fr/design/chartx/component/MultiComboBoxPaneWithUISpinner.java b/designer-chart/src/main/java/com/fr/design/chartx/component/MultiComboBoxPaneWithUISpinner.java index 8b20768e2..1b77d163e 100644 --- a/designer-chart/src/main/java/com/fr/design/chartx/component/MultiComboBoxPaneWithUISpinner.java +++ b/designer-chart/src/main/java/com/fr/design/chartx/component/MultiComboBoxPaneWithUISpinner.java @@ -13,6 +13,8 @@ import java.util.List; public class MultiComboBoxPaneWithUISpinner extends AbstractMultiComponentPaneWithUISpinner { private List currentBoxList = new ArrayList(); + private boolean hasUse = false; + @Override protected void initComps() { currentBoxList = new ArrayList(); @@ -23,9 +25,15 @@ public class MultiComboBoxPaneWithUISpinner extends AbstractMultiComponentPaneWi this.currentBoxList = currentBoxList; } + public void setHasUse(boolean hasUse) { + this.hasUse = hasUse; + } + @Override protected UIComboBox createJComponent() { - return new UIComboBox(currentBoxList.toArray(new Object[currentBoxList.size()])); + UIComboBox uiComboBox = new UIComboBox(currentBoxList.toArray(new Object[currentBoxList.size()])); + uiComboBox.setEnabled(hasUse); + return uiComboBox; } @Override diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/MultiCategoryDataSetFieldsPane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/MultiCategoryDataSetFieldsPane.java index 911db920c..b028a0b55 100644 --- a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/MultiCategoryDataSetFieldsPane.java +++ b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/MultiCategoryDataSetFieldsPane.java @@ -9,8 +9,8 @@ import com.fr.design.gui.icombobox.UIComboBox; import javax.swing.BorderFactory; import javax.swing.JPanel; import javax.swing.JSeparator; -import java.awt.BorderLayout; import java.util.List; +import java.awt.BorderLayout; /** @@ -49,6 +49,12 @@ public class MultiCategoryDataSetFieldsPane extends AbstractDataSetFieldsWithSer return list.toArray(new UIComboBox[list.size()]); } + @Override + public void checkBoxUse(boolean hasUse) { + super.checkBoxUse(hasUse); + multiCategoryPane.setHasUse(hasUse); + } + @Override public void refreshBoxListWithSelectTableData(List columnNameList) { super.refreshBoxListWithSelectTableData(columnNameList); diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/MultiPieDataSetFieldsPane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/MultiPieDataSetFieldsPane.java index e18686616..26f623e37 100644 --- a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/MultiPieDataSetFieldsPane.java +++ b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/MultiPieDataSetFieldsPane.java @@ -16,9 +16,9 @@ import javax.swing.BorderFactory; import javax.swing.JPanel; import javax.swing.JSeparator; import javax.swing.SwingConstants; +import java.util.List; import java.awt.BorderLayout; import java.awt.Component; -import java.util.List; /** * Created by shine on 2019/6/18. @@ -90,6 +90,12 @@ public class MultiPieDataSetFieldsPane extends AbstractDataSetFieldsPane { this.setLayout(new BorderLayout()); this.add(tableDataPane, BorderLayout.NORTH); this.add(dataSetFieldsPane, BorderLayout.CENTER); + checkBoxUse(); } /** From 18f0756d586e39d3e32907f14b3f2cd3b6226010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com> Date: Wed, 27 Nov 2019 17:25:52 +0800 Subject: [PATCH 07/11] =?UTF-8?q?CHART-11446=20=E6=9C=AA=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E7=81=B0=E5=8C=96=E4=BA=86combox?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chartx/component/AbstractMultiComponentPane.java | 8 ++++++-- .../AbstractMultiComponentPaneWithUISpinner.java | 8 ++++++-- .../fr/design/chartx/component/MultiComboBoxPane.java | 9 +-------- .../component/MultiComboBoxPaneWithUISpinner.java | 10 +--------- .../chartx/fields/AbstractDataSetFieldsPane.java | 6 +++--- .../fields/diff/MultiCategoryDataSetFieldsPane.java | 2 +- .../chartx/fields/diff/MultiPieDataSetFieldsPane.java | 2 +- 7 files changed, 19 insertions(+), 26 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractMultiComponentPane.java b/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractMultiComponentPane.java index 6474cad0b..f82e4b253 100644 --- a/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractMultiComponentPane.java +++ b/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractMultiComponentPane.java @@ -10,13 +10,13 @@ import com.fr.general.IOUtils; import javax.swing.BoxLayout; import javax.swing.JComponent; import javax.swing.JPanel; +import java.util.ArrayList; +import java.util.List; import java.awt.BorderLayout; import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.util.ArrayList; -import java.util.List; /** @@ -168,4 +168,8 @@ public abstract class AbstractMultiComponentPane extends J updateField(comboBox, temp); } } + + public void checkEnable(boolean hasUse){ + addButton.setEnabled(hasUse); + } } diff --git a/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractMultiComponentPaneWithUISpinner.java b/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractMultiComponentPaneWithUISpinner.java index 5f0e6500b..f784c4a86 100644 --- a/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractMultiComponentPaneWithUISpinner.java +++ b/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractMultiComponentPaneWithUISpinner.java @@ -11,10 +11,10 @@ import com.fr.stable.AssistUtils; import javax.swing.JComponent; import javax.swing.JPanel; -import java.awt.BorderLayout; -import java.awt.Component; import java.util.ArrayList; import java.util.List; +import java.awt.BorderLayout; +import java.awt.Component; /** * Created by shine on 2019/6/18. @@ -148,4 +148,8 @@ public abstract class AbstractMultiComponentPaneWithUISpinner { private List currentBoxItems = new ArrayList(); - private boolean hasUse = false; public void setCurrentBoxItems(List currentBoxItems) { this.currentBoxItems = currentBoxItems; } - public void setHasUse(boolean hasUse) { - this.hasUse = hasUse; - } - @Override protected UIComboBox createFirstFieldComponent() { return new UIComboBoxWithNone(); @@ -31,9 +26,7 @@ public class MultiComboBoxPane extends AbstractMultiComponentPane { @Override protected UIComboBox createOtherFieldComponent() { - UIComboBox uiComboBox = new UIComboBox(currentBoxItems.toArray(new Object[currentBoxItems.size()])); - uiComboBox.setEnabled(hasUse); - return uiComboBox; + return new UIComboBox(currentBoxItems.toArray(new Object[currentBoxItems.size()])); } @Override diff --git a/designer-chart/src/main/java/com/fr/design/chartx/component/MultiComboBoxPaneWithUISpinner.java b/designer-chart/src/main/java/com/fr/design/chartx/component/MultiComboBoxPaneWithUISpinner.java index 1b77d163e..8b20768e2 100644 --- a/designer-chart/src/main/java/com/fr/design/chartx/component/MultiComboBoxPaneWithUISpinner.java +++ b/designer-chart/src/main/java/com/fr/design/chartx/component/MultiComboBoxPaneWithUISpinner.java @@ -13,8 +13,6 @@ import java.util.List; public class MultiComboBoxPaneWithUISpinner extends AbstractMultiComponentPaneWithUISpinner { private List currentBoxList = new ArrayList(); - private boolean hasUse = false; - @Override protected void initComps() { currentBoxList = new ArrayList(); @@ -25,15 +23,9 @@ public class MultiComboBoxPaneWithUISpinner extends AbstractMultiComponentPaneWi this.currentBoxList = currentBoxList; } - public void setHasUse(boolean hasUse) { - this.hasUse = hasUse; - } - @Override protected UIComboBox createJComponent() { - UIComboBox uiComboBox = new UIComboBox(currentBoxList.toArray(new Object[currentBoxList.size()])); - uiComboBox.setEnabled(hasUse); - return uiComboBox; + return new UIComboBox(currentBoxList.toArray(new Object[currentBoxList.size()])); } @Override diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/AbstractDataSetFieldsPane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/AbstractDataSetFieldsPane.java index 82cc89a62..9e8848ebc 100644 --- a/designer-chart/src/main/java/com/fr/design/chartx/fields/AbstractDataSetFieldsPane.java +++ b/designer-chart/src/main/java/com/fr/design/chartx/fields/AbstractDataSetFieldsPane.java @@ -17,10 +17,10 @@ import com.fr.stable.StringUtils; import javax.swing.BorderFactory; import javax.swing.JPanel; import javax.swing.SwingConstants; -import java.awt.BorderLayout; -import java.awt.Component; import java.util.Arrays; import java.util.List; +import java.awt.BorderLayout; +import java.awt.Component; import static com.fr.design.mainframe.chart.gui.data.table.DataPaneHelper.refreshBoxItems; @@ -95,7 +95,7 @@ public abstract class AbstractDataSetFieldsPane Date: Wed, 27 Nov 2019 17:34:50 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1,=20sonar?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/chartx/CustomChartDataPane.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/chartx/CustomChartDataPane.java b/designer-chart/src/main/java/com/fr/design/chartx/CustomChartDataPane.java index 9ff8fd28c..197a1c1c9 100644 --- a/designer-chart/src/main/java/com/fr/design/chartx/CustomChartDataPane.java +++ b/designer-chart/src/main/java/com/fr/design/chartx/CustomChartDataPane.java @@ -41,6 +41,9 @@ import java.util.Map; */ public class CustomChartDataPane extends ChartDataPane { + private static final int HGAP = 0; + private static final int VGAP = 6; + public CustomChartDataPane(AttributeChangeListener listener) { super(listener); } @@ -93,9 +96,11 @@ public class CustomChartDataPane extends ChartDataPane { case BUBBLE: return new SingleDataPane(new ScatterDataSetFieldsPane(), new ScatterCellDataFieldsPane()); default: - return StringUtils.equals(CustomStyle.CUSTOM.toString(), plot.getCustomType()) ? - new SingleDataPane(new SingleCategoryDataSetFieldsPane(), new SingleCategoryCellDataFieldsPane()) : - new SingleDataPane(new MultiCategoryDataSetFieldsPane(), new MultiCategoryCellDataFieldsPane()); + if (StringUtils.equals(CustomStyle.CUSTOM.toString(), plot.getCustomType())){ + return new SingleDataPane(new SingleCategoryDataSetFieldsPane(), new SingleCategoryCellDataFieldsPane()); + } else { + return new SingleDataPane(new MultiCategoryDataSetFieldsPane(), new MultiCategoryCellDataFieldsPane()); + } } } @@ -147,7 +152,7 @@ public class CustomChartDataPane extends ChartDataPane { JPanel tabPanel = new JPanel(new BorderLayout()); tabPanel.setBorder(BorderFactory.createMatteBorder(0, 0, 0, 0, getBackground())); tabPanel.add(tabPane, BorderLayout.CENTER); - this.setLayout(new BorderLayout(0, 6)); + this.setLayout(new BorderLayout(HGAP, VGAP)); this.add(tabPanel, BorderLayout.NORTH); this.add(centerPane, BorderLayout.CENTER); } From 2931612965e6308780ebc3df03c0b0a6a4887dc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com> Date: Thu, 28 Nov 2019 10:50:00 +0800 Subject: [PATCH 09/11] =?UTF-8?q?CHART-11286=20=E6=95=B0=E6=8D=AE=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chartx/component/AbstractSingleFilterPane.java | 9 +++++++-- .../chartx/component/CategorySeriesFilterPane.java | 9 +++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractSingleFilterPane.java b/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractSingleFilterPane.java index 487c6cf13..187dd2547 100644 --- a/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractSingleFilterPane.java +++ b/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractSingleFilterPane.java @@ -20,6 +20,7 @@ import javax.swing.event.ChangeListener; import java.awt.BorderLayout; import java.awt.Component; import java.awt.Dimension; +import java.awt.Label; /** * Created by shine on 2019/07/18. @@ -76,7 +77,7 @@ public abstract class AbstractSingleFilterPane extends AbstractChartTabPane Date: Thu, 28 Nov 2019 14:53:20 +0800 Subject: [PATCH 10/11] =?UTF-8?q?CHART-11610=20=E9=A5=BC=E5=9B=BE=E3=80=81?= =?UTF-8?q?=E5=A4=9A=E6=8C=87=E9=92=88=E4=BB=AA=E8=A1=A8=E7=9B=98=20?= =?UTF-8?q?=E5=9C=A8=E7=BB=84=E5=90=88=E5=9B=BE=E4=B8=AD=20=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=88=86=E7=B1=BB=E9=85=8D=E7=BD=AE=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/chartx/CustomChartDataPane.java | 8 +++++ .../diff/SeriesValueCellDataFieldsPane.java | 35 +++++++++++++++++++ .../diff/SeriesValueDataSetFieldsPane.java | 35 +++++++++++++++++++ 3 files changed, 78 insertions(+) create mode 100644 designer-chart/src/main/java/com/fr/design/chartx/fields/diff/SeriesValueCellDataFieldsPane.java create mode 100644 designer-chart/src/main/java/com/fr/design/chartx/fields/diff/SeriesValueDataSetFieldsPane.java diff --git a/designer-chart/src/main/java/com/fr/design/chartx/CustomChartDataPane.java b/designer-chart/src/main/java/com/fr/design/chartx/CustomChartDataPane.java index 9ff8fd28c..de2469d5b 100644 --- a/designer-chart/src/main/java/com/fr/design/chartx/CustomChartDataPane.java +++ b/designer-chart/src/main/java/com/fr/design/chartx/CustomChartDataPane.java @@ -9,6 +9,8 @@ import com.fr.design.chartx.fields.diff.MultiCategoryCellDataFieldsPane; import com.fr.design.chartx.fields.diff.MultiCategoryDataSetFieldsPane; import com.fr.design.chartx.fields.diff.ScatterCellDataFieldsPane; import com.fr.design.chartx.fields.diff.ScatterDataSetFieldsPane; +import com.fr.design.chartx.fields.diff.SeriesValueCellDataFieldsPane; +import com.fr.design.chartx.fields.diff.SeriesValueDataSetFieldsPane; import com.fr.design.chartx.fields.diff.SingleCategoryCellDataFieldsPane; import com.fr.design.chartx.fields.diff.SingleCategoryDataSetFieldsPane; import com.fr.design.chartx.single.SingleDataPane; @@ -92,6 +94,12 @@ public class CustomChartDataPane extends ChartDataPane { case SCATTER: case BUBBLE: return new SingleDataPane(new ScatterDataSetFieldsPane(), new ScatterCellDataFieldsPane()); + case PIE: + case SAME_PIE: + case DIFFERENT_PIE: + case POINTER_180: + case POINTER_360: + return new SingleDataPane(new SeriesValueDataSetFieldsPane(), new SeriesValueCellDataFieldsPane()); default: return StringUtils.equals(CustomStyle.CUSTOM.toString(), plot.getCustomType()) ? new SingleDataPane(new SingleCategoryDataSetFieldsPane(), new SingleCategoryCellDataFieldsPane()) : diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/SeriesValueCellDataFieldsPane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/SeriesValueCellDataFieldsPane.java new file mode 100644 index 000000000..383bcb3a6 --- /dev/null +++ b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/SeriesValueCellDataFieldsPane.java @@ -0,0 +1,35 @@ +package com.fr.design.chartx.fields.diff; + +import com.fr.chartx.data.field.diff.ColumnFieldCollectionWithSeriesValue; +import com.fr.design.formula.TinyFormulaPane; + +/** + * @author shine + * @version 10.0 + * Created by shine on 2019/11/28 + *

+ * 饼图、多指针仪表盘 在组合图中 没有分类配置项。 + */ +public class SeriesValueCellDataFieldsPane extends AbstractCellDataFieldsWithSeriesValuePane { + @Override + protected String[] fieldLabels() { + return new String[0]; + } + + @Override + protected TinyFormulaPane[] formulaPanes() { + return new TinyFormulaPane[0]; + } + + @Override + public void populateBean(ColumnFieldCollectionWithSeriesValue ob) { + populateSeriesValuePane(ob); + } + + @Override + public ColumnFieldCollectionWithSeriesValue updateBean() { + ColumnFieldCollectionWithSeriesValue columnFieldCollectionWithSeriesValue = new ColumnFieldCollectionWithSeriesValue(); + updateSeriesValuePane(columnFieldCollectionWithSeriesValue); + return columnFieldCollectionWithSeriesValue; + } +} diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/SeriesValueDataSetFieldsPane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/SeriesValueDataSetFieldsPane.java new file mode 100644 index 000000000..7f5120505 --- /dev/null +++ b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/SeriesValueDataSetFieldsPane.java @@ -0,0 +1,35 @@ +package com.fr.design.chartx.fields.diff; + +import com.fr.chartx.data.field.diff.ColumnFieldCollectionWithSeriesValue; +import com.fr.design.gui.icombobox.UIComboBox; + +/** + * @author shine + * @version 10.0 + * Created by shine on 2019/11/28 + *

+ * 饼图、多指针仪表盘 在组合图中 没有分类配置项。 + */ +public class SeriesValueDataSetFieldsPane extends AbstractDataSetFieldsWithSeriesValuePane { + @Override + protected String[] fieldLabels() { + return new String[0]; + } + + @Override + protected UIComboBox[] filedComboBoxes() { + return new UIComboBox[0]; + } + + @Override + public void populateBean(ColumnFieldCollectionWithSeriesValue ob) { + populateSeriesValuePane(ob); + } + + @Override + public ColumnFieldCollectionWithSeriesValue updateBean() { + ColumnFieldCollectionWithSeriesValue columnFieldCollectionWithSeriesValue = new ColumnFieldCollectionWithSeriesValue(); + updateSeriesValuePane(columnFieldCollectionWithSeriesValue); + return columnFieldCollectionWithSeriesValue; + } +} From f0d8bceacc666ab8d63d0fb6c5163b8e5d73a01a Mon Sep 17 00:00:00 2001 From: shine Date: Fri, 29 Nov 2019 16:40:11 +0800 Subject: [PATCH 11/11] =?UTF-8?q?CHART-11610=20=E7=BB=84=E5=90=88=E5=9B=BE?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E9=A5=BC=E5=9B=BE=20=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E5=88=86=E7=B1=BB=20=E7=9B=B4=E6=8E=A5=E7=94=A8funnel=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/chartx/CustomChartDataPane.java | 6 ++-- .../fields/diff/FunnelCellDataFieldsPane.java | 1 + .../fields/diff/FunnelDataSetFieldsPane.java | 1 + .../diff/SeriesValueCellDataFieldsPane.java | 35 ------------------- .../diff/SeriesValueDataSetFieldsPane.java | 35 ------------------- 5 files changed, 5 insertions(+), 73 deletions(-) delete mode 100644 designer-chart/src/main/java/com/fr/design/chartx/fields/diff/SeriesValueCellDataFieldsPane.java delete mode 100644 designer-chart/src/main/java/com/fr/design/chartx/fields/diff/SeriesValueDataSetFieldsPane.java diff --git a/designer-chart/src/main/java/com/fr/design/chartx/CustomChartDataPane.java b/designer-chart/src/main/java/com/fr/design/chartx/CustomChartDataPane.java index 13f0ce545..5396e88e6 100644 --- a/designer-chart/src/main/java/com/fr/design/chartx/CustomChartDataPane.java +++ b/designer-chart/src/main/java/com/fr/design/chartx/CustomChartDataPane.java @@ -3,14 +3,14 @@ package com.fr.design.chartx; import com.fr.chart.chartattr.ChartCollection; import com.fr.chartx.data.AbstractDataDefinition; import com.fr.chartx.data.CustomChartDataDefinition; +import com.fr.design.chartx.fields.diff.FunnelCellDataFieldsPane; +import com.fr.design.chartx.fields.diff.FunnelDataSetFieldsPane; import com.fr.design.chartx.fields.diff.GaugeCellDataFieldsPane; import com.fr.design.chartx.fields.diff.GaugeDataSetFieldsPane; import com.fr.design.chartx.fields.diff.MultiCategoryCellDataFieldsPane; import com.fr.design.chartx.fields.diff.MultiCategoryDataSetFieldsPane; import com.fr.design.chartx.fields.diff.ScatterCellDataFieldsPane; import com.fr.design.chartx.fields.diff.ScatterDataSetFieldsPane; -import com.fr.design.chartx.fields.diff.SeriesValueCellDataFieldsPane; -import com.fr.design.chartx.fields.diff.SeriesValueDataSetFieldsPane; import com.fr.design.chartx.fields.diff.SingleCategoryCellDataFieldsPane; import com.fr.design.chartx.fields.diff.SingleCategoryDataSetFieldsPane; import com.fr.design.chartx.single.SingleDataPane; @@ -102,7 +102,7 @@ public class CustomChartDataPane extends ChartDataPane { case DIFFERENT_PIE: case POINTER_180: case POINTER_360: - return new SingleDataPane(new SeriesValueDataSetFieldsPane(), new SeriesValueCellDataFieldsPane()); + return new SingleDataPane(new FunnelDataSetFieldsPane(), new FunnelCellDataFieldsPane()); default: if (StringUtils.equals(CustomStyle.CUSTOM.toString(), plot.getCustomType())){ return new SingleDataPane(new SingleCategoryDataSetFieldsPane(), new SingleCategoryCellDataFieldsPane()); diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/FunnelCellDataFieldsPane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/FunnelCellDataFieldsPane.java index 5d9aaf7b0..c1766576c 100644 --- a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/FunnelCellDataFieldsPane.java +++ b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/FunnelCellDataFieldsPane.java @@ -13,6 +13,7 @@ import java.awt.BorderLayout; /** * Created by Wim on 2019/10/23. + * 饼图、多指针仪表盘 在组合图中 没有分类配置项, 也用这个。 */ public class FunnelCellDataFieldsPane extends AbstractCellDataFieldsWithSeriesValuePane { diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/FunnelDataSetFieldsPane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/FunnelDataSetFieldsPane.java index aa1c9fe28..ee15e3945 100644 --- a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/FunnelDataSetFieldsPane.java +++ b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/FunnelDataSetFieldsPane.java @@ -14,6 +14,7 @@ import java.awt.BorderLayout; /** * Created by Wim on 2019/10/23. + * 饼图、多指针仪表盘 在组合图中 没有分类配置项, 也用这个。 */ public class FunnelDataSetFieldsPane extends AbstractDataSetFieldsWithSeriesValuePane { diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/SeriesValueCellDataFieldsPane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/SeriesValueCellDataFieldsPane.java deleted file mode 100644 index 383bcb3a6..000000000 --- a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/SeriesValueCellDataFieldsPane.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.fr.design.chartx.fields.diff; - -import com.fr.chartx.data.field.diff.ColumnFieldCollectionWithSeriesValue; -import com.fr.design.formula.TinyFormulaPane; - -/** - * @author shine - * @version 10.0 - * Created by shine on 2019/11/28 - *

- * 饼图、多指针仪表盘 在组合图中 没有分类配置项。 - */ -public class SeriesValueCellDataFieldsPane extends AbstractCellDataFieldsWithSeriesValuePane { - @Override - protected String[] fieldLabels() { - return new String[0]; - } - - @Override - protected TinyFormulaPane[] formulaPanes() { - return new TinyFormulaPane[0]; - } - - @Override - public void populateBean(ColumnFieldCollectionWithSeriesValue ob) { - populateSeriesValuePane(ob); - } - - @Override - public ColumnFieldCollectionWithSeriesValue updateBean() { - ColumnFieldCollectionWithSeriesValue columnFieldCollectionWithSeriesValue = new ColumnFieldCollectionWithSeriesValue(); - updateSeriesValuePane(columnFieldCollectionWithSeriesValue); - return columnFieldCollectionWithSeriesValue; - } -} diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/SeriesValueDataSetFieldsPane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/SeriesValueDataSetFieldsPane.java deleted file mode 100644 index 7f5120505..000000000 --- a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/SeriesValueDataSetFieldsPane.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.fr.design.chartx.fields.diff; - -import com.fr.chartx.data.field.diff.ColumnFieldCollectionWithSeriesValue; -import com.fr.design.gui.icombobox.UIComboBox; - -/** - * @author shine - * @version 10.0 - * Created by shine on 2019/11/28 - *

- * 饼图、多指针仪表盘 在组合图中 没有分类配置项。 - */ -public class SeriesValueDataSetFieldsPane extends AbstractDataSetFieldsWithSeriesValuePane { - @Override - protected String[] fieldLabels() { - return new String[0]; - } - - @Override - protected UIComboBox[] filedComboBoxes() { - return new UIComboBox[0]; - } - - @Override - public void populateBean(ColumnFieldCollectionWithSeriesValue ob) { - populateSeriesValuePane(ob); - } - - @Override - public ColumnFieldCollectionWithSeriesValue updateBean() { - ColumnFieldCollectionWithSeriesValue columnFieldCollectionWithSeriesValue = new ColumnFieldCollectionWithSeriesValue(); - updateSeriesValuePane(columnFieldCollectionWithSeriesValue); - return columnFieldCollectionWithSeriesValue; - } -}