Pull request #14908: REPORT-135680 & REPORT-135417 fix:NewUI 自定义分组面板尺寸调整、linux按钮显示不全问题调整

Merge in DESIGN/design from ~LEVY.XIE/design:fbp/release to fbp/release

* commit 'f4b7452c1627f49a57f08c8d7e377388e02d4120':
  REPORT-134055 fix:服务器数据集上下移按钮屏蔽
  REPORT-135680 & REPORT-135417 fix:NewUI 自定义分组面板尺寸调整、linux按钮显示不全问题调整

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();

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(

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
 
 

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
 
 

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
 
 

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
 
 
 

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
 
 

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 javax.swing.BorderFactory;
-import java.awt.*;
+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,19 +125,17 @@ 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"),
         		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.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);
-        southPane.add(otherComboBox);
+		Row southPane = FineLayoutBuilder.createHorizontalLayout(10, forceCheckBox, moreCheckBox, otherComboBox, label, otherTextField);
-        southPane.add(GUICoreUtils.createFlowPane(new Component[]{label, otherTextField}, FlowLayout.LEFT));
+		conditionsGroupPane.add(southPane, BorderLayout.SOUTH);
 
         // 公式分组
         formulaGroupPane = new FormulaGroupPane();