Merge pull request #1097 in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0

* commit 'c367d6b5a7c89bee0131d12d930d8e27b2323a18':
  REPORT-21584 设置参数界面的设计宽度到100，所有控件还是可以正常显示
  无
  REPORT-16985 屏蔽新插件管理器开启选项

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

@@ -24,6 +24,7 @@ import com.fr.design.mainframe.JTemplate;
 import com.fr.design.mainframe.widget.accessibles.AccessibleBackgroundEditor;
 import com.fr.design.utils.gui.UIComponentUtils;
 import com.fr.design.widget.ui.designer.AbstractDataModify;
+import com.fr.design.widget.ui.designer.component.UIBoundSpinner;
 import com.fr.form.ui.container.WParameterLayout;
 import com.fr.general.Background;
 
@@ -61,7 +62,7 @@ public class RootDesignDefinePane extends AbstractDataModify<WParameterLayout> {
 
     public void initComponent() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        designerWidth = new UISpinner(1, Integer.MAX_VALUE, 1);
+        designerWidth = new UIBoundSpinner(1, Integer.MAX_VALUE, 1);
         JPanel advancePane = createAdvancePane();
         UIExpandablePane advanceExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, advancePane);
         this.add(advanceExpandablePane, BorderLayout.NORTH);
@@ -162,7 +163,11 @@ public class RootDesignDefinePane extends AbstractDataModify<WParameterLayout> {
     public WParameterLayout updateBean() {
         WParameterLayout wParameterLayout = (WParameterLayout) creator.toData();
         wParameterLayout.setLabelName(labelNameTextField.getText());
+        if (isCompsOutOfDesignerWidth((int) designerWidth.getValue())) {
+            designerWidth.setValue(wParameterLayout.getDesignWidth());
+        } else {
             wParameterLayout.setDesignWidth((int) designerWidth.getValue());
+        }
         wParameterLayout.setDelayDisplayContent(displayReport.isSelected());
         wParameterLayout.setUseParamsTemplate(useParamsTemplate.isSelected());
         JTemplate jTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
@@ -172,6 +177,15 @@ public class RootDesignDefinePane extends AbstractDataModify<WParameterLayout> {
         return wParameterLayout;
     }
 
+    private boolean isCompsOutOfDesignerWidth(int designerWidth){
+        for(int i=0; i<root.getComponentCount(); i++){
+            Component comp = root.getComponent(i);
+            if(comp.getX() + comp.getWidth() > designerWidth){
+                return true;
+            }
+        }
+        return false;
+    }
     @Override
     public DataCreatorUI dataUI() {
         return null;