Pull request #12201: REPORT-97225【H5控件增强】关于文本类控件的新功能，设计器设置项的屏蔽

Merge in DESIGN/design from ~CORAL.CHEN/design:release/11.0 to release/11.0

* commit '41329b7cd38b00fb1546c1afc9d302b1b5269f06':
  EPORT-97225 【H5控件增强】关于文本类控件的新功能，设计器设置项的屏蔽

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

@@ -6,9 +6,7 @@ package com.fr.design.designer.creator;
 import com.fr.base.BaseUtils;
 import com.fr.base.ScreenResolution;
 import com.fr.base.Style;
-import com.fr.design.designer.properties.mobile.NumberEditorMobilePropertyUI;
 import com.fr.design.form.util.XCreatorConstants;
-import com.fr.design.fun.WidgetPropertyUIProvider;
 import com.fr.design.mainframe.widget.editors.InChangeBooleanEditor;
 import com.fr.design.mainframe.widget.editors.SpinnerMaxNumberEditor;
 import com.fr.design.mainframe.widget.editors.SpinnerMinNumberEditor;
@@ -94,18 +92,18 @@ public class XNumberEditor extends XWrapperedFieldEditor {
 	}
 
 	@Override
-    protected JComponent initEditor() {
-        setBorder(FIELDBORDER);
-        return this;
-    }
+	protected JComponent initEditor() {
+		setBorder(FIELDBORDER);
+		return this;
+	}
 
-    @Override
-    protected String getIconName() {
-        return "number_field_16.png";
-    }
+	@Override
+	protected String getIconName() {
+		return "number_field_16.png";
+	}
 
-    @Override
-    public WidgetPropertyUIProvider[] getWidgetPropertyUIProviders() {
-        return new WidgetPropertyUIProvider[]{new NumberEditorMobilePropertyUI(this)};
-    }
+//    @Override
+//    public WidgetPropertyUIProvider[] getWidgetPropertyUIProviders() {
+//        return new WidgetPropertyUIProvider[]{new NumberEditorMobilePropertyUI(this)};
+//    }
 }

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

@@ -3,9 +3,7 @@
  */
 package com.fr.design.designer.creator;
 
-import com.fr.design.designer.properties.mobile.PasswordMobilePropertyUI;
 import com.fr.design.form.util.XCreatorConstants;
-import com.fr.design.fun.WidgetPropertyUIProvider;
 import com.fr.design.gui.ibutton.UIPasswordField;
 import com.fr.design.mainframe.widget.editors.RegexEditor;
 import com.fr.design.mainframe.widget.editors.WidgetValueEditor;
@@ -70,8 +68,8 @@ public class XPassword extends XWrapperedFieldEditor {
                 (CRPropertyDescriptor[]) ArrayUtils.addAll(sup, new CRPropertyDescriptor[]{regex, waterMark});
     }
 
-    @Override
-    public WidgetPropertyUIProvider[] getWidgetPropertyUIProviders() {
-        return new WidgetPropertyUIProvider[]{new PasswordMobilePropertyUI(this)};
-    }
+//    @Override
+//    public WidgetPropertyUIProvider[] getWidgetPropertyUIProviders() {
+//        return new WidgetPropertyUIProvider[]{new PasswordMobilePropertyUI(this)};
+//    }
 }

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

@@ -6,9 +6,7 @@ package com.fr.design.designer.creator;
 import com.fr.base.BaseUtils;
 import com.fr.base.ScreenResolution;
 import com.fr.base.Style;
-import com.fr.design.designer.properties.mobile.TextAreaMobilePropertyUI;
 import com.fr.design.form.util.XCreatorConstants;
-import com.fr.design.fun.WidgetPropertyUIProvider;
 import com.fr.design.mainframe.widget.editors.RegexEditor;
 import com.fr.design.mainframe.widget.editors.WidgetValueEditor;
 import com.fr.design.mainframe.widget.renderer.RegexCellRencerer;
@@ -85,9 +83,9 @@ public class XTextArea extends XWrapperedFieldEditor {
         return "text_area_16.png";
     }
 
-    @Override
-    public WidgetPropertyUIProvider[] getWidgetPropertyUIProviders() {
-        return new WidgetPropertyUIProvider[]{new TextAreaMobilePropertyUI(this)};
-    }
+//    @Override
+//    public WidgetPropertyUIProvider[] getWidgetPropertyUIProviders() {
+//        return new WidgetPropertyUIProvider[]{new TextAreaMobilePropertyUI(this)};
+//    }
 
 }

designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/TextEditorMobileDefinePane.java

@@ -3,7 +3,6 @@ package com.fr.design.widget.ui.designer.mobile;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.FormDesigner;
-import com.fr.design.widget.ui.designer.mobile.component.MobileTextEditSettingPane;
 import com.fr.design.widget.ui.designer.mobile.component.MobileTextFieldInputSettingPane;
 import com.fr.form.ui.TextEditor;
 
@@ -31,9 +30,9 @@ public class TextEditorMobileDefinePane extends BaseTextEditorMobileDefinePane {
     @Override
     protected void initSettingPane(JPanel container) {
         inputSettingPane = new MobileTextFieldInputSettingPane();
-        textSettingPane = new MobileTextEditSettingPane();
+//        textSettingPane = new MobileTextEditSettingPane();
         container.add(inputSettingPane);
-        container.add(textSettingPane);
+//        container.add(textSettingPane);
     }
 
 
@@ -41,7 +40,7 @@ public class TextEditorMobileDefinePane extends BaseTextEditorMobileDefinePane {
     public void populate(FormDesigner designer) {
         TextEditor textEditor = (TextEditor) getxCreator().toData();
         inputSettingPane.populateBean(textEditor.getMobileScanCodeAttr());
-        textSettingPane.populateBean(textEditor.getMobileTextEditAttr());
+//        textSettingPane.populateBean(textEditor.getMobileTextEditAttr());
         this.bindListeners2Widgets();
     }
 
@@ -49,7 +48,7 @@ public class TextEditorMobileDefinePane extends BaseTextEditorMobileDefinePane {
     public void update() {
         TextEditor textEditor = (TextEditor) getxCreator().toData();
         inputSettingPane.updateBean(textEditor.getMobileScanCodeAttr());
-        textSettingPane.updateBean(textEditor.getMobileTextEditAttr());
+//        textSettingPane.updateBean(textEditor.getMobileTextEditAttr());
         DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified();
     }
 

designer-realize/src/main/java/com/fr/design/widget/WidgetMobilePaneFactory.java

@@ -4,14 +4,8 @@ import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.fun.CellWidgetOptionProvider;
 import com.fr.design.widget.mobile.WidgetMobilePane;
 import com.fr.design.widget.ui.mobile.MultiFileEditorMobilePane;
-import com.fr.design.widget.ui.mobile.NumberEditorMobilePane;
-import com.fr.design.widget.ui.mobile.PasswordMobilePane;
-import com.fr.design.widget.ui.mobile.TextAreaMobilePane;
 import com.fr.design.widget.ui.mobile.TextEditorMobilePane;
 import com.fr.form.ui.MultiFileEditor;
-import com.fr.form.ui.NumberEditor;
-import com.fr.form.ui.Password;
-import com.fr.form.ui.TextArea;
 import com.fr.form.ui.TextEditor;
 import com.fr.form.ui.Widget;
 import com.fr.general.GeneralContext;
@@ -35,9 +29,10 @@ public class WidgetMobilePaneFactory {
     static {
         mobilePaneMap.put(MultiFileEditor.class, MultiFileEditorMobilePane.class);
         mobilePaneMap.put(TextEditor.class, TextEditorMobilePane.class);
-        mobilePaneMap.put(TextArea.class, TextAreaMobilePane.class);
-        mobilePaneMap.put(NumberEditor.class, NumberEditorMobilePane.class);
-        mobilePaneMap.put(Password.class, PasswordMobilePane.class);
+        // 此版本不发布，先屏蔽入口
+        // mobilePaneMap.put(TextArea.class, TextAreaMobilePane.class);
+        // mobilePaneMap.put(NumberEditor.class, NumberEditorMobilePane.class);
+        // mobilePaneMap.put(Password.class, PasswordMobilePane.class);
         mobilePluginPaneMap.putAll(ExtraDesignClassManager.getInstance().getCellWidgetMobileOptionsMap());
 
         GeneralContext.listenPluginRunningChanged(new PluginEventListener() {

designer-realize/src/main/java/com/fr/design/widget/ui/mobile/TextEditorMobilePane.java

@@ -37,7 +37,7 @@ public class TextEditorMobilePane extends WidgetMobilePane {
         settingPane = new MobileTextFieldInputSettingPane();
         textSettingPane = new MobileTextEditSettingPane();
         container.add(settingPane);
-        container.add(textSettingPane);
+//        container.add(textSettingPane);
         this.add(new UIExpandablePane(Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, container), BorderLayout.NORTH);
     }