From caf3a5974ef9c8dad7e411192522b335370d24c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Levy=2EXie-=E8=A7=A3=E5=AE=89=E6=A3=AE?= Date: Wed, 25 Sep 2024 16:24:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-135680=20&=20REPORT-135417=20fix:New?= =?UTF-8?q?UI=20=E8=87=AA=E5=AE=9A=E4=B9=89=E5=88=86=E7=BB=84=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E5=B0=BA=E5=AF=B8=E8=B0=83=E6=95=B4=E3=80=81linux?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/web/CustomIconPane.java | 3 +- .../fr/design/i18n/dimension_en.properties | 2 +- .../fr/design/i18n/dimension_ja_JP.properties | 2 +- .../fr/design/i18n/dimension_ko_KR.properties | 2 +- .../fr/design/i18n/dimension_zh.properties | 1 + .../fr/design/i18n/dimension_zh_TW.properties | 2 +- .../dscolumn/SpecifiedGroupAttrPane.java | 30 ++++++++++--------- 7 files changed, 23 insertions(+), 19 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/web/CustomIconPane.java b/designer-base/src/main/java/com/fr/design/web/CustomIconPane.java index 2f1f7b8846..5e8a147a85 100644 --- a/designer-base/src/main/java/com/fr/design/web/CustomIconPane.java +++ b/designer-base/src/main/java/com/fr/design/web/CustomIconPane.java @@ -420,6 +420,7 @@ public class CustomIconPane extends BasicPane { UIButton browseButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_SelectIcon")); browseButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Click_this_button")); nameTextField = new UITextField(20); + nameTextField.setPreferredSize(FineUIScale.createScaleDimension(172, 24)); browseButton.addActionListener(e -> onBrowseButtonClicked(SwingUtilities.getWindowAncestor(EditIconDialog.this))); @@ -443,7 +444,7 @@ public class CustomIconPane extends BasicPane { }); showImageLabel = new UILabel(); - showImageLabel.setPreferredSize(FineUIScale.scale(new Dimension(50, 50))); + showImageLabel.setPreferredSize(FineUIScale.createScaleDimension(50, 50)); JPanel centerPane = column(10, row( diff --git a/designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties b/designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties index 190da5ff4b..f9b75269f7 100644 --- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties +++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties @@ -38,6 +38,6 @@ com.fr.design.actions.reportWebAttr.dialog=800*630 com.fr.design.actions.printingSetting.dialog=700*600 com.fr.design.data.datapane.preview.dialog=700*600 com.fr.design.data.tabledata.dialog=1200*600 - +com.fr.design.dscolumn.SpecifiedGroupAttrPane=900*600 diff --git a/designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties b/designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties index 32408cc796..4b9a58fa23 100644 --- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties +++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties @@ -37,6 +37,6 @@ com.fr.design.actions.reportWebAttr.dialog=700*630 com.fr.design.actions.printingSetting.dialog=700*600 com.fr.design.data.datapane.preview.dialog=700*600 com.fr.design.data.tabledata.dialog=900*600 - +com.fr.design.dscolumn.SpecifiedGroupAttrPane=800*600 diff --git a/designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties b/designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties index 86c6e11cb2..1b2a61ed78 100644 --- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties +++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties @@ -37,6 +37,6 @@ com.fr.design.actions.reportWebAttr.dialog=700*630 com.fr.design.actions.printingSetting.dialog=700*600 com.fr.design.data.datapane.preview.dialog=700*600 com.fr.design.data.tabledata.dialog=900*600 - +com.fr.design.dscolumn.SpecifiedGroupAttrPane=760*600 diff --git a/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh.properties b/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh.properties index 44d8e4180e..e187dfc098 100644 --- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh.properties +++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh.properties @@ -37,6 +37,7 @@ com.fr.design.actions.reportWebAttr.dialog=660*600 com.fr.design.actions.printingSetting.dialog=660*600 com.fr.design.data.datapane.preview.dialog=660*600 com.fr.design.data.tabledata.dialog=900*600 +com.fr.design.dscolumn.SpecifiedGroupAttrPane=760*600 diff --git a/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties b/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties index ef212e9c63..8c3e985151 100644 --- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties +++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties @@ -36,6 +36,6 @@ com.fr.design.actions.reportWebAttr.dialog=700*630 com.fr.design.actions.printingSetting.dialog=700*600 com.fr.design.data.datapane.preview.dialog=700*600 com.fr.design.data.tabledata.dialog=900*600 - +com.fr.design.dscolumn.SpecifiedGroupAttrPane=760*600 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 641e541a4d..5df4e19202 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,6 @@ package com.fr.design.dscolumn; +import com.fine.swing.ui.layout.Row; import com.fine.theme.utils.FineLayoutBuilder; import com.fine.theme.utils.FineUIUtils; import com.fr.base.BaseFormula; @@ -20,7 +21,6 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilist.ModNameActionListener; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.NameObject; import com.fr.report.cell.CellElement; @@ -30,8 +30,12 @@ import com.fr.report.cell.cellattr.core.group.FunctionGrouper; import com.fr.report.cell.cellattr.core.group.RecordGrouper; import com.fr.stable.Nameable; -import javax.swing.*; -import java.awt.*; +import javax.swing.BorderFactory; +import javax.swing.JPanel; +import javax.swing.SwingUtilities; +import java.awt.BorderLayout; +import java.awt.CardLayout; +import java.awt.Font; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.ItemEvent; @@ -121,20 +125,18 @@ public class SpecifiedGroupAttrPane extends BasicPane { conditionsGroupPane.add(specifiedControlPane, BorderLayout.CENTER); - JPanel southPane = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane(); - conditionsGroupPane.add(southPane, BorderLayout.SOUTH); forceCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_SpecifiedG-Force_Group")); - moreCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_One_Record_Exists_In_Many_Groups")); - southPane.add(forceCheckBox); southPane.add(moreCheckBox); - otherComboBox = new UIComboBox(new String[] {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_SpecifiedG-Discard_All_Others"), + moreCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_One_Record_Exists_In_Many_Groups")); + 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); + otherComboBox.addItemListener(otherItemListener); + otherComboBox.putClientProperty(COMBO_BOX_TYPE, ADAPTIVE_COMBO_BOX); + + UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OtherGroup_Name") + ":"); + otherTextField = new UITextField(8); + Row southPane = FineLayoutBuilder.createHorizontalLayout(10, forceCheckBox, moreCheckBox, otherComboBox, label, otherTextField); + conditionsGroupPane.add(southPane, BorderLayout.SOUTH); - UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OtherGroup_Name") + ":"); - otherTextField = new UITextField(8); - southPane.add(otherComboBox); - southPane.add(GUICoreUtils.createFlowPane(new Component[]{label, otherTextField}, FlowLayout.LEFT)); - // 公式分组 formulaGroupPane = new FormulaGroupPane(); From f4b7452c1627f49a57f08c8d7e377388e02d4120 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Levy=2EXie-=E8=A7=A3=E5=AE=89=E6=A3=AE?= Date: Wed, 25 Sep 2024 17:13:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-134055=20fix:=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=99=A8=E6=95=B0=E6=8D=AE=E9=9B=86=E4=B8=8A=E4=B8=8B=E7=A7=BB?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=B1=8F=E8=94=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/datapane/TableDataPaneListPane.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java index f5fe0edf89..cbc67bb2e8 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java @@ -1,5 +1,6 @@ package com.fr.design.data.datapane; +import com.fine.theme.utils.FineUIScale; import com.fr.base.TableData; import com.fr.base.TableDataBean; import com.fr.data.MultiResultTableData; @@ -14,6 +15,7 @@ import com.fr.design.data.datapane.preview.TableDataBeanHelper; import com.fr.design.dialog.FineJOptionPane; import com.fr.design.gui.controlpane.JListControlPane; import com.fr.design.gui.controlpane.NameableCreator; +import com.fr.design.gui.controlpane.ShortCut4JControlPane; import com.fr.design.gui.ilist.ListModelElement; import com.fr.design.i18n.Toolkit; import com.fr.file.ProcedureConfig; @@ -94,6 +96,21 @@ public class TableDataPaneListPane extends JListControlPane implements TableData return Toolkit.i18nText("Fine-Design_Basic_Table_Data_Duplicate_Name_Tips", getEditingName()); } + @Override + protected ShortCut4JControlPane[] createShortcuts() { + return new ShortCut4JControlPane[]{ + shortCutFactory.addItemShortCut(), + shortCutFactory.removeItemShortCut(), + shortCutFactory.copyItemShortCut(), + shortCutFactory.sortItemShortCut(), + }; + } + + @Override + protected int getLeftPreferredSize() { + return FineUIScale.scale(180); + } + @Override public Collection getExtraItemsToCheckNameRepeat() { return DesignTableDataManager.getGlobalDataSet().keySet();