From abb50755024d02b78d3d645097110db00e9997d1 Mon Sep 17 00:00:00 2001 From: "shengzu.xue" Date: Tue, 7 Jan 2025 17:22:32 +0800 Subject: [PATCH 01/10] =?UTF-8?q?REPORT-144631=20-=E5=9B=BE=E8=A1=A8?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=87=AA=E5=8A=A8=E6=8E=A8=E8=8D=90UI?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/chart/AutoChartTypePane.java | 32 +++++++++++++++++-- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java b/designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java index 4aaf6a0281..925595dc17 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java @@ -1,9 +1,10 @@ package com.fr.design.chart; +import com.fine.theme.utils.FineUIScale; +import com.fine.theme.utils.FineUIUtils; import com.fr.base.chart.chartdata.CallbackEvent; import com.fr.chart.chartattr.ChartCollection; import com.fr.design.chart.auto.AutoTypeCalculate; -import com.fr.design.data.DesignTableDataManager; import com.fr.design.data.datapane.TableDataComboBox; import com.fr.design.data.tabledata.wrapper.TableDataWrapper; import com.fr.design.dialog.FineJOptionPane; @@ -39,6 +40,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.CancellationException; import java.awt.Color; +import java.awt.BorderLayout; import java.awt.Component; import java.awt.Dimension; import java.awt.event.ActionEvent; @@ -58,7 +60,7 @@ public class AutoChartTypePane extends ChartWizardPane implements CallbackEvent private UIButton refreshButton; private TableDataComboBox tableNameComboBox; - private UIComboCheckBox dataFieldBox; + private DataFieldComboBox dataFieldBox; private AutoProgressBar connectionBar; private SwingWorker worker; @@ -93,6 +95,29 @@ public class AutoChartTypePane extends ChartWizardPane implements CallbackEvent this.add(splitPane); } + private class DataFieldComboBox extends UIComboCheckBox { + public DataFieldComboBox(Object[] value) { + super(value); + } + @Override + protected void setLayoutAndAddComponents() { + // 使用BorderLayout 将ClickPane添加到中心，不然受到FineComboBoxUI影响会有两个下拉箭头按钮 + this.setLayout(FRGUIPaneFactory.createBorderLayout()); + JPanel pane = getClickPane(); + pane.setOpaque(false); + this.add(pane, BorderLayout.CENTER); + } + @Override + public Dimension getPreferredSize() { + // 这里大小设计要和TableDataComboBox保持一致，不然两个多选框会有大小差异 + int renderFix = FineUIScale.scale(5); + int comboHeight = FineUIUtils.getAndScaleInt("ComboBox.comboHeight", 24); + return new Dimension(super.getPreferredSize().width + renderFix, comboHeight); + } + + } + + ListCellRenderer iconCellRenderer = new DefaultListCellRenderer() { public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); @@ -125,13 +150,14 @@ public class AutoChartTypePane extends ChartWizardPane implements CallbackEvent panel.add(areaNamePane); areaNamePane.add(new UILabel(Toolkit.i18nText("Fine-Design_Chart_Data_Field") + ":")); areaNamePane.add(dataFieldBox); + dataFieldBox.setPreferredSize(new Dimension(126, 20)); panel.add(refreshButton); panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0)); return panel; } private void initButtonGroup() { - dataFieldBox = new UIComboCheckBox(new Object[0]); + dataFieldBox = new DataFieldComboBox(new Object[0]); dataFieldBox.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { From 04f44fa9c376b8ab43e4332f3f63cb5b9009e971 Mon Sep 17 00:00:00 2001 From: "shengzu.xue" Date: Wed, 8 Jan 2025 10:13:24 +0800 Subject: [PATCH 02/10] =?UTF-8?q?REPORT-144631=20=E8=B0=83=E6=95=B4AutoCha?= =?UTF-8?q?rtTypePane=20DataFieldComboBox=20=E7=9A=84=E5=AE=BD=E5=BA=A6?= =?UTF-8?q?=E7=BC=A9=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/chart/AutoChartTypePane.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java b/designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java index 925595dc17..3c28c71fde 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java @@ -110,9 +110,9 @@ public class AutoChartTypePane extends ChartWizardPane implements CallbackEvent @Override public Dimension getPreferredSize() { // 这里大小设计要和TableDataComboBox保持一致，不然两个多选框会有大小差异 - int renderFix = FineUIScale.scale(5); + int comboWidth = FineUIScale.scale(super.getPreferredSize().width); int comboHeight = FineUIUtils.getAndScaleInt("ComboBox.comboHeight", 24); - return new Dimension(super.getPreferredSize().width + renderFix, comboHeight); + return new Dimension(comboWidth, comboHeight); } } From 015a323e0c30561ddc8c7f2b32f14aa167506017 Mon Sep 17 00:00:00 2001 From: "shengzu.xue" Date: Wed, 8 Jan 2025 14:10:43 +0800 Subject: [PATCH 03/10] =?UTF-8?q?REPORT-144631=20=E8=B0=83=E6=95=B4AutoCha?= =?UTF-8?q?rtTypePane=20combobox=E7=BC=A9=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/chart/AutoChartTypePane.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java b/designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java index 3c28c71fde..13257debaa 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java @@ -110,9 +110,8 @@ public class AutoChartTypePane extends ChartWizardPane implements CallbackEvent @Override public Dimension getPreferredSize() { // 这里大小设计要和TableDataComboBox保持一致，不然两个多选框会有大小差异 - int comboWidth = FineUIScale.scale(super.getPreferredSize().width); int comboHeight = FineUIUtils.getAndScaleInt("ComboBox.comboHeight", 24); - return new Dimension(comboWidth, comboHeight); + return new Dimension(super.getPreferredSize().width, comboHeight); } } @@ -139,18 +138,17 @@ public class AutoChartTypePane extends ChartWizardPane implements CallbackEvent private JPanel createContentPane() { JPanel panel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - JPanel tableDataPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); panel.add(tableDataPane); tableDataPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Chart_Table_Data") + ":")); - tableNameComboBox.setPreferredSize(new Dimension(126, 20)); + tableNameComboBox.setPreferredSize(new Dimension(FineUIScale.scale(126), FineUIScale.scale(20))); tableDataPane.add(tableNameComboBox); JPanel areaNamePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); panel.add(areaNamePane); areaNamePane.add(new UILabel(Toolkit.i18nText("Fine-Design_Chart_Data_Field") + ":")); areaNamePane.add(dataFieldBox); - dataFieldBox.setPreferredSize(new Dimension(126, 20)); + dataFieldBox.setPreferredSize(new Dimension(FineUIScale.scale(126), FineUIScale.scale(20))); panel.add(refreshButton); panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0)); return panel; From 431673d68eca95e4d6368c0cb8882d0bf2ca80cc Mon Sep 17 00:00:00 2001 From: "shengzu.xue" Date: Wed, 8 Jan 2025 16:37:59 +0800 Subject: [PATCH 04/10] =?UTF-8?q?REPORT-144631=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/chart/AutoChartTypePane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java b/designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java index 13257debaa..947fafa398 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java @@ -101,7 +101,7 @@ public class AutoChartTypePane extends ChartWizardPane implements CallbackEvent } @Override protected void setLayoutAndAddComponents() { - // 使用BorderLayout 将ClickPane添加到中心，不然受到FineComboBoxUI影响会有两个下拉箭头按钮 + // 使用BorderLayout 将ClickPane添加到中心，不然受到FlatComboBoxUI影响会有两个下拉箭头按钮 this.setLayout(FRGUIPaneFactory.createBorderLayout()); JPanel pane = getClickPane(); pane.setOpaque(false); From 8616097d73d2c01502194d07784772f08d3db546 Mon Sep 17 00:00:00 2001 From: "shengzu.xue" Date: Mon, 13 Jan 2025 17:58:23 +0800 Subject: [PATCH 05/10] =?UTF-8?q?REPORT-144631=20checkbox=E4=BD=BF?= =?UTF-8?q?=E7=94=A8row=E6=9D=A5=E5=B8=83=E5=B1=80=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Conflicts: # designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java --- .../src/main/java/com/fr/design/chart/AutoChartTypePane.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java b/designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java index 947fafa398..a390d3fb53 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java @@ -48,6 +48,8 @@ import java.awt.event.ActionListener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; +import static com.fine.swing.ui.layout.Layouts.*; + /** * @author Bjorn * @version 10.0 @@ -156,6 +158,7 @@ public class AutoChartTypePane extends ChartWizardPane implements CallbackEvent private void initButtonGroup() { dataFieldBox = new DataFieldComboBox(new Object[0]); + dataFieldBox.getClickPane().setOpaque(false); dataFieldBox.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { From ec849970e4991add6219358f051285b3c8409161 Mon Sep 17 00:00:00 2001 From: "shengzu.xue" Date: Mon, 13 Jan 2025 18:06:01 +0800 Subject: [PATCH 06/10] =?UTF-8?q?REPORT-144631=20AutoChartTypePane=20?= =?UTF-8?q?=E4=B8=AD=E7=9A=84DataFieldComboBox?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/chart/AutoChartTypePane.java | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java b/designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java index a390d3fb53..ece856eadc 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java @@ -138,22 +138,22 @@ public class AutoChartTypePane extends ChartWizardPane implements CallbackEvent } }; + private JPanel createContentPane() { - JPanel panel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - JPanel tableDataPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - panel.add(tableDataPane); - tableDataPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Chart_Table_Data") + ":")); - tableNameComboBox.setPreferredSize(new Dimension(FineUIScale.scale(126), FineUIScale.scale(20))); - tableDataPane.add(tableNameComboBox); - - JPanel areaNamePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - panel.add(areaNamePane); - areaNamePane.add(new UILabel(Toolkit.i18nText("Fine-Design_Chart_Data_Field") + ":")); - areaNamePane.add(dataFieldBox); - dataFieldBox.setPreferredSize(new Dimension(FineUIScale.scale(126), FineUIScale.scale(20))); - panel.add(refreshButton); - panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0)); - return panel; + JPanel contentPane = new JPanel(new BorderLayout()); + contentPane.add(column( + row(10, + flex().weight(0.1), + cell(new UILabel(Toolkit.i18nText("Fine-Design_Chart_Table_Data") + ":")).weight(1), + cell(tableNameComboBox).weight(3), + cell(new UILabel(Toolkit.i18nText("Fine-Design_Chart_Data_Field") + ":")).weight(1.3), + cell(dataFieldBox).weight(3), + cell(refreshButton).weight(1.5), + flex(3) + ).with(it -> it.setPreferredSize(new Dimension(super.getPreferredSize().width, FineUIScale.scale(tableNameComboBox.getPreferredSize().height)))) + ).getComponent()); + contentPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0)); + return contentPane; } private void initButtonGroup() { From 81284ba66e40f937be1d55360ee95ffc0d85972e Mon Sep 17 00:00:00 2001 From: "shengzu.xue" Date: Mon, 13 Jan 2025 18:12:19 +0800 Subject: [PATCH 07/10] =?UTF-8?q?REPORT-144631=20=E4=BC=98=E5=8C=96import?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/chart/AutoChartTypePane.java | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java b/designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java index ece856eadc..011f31f506 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java @@ -1,7 +1,7 @@ package com.fr.design.chart; import com.fine.theme.utils.FineUIScale; -import com.fine.theme.utils.FineUIUtils; +import com.fine.swing.ui.layout.Layouts; import com.fr.base.chart.chartdata.CallbackEvent; import com.fr.chart.chartattr.ChartCollection; import com.fr.design.chart.auto.AutoTypeCalculate; @@ -48,7 +48,6 @@ import java.awt.event.ActionListener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; -import static com.fine.swing.ui.layout.Layouts.*; /** * @author Bjorn @@ -141,15 +140,15 @@ public class AutoChartTypePane extends ChartWizardPane implements CallbackEvent private JPanel createContentPane() { JPanel contentPane = new JPanel(new BorderLayout()); - contentPane.add(column( - row(10, - flex().weight(0.1), - cell(new UILabel(Toolkit.i18nText("Fine-Design_Chart_Table_Data") + ":")).weight(1), - cell(tableNameComboBox).weight(3), - cell(new UILabel(Toolkit.i18nText("Fine-Design_Chart_Data_Field") + ":")).weight(1.3), - cell(dataFieldBox).weight(3), - cell(refreshButton).weight(1.5), - flex(3) + contentPane.add(Layouts.column( + Layouts.row(10, + Layouts.flex().weight(0.1), + Layouts.cell(new UILabel(Toolkit.i18nText("Fine-Design_Chart_Table_Data") + ":")).weight(1), + Layouts.cell(tableNameComboBox).weight(3), + Layouts.cell(new UILabel(Toolkit.i18nText("Fine-Design_Chart_Data_Field") + ":")).weight(1.3), + Layouts.cell(dataFieldBox).weight(3), + Layouts.cell(refreshButton).weight(1.5), + Layouts.flex(3) ).with(it -> it.setPreferredSize(new Dimension(super.getPreferredSize().width, FineUIScale.scale(tableNameComboBox.getPreferredSize().height)))) ).getComponent()); contentPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0)); From 0c6ce3af338544deccb78ba8ed379c673d2d7afc Mon Sep 17 00:00:00 2001 From: "shengzu.xue" Date: Thu, 16 Jan 2025 09:56:00 +0800 Subject: [PATCH 08/10] =?UTF-8?q?REPORT-144631=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E8=87=AA=E5=8A=A8=E7=B1=BB=E5=9E=8B=E6=8E=A8?= =?UTF-8?q?=E8=8D=90=E5=B8=83=E5=B1=80=EF=BC=8C=E4=BF=AE=E6=94=B9=E9=83=A8?= =?UTF-8?q?=E5=88=86icon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../images/m_insert/auto_chart_disabled.svg | 6 ++++ .../images/m_insert/auto_chart_normal.svg | 6 ++++ .../fr/design/chart/AutoChartTypePane.java | 34 +++++++++++-------- .../type/AbstractVanChartTypePane.java | 3 +- .../insert/cell/AutoChartCellAction.java | 3 +- .../insert/flot/AutoChartFloatAction.java | 2 +- 6 files changed, 36 insertions(+), 18 deletions(-) create mode 100644 designer-base/src/main/resources/com/fr/design/images/m_insert/auto_chart_disabled.svg create mode 100644 designer-base/src/main/resources/com/fr/design/images/m_insert/auto_chart_normal.svg diff --git a/designer-base/src/main/resources/com/fr/design/images/m_insert/auto_chart_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/m_insert/auto_chart_disabled.svg new file mode 100644 index 0000000000..565ad5c907 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/images/m_insert/auto_chart_disabled.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_insert/auto_chart_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_insert/auto_chart_normal.svg new file mode 100644 index 0000000000..2361fbbd55 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/images/m_insert/auto_chart_normal.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java b/designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java index 011f31f506..60fd80e4e0 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java @@ -1,7 +1,7 @@ package com.fr.design.chart; -import com.fine.theme.utils.FineUIScale; -import com.fine.swing.ui.layout.Layouts; +import com.fine.theme.utils.FineUIStyle; +import com.fine.theme.utils.FineUIUtils; import com.fr.base.chart.chartdata.CallbackEvent; import com.fr.chart.chartattr.ChartCollection; import com.fr.design.chart.auto.AutoTypeCalculate; @@ -19,6 +19,7 @@ import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.GeneralUtils; import com.fr.log.FineLoggerFactory; import com.fr.plugin.chart.vanchart.VanChart; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import javax.swing.BorderFactory; import javax.swing.DefaultListCellRenderer; @@ -48,6 +49,10 @@ import java.awt.event.ActionListener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.column; /** * @author Bjorn @@ -140,18 +145,18 @@ public class AutoChartTypePane extends ChartWizardPane implements CallbackEvent private JPanel createContentPane() { JPanel contentPane = new JPanel(new BorderLayout()); - contentPane.add(Layouts.column( - Layouts.row(10, - Layouts.flex().weight(0.1), - Layouts.cell(new UILabel(Toolkit.i18nText("Fine-Design_Chart_Table_Data") + ":")).weight(1), - Layouts.cell(tableNameComboBox).weight(3), - Layouts.cell(new UILabel(Toolkit.i18nText("Fine-Design_Chart_Data_Field") + ":")).weight(1.3), - Layouts.cell(dataFieldBox).weight(3), - Layouts.cell(refreshButton).weight(1.5), - Layouts.flex(3) - ).with(it -> it.setPreferredSize(new Dimension(super.getPreferredSize().width, FineUIScale.scale(tableNameComboBox.getPreferredSize().height)))) - ).getComponent()); - contentPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0)); + contentPane.add(column( + row(10, + cell(new UILabel(Toolkit.i18nText("Fine-Design_Chart_Table_Data"))), + cell(tableNameComboBox).weight(1), + cell(new UILabel(Toolkit.i18nText("Fine-Design_Chart_Data_Field"))), + cell(dataFieldBox).weight(1), + cell(refreshButton), + flex(1) + ), + flex() + ).with(it -> it.setBorder(new ScaledEmptyBorder(10, 10, 10, 10))).getComponent()); + return contentPane; } @@ -206,6 +211,7 @@ public class AutoChartTypePane extends ChartWizardPane implements CallbackEvent private void initRefreshLabel() { refreshButton = new UIButton(Toolkit.i18nText("Fine-Design_Chart_Recommend")); + FineUIStyle.setStyle(refreshButton, FineUIStyle.STYLE_PRIMARY); refreshButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java index ef58809795..fcc27ee301 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java @@ -2,6 +2,7 @@ package com.fr.van.chart.designer.type; import com.fr.base.BaseUtils; import com.fr.base.chart.chartdata.TopDefinitionProvider; +import com.fr.base.svg.IconUtils; import com.fr.chart.base.AttrFillStyle; import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Legend; @@ -61,7 +62,7 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane Date: Thu, 16 Jan 2025 10:22:11 +0800 Subject: [PATCH 09/10] =?UTF-8?q?REPORT-144631=20=E6=94=BE=E5=BC=83?= =?UTF-8?q?=E5=AF=B9=E4=BA=8EUIComboCheckBox=E7=9B=B8=E5=85=B3=E7=9A=84?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/chart/AutoChartTypePane.java | 26 ++----------------- 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java b/designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java index 60fd80e4e0..2e07a6e1ae 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java @@ -1,7 +1,6 @@ package com.fr.design.chart; import com.fine.theme.utils.FineUIStyle; -import com.fine.theme.utils.FineUIUtils; import com.fr.base.chart.chartdata.CallbackEvent; import com.fr.chart.chartattr.ChartCollection; import com.fr.design.chart.auto.AutoTypeCalculate; @@ -66,7 +65,7 @@ public class AutoChartTypePane extends ChartWizardPane implements CallbackEvent private UIButton refreshButton; private TableDataComboBox tableNameComboBox; - private DataFieldComboBox dataFieldBox; + private UIComboCheckBox dataFieldBox; private AutoProgressBar connectionBar; private SwingWorker worker; @@ -101,27 +100,6 @@ public class AutoChartTypePane extends ChartWizardPane implements CallbackEvent this.add(splitPane); } - private class DataFieldComboBox extends UIComboCheckBox { - public DataFieldComboBox(Object[] value) { - super(value); - } - @Override - protected void setLayoutAndAddComponents() { - // 使用BorderLayout 将ClickPane添加到中心，不然受到FlatComboBoxUI影响会有两个下拉箭头按钮 - this.setLayout(FRGUIPaneFactory.createBorderLayout()); - JPanel pane = getClickPane(); - pane.setOpaque(false); - this.add(pane, BorderLayout.CENTER); - } - @Override - public Dimension getPreferredSize() { - // 这里大小设计要和TableDataComboBox保持一致，不然两个多选框会有大小差异 - int comboHeight = FineUIUtils.getAndScaleInt("ComboBox.comboHeight", 24); - return new Dimension(super.getPreferredSize().width, comboHeight); - } - - } - ListCellRenderer iconCellRenderer = new DefaultListCellRenderer() { public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { @@ -161,7 +139,7 @@ public class AutoChartTypePane extends ChartWizardPane implements CallbackEvent } private void initButtonGroup() { - dataFieldBox = new DataFieldComboBox(new Object[0]); + dataFieldBox = new UIComboCheckBox(new Object[0]); dataFieldBox.getClickPane().setOpaque(false); dataFieldBox.addActionListener(new ActionListener() { @Override From 0d66014eedd8d89bca423c0e3c2ac1985c6aba89 Mon Sep 17 00:00:00 2001 From: "shengzu.xue" Date: Fri, 17 Jan 2025 10:54:22 +0800 Subject: [PATCH 10/10] =?UTF-8?q?REPORT-144631=20=E4=BD=BF=E7=94=A8LazyIco?= =?UTF-8?q?n=E9=80=82=E9=85=8DIcon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/icon/insert}/auto_chart_disabled.svg | 0 .../m_insert => fine/theme/icon/insert}/auto_chart_normal.svg | 0 .../resources/com/fine/theme/light/ui/fine_light.icon.json | 4 ++++ .../fr/van/chart/designer/type/AbstractVanChartTypePane.java | 3 ++- .../fr/design/actions/insert/cell/AutoChartCellAction.java | 3 ++- .../fr/design/actions/insert/flot/AutoChartFloatAction.java | 4 ++-- 6 files changed, 10 insertions(+), 4 deletions(-) rename designer-base/src/main/resources/com/{fr/design/images/m_insert => fine/theme/icon/insert}/auto_chart_disabled.svg (100%) rename designer-base/src/main/resources/com/{fr/design/images/m_insert => fine/theme/icon/insert}/auto_chart_normal.svg (100%) diff --git a/designer-base/src/main/resources/com/fr/design/images/m_insert/auto_chart_disabled.svg b/designer-base/src/main/resources/com/fine/theme/icon/insert/auto_chart_disabled.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/images/m_insert/auto_chart_disabled.svg rename to designer-base/src/main/resources/com/fine/theme/icon/insert/auto_chart_disabled.svg diff --git a/designer-base/src/main/resources/com/fr/design/images/m_insert/auto_chart_normal.svg b/designer-base/src/main/resources/com/fine/theme/icon/insert/auto_chart_normal.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/images/m_insert/auto_chart_normal.svg rename to designer-base/src/main/resources/com/fine/theme/icon/insert/auto_chart_normal.svg diff --git a/designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json b/designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json index 3e73413584..cce6c03234 100644 --- a/designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json +++ b/designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json @@ -511,6 +511,10 @@ "normal": "alphafine/alphaFine_template.svg", "disable": "alphafine/alphaFine_template_disable.svg", "white": "alphafine/alphaFine_template_white.svg" + }, + "auto_chart": { + "normal": "insert/auto_chart_normal.svg", + "disable": "insert/auto_chart_disabled.svg" } } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java index fcc27ee301..61668a9278 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java @@ -1,5 +1,6 @@ package com.fr.van.chart.designer.type; +import com.fine.theme.icon.LazyIcon; import com.fr.base.BaseUtils; import com.fr.base.chart.chartdata.TopDefinitionProvider; import com.fr.base.svg.IconUtils; @@ -62,7 +63,7 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane