Merge pull request #6228 in DESIGN/design from release/10.0 to bugfix/10.0

* commit 'ef165426357a163715ad5c6a556dbe2aa75c5a40':
  REPORT-60561 全局自适应-样式细节优化

designer-base/src/main/java/com/fr/design/report/fit/BaseFitAttrPane.java

@@ -17,7 +17,6 @@ import com.fr.report.fit.ReportFitAttr;
 
 
 import javax.swing.*;
-import javax.swing.border.EmptyBorder;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -33,6 +32,7 @@ import static com.fr.design.i18n.Toolkit.i18nText;
 public abstract class BaseFitAttrPane extends BasicBeanPane<ReportFitAttr> {
 
     protected JPanel contentJPanel;
+    protected UILabel belowSetLabel;
     protected UIComboBox itemChoose;
     protected java.util.List<FitAttrModel> fitAttrModelList = new ArrayList<>();
 
@@ -97,7 +97,7 @@ public abstract class BaseFitAttrPane extends BasicBeanPane<ReportFitAttr> {
         }
 
         attrJPanel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
-        attrJPanel.setBorder(new EmptyBorder(0, 100, 10, 100));
+        attrJPanel.setBorder(BorderFactory.createEmptyBorder(5, 0, 10, 0));
         contentJPanel.add(attrJPanel);
     }
 
@@ -136,9 +136,18 @@ public abstract class BaseFitAttrPane extends BasicBeanPane<ReportFitAttr> {
 
     protected void initPreviewJPanel() {
         previewJPanel = new FitPreviewPane();
+        previewJPanel.setBorder(BorderFactory.createEmptyBorder(0, getPreviewJPanelLeft(), 0, 0));
         contentJPanel.add(previewJPanel);
     }
 
+    private int getPreviewJPanelLeft() {
+        int left = 0;
+        if (belowSetLabel.getPreferredSize() != null) {
+            left = belowSetLabel.getPreferredSize().width + BELOW_SET_COMPONENT_HSPACE;
+        }
+        return left;
+    }
+
     protected int getStateInPC(int index) {
         FitType[] fitTypes = fitAttrModel.getFitTypes();
         return fitTypes[index].getState();
@@ -188,29 +197,26 @@ public abstract class BaseFitAttrPane extends BasicBeanPane<ReportFitAttr> {
     protected void initComponents() {
         this.setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
         this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
-        contentJPanel = new JPanel();
+        contentJPanel = FRGUIPaneFactory.createVerticalFlowLayout_Pane(false, FlowLayout.LEFT, 0, 0);
-        contentJPanel.setLayout(FRGUIPaneFactory.createCenterFlowLayout());
         this.add(contentJPanel);
         initItemChoose();
+        initPrompt();
     }
 
 
     private void initItemChoose() {
-        JPanel chooseJPanel = new JPanel();
+        JPanel chooseJPanel = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
-        chooseJPanel.setLayout(FRGUIPaneFactory.createLabelFlowLayout());
         ItemListener itemListener = getItemListener();
         itemChoose = new UIComboBox(getItemNames());
         itemChoose.addItemListener(itemListener);
-        UILabel belowSetLabel = new UILabel(i18nText("Fine-Design_Report_Blow_Set"));
+        belowSetLabel = new UILabel(i18nText("Fine-Design_Report_Blow_Set"));
+        JPanel hSpaceLabel = new JPanel();
+        hSpaceLabel.setSize(BELOW_SET_COMPONENT_HSPACE, 0);
         JPanel buttonPane = GUICoreUtils.createFlowPane(new Component[]{
-                belowSetLabel, itemChoose}, FlowLayout.LEFT, BELOW_SET_COMPONENT_HSPACE);
+                belowSetLabel, hSpaceLabel, itemChoose}, FlowLayout.LEFT);
         chooseJPanel.add(buttonPane);
-        chooseJPanel.setPreferredSize(new Dimension(500, 50));
+        chooseJPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 5, 0));
-        JPanel jPanel = new JPanel();
+        contentJPanel.add(chooseJPanel);
-        jPanel.setLayout(FRGUIPaneFactory.createBorderLayout());
-        jPanel.add(chooseJPanel, BorderLayout.WEST);
-
-        contentJPanel.add(jPanel);
     }
 
 
@@ -221,6 +227,9 @@ public abstract class BaseFitAttrPane extends BasicBeanPane<ReportFitAttr> {
 
     }
 
+    protected void initPrompt() {
+    }
+
     protected void refresh() {
         validate();
         repaint();

designer-form/src/main/java/com/fr/design/mainframe/JForm.java

@@ -576,7 +576,7 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
     }
 
 
-    private ShortCut getReportFitAttrAction() {
+    protected ShortCut getReportFitAttrAction() {
         FormAdaptiveConfigUIProcessor adaptiveConfigUI = ExtraDesignClassManager.getInstance().getSingle(FormAdaptiveConfigUIProcessor.MARK_STRING);
         if (adaptiveConfigUI != null) {
             return adaptiveConfigUI.getConfigShortCut(this);

designer-realize/src/main/java/com/fr/design/webattr/ServerFitAttrPane.java

@@ -1,6 +1,8 @@
 package com.fr.design.webattr;
 
 import com.fr.config.Configuration;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.report.fit.BaseFitAttrPane;
 import com.fr.design.report.fit.FitAttrModel;
 import com.fr.general.ComparatorUtils;
@@ -9,6 +11,7 @@ import com.fr.report.fit.ReportFitConfig;
 import com.fr.transaction.Configurations;
 import com.fr.transaction.Worker;
 
+import java.awt.Color;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 
@@ -33,7 +36,6 @@ public class ServerFitAttrPane extends BaseFitAttrPane {
         super.populateBean(reportFitAttr);
     }
 
-
     public ReportFitAttr updateBean() {
         ReportFitAttr reportFitAttr = super.updateBean();
         Configurations.update(new Worker() {
@@ -74,5 +76,14 @@ public class ServerFitAttrPane extends BaseFitAttrPane {
             }
         };
     }
+
+    @Override
+    protected void initPrompt() {
+        if (fitAttrModelList.size() == 3) {
+            UILabel uiLabel = new UILabel(Toolkit.i18nText("Fine-Designer_Fit_Attr_Pane_Hint"));
+            uiLabel.setForeground(Color.lightGray);
+            contentJPanel.add(uiLabel);
+        }
+    }
 }