From 8feb5752f8c4fbbab9ec531743d890e788a96e21 Mon Sep 17 00:00:00 2001 From: "Yuan.Wang" Date: Wed, 11 Jan 2023 17:15:07 +0800 Subject: [PATCH 1/3] =?UTF-8?q?REPORT-88359=20=E8=AE=BE=E8=AE=A1=E5=99=A8K?= =?UTF-8?q?ey=E7=BC=BA=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/parameter/RootDesignDefinePane.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java b/designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java index 910b466f79..9b4dfb4c44 100644 --- a/designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java @@ -134,7 +134,7 @@ public class RootDesignDefinePane extends AbstractDataModify { displayReport = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Display_Nothing_Before_Query")); UIComponentUtils.setLineWrap(displayReport); useParamsTemplate = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Use_Params_Template")); - fireAfterEditor = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("触发编辑结束事件")); + fireAfterEditor = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Trigger_Editing_End_Event")); fireAfterEditor.setEnabled(false); fireAfterEditor.setBorder(BorderFactory.createEmptyBorder(0, 30, 0, 0)); useParamsTemplate.addChangeListener(e -> { @@ -189,7 +189,7 @@ public class RootDesignDefinePane extends AbstractDataModify { displayReport = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Display_Nothing_Before_Query")); UIComponentUtils.setLineWrap(displayReport); useParamsTemplate = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Use_Params_Template")); - fireAfterEditor = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("触发编辑结束事件")); + fireAfterEditor = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Trigger_Editing_End_Event")); fireAfterEditor.setEnabled(false); fireAfterEditor.setBorder(BorderFactory.createEmptyBorder(0, 30, 0, 0)); useParamsTemplate.addChangeListener(e -> { From aeed26983380b700ad220aae5657c2826383dc49 Mon Sep 17 00:00:00 2001 From: zack Date: Tue, 31 Jan 2023 10:48:27 +0800 Subject: [PATCH 2/3] =?UTF-8?q?REPORT-87781=20=E5=9B=BE=E8=A1=A8=E6=B8=90?= =?UTF-8?q?=E5=8F=98=E6=94=AF=E6=8C=81=E5=88=B030=E9=98=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gui/style/series/UIColorPickerPane.java | 5 +++-- .../component/GradualIntervalConfigPane.java | 16 ++++++++-------- .../chart/range/component/LegendGradientBar.java | 4 +++- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java index ba617b5e78..2ae7e502e1 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java @@ -21,6 +21,7 @@ import com.fr.design.style.color.ColorSelectBox; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.stable.StringUtils; import com.fr.van.chart.designer.TableLayout4VanChartHelper; +import com.fr.van.chart.range.component.LegendGradientBar; import javax.swing.JComponent; import javax.swing.JFrame; @@ -102,7 +103,7 @@ public class UIColorPickerPane extends BasicPane implements UIObserver { } }); - regionNumPane = new UINumberDragPane(1, 6) { + regionNumPane = new UINumberDragPane(1, LegendGradientBar.COLOR_GRADUAL_NUM_MAX) { @Override public void userEvent(double value) { if(!UIColorPickerPane.this.moveOnColorOrTextPane){ @@ -191,7 +192,7 @@ public class UIColorPickerPane extends BasicPane implements UIObserver { } }); - regionNumPane = new UINumberDragPane(1, 6) { + regionNumPane = new UINumberDragPane(1, LegendGradientBar.COLOR_GRADUAL_NUM_MAX) { @Override public void userEvent(double value) { if(!UIColorPickerPane.this.moveOnColorOrTextPane){ diff --git a/designer-chart/src/main/java/com/fr/van/chart/range/component/GradualIntervalConfigPane.java b/designer-chart/src/main/java/com/fr/van/chart/range/component/GradualIntervalConfigPane.java index 1a0413ffaa..f1cdc5b62e 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/range/component/GradualIntervalConfigPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/range/component/GradualIntervalConfigPane.java @@ -14,7 +14,7 @@ import javax.swing.event.ChangeListener; import java.awt.BorderLayout; import java.awt.Component; -public class GradualIntervalConfigPane extends JPanel{ +public class GradualIntervalConfigPane extends JPanel { private static final long serialVersionUID = 1614283200308877353L; //最大最小值面板 @@ -26,7 +26,7 @@ public class GradualIntervalConfigPane extends JPanel{ //渐变色编辑器 private LegendGradientBar legendGradientBar; - public GradualIntervalConfigPane(){ + public GradualIntervalConfigPane() { initComponents(); } @@ -42,10 +42,10 @@ public class GradualIntervalConfigPane extends JPanel{ } }); - numberDragPane = new UINumberDragPane(1,6) { + numberDragPane = new UINumberDragPane(1, LegendGradientBar.COLOR_GRADUAL_NUM_MAX) { @Override public void userEvent(double value) { - legendGradientBar.refreshColorSelectionBtnNum((int)value); + legendGradientBar.refreshColorSelectionBtnNum((int) value); } }; @@ -60,9 +60,9 @@ public class GradualIntervalConfigPane extends JPanel{ Component[][] components = getPaneComponents(minMaxValuePane, colorSelectBox, numberDragPane, legendGradientBar); //控件承载面板 - JPanel contentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components,row,col); + JPanel contentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); this.setLayout(new BorderLayout()); - this.add(contentPane,BorderLayout.CENTER); + this.add(contentPane, BorderLayout.CENTER); } protected LegendGradientBar createLegendGradientBar() { @@ -81,7 +81,7 @@ public class GradualIntervalConfigPane extends JPanel{ }; } - public void populate(GradualIntervalConfig intervalConfig){ + public void populate(GradualIntervalConfig intervalConfig) { minMaxValuePane.populate(intervalConfig.getMinAndMaxValue()); colorSelectBox.setSelectObject(intervalConfig.getSubColor()); @@ -92,7 +92,7 @@ public class GradualIntervalConfigPane extends JPanel{ legendGradientBar.populate(intervalConfig); } - public void update(GradualIntervalConfig intervalConfig){ + public void update(GradualIntervalConfig intervalConfig) { minMaxValuePane.update(intervalConfig.getMinAndMaxValue()); intervalConfig.setSubColor(colorSelectBox.getSelectObject()); diff --git a/designer-chart/src/main/java/com/fr/van/chart/range/component/LegendGradientBar.java b/designer-chart/src/main/java/com/fr/van/chart/range/component/LegendGradientBar.java index 6096056a4b..c55e2a4923 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/range/component/LegendGradientBar.java +++ b/designer-chart/src/main/java/com/fr/van/chart/range/component/LegendGradientBar.java @@ -44,14 +44,16 @@ public class LegendGradientBar extends JComponent implements ColorSelectable, UI private static final int REC_HEIGHT = 30; private static final int MAX_VERTICAL = 45; + //颜色选择器个数 private int colorSelectionBtnNum; //主题色 private Color subColor; - private int max = 150; + private static int max = 150; private int min = 4; + public static final int COLOR_GRADUAL_NUM_MAX = max / 5; //选中的颜色 private Color color; From 6123c5ff59e285e4dbed6efff7df2911ecd2d172 Mon Sep 17 00:00:00 2001 From: "Leo.Qin" Date: Tue, 31 Jan 2023 15:42:06 +0800 Subject: [PATCH 3/3] =?UTF-8?q?REPORT-88365=20=E5=86=B3=E7=AD=96=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E5=8D=95=E5=85=83=E6=A0=BC=E6=8F=92=E5=85=A5?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=97=EF=BC=8C=E5=8D=95=E5=85=83=E6=A0=BC?= =?UTF-8?q?=E5=85=83=E7=B4=A0=E9=A1=B5=E9=9D=A2=E6=9C=89=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=20=E3=80=90=E9=97=AE=E9=A2=98=E5=8E=9F=E5=9B=A0=E3=80=91?= =?UTF-8?q?=E5=8D=95=E9=80=89=E6=97=B6=E9=BB=98=E8=AE=A4=E5=B0=86cellDSCol?= =?UTF-8?q?umnAdvancedPane=E7=9A=84visible=E8=AE=BE=E4=B8=BAtrue=EF=BC=8C?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8=20?= =?UTF-8?q?=E3=80=90=E6=94=B9=E5=8A=A8=E6=80=9D=E8=B7=AF=E3=80=91=E7=BB=93?= =?UTF-8?q?=E5=90=88cellDSColumnAdvancedPane=E7=9A=84=E5=8E=9F=E5=A7=8Bvis?= =?UTF-8?q?ible=E7=8A=B6=E6=80=81=E5=8F=8A=E5=8D=95=E5=85=83=E6=A0=BC?= =?UTF-8?q?=E7=9A=84=E5=8D=95=E9=80=89=E5=A4=9A=E9=80=89=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=86=8D=E8=BF=9B=E8=A1=8C=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/quickeditor/cellquick/CellDSColumnEditor.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java b/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java index 575f89fb07..e9917d2c21 100644 --- a/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java +++ b/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java @@ -162,6 +162,7 @@ public class CellDSColumnEditor extends CellQuickEditor { // 由于多选的时候修改了 cellDSColumnBasicPane 中组件的visiable属性，切换时需要将其设置为false cellDSColumnBasicPane.setVisible(false); + cellDSColumnAdvancedPane.setVisible(false); card.show(cardContainer, paneList.get(index).title4PopupWindow()); paneList.get(index).populate(); @@ -1064,7 +1065,10 @@ public class CellDSColumnEditor extends CellQuickEditor { @Override public void refreshMultipleDetails() { tabsHeaderIconPane.setVisible(tc.isSelectedOneCell()); - cellDSColumnAdvancedPane.setVisible(tc.isSelectedOneCell()); + + // 需要结合AdvancedPane的原始visible状态设置单选多选visible + boolean advancedPaneVisible = cellDSColumnAdvancedPane.isVisible(); + cellDSColumnAdvancedPane.setVisible(advancedPaneVisible && tc.isSelectedOneCell()); cellDSColumnBasicPane.setMultipleVisible(tc.isSelectedOneCell()); }