From cd4c63cf8a87cc56c0d5cb231545548167c1daab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Levy=2EXie-=E8=A7=A3=E5=AE=89=E6=A3=AE?= Date: Mon, 23 Sep 2024 18:53:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-135476=20fix:NewUI=E6=81=A2=E5=A4=8D?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E7=BA=BF=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/DesignerEnvManager.java | 10 +++++----- .../java/com/fr/design/mainframe/ElementCasePane.java | 6 ++---- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java index 89b0b9fac0..026e01337a 100644 --- a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java +++ b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java @@ -159,7 +159,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter, AsyncXmlReada private boolean rowHeaderVisible = true; private boolean verticalScrollBarVisible = true; private boolean horizontalScrollBarVisible = true; - private Color gridLineColor = Color.lightGray; // line color. + private Color gridLineColor = new Color(230, 233, 239); // line color. private Color paginationLineColor = Color.black; // line color of paper private boolean supportCellEditorDef = false; private boolean isDragPermited = false; @@ -2167,10 +2167,10 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter, AsyncXmlReada this.setUndoLimit(reader.getAttrAsInt("undoLimit", 5)); this.setStartWithEmptyFile(reader.getAttrAsBoolean("startWithEmptyFile", false)); this.setDefaultStringToFormula(reader.getAttrAsBoolean("defaultStringToFormula", false)); - if ((tmpVal = reader.getAttrAsString("gridLineColor", null)) != null) { + if ((tmpVal = reader.getAttrAsString("uiGridLineColor", null)) != null) { this.setGridLineColor(new Color(Integer.parseInt(tmpVal))); } - if ((tmpVal = reader.getAttrAsString("paginationLineColor", null)) != null) { + if ((tmpVal = reader.getAttrAsString("uiPaginationLineColor", null)) != null) { this.setPaginationLineColor(new Color(Integer.parseInt(tmpVal))); } } @@ -2602,8 +2602,8 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter, AsyncXmlReada .attr("horizontalScrollBarVisible", this.isHorizontalScrollBarVisible()) .attr("supportCellEditorDef", this.isSupportCellEditorDef()) .attr("isDragPermited", this.isDragPermited()) - .attr("gridLineColor", this.getGridLineColor().getRGB()) - .attr("paginationLineColor", this.getPaginationLineColor().getRGB()) + .attr("uiGridLineColor", this.getGridLineColor().getRGB()) + .attr("uiPaginationLineColor", this.getPaginationLineColor().getRGB()) .attr("undoLimit", this.getUndoLimit()) .attr("startWithEmptyFile", this.isStartWithEmptyFile()) .end(); diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java b/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java index 01557672fc..b919fbd3c9 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java @@ -4,7 +4,6 @@ package com.fr.design.mainframe; import com.fine.theme.icon.LazyIcon; -import com.formdev.flatlaf.ui.FlatUIUtils; import com.fr.base.BaseFormula; import com.fr.base.DynamicUnitList; import com.fr.base.Formula; @@ -410,9 +409,8 @@ public abstract class ElementCasePane extends Tar grid.setDefaultFloatEditor(CellImagePainter.class, new ImageFloatEditor()); DesignerEnvManager designerEnvManager = DesignerEnvManager.getEnvManager(); - // todo: 主题化与env.xml内定义的属性优先级问题 - grid.setGridLineColor(FlatUIUtils.getUIColor("Center.ZoneBorderColor", designerEnvManager.getGridLineColor())); - grid.setPaginationLineColor(FlatUIUtils.getUIColor("Center.PageLineColor", designerEnvManager.getPaginationLineColor())); + grid.setGridLineColor(designerEnvManager.getGridLineColor()); + grid.setPaginationLineColor(designerEnvManager.getPaginationLineColor()); } private void addExtraCellEditor(Grid grid) { From 324814795607ef4d1f5c016bd2654d414240c2eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Levy=2EXie-=E8=A7=A3=E5=AE=89=E6=A3=AE?= Date: Mon, 23 Sep 2024 18:54:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-135417=20fix:=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E5=88=86=E7=BB=84=E9=9D=A2=E6=9D=BF=E7=BF=BB=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dscolumn/SpecifiedGroupAttrPane.java | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/dscolumn/SpecifiedGroupAttrPane.java b/designer-realize/src/main/java/com/fr/design/dscolumn/SpecifiedGroupAttrPane.java index 5402e04687..641e541a4d 100644 --- a/designer-realize/src/main/java/com/fr/design/dscolumn/SpecifiedGroupAttrPane.java +++ b/designer-realize/src/main/java/com/fr/design/dscolumn/SpecifiedGroupAttrPane.java @@ -1,5 +1,7 @@ package com.fr.design.dscolumn; +import com.fine.theme.utils.FineLayoutBuilder; +import com.fine.theme.utils.FineUIUtils; import com.fr.base.BaseFormula; import com.fr.design.beans.BasicBeanPane; import com.fr.design.condition.DSColumnLiteConditionPane; @@ -36,6 +38,9 @@ import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.util.ArrayList; +import static com.fine.theme.utils.FineClientProperties.ADAPTIVE_COMBO_BOX; +import static com.fine.theme.utils.FineClientProperties.COMBO_BOX_TYPE; + /** * SpecifiedGroupAttrDialog */ @@ -86,10 +91,11 @@ public class SpecifiedGroupAttrPane extends BasicPane { } protected void initComponents() { - this.setLayout(FRGUIPaneFactory.createBorderLayout()); + this.setLayout(FRGUIPaneFactory.createScaledBorderLayout(0, 10)); specifiedComboBox = new UIComboBox(new String[] { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Condition_Group"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Formula_Group") }); + specifiedComboBox.putClientProperty(COMBO_BOX_TYPE, ADAPTIVE_COMBO_BOX); specifiedComboBox.addItemListener(new ItemListener() { public void itemStateChanged(ItemEvent e) { @@ -101,9 +107,8 @@ public class SpecifiedGroupAttrPane extends BasicPane { } }); - JPanel northPane = GUICoreUtils.createFlowPane( - new JComponent[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Select_Specified_Grouping") + ":"), - specifiedComboBox}, FlowLayout.LEFT); + JPanel northPane = FineLayoutBuilder.createHorizontalLayout(10, + new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Select_Specified_Grouping") + ":"), specifiedComboBox); this.add(northPane, BorderLayout.NORTH); cardLayout = new CardLayout(); @@ -124,6 +129,7 @@ public class SpecifiedGroupAttrPane extends BasicPane { otherComboBox = new UIComboBox(new String[] {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_SpecifiedG-Discard_All_Others"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_SpecifiedG_Leave_In_Their_Own_Groups"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_SpecifiedG_Put_All_Others_Together")}); otherComboBox.addItemListener(otherItemListener); + UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OtherGroup_Name") + ":"); otherTextField = new UITextField(8); southPane.add(otherComboBox); @@ -132,9 +138,9 @@ public class SpecifiedGroupAttrPane extends BasicPane { // 公式分组 formulaGroupPane = new FormulaGroupPane(); - centerCardPane.add("Condition", conditionsGroupPane); - centerCardPane.add("Formula", formulaGroupPane); + centerCardPane.add("Formula", FineUIUtils.wrapComponentWithTitle(formulaGroupPane, + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_D_Dispaly_Divide_Result_Set_into_Groups"))); this.add(centerCardPane, BorderLayout.CENTER); } @@ -310,7 +316,6 @@ public class SpecifiedGroupAttrPane extends BasicPane { private JPanel southPane; public FormulaGroupPane() { - this.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_D_Dispaly_Divide_Result_Set_into_Groups"))); this.setLayout(FRGUIPaneFactory.createM_BorderLayout()); JPanel contentPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(1); this.add(contentPane, BorderLayout.NORTH); @@ -319,10 +324,10 @@ public class SpecifiedGroupAttrPane extends BasicPane { northPane.setLayout(FRGUIPaneFactory.createBorderLayout()); contentPane.add(northPane); modeComboBox = new UIComboBox(displayModeNames); + modeComboBox.putClientProperty(COMBO_BOX_TYPE, ADAPTIVE_COMBO_BOX); + northPane.add(FineLayoutBuilder.createHorizontalLayout(10, + new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Display_Modes") + ":"), modeComboBox)); - northPane.add(GUICoreUtils.createFlowPane(new JComponent[] { new UILabel(InsertText), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Display_Modes") + ": "), - modeComboBox }, FlowLayout.LEFT), BorderLayout.WEST); - UILabel label = new UILabel("="); label.setFont(new Font("Dialog", Font.BOLD, 12)); valueField = new UITextField(16); @@ -330,7 +335,6 @@ public class SpecifiedGroupAttrPane extends BasicPane { UIButton formulaButton = new UIButton("..."); formulaButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula") + "..."); - formulaButton.setPreferredSize(new Dimension(25, valueField.getPreferredSize().height)); formulaButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { BaseFormula valueFormula = BaseFormula.createFormulaBuilder().build(); @@ -358,8 +362,8 @@ public class SpecifiedGroupAttrPane extends BasicPane { } }); - southPane = GUICoreUtils.createFlowPane(new JComponent[] {new UILabel(InsertText), //new UILabel(com.fr.design.i18n.Toolkit.i18nText("I-Message_FunctionGrouper_2")), - new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Custom_Value") + ": "), label, valueField, formulaButton}, FlowLayout.LEFT); + southPane = FineLayoutBuilder.createHorizontalLayout(10, + new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Custom_Value") + ": "), label, valueField, formulaButton); contentPane.add(southPane); }