Merge pull request #1662 in BA/design from ~PLOUGH/design:feature/9.0 to feature/9.0

* commit 'bddce6e6e69ddaaa3ee1ba6c90a130f4a0ab8d4b':
  REPORT-6888 9.0 控件的标签属性问题=》修复表单控件属性面板高级设置中文本框无法正常输入的问题

designer_form/src/com/fr/design/mainframe/JForm.java

@@ -15,7 +15,12 @@ import com.fr.design.designer.beans.actions.FormDeleteAction;
 import com.fr.design.designer.beans.actions.PasteAction;
 import com.fr.design.designer.beans.events.DesignerEditListener;
 import com.fr.design.designer.beans.events.DesignerEvent;
-import com.fr.design.designer.creator.*;
+import com.fr.design.designer.creator.XComponent;
+import com.fr.design.designer.creator.XCreator;
+import com.fr.design.designer.creator.XCreatorUtils;
+import com.fr.design.designer.creator.XLayoutContainer;
+import com.fr.design.designer.creator.XWAbsoluteBodyLayout;
+import com.fr.design.designer.creator.XWParameterLayout;
 import com.fr.design.designer.properties.FormWidgetAuthorityEditPane;
 import com.fr.design.event.TargetModifiedEvent;
 import com.fr.design.event.TargetModifiedListener;
@@ -58,8 +63,17 @@ import com.fr.stable.ArrayUtils;
 import com.fr.stable.Constants;
 import com.fr.stable.bridge.StableFactory;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.BorderFactory;
+import javax.swing.Icon;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import javax.swing.SwingConstants;
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Font;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.image.BufferedImage;
@@ -797,15 +811,6 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
             JForm.this.fireTargetModified();
         }
     }
-
-    /**
-     * 模板更新
-     */
-    public void fireTargetModified() {
-        super.fireTargetModified();
-        WidgetPropertyPane.getInstance().refreshDockingView();
-    }
-
     /**
      * 在Form和ElementCase, 以及ElementCase和ElementCase之间切换
      *

designer_form/src/com/fr/design/mainframe/actions/FormMobileAttrAction.java

@@ -8,6 +8,7 @@ import com.fr.design.form.mobile.FormMobileAttrPane;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.FormArea;
 import com.fr.design.mainframe.JForm;
+import com.fr.design.mainframe.WidgetPropertyPane;
 import com.fr.design.menu.MenuKeySet;
 import com.fr.form.main.Form;
 import com.fr.form.main.mobile.FormMobileAttr;
@@ -16,7 +17,7 @@ import com.fr.plugin.ExtraClassManager;
 import com.fr.stable.ReportFunctionProcessor;
 import com.fr.stable.fun.FunctionProcessor;
 
-import javax.swing.*;
+import javax.swing.KeyStroke;
 import java.awt.event.ActionEvent;
 
 /**
@@ -54,7 +55,7 @@ public class FormMobileAttrAction extends JTemplateAction<JForm> {
                 FormMobileAttr formMobileAttr = mobileAttrPane.updateBean();
                 formTpl.setFormMobileAttr(formMobileAttr);
                 ((FormArea)jf.getFormDesign().getParent()).onMobileAttrModified();
-                jf.fireTargetModified();
+                WidgetPropertyPane.getInstance().refreshDockingView();
                 if (formMobileAttr.isMobileOnly()) {
                     FunctionProcessor processor = ExtraClassManager.getInstance().getFunctionProcessor();
                     if (processor != null) {