Pull request #1817: 无jira任务， release/10.0 合 bugfix/10.0

Merge in DESIGN/design from release/10.0 to bugfix/10.0

* commit 'a1d3ac858418bf370cc80600b0fff34430a019d3':
  REPORT-35387 参数面板已有控件的时候，点击右侧全部添加，控件重叠 代码格式调整
  REPORT-35387 参数面板已有控件的时候，点击右侧全部添加，控件重叠 删除打印语句
  REPORT-35387 参数面板已有控件的时候，点击右侧全部添加，控件重叠
  REPORT-35205 fix
  REPORT-35379 && REPORT-35205
  修改属性访问修饰符
  REPORT-35253 切换远程到本地设计器的问题
  REPORT-34780 && CHART-14441
  CHART-14624  调整面积图系列面板不透明的enable属性的check
  REPORT-35381 && REPORT-35379
  CHART-14598 雷达图增加线宽设置

designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java

@@ -76,7 +76,7 @@ public class AboutDialog extends JDialog implements ActionListener {
 
         this.getRootPane().setDefaultButton(okButton);
 
-        this.setSize(new Dimension(660, 600));
+        this.setSize(defaultPane.getPreferredSize().width, 600);
         GUICoreUtils.centerWindow(this);
     }
 

designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java

@@ -4,6 +4,7 @@
 package com.fr.design.actions.help;
 
 import com.fr.base.FRContext;
+import com.fr.base.GraphHelper;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.gui.ilable.ActionLabel;
 import com.fr.design.gui.ilable.BoldFontTextLabel;
@@ -36,9 +37,13 @@ public class AboutPane extends JPanel {
     private static final String COMPANY_TELEPHONE = CloudCenter.getInstance().acquireUrlByKind("help.compNo");
     private static final String PRESIDENT_PHONE = CloudCenter.getInstance().acquireUrlByKind("help.PNo");
 
+    private int maxWidth;
+
     public AboutPane() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
-
+        this.maxWidth = GraphHelper.getWidth(getBuildTitle() + GeneralUtils.readFullBuildNO() +
+                                                     com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Copy_Build_NO") +
+                                                     com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Copy_Build_NO_OK"));
         //center panel
         JPanel centerPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
         this.add(centerPane, BorderLayout.CENTER);
@@ -90,6 +95,11 @@ public class AboutPane extends JPanel {
         }
     }
 
+    @Override
+    public Dimension getPreferredSize() {
+        return new Dimension(this.maxWidth, super.getPreferredSize().height);
+    }
+
     private void addPhoneAndQQPane(JPanel contentPane) {
         BoxCenterAligmentPane boxCenterAlignmentPane;
         // 英文版不显示服务电话和QQ

designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java

@@ -60,7 +60,10 @@ public class TableDataPaneListPane extends JListControlPane implements TableData
                 if (StringUtils.isEmpty(tempName)) {
                     isNamePermitted = false;
                     nameableList.stopEditing();
-                    FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), Toolkit.i18nText("Fine-Design_Basic_Table_Data_Empty_Name_Tips"));
+                    FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this),
+                                                      Toolkit.i18nText("Fine-Design_Basic_Table_Data_Empty_Name_Tips"),
+                                                      Toolkit.i18nText("Fine-Design_Report_Alert"),
+                                                      JOptionPane.WARNING_MESSAGE);
                     setIllegalIndex(editingIndex);
                     return;
                 }

designer-base/src/main/java/com/fr/design/env/RemoteDesignerWorkspaceInfo.java

@@ -1,16 +1,39 @@
 package com.fr.design.env;
 
+import com.fr.design.DesignerEnvManager;
+import com.fr.general.ComparatorUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.security.SecurityToolbox;
 import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
+import com.fr.stable.project.ProjectConstants;
 import com.fr.stable.xml.XMLPrintWriter;
 import com.fr.stable.xml.XMLableReader;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.connect.WorkspaceConnectionInfo;
 
+import java.util.HashSet;
+import java.util.Set;
+
 public class RemoteDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
 
+    private static final Set<String> FILTER_SET = new HashSet<>();
+    private static final String HTTPS = "https://";
+    private static final String HTTP = "http://";
+    private static final String DEFAULT_SERVLET_NAME = "decision";
+    private static final String PATH = ProjectConstants.FORWARD_SLASH + ProjectConstants.WEBAPP_NAME + ProjectConstants.FORWARD_SLASH + DEFAULT_SERVLET_NAME;
+    private static final String HOST_NAME = "127.0.0.1";
+    private static final String LOCAL_HOTS_NAME = "localhost";
+    private static final String QUOTATION = ":";
+    private static final String PORT = Integer.toString(DesignerEnvManager.getEnvManager().getEmbedServerPort());
+
+    static {
+        FILTER_SET.add(HTTP + HOST_NAME + QUOTATION + PORT + PATH);
+        FILTER_SET.add(HTTPS + HOST_NAME + QUOTATION + PORT + PATH);
+        FILTER_SET.add(HTTP + LOCAL_HOTS_NAME + QUOTATION + PORT + PATH);
+        FILTER_SET.add(HTTPS + LOCAL_HOTS_NAME + QUOTATION + PORT + PATH);
+    }
+
     private String name;
 
     private String remindTime;
@@ -109,6 +132,10 @@ public class RemoteDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
     @Override
     public boolean checkValid() {
         boolean result = false;
+        if (FILTER_SET.contains(connection.getUrl())) {
+            FineLoggerFactory.getLogger().error("url is same with local designer");
+            return result;
+        }
         try {
             result = WorkContext.getConnector().testConnection(connection);
         } catch (Exception e) {

designer-base/src/main/java/com/fr/design/gui/icontainer/UIEastResizableContainer.java

@@ -18,6 +18,10 @@ import java.awt.event.MouseMotionListener;
  */
 public class UIEastResizableContainer extends JPanel {
     private static final long serialVersionUID = 1854340560790476907L;
+
+    public static final int MAX_CONTAINER_WIDTH = 500;
+    public static final int MIN_CONTAINER_WIDTH = 286;
+
     private int containerWidth = 240;
     private int preferredWidth = 240;
     private int topToolPaneHeight = 25;
@@ -262,7 +266,13 @@ public class UIEastResizableContainer extends JPanel {
 
                 @Override
                 public void mouseDragged(MouseEvent e) {
-                    // do nothing
+                    containerWidth = UIEastResizableContainer.this.getWidth() + (UIEastResizableContainer.this.getLocationOnScreen().x - e.getXOnScreen());
+                    containerWidth = Math.min(containerWidth, MAX_CONTAINER_WIDTH);
+                    containerWidth = Math.max(containerWidth, MIN_CONTAINER_WIDTH);
+                    refreshContainer();
+                    if ( DesignModeContext.isAuthorityEditing()) {
+                        DesignerContext.getDesignerFrame().doResize();
+                    }
                 }
             });
             addMouseListener(new MouseAdapter() {

designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java

@@ -1,6 +1,7 @@
 package com.fr.design.mainframe;
 
 import com.fr.base.BaseUtils;
+import com.fr.base.FRContext;
 import com.fr.base.vcs.DesignerMode;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.ExtraDesignClassManager;
@@ -66,7 +67,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
     private JPanel leftPane;
     private JPanel rightPane;
     private FixedPopupPane currentPopupPane;
-    private static final int CONTAINER_WIDTH = 286;
+    private static final int CONTAINER_WIDTH = containerWidth();
     private static final int TAB_WIDTH = 38;
     private static final int TAB_BUTTON_WIDTH = 32;
     private static final int TAB_BUTTON_HEIGHT = 28;
@@ -107,6 +108,13 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
     private PropertyMode currentMode;  // 当前模式（根据不同模式，显示不同的可用面板）
 
 
+    private static int containerWidth() {
+        if (FRContext.isChineseEnv()) {
+            return UIEastResizableContainer.MIN_CONTAINER_WIDTH;
+        }
+        return UIEastResizableContainer.MAX_CONTAINER_WIDTH;
+    }
+
     /**
      * 得到实例
      *

designer-base/src/main/java/com/fr/file/FILEChooserPane.java

@@ -12,6 +12,7 @@ import com.fr.design.dialog.UIDialog;
 import com.fr.design.env.DesignerWorkspaceInfo;
 import com.fr.design.env.DesignerWorkspaceType;
 import com.fr.design.file.HistoryTemplateListPane;
+import com.fr.design.file.NodeAuthProcessor;
 import com.fr.design.fun.ReportSupportedFileUIProvider;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ibutton.UIButtonUI;
@@ -916,7 +917,8 @@ public class FILEChooserPane extends BasicPane {
         try {
             access = FRContext.getOrganizationOperator().canAccess(selectedFile.getPath());
             if (selectedFile.isEnvFile() && selectedFile instanceof FileNodeFILE) {
-                access = access && ((FileNodeFILE) selectedFile).hasFullAuth();
+                FileNodeFILE fileNodeFILE = ((FileNodeFILE) selectedFile);
+                access = access && fileNodeFILE.hasFullAuth() && NodeAuthProcessor.getInstance().checkFileNodeAuth(new FileNode(fileNodeFILE.getPath(), fileNodeFILE.isDirectory()));
             }
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);

designer-base/src/test/java/com/fr/design/env/RemoteDesignerWorkspaceInfoTest.java

@@ -0,0 +1,25 @@
+package com.fr.design.env;
+
+import com.fr.workspace.connect.WorkspaceConnectionInfo;
+import junit.framework.TestCase;
+import org.junit.Assert;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2020/7/15
+ */
+public class RemoteDesignerWorkspaceInfoTest extends TestCase {
+
+    public void testCheckValid() {
+        RemoteDesignerWorkspaceInfo workspaceInfo0 = RemoteDesignerWorkspaceInfo.create(new WorkspaceConnectionInfo("http://localhost:8075/webroot/decision", "admin", "123", "", "", true));
+        RemoteDesignerWorkspaceInfo workspaceInfo1 = RemoteDesignerWorkspaceInfo.create(new WorkspaceConnectionInfo("http://127.0.0.1:8075/webroot/decision", "admin", "123", "", "", true));
+        RemoteDesignerWorkspaceInfo workspaceInfo2 = RemoteDesignerWorkspaceInfo.create(new WorkspaceConnectionInfo("https://127.0.0.1:8075/webroot/decision", "admin", "123", "", "", true));
+        RemoteDesignerWorkspaceInfo workspaceInfo3 = RemoteDesignerWorkspaceInfo.create(new WorkspaceConnectionInfo("https://localhost:8075/webroot/decision", "admin", "123", "", "", true));
+        Assert.assertFalse(workspaceInfo0.checkValid());
+        Assert.assertFalse(workspaceInfo1.checkValid());
+        Assert.assertFalse(workspaceInfo2.checkValid());
+        Assert.assertFalse(workspaceInfo3.checkValid());
+    }
+
+}

designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartAreaFillColorConditionPane.java

@@ -1,11 +1,11 @@
 package com.fr.van.chart.designer.other.condition.item;
 
-import com.fr.chart.base.ChartConstants;
 import com.fr.chart.base.DataSeriesCondition;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.condition.ConditionAttributesPane;
-
+import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.plugin.chart.base.AttrAreaSeriesFillColorBackground;
+import com.fr.plugin.chart.type.GradientType;
 import com.fr.van.chart.designer.component.VanChartAreaSeriesFillColorPane;
 
 import javax.swing.JPanel;
@@ -40,6 +40,7 @@ public class VanChartAreaFillColorConditionPane  extends AbstractNormalMultiLine
 
     /**
      * 条件属性item的名称
+     *
      * @return item的名称
      */
     public String nameForPopupMenuItem() {
@@ -54,13 +55,13 @@ public class VanChartAreaFillColorConditionPane  extends AbstractNormalMultiLine
     public void setDefault() {
         //下面这句话是给各组件一个默认值
         fillColorBackground.populate(new AttrAreaSeriesFillColorBackground());
-        fillColorBackground.checkoutAlpha(!(plot != null && plot.getPlotStyle() == ChartConstants.STYLE_SHADE));
+        fillColorBackground.checkoutAlpha(plot != null && ((VanChartPlot) plot).getGradientStyle().getGradientType() == GradientType.NONE);
     }
 
     public void populate(DataSeriesCondition condition) {
         if (condition instanceof AttrAreaSeriesFillColorBackground) {
             fillColorBackground.populate((AttrAreaSeriesFillColorBackground) condition);
-            fillColorBackground.checkoutAlpha(!(plot != null &&  plot.getPlotStyle() == ChartConstants.STYLE_SHADE));
+            fillColorBackground.checkoutAlpha(plot != null && ((VanChartPlot) plot).getGradientStyle().getGradientType() == GradientType.NONE);
         }
     }
 

designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAlertValuePane.java

@@ -50,10 +50,10 @@ public class VanChartAlertValuePane extends BasicBeanPane<VanChartAlertValue> {
     private static final double LINE_WIDTH_DEFAULT_VALUE = 1;
 
     private UIButtonGroup alertAxis;
-    protected TinyFormulaPane alertValue;
-    protected LineTypeComboBox alertLineStyle;//线型
+    private TinyFormulaPane alertValue;
+    private LineTypeComboBox alertLineStyle;//线型
     private UISpinner lineWidthSpinner;//线宽
-    protected ColorSelectBox alertLineColor;
+    private ColorSelectBox alertLineColor;
 
     private UIButtonGroup alertTextPosition;
     private TinyFormulaPane alertText;
@@ -67,6 +67,22 @@ public class VanChartAlertValuePane extends BasicBeanPane<VanChartAlertValue> {
         initComponents();
     }
 
+    public TinyFormulaPane getAlertValue() {
+        return alertValue;
+    }
+
+    public LineTypeComboBox getAlertLineStyle() {
+        return alertLineStyle;
+    }
+
+    public UISpinner getLineWidthSpinner() {
+        return lineWidthSpinner;
+    }
+
+    public ColorSelectBox getAlertLineColor() {
+        return alertLineColor;
+    }
+
     private void initComponents() {
         alertValue = new TinyFormulaPane();
 

designer-chart/src/main/java/com/fr/van/chart/designer/style/background/radar/VanChartRadarAlertValuePane.java

@@ -1,7 +1,7 @@
 package com.fr.van.chart.designer.style.background.radar;
 
 import com.fr.design.gui.ilable.UILabel;
-
+import com.fr.design.i18n.Toolkit;
 import com.fr.van.chart.designer.style.background.VanChartAlertValuePane;
 
 import java.awt.Component;
@@ -14,9 +14,10 @@ public class VanChartRadarAlertValuePane extends VanChartAlertValuePane {
 
     protected Component[][] getTopPaneComponents() {
         return new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Value")),alertValue},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),alertLineStyle},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color")),alertLineColor},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Use_Value")), getAlertValue()},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Line_Style")), getAlertLineStyle()},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Line_Width")), getLineWidthSpinner()},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Color")), getAlertLineColor()},
         };
     }
 

designer-chart/src/main/java/com/fr/van/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java

@@ -5,7 +5,6 @@ import com.fr.base.chart.chartdata.model.LargeDataModel;
 import com.fr.base.chart.chartdata.model.NormalDataModel;
 import com.fr.chart.base.AttrAlpha;
 import com.fr.chart.base.AttrBorder;
-import com.fr.chart.base.ChartConstants;
 import com.fr.chart.base.GradientStyle;
 import com.fr.chart.chartattr.Plot;
 import com.fr.chart.chartglyph.ConditionAttr;
@@ -310,7 +309,7 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
 
         populateCondition(plot.getConditionCollection().getDefaultAttr());
 
-        checkAreaSeriesFillColorPane(plot.getPlotStyle());
+        checkAreaSeriesFillColorPane(((VanChartPlot) plot).getGradientStyle());
 
         checkCompsEnabledWithLarge(plot);
     }
@@ -369,16 +368,16 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
 
         updateCondition(plot.getConditionCollection().getDefaultAttr());
 
-        checkAreaSeriesFillColorPane(plot.getPlotStyle());
+        checkAreaSeriesFillColorPane(((VanChartPlot) plot).getGradientStyle());
     }
 
     protected void checkoutMapType(Plot plot) {
 
     }
 
-    protected void checkAreaSeriesFillColorPane(int plotStyle) {
+    protected void checkAreaSeriesFillColorPane(GradientStyle gradientStyle) {
         if (areaSeriesFillColorPane != null) {
-            areaSeriesFillColorPane.checkoutAlpha(plotStyle == ChartConstants.STYLE_NONE);
+            areaSeriesFillColorPane.checkoutAlpha(gradientStyle.getGradientType() == GradientType.NONE);
         }
     }
 

designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java

@@ -11,6 +11,7 @@ import com.fr.design.designer.creator.cardlayout.XWCardMainBorderLayout;
 import com.fr.design.designer.creator.cardlayout.XWCardTagLayout;
 import com.fr.design.designer.creator.cardlayout.XWCardTitleLayout;
 import com.fr.design.designer.creator.cardlayout.XWTabFitLayout;
+import com.fr.design.fun.ChartWidgetOptionProvider;
 import com.fr.design.fun.FormWidgetOptionProvider;
 import com.fr.design.fun.ParameterWidgetOptionProvider;
 import com.fr.design.module.DesignModuleFactory;
@@ -102,7 +103,8 @@ public class XCreatorUtils {
             public boolean accept(PluginContext context) {
 
                 return context.contain(PluginModule.ExtraDesign, ParameterWidgetOptionProvider.XML_TAG)
-                        || context.contain(PluginModule.ExtraDesign, FormWidgetOptionProvider.XML_TAG);
+                        || context.contain(PluginModule.ExtraDesign, FormWidgetOptionProvider.XML_TAG)
+                        || context.contain(PluginModule.ExtraDesign, ChartWidgetOptionProvider.XML_TAG);
             }
         });
     }

designer-form/src/main/java/com/fr/design/form/parameter/FormParaDesigner.java

@@ -83,6 +83,7 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP
     private static final int SUBMIT_BUTTON_H_LOCATION = 270;
     private static final int PARA_IMAGE_SHIFT_X = -4;
     private static final int FORM_AREA_PADDING_LEFT = 13;
+    private int addableRegionY;
 
     private static Image paraImage = BaseUtils.readImage("/com/fr/design/images/form/parameter.png");
 
@@ -412,10 +413,30 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP
         if (layoutContainer == null) {
             layoutContainer = new XWParameterLayout();
         }
+        refreshAddableRegion(layoutContainer);
         layoutContainer.setSize(LARGE_PREFERRED_SIZE);
         setRootComponent(layoutContainer);
     }
 
+    /**
+     * @param layoutContainer
+     * @Description: 为了不覆盖以前的组件，所以要计算可以添加组件的区域
+     * @return:
+     * @Author: Henry.Wang
+     * @date: 2020/7/15 15:12
+     */
+    public void refreshAddableRegion(XLayoutContainer layoutContainer) {
+        addableRegionY = 0;
+        for (int i = 0; i < layoutContainer.getComponentCount(); i++) {
+            Rectangle rectangle = layoutContainer.getComponent(i).getBounds();
+            if (addableRegionY < rectangle.y + rectangle.height) {
+                addableRegionY = rectangle.y + rectangle.height;
+            }
+        }
+        int vGap = V_COMPONENT_GAP - (int) XCreator.SMALL_PREFERRED_SIZE.getHeight();
+        addableRegionY = Math.max(0, addableRegionY - FIRST_V_LOCATION + (int) (XCreator.SMALL_PREFERRED_SIZE.getHeight() / 2) + vGap);
+    }
+
     /**
      * 是否是报表的参数面板
      *
@@ -583,14 +604,15 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP
         label.setWidgetName("Label" + name);
         label.setWidgetValue(new WidgetValue(name + ":"));
         XCreator xCreator = XCreatorUtils.createXCreator(label);
-        if (!(this.autoAddComponent(xCreator, H_COMPONENT_GAP * (currentIndex % NUM_IN_A_LINE)
-                + FIRST_H_LOCATION, FIRST_V_LOCATION + V_COMPONENT_GAP * (currentIndex / NUM_IN_A_LINE)))) {
+        int x = H_COMPONENT_GAP * (currentIndex % NUM_IN_A_LINE) + FIRST_H_LOCATION;
+        int y = addableRegionY + FIRST_V_LOCATION + V_COMPONENT_GAP * (currentIndex / NUM_IN_A_LINE);
+        if (!(this.autoAddComponent(xCreator, x, y))) {
             return false;
         }
         EditorHolder editor = new EditorHolder(parameter);
         xCreator = XCreatorUtils.createXCreator(editor);
-        if (!(this.autoAddComponent(xCreator, H_COMPONENT_GAP * (currentIndex % NUM_IN_A_LINE)
-                + SECOND_H_LOCATION, FIRST_V_LOCATION + V_COMPONENT_GAP * (currentIndex / NUM_IN_A_LINE)))) {
+        x = H_COMPONENT_GAP * (currentIndex % NUM_IN_A_LINE) + SECOND_H_LOCATION;
+        if (!(this.autoAddComponent(xCreator, x, y))) {
             return false;
         }
         return true;
@@ -646,16 +668,17 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP
             label.setWidgetValue(new WidgetValue(parameterArray[i].getName() + ":"));
             XCreator xCreator = XCreatorUtils.createXCreator(label);
 
-            if (!(this.autoAddComponent(xCreator, H_COMPONENT_GAP * (currentIndex % NUM_IN_A_LINE)
-                    + FIRST_H_LOCATION, FIRST_V_LOCATION + V_COMPONENT_GAP * (currentIndex / NUM_IN_A_LINE)))) {
+            int x = H_COMPONENT_GAP * (currentIndex % NUM_IN_A_LINE) + FIRST_H_LOCATION;
+            int y = addableRegionY + FIRST_V_LOCATION + V_COMPONENT_GAP * (currentIndex / NUM_IN_A_LINE);
+            if (!(this.autoAddComponent(xCreator, x, y))) {
                 break;
             }
             // 每行显示5组
             EditorHolder editor = new EditorHolder(parameterArray[i]);
             editor.setWidgetName(parameterArray[i].getName());
             xCreator = XCreatorUtils.createXCreator(editor);
-            if (!(this.autoAddComponent(xCreator, H_COMPONENT_GAP * (currentIndex % NUM_IN_A_LINE)
-                    + SECOND_H_LOCATION, FIRST_V_LOCATION + V_COMPONENT_GAP * (currentIndex / NUM_IN_A_LINE)))) {
+            x = H_COMPONENT_GAP * (currentIndex % NUM_IN_A_LINE) + SECOND_H_LOCATION;
+            if (!(this.autoAddComponent(xCreator, x, y))) {
                 break;
             }
             currentIndex++;

designer-realize/src/main/java/com/fr/quickeditor/CellQuickEditor.java

@@ -1,5 +1,6 @@
 package com.fr.quickeditor;
 
+import com.fr.base.GraphHelper;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.file.HistoryTemplateListPane;
@@ -49,7 +50,6 @@ public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> {
 
     protected static final Dimension LABEL_DIMENSION = new Dimension(60, 20);
     protected static final int VGAP = 10, HGAP = 8, VGAP_INNER = 3;
-    private static final int INSERT_CONTENT_LABEL_WIDTH = 60;
 
     /**
      * 滚动条相关配置
@@ -208,7 +208,7 @@ public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> {
     private JPanel initTopContent() {
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
-        double[] columnSize = {INSERT_CONTENT_LABEL_WIDTH, f};
+        double[] columnSize = {GraphHelper.getWidth(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Insert_Cell_Element")), f};
         double[] rowSize = {p, p};
         UILabel cellLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell"));
         UILabel insertContentLabel = FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Insert_Cell_Element"));