Pull request #6125: release/11.0 合 feature/x 解决冲突

Merge in DESIGN/design from ~HENRY.WANG/design:feature/x to feature/x

* commit '6d6be3b0c52b49dea53ce0e14f15fe286faff4a2':
  REPORT-59681 远程设计控制模板自适应权限控制
  REPORT-60134 表单组件属性国际化-显示不全

designer-base/src/main/java/com/fr/design/gui/style/AbstractTranslucentBackgroundSpecialPane.java

@@ -2,13 +2,13 @@ package com.fr.design.gui.style;
 
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.dialog.BasicPane;
-import com.fr.design.dialog.BasicScrollPane;
 import com.fr.design.gui.frpane.UIPercentDragPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.backgroundpane.GradientBackgroundQuickPane;
+import com.fr.design.widget.FRWidgetFactory;
 import com.fr.general.Background;
 import com.fr.general.act.BackgroundPacker;
 
@@ -51,8 +51,8 @@ public abstract class AbstractTranslucentBackgroundSpecialPane<T extends Backgro
 
         // 确保BackgroundSpecialPane高度变化时，Label依然保持与其顶部对齐
         JPanel backgroundLabelPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        backgroundLabelPane.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, 0, 0));
+        backgroundLabelPane.setBorder(BorderFactory.createEmptyBorder(7, 0, 0, 0));
-        backgroundLabelPane.add(new UILabel(backgroundName), BorderLayout.NORTH);
+        backgroundLabelPane.add(FRWidgetFactory.createLineWrapLabel(backgroundName), BorderLayout.NORTH);
 
         JPanel backgroundComposedPane = TableLayoutHelper.createGapTableLayoutPane(
                 new JComponent[][]{
@@ -62,7 +62,7 @@ public abstract class AbstractTranslucentBackgroundSpecialPane<T extends Backgro
 
         JPanel opacityComposedPane = TableLayoutHelper.createGapTableLayoutPane(
                 new JComponent[][]{
-                        {new UILabel(""), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget-Style_Alpha"))},
+                        {new UILabel(""), FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget-Style_Alpha"))},
                         {new UILabel(""), opacityPane}
                 },
                 new double[]{p, p}, columnSize, IntervalConstants.INTERVAL_L1, IntervalConstants.INTERVAL_L1);

designer-base/src/main/java/com/fr/design/gui/style/ComponentIntegralStylePane.java

@@ -2,11 +2,11 @@ package com.fr.design.gui.style;
 
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.gui.icombobox.UIComboBox;
-import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UISpinner;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.widget.FRWidgetFactory;
 import com.fr.general.act.BorderPacker;
 
 import javax.swing.JComponent;
@@ -72,9 +72,9 @@ public class ComponentIntegralStylePane extends AbstractBorderPackerPane {
         double[] columnSize = {this.uiLabelWidth, this.uiSettingWidth > 0 ? this.uiSettingWidth : f};
 
         JPanel content = TableLayoutHelper.createGapTableLayoutPane(new JComponent[][]{
-                        {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Render_Style")), borderStyleCombo},
+                        {FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Render_Style")), FRGUIPaneFactory.createBorderLayoutNorthPaneWithComponent(borderStyleCombo)},
                         {this.borderPane, null},
-                        {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Radius")), cornerSpinner},
+                        {FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Radius")), cornerSpinner},
                 },
                 rowSize, columnSize, IntervalConstants.INTERVAL_L1, IntervalConstants.INTERVAL_L1);
 

designer-base/src/main/java/com/fr/design/gui/style/ComponentTitleStylePane.java

@@ -9,10 +9,10 @@ import com.fr.design.gui.ibutton.UIColorButton;
 import com.fr.design.gui.ibutton.UIToggleButton;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.icombobox.UIComboBox;
-import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.widget.FRWidgetFactory;
 import com.fr.form.ui.LayoutBorderStyle;
 import com.fr.form.ui.WidgetTitle;
 import com.fr.general.FRFont;
@@ -168,7 +168,7 @@ public class ComponentTitleStylePane extends AbstractBorderPackerPane {
         visibleCheckbox.setSelected(false);
 
         container.add(visibleCheckbox, BorderLayout.WEST);
-        container.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Visible")), BorderLayout.CENTER);
+        container.add(FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Visible")), BorderLayout.CENTER);
 
         visibleCheckbox.addChangeListener(new ChangeListener() {
             @Override
@@ -192,7 +192,7 @@ public class ComponentTitleStylePane extends AbstractBorderPackerPane {
         double[] columnSize = {this.uiLabelWidth, this.uiSettingWidth > 0 ? this.uiSettingWidth : f};
 
         return TableLayoutHelper.createCommonTableLayoutPane(
-                new JComponent[][]{{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Content")), textContentPane}},
+                new JComponent[][]{{FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Content")), textContentPane}},
                 rowSize, columnSize, IntervalConstants.INTERVAL_L1);
     }
 
@@ -203,10 +203,10 @@ public class ComponentTitleStylePane extends AbstractBorderPackerPane {
         double[] columnSize = {this.uiLabelWidth, this.uiSettingWidth > 0 ? this.uiSettingWidth : f};
 
         JComponent[][] components = new JComponent[][]{
-                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Format")), fontFamilyComboBox},
+                {FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Format")), FRGUIPaneFactory.createBorderLayoutNorthPaneWithComponent(fontFamilyComboBox)},
                 {null, createTitleFontButtonPane()},
                 {insetImagePane, null},
-                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Text_Align")), alignPane},
+                {FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Text_Align")), alignPane},
                 {backgroundPane, null}
         };
 

designer-base/src/main/java/com/fr/design/gui/style/FollowingThemePane.java

@@ -1,10 +1,7 @@
 package com.fr.design.gui.style;
 
-import com.fr.base.theme.FormTheme;
 import com.fr.base.theme.TemplateTheme;
 import com.fr.design.dialog.BasicPane;
-import com.fr.design.event.GlobalNameListener;
-import com.fr.design.event.GlobalNameObserver;
 import com.fr.design.event.UIObserver;
 import com.fr.design.event.UIObserverListener;
 import com.fr.design.file.HistoryTemplateListCache;
@@ -15,12 +12,12 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.JTemplate;
+import com.fr.design.widget.FRWidgetFactory;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import java.awt.BorderLayout;
 import java.awt.Component;
-import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
@@ -66,12 +63,12 @@ public class FollowingThemePane extends BasicPane implements UIObserver {
             }
         });
 
-        UILabel followingThemeLabel = new UILabel(name);
+        UILabel followingThemeLabel = FRWidgetFactory.createLineWrapLabel(name);
 
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
         JPanel followingThemePane =
-                TableLayoutHelper.createGapTableLayoutPane( new Component[][]{new Component[] { followingThemeLabel, followingThemeButtonGroup}},
+                TableLayoutHelper.createGapTableLayoutPane( new Component[][]{new Component[] { followingThemeLabel, FRGUIPaneFactory.createBorderLayoutNorthPaneWithComponent(followingThemeButtonGroup)}},
                         new double[] { p }, new double[] { SETTING_LABEL_WIDTH, f }, 10, 0);
         followingThemePane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
         followingThemePane.setVisible(false);

designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java

@@ -7,6 +7,7 @@ import com.fr.stable.AssistUtils;
 import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
 import javax.swing.Icon;
+import javax.swing.JComponent;
 import javax.swing.JPanel;
 import javax.swing.JRadioButton;
 import java.awt.BorderLayout;
@@ -631,6 +632,12 @@ public class FRGUIPaneFactory {
         return iconRadioPane;
     }
 
+    public static JPanel createBorderLayoutNorthPaneWithComponent(JComponent content) {
+        JPanel jPanel = new JPanel(new BorderLayout());
+        jPanel.add(content, BorderLayout.NORTH);
+        return jPanel;
+    }
+
     /**
      * 计算宽度
      *

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

@@ -0,0 +1,55 @@
+package com.fr.design.report.fit;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.JTemplate;
+import com.fr.design.report.fit.provider.AbstractFitAttrModelProvider;
+
+import com.fr.form.fit.common.LightTool;
+import com.fr.form.fit.config.FormFitConfig;
+import com.fr.form.main.Form;
+import com.fr.report.fit.ReportFitAttr;
+
+
+public class AdaptiveFrmFitAttrModel extends AbstractFitAttrModelProvider {
+
+    public FitType[] getFitTypes() {
+        return new FitType[]{
+                FitType.DOUBLE_FIT,
+                FitType.HORIZONTAL_FIT,
+                FitType.NOT_FIT
+        };
+    }
+
+    public String getFitName() {
+        return Toolkit.i18nText("Fine-Designer_Fit_Report_Scale_Method");
+    }
+
+    @Override
+    public String getModelName() {
+        return Toolkit.i18nText("Fine-Design_New_Decision_Report");
+    }
+
+    @Override
+    public ReportFitAttr getGlobalReportFitAttr() {
+        return FormFitConfig.getInstance().getNewFitAttr();
+    }
+
+    @Override
+    public void setGlobalReportFitAttr(ReportFitAttr reportFitAttr) {
+        FormFitConfig.getInstance().setNewFitAttr(reportFitAttr);
+    }
+
+    @Override
+    public int getPriority() {
+        return 2;
+    }
+
+    @Override
+    public boolean isAvailable(JTemplate jTemplate) {
+        if (jTemplate.getTarget() instanceof Form) {
+            return LightTool.containNewFormFlag((Form) jTemplate.getTarget());
+        }
+        return false;
+    }
+
+}

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

@@ -50,6 +50,7 @@ public abstract class BaseFitAttrPane extends BasicBeanPane<ReportFitAttr> {
     private void initFitAttrModel() {
         fitAttrModelList.add(new FrmFitAttrModel());
         fitAttrModelList.add(new CptFitAttrModel());
+        fitAttrModelList.add(new AdaptiveFrmFitAttrModel());
 
         Set<FitAttrModelProvider> fitAttrModelProviders = ExtraDesignClassManager.getInstance().getArray(FitAttrModelProvider.XML_TAG);
 

designer-form/src/main/java/com/fr/design/actions/FormFitAttrAction.java

@@ -8,6 +8,7 @@ import com.fr.design.fit.NewJForm;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.design.menu.MenuKeySet;
+import com.fr.design.report.fit.menupane.TemplateFitAttrPane;
 import com.fr.report.fit.FitProvider;
 import com.fr.report.fit.ReportFitAttr;
 
@@ -47,26 +48,20 @@ public class FormFitAttrAction extends JTemplateAction {
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
         this.setSmallIcon(DesignerUIModeConfig.getInstance().newUIMode() ?
-                "/com/fr/design/images/reportfit/fit.png":
+                "/com/fr/design/images/reportfit/fit.png" :
-               "/com/fr/design/images/reportfit/fit");
+                "/com/fr/design/images/reportfit/fit");
     }
 
-    /**
-     * Action触发事件
-     *
-     * @param e 事件
-     */
     @Override
     public void actionPerformed(ActionEvent e) {
         final JTemplate jwb = getEditingComponent();
-        if (jwb == null || !(jwb instanceof NewJForm)) {
+        if (jwb == null) {
             return;
         }
         final FitProvider wbTpl = (FitProvider) jwb.getTarget();
         ReportFitAttr fitAttr = wbTpl.getReportFitAttr();
-        NewJForm newJForm = (NewJForm) jwb;
+        TemplateFitAttrPane templateFitAttrPane = new TemplateFitAttrPane();
-        BasicBeanPane attrPane =  newJForm.getJFormType().obtainAttrPane(newJForm);
+        showFitDialog(fitAttr, jwb, wbTpl, templateFitAttrPane);
-        showFitDialog(fitAttr, jwb, wbTpl, attrPane);
     }
 
     private void showFitDialog(ReportFitAttr fitAttr, final JTemplate jwb, final FitProvider wbTpl, final BasicBeanPane<ReportFitAttr> attrPane) {