Merge pull request #1668 in BA/design from ~FANGLEI/design:release/9.0 to release/9.0

* commit 'b9aaedc1415c2b8ec65e5e97f0d8adcc918de186':
  .
  不能直接修改反射的参数，把FieldEditorDefinePane中的designer获取方式换成从WidgetPropertyPane中获取
  MOBILE-7394 解决设计器标签控件赋值后，控件标签名称的赋值问题

designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java

@@ -53,7 +53,6 @@ public class RootDesignDefinePane extends AbstractDataModify<WParameterLayout> {
         initComponent();
     }
 
-
     public void initComponent() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         designerWidth = new UISpinner(1, Integer.MAX_VALUE, 1);

designer_form/src/com/fr/design/widget/ui/designer/FieldEditorDefinePane.java

@@ -9,8 +9,13 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.mainframe.FormDesigner;
+import com.fr.design.mainframe.WidgetPropertyPane;
 import com.fr.design.widget.ui.designer.component.FontSizeComboPane;
 import com.fr.form.ui.FieldEditor;
+import com.fr.form.ui.Widget;
+import com.fr.form.ui.container.WParameterLayout;
+import com.fr.general.ComparatorUtils;
 import com.fr.general.Inter;
 
 import javax.swing.*;
@@ -70,6 +75,12 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
         e.setAllowBlank(this.allowBlankCheckBox.isSelected());
         e.setErrorMessage(this.errorMsgTextField.getText());
         e.setFontSize(fontSizePane.getValue());
+        designer = WidgetPropertyPane.getInstance().getEditingFormDesigner();
+        if (!ComparatorUtils.equals(e.getLabelName(), labelNameTextField.getText())) {
+            XCreator xCreator = designer.getSelectionModel().getSelection().getSelectedCreator();
+            Widget selectedWidget = xCreator.toData();
+            ((WParameterLayout) designer.getParaComponent().toData()).setNameTagModified(selectedWidget.getWidgetName(), true);
+        }
         e.setLabelName(labelNameTextField.getText());
         return e;
     }

designer_form/src/com/fr/design/widget/ui/designer/TextFieldEditorDefinePane.java

@@ -27,7 +27,6 @@ public class TextFieldEditorDefinePane extends FieldEditorDefinePane<TextEditor>
         super(xCreator);
     }
 
-
     @Override
     protected JPanel setFirstContentPane() {
         regPane = createRegPane();