Merge pull request #1323 in BA/design from ~KERRY/design:release/9.0 to release/9.0

* commit 'b29838c9d158228b05a0cadd6826cdd5ed5d3670':
  REPORT-4947 表单组件可用可见设置失效

designer_base/src/com/fr/design/mainframe/widget/BasicPropertyPane.java

@@ -28,7 +28,7 @@ public class BasicPropertyPane extends BasicPane {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         this.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
         widgetName = new UITextField();
-        widgetName.setGlobalName(Inter.getLocText("FR-Designer_Widget_Name"));
+        widgetName.setGlobalName(Inter.getLocText("FR-Designer_Basic"));
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
         double[] rowSize = {p};

designer_form/src/com/fr/design/mainframe/widget/ui/BasicSetVisiblePropertyPane.java

@@ -27,6 +27,8 @@ public class BasicSetVisiblePropertyPane extends FormBasicPropertyPane {
             pane2.add(otherOtherConfig);
         }
         visibleCheckBox = new UICheckBox(Inter.getLocText("Widget-Visible"), true);
+        visibleCheckBox.setGlobalName(Inter.getLocText("FR-Designer_Basic"));
+
         visibleCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0));
         pane2.add(visibleCheckBox);
         this.add(pane2, BorderLayout.CENTER);

designer_form/src/com/fr/design/mainframe/widget/ui/FormBasicWidgetPropertyPane.java

@@ -17,6 +17,8 @@ public class FormBasicWidgetPropertyPane extends BasicSetVisiblePropertyPane {
 
     public UICheckBox createOtherConfig() {
         enableCheckBox = new UICheckBox(Inter.getLocText("Enabled"), true);
+        enableCheckBox.setGlobalName(Inter.getLocText("FR-Designer_Basic"));
+
         enableCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0));
         return enableCheckBox;
     }

designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java

@@ -210,7 +210,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
     public void updateCreator() {
         currentEditorDefinePane.setGlobalName(getGlobalName());
         Widget widget = currentEditorDefinePane.updateBean();
-        if (ComparatorUtils.equals(getGlobalName(), Inter.getLocText("FR-Designer_Widget_Name")) && widgetPropertyPane != null) {
+        if (ComparatorUtils.equals(getGlobalName(), Inter.getLocText("FR-Designer_Basic")) && widgetPropertyPane != null) {
             widgetPropertyPane.update(widget);
             xCreator.resetCreatorName(widget.getWidgetName());
             designer.getEditListenerTable().fireCreatorModified(xCreator, DesignerEvent.CREATOR_RENAMED);