Merge pull request #12682 in DESIGN/design from final/11.0 to release/11.0

* commit '9d3cccd6efa6855e3166ea16b04b13af317966f6':
  REPORT-103382 切换移动端自定义样式，类转换异常
  REPORT-97143 延期，屏蔽入口
  REPORT-104017 不专门适配fvs了，编辑窗口根据模版主题适配图层的功能可以兼容fvs场景，fvs创建图层时处理一下为black即可
  REPORT-104133 【文本类控件】文本类控件新功能入口在设计器上打开
  REPORT-104017 删除没用的代码
  REPORT-104017 海外版本地图组件的GIS图层优化-fvs下切换gis图层配置时自动会由mapbox变为黑色
  REPORT-104017 海外版本地图组件的GIS图层优化-fvs下切换gis图层配置时自动会由mapbox变为黑色
  REPORT-104017 海外版本地图组件的GIS图层优化-fvs下切换gis图层配置时自动会由mapbox变为黑色
  REPORT-104017 海外版本地图组件的GIS图层优化-fvs下切换gis图层配置时自动会由mapbox变为黑色

designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileStyleDefinePane.java

@@ -91,6 +91,7 @@ public class MobileStyleDefinePane extends BasicBeanPane<MobileStyle> {
 
     @Override
     public MobileStyle updateBean() {
+        mobileStyle = Reflect.on(mobileStyleClazz).create().get();
         this.widget.setMobileStyle(mobileStyle);
         this.customBeanPane.updateBean();
         mobileStyle.setCommonCustom(customCombo.getSelectedIndex() == 1);

designer-chart/src/main/java/com/fr/van/chart/map/designer/type/GisLayerPane.java

@@ -248,19 +248,9 @@ public class GisLayerPane extends JPanel implements UIObserver {
     }
 
     public void resetGisLayer(VanChartMapPlot mapPlot) {
-
-//        if (ChartEditContext.supportTheme()) {
-            GisLayer defaultGisLayer = mapPlot.getDefaultGisLayer();
-            mapPlot.setGisLayer(defaultGisLayer);
-            populate(defaultGisLayer);
-//        } else {
-//            GaoDeGisType gaoDeGisType = mapPlot.getDefaultGisLayerType();
-//
-//            mapPlot.getGisLayer().setGisLayerType(GISLayerType.GAO_DE_API);
-//            mapPlot.getGisLayer().setLayerName(gaoDeGisType.getTypeName());
-//            mapPlot.getGisLayer().setGaoDeGisType(gaoDeGisType);
-//            populate(mapPlot.getGisLayer());
-//        }
+        GisLayer defaultGisLayer = mapPlot.getDefaultGisLayer();
+        mapPlot.setGisLayer(defaultGisLayer);
+        populate(defaultGisLayer);
     }
 
     public void populate(GisLayer layer) {
@@ -269,7 +259,6 @@ public class GisLayerPane extends JPanel implements UIObserver {
                 gisButton.setSelectedIndex(0);
                 layer.setGisLayerType(GISLayerType.AUTO);
                 layer.setLayerName(GISLayerType.getLocString(GISLayerType.AUTO));
-                //dealWithTemplateTheme(layer);
                 break;
             case GAO_DE_API:
                 populateStandardGis(layer);
@@ -291,7 +280,7 @@ public class GisLayerPane extends JPanel implements UIObserver {
         if (layer.getGisLayerType() == GISLayerType.LAYER_NULL) {
             standardLayers.setSelectedIndex(standardLayers.getItemCount() - 1);
         } else {
-            if(Locale.CHINA.equals(GeneralContext.getLocale())) {
+            if (Locale.CHINA.equals(GeneralContext.getLocale())) {
                 standardLayers.setSelectedItem(layerName);
                 layer.setGaoDeGisType(GaoDeGisType.parseByLocaleName(layerName));
             } else {
@@ -358,8 +347,11 @@ public class GisLayerPane extends JPanel implements UIObserver {
      * @param layer 图层
      */
     private void adaptEditingTemplateTheme(GisLayer layer) {
+        if (Locale.CHINA.equals(GeneralContext.getLocale())) {
+            return;
+        }
         JTemplate<?, ?> currentEditingTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
-        if(JTemplate.isValid(currentEditingTemplate)) {
+        if (JTemplate.isValid(currentEditingTemplate)) {
             boolean dark = currentEditingTemplate.getTemplateTheme().isDark();
             String name = dark ? Toolkit.i18nText("Fine-Design_Chart_Layer_Black") : Toolkit.i18nText("Fine-Design_Chart_Layer_MapBox");
             layer.setLayerName(name);

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

@@ -102,8 +102,8 @@ public class XNumberEditor extends XWrapperedFieldEditor {
 		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/widget/ui/designer/mobile/TextEditorMobileDefinePane.java

@@ -30,9 +30,10 @@ 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);
     }
 
 
@@ -40,7 +41,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();
     }
 
@@ -48,7 +49,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

@@ -29,10 +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);
     }