From c65877b26f71e8bffe4c76064301391baa02494f Mon Sep 17 00:00:00 2001 From: obo Date: Fri, 25 Aug 2023 10:49:08 +0800 Subject: [PATCH 1/9] =?UTF-8?q?REPORT-104017=20=E6=B5=B7=E5=A4=96=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=9B=BE=E7=BB=84=E4=BB=B6=E7=9A=84GIS?= =?UTF-8?q?=E5=9B=BE=E5=B1=82=E4=BC=98=E5=8C=96-fvs=E4=B8=8B=E5=88=87?= =?UTF-8?q?=E6=8D=A2gis=E5=9B=BE=E5=B1=82=E9=85=8D=E7=BD=AE=E6=97=B6?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E4=BC=9A=E7=94=B1mapbox=E5=8F=98=E4=B8=BA?= =?UTF-8?q?=E9=BB=91=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../van/chart/map/designer/type/GisLayerPane.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/GisLayerPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/GisLayerPane.java index 253e5dcf19..3a078d4e29 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/GisLayerPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/GisLayerPane.java @@ -358,10 +358,22 @@ 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(); + String defaultTabOperator = "DefaultTabOperator"; //用于判断是否为fvs,fvs没有主题,但会返回深色主题导致mapbox切换为black + 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"); + String name; + String mapbox = Toolkit.i18nText("Fine-Design_Chart_Layer_MapBox"); + String black = Toolkit.i18nText("Fine-Design_Chart_Layer_Black"); + if(defaultTabOperator.equals(currentEditingTemplate.getTemplateTabOperatorType())) { + name = dark ? black : mapbox; + } else { + name = mapbox; + } layer.setLayerName(name); } } From 3109cda04d14f5ce066f3e5587d359d7f4f915ae Mon Sep 17 00:00:00 2001 From: obo Date: Fri, 25 Aug 2023 13:56:50 +0800 Subject: [PATCH 2/9] =?UTF-8?q?REPORT-104017=20=E6=B5=B7=E5=A4=96=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=9B=BE=E7=BB=84=E4=BB=B6=E7=9A=84GIS?= =?UTF-8?q?=E5=9B=BE=E5=B1=82=E4=BC=98=E5=8C=96-fvs=E4=B8=8B=E5=88=87?= =?UTF-8?q?=E6=8D=A2gis=E5=9B=BE=E5=B1=82=E9=85=8D=E7=BD=AE=E6=97=B6?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E4=BC=9A=E7=94=B1mapbox=E5=8F=98=E4=B8=BA?= =?UTF-8?q?=E9=BB=91=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/map/designer/type/GisLayerPane.java | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/GisLayerPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/GisLayerPane.java index 3a078d4e29..d7bc40e33e 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/GisLayerPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/GisLayerPane.java @@ -62,6 +62,11 @@ public class GisLayerPane extends JPanel implements UIObserver { private String[] layers = MapLayerConfigManager.getCustomLayerItems(); + /** + * fvs的具体类型 + */ + private String FVS_TEMPLATE_CLASS = "class com.fr.plugin.wysiwyg.report.JDuchamp"; + public GisLayerPane() { initComps(); } @@ -250,9 +255,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); + GisLayer defaultGisLayer = mapPlot.getDefaultGisLayer(); + mapPlot.setGisLayer(defaultGisLayer); + populate(defaultGisLayer); // } else { // GaoDeGisType gaoDeGisType = mapPlot.getDefaultGisLayerType(); // @@ -291,7 +296,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,22 +363,16 @@ public class GisLayerPane extends JPanel implements UIObserver { * @param layer 图层 */ private void adaptEditingTemplateTheme(GisLayer layer) { - if (Locale.CHINA.equals(GeneralContext.getLocale())) { + if (GeneralContext.isSimpleChineseEnv()) { return; } JTemplate currentEditingTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); - String defaultTabOperator = "DefaultTabOperator"; //用于判断是否为fvs,fvs没有主题,但会返回深色主题导致mapbox切换为black - - if(JTemplate.isValid(currentEditingTemplate)) { - boolean dark = currentEditingTemplate.getTemplateTheme().isDark(); - String name; - String mapbox = Toolkit.i18nText("Fine-Design_Chart_Layer_MapBox"); - String black = Toolkit.i18nText("Fine-Design_Chart_Layer_Black"); - if(defaultTabOperator.equals(currentEditingTemplate.getTemplateTabOperatorType())) { - name = dark ? black : mapbox; - } else { - name = mapbox; + if (JTemplate.isValid(currentEditingTemplate)) { + if (FVS_TEMPLATE_CLASS.equals(currentEditingTemplate.getClass().toString())) { + return; } + 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); } } From 6eb5934a997c1955aecbd4ea877b6aa87abcc6e6 Mon Sep 17 00:00:00 2001 From: obo Date: Fri, 25 Aug 2023 14:00:30 +0800 Subject: [PATCH 3/9] =?UTF-8?q?REPORT-104017=20=E6=B5=B7=E5=A4=96=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=9B=BE=E7=BB=84=E4=BB=B6=E7=9A=84GIS?= =?UTF-8?q?=E5=9B=BE=E5=B1=82=E4=BC=98=E5=8C=96-fvs=E4=B8=8B=E5=88=87?= =?UTF-8?q?=E6=8D=A2gis=E5=9B=BE=E5=B1=82=E9=85=8D=E7=BD=AE=E6=97=B6?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E4=BC=9A=E7=94=B1mapbox=E5=8F=98=E4=B8=BA?= =?UTF-8?q?=E9=BB=91=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/van/chart/map/designer/type/GisLayerPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/GisLayerPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/GisLayerPane.java index d7bc40e33e..868a41fd4f 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/GisLayerPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/GisLayerPane.java @@ -65,7 +65,7 @@ public class GisLayerPane extends JPanel implements UIObserver { /** * fvs的具体类型 */ - private String FVS_TEMPLATE_CLASS = "class com.fr.plugin.wysiwyg.report.JDuchamp"; + private static final String FVS_TEMPLATE_CLASS = "class com.fr.plugin.wysiwyg.report.JDuchamp"; public GisLayerPane() { initComps(); From 5675d210ed8f4ebc85e65caa10652726a4da9932 Mon Sep 17 00:00:00 2001 From: obo Date: Fri, 25 Aug 2023 14:05:29 +0800 Subject: [PATCH 4/9] =?UTF-8?q?REPORT-104017=20=E6=B5=B7=E5=A4=96=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=9B=BE=E7=BB=84=E4=BB=B6=E7=9A=84GIS?= =?UTF-8?q?=E5=9B=BE=E5=B1=82=E4=BC=98=E5=8C=96-fvs=E4=B8=8B=E5=88=87?= =?UTF-8?q?=E6=8D=A2gis=E5=9B=BE=E5=B1=82=E9=85=8D=E7=BD=AE=E6=97=B6?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E4=BC=9A=E7=94=B1mapbox=E5=8F=98=E4=B8=BA?= =?UTF-8?q?=E9=BB=91=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/van/chart/map/designer/type/GisLayerPane.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/GisLayerPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/GisLayerPane.java index 868a41fd4f..faef723a4e 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/GisLayerPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/GisLayerPane.java @@ -65,7 +65,7 @@ public class GisLayerPane extends JPanel implements UIObserver { /** * fvs的具体类型 */ - private static final String FVS_TEMPLATE_CLASS = "class com.fr.plugin.wysiwyg.report.JDuchamp"; + private static final String FVS_TEMPLATE_CLASS = "com.fr.plugin.wysiwyg.report.JDuchamp"; public GisLayerPane() { initComps(); @@ -368,7 +368,7 @@ public class GisLayerPane extends JPanel implements UIObserver { } JTemplate currentEditingTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); if (JTemplate.isValid(currentEditingTemplate)) { - if (FVS_TEMPLATE_CLASS.equals(currentEditingTemplate.getClass().toString())) { + if (FVS_TEMPLATE_CLASS.equals(currentEditingTemplate.getClass().getName())) { return; } boolean dark = currentEditingTemplate.getTemplateTheme().isDark(); From 34a49a231f6eb38baf27a08046af3979fcd4a5e0 Mon Sep 17 00:00:00 2001 From: obo Date: Fri, 25 Aug 2023 14:25:51 +0800 Subject: [PATCH 5/9] =?UTF-8?q?REPORT-104017=20=E5=88=A0=E9=99=A4=E6=B2=A1?= =?UTF-8?q?=E7=94=A8=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/van/chart/map/designer/type/GisLayerPane.java | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/GisLayerPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/GisLayerPane.java index faef723a4e..5681d9c1f0 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/GisLayerPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/GisLayerPane.java @@ -253,19 +253,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()); -// } } public void populate(GisLayer layer) { @@ -274,7 +264,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); From f1ffa3a493e10c7bc613a78e620d619e0a59a65e Mon Sep 17 00:00:00 2001 From: "Coral.Chen" Date: Mon, 28 Aug 2023 13:51:24 +0800 Subject: [PATCH 6/9] =?UTF-8?q?REPORT-104133=20=E3=80=90=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E7=B1=BB=E6=8E=A7=E4=BB=B6=E3=80=91=E6=96=87=E6=9C=AC=E7=B1=BB?= =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E6=96=B0=E5=8A=9F=E8=83=BD=E5=85=A5=E5=8F=A3?= =?UTF-8?q?=E5=9C=A8=E8=AE=BE=E8=AE=A1=E5=99=A8=E4=B8=8A=E6=89=93=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/designer/creator/XNumberEditor.java | 10 ++++++---- .../com/fr/design/designer/creator/XPassword.java | 10 ++++++---- .../com/fr/design/designer/creator/XTextArea.java | 10 ++++++---- .../designer/mobile/TextEditorMobileDefinePane.java | 9 +++++---- .../fr/design/widget/WidgetMobilePaneFactory.java | 13 +++++++++---- .../widget/ui/mobile/TextEditorMobilePane.java | 2 +- 6 files changed, 33 insertions(+), 21 deletions(-) diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java index 12bed66f01..8861d6fcbc 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java @@ -6,7 +6,9 @@ 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; @@ -102,8 +104,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)}; + } } diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XPassword.java b/designer-form/src/main/java/com/fr/design/designer/creator/XPassword.java index f3d6214bfc..29de6c9d05 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XPassword.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XPassword.java @@ -3,7 +3,9 @@ */ 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; @@ -68,8 +70,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)}; + } } diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XTextArea.java b/designer-form/src/main/java/com/fr/design/designer/creator/XTextArea.java index e5702c81f2..88d0391ceb 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XTextArea.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XTextArea.java @@ -6,7 +6,9 @@ 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; @@ -83,9 +85,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)}; + } } diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/TextEditorMobileDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/TextEditorMobileDefinePane.java index 834c3fb51b..3e3010aa4d 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/TextEditorMobileDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/TextEditorMobileDefinePane.java @@ -3,6 +3,7 @@ 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; @@ -30,9 +31,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); } @@ -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(); } diff --git a/designer-realize/src/main/java/com/fr/design/widget/WidgetMobilePaneFactory.java b/designer-realize/src/main/java/com/fr/design/widget/WidgetMobilePaneFactory.java index 76f57797b5..eef3477c97 100644 --- a/designer-realize/src/main/java/com/fr/design/widget/WidgetMobilePaneFactory.java +++ b/designer-realize/src/main/java/com/fr/design/widget/WidgetMobilePaneFactory.java @@ -4,8 +4,14 @@ 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; @@ -29,10 +35,9 @@ 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() { diff --git a/designer-realize/src/main/java/com/fr/design/widget/ui/mobile/TextEditorMobilePane.java b/designer-realize/src/main/java/com/fr/design/widget/ui/mobile/TextEditorMobilePane.java index a80a27df52..7c836389d7 100644 --- a/designer-realize/src/main/java/com/fr/design/widget/ui/mobile/TextEditorMobilePane.java +++ b/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); } From bb1b959606655528d4481ef35945f3d43c3ad530 Mon Sep 17 00:00:00 2001 From: obo Date: Tue, 29 Aug 2023 14:17:50 +0800 Subject: [PATCH 7/9] =?UTF-8?q?REPORT-104017=20=E4=B8=8D=E4=B8=93=E9=97=A8?= =?UTF-8?q?=E9=80=82=E9=85=8Dfvs=E4=BA=86=EF=BC=8C=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E7=AA=97=E5=8F=A3=E6=A0=B9=E6=8D=AE=E6=A8=A1=E7=89=88=E4=B8=BB?= =?UTF-8?q?=E9=A2=98=E9=80=82=E9=85=8D=E5=9B=BE=E5=B1=82=E7=9A=84=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=8F=AF=E4=BB=A5=E5=85=BC=E5=AE=B9fvs=E5=9C=BA?= =?UTF-8?q?=E6=99=AF=EF=BC=8Cfvs=E5=88=9B=E5=BB=BA=E5=9B=BE=E5=B1=82?= =?UTF-8?q?=E6=97=B6=E5=A4=84=E7=90=86=E4=B8=80=E4=B8=8B=E4=B8=BAblack?= =?UTF-8?q?=E5=8D=B3=E5=8F=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/van/chart/map/designer/type/GisLayerPane.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/GisLayerPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/GisLayerPane.java index 5681d9c1f0..37f178e196 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/GisLayerPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/GisLayerPane.java @@ -62,11 +62,6 @@ public class GisLayerPane extends JPanel implements UIObserver { private String[] layers = MapLayerConfigManager.getCustomLayerItems(); - /** - * fvs的具体类型 - */ - private static final String FVS_TEMPLATE_CLASS = "com.fr.plugin.wysiwyg.report.JDuchamp"; - public GisLayerPane() { initComps(); } @@ -352,14 +347,11 @@ public class GisLayerPane extends JPanel implements UIObserver { * @param layer 图层 */ private void adaptEditingTemplateTheme(GisLayer layer) { - if (GeneralContext.isSimpleChineseEnv()) { + if (Locale.CHINA.equals(GeneralContext.getLocale())) { return; } JTemplate currentEditingTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); if (JTemplate.isValid(currentEditingTemplate)) { - if (FVS_TEMPLATE_CLASS.equals(currentEditingTemplate.getClass().getName())) { - return; - } 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); From ba6a74caafec4d559e3bf5d24ed1e891df4c1b4a Mon Sep 17 00:00:00 2001 From: "Coral.Chen" Date: Wed, 30 Aug 2023 15:21:23 +0800 Subject: [PATCH 8/9] =?UTF-8?q?REPORT-97143=20=E5=BB=B6=E6=9C=9F=EF=BC=8C?= =?UTF-8?q?=E5=B1=8F=E8=94=BD=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/designer/creator/XNumberEditor.java | 10 ++++------ .../com/fr/design/designer/creator/XPassword.java | 10 ++++------ .../com/fr/design/designer/creator/XTextArea.java | 10 ++++------ .../designer/mobile/TextEditorMobileDefinePane.java | 10 +++++----- .../fr/design/widget/WidgetMobilePaneFactory.java | 13 ++++--------- .../widget/ui/mobile/TextEditorMobilePane.java | 2 +- 6 files changed, 22 insertions(+), 33 deletions(-) diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java index 8861d6fcbc..fca3f89b64 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java +++ b/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; @@ -104,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)}; +// } } diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XPassword.java b/designer-form/src/main/java/com/fr/design/designer/creator/XPassword.java index 29de6c9d05..f3d6214bfc 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XPassword.java +++ b/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)}; +// } } diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XTextArea.java b/designer-form/src/main/java/com/fr/design/designer/creator/XTextArea.java index 88d0391ceb..e5702c81f2 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XTextArea.java +++ b/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)}; +// } } diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/TextEditorMobileDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/TextEditorMobileDefinePane.java index 3e3010aa4d..4c23bc1c7f 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/TextEditorMobileDefinePane.java +++ b/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,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); } @@ -41,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(); } @@ -49,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(); } diff --git a/designer-realize/src/main/java/com/fr/design/widget/WidgetMobilePaneFactory.java b/designer-realize/src/main/java/com/fr/design/widget/WidgetMobilePaneFactory.java index eef3477c97..6f0b0d5e73 100644 --- a/designer-realize/src/main/java/com/fr/design/widget/WidgetMobilePaneFactory.java +++ b/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() { diff --git a/designer-realize/src/main/java/com/fr/design/widget/ui/mobile/TextEditorMobilePane.java b/designer-realize/src/main/java/com/fr/design/widget/ui/mobile/TextEditorMobilePane.java index 7c836389d7..345da2fee2 100644 --- a/designer-realize/src/main/java/com/fr/design/widget/ui/mobile/TextEditorMobilePane.java +++ b/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); } From dc517ad4c37a9277df1ee65a178ac042ec370571 Mon Sep 17 00:00:00 2001 From: "Coral.Chen" Date: Thu, 31 Aug 2023 14:22:56 +0800 Subject: [PATCH 9/9] =?UTF-8?q?REPORT-103382=20=E5=88=87=E6=8D=A2=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=EF=BC=8C=E7=B1=BB=E8=BD=AC=E6=8D=A2=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/mainframe/mobile/ui/MobileStyleDefinePane.java | 1 + 1 file changed, 1 insertion(+) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileStyleDefinePane.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileStyleDefinePane.java index 268672fb30..8008c5ce8e 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileStyleDefinePane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileStyleDefinePane.java @@ -91,6 +91,7 @@ public class MobileStyleDefinePane extends BasicBeanPane { @Override public MobileStyle updateBean() { + mobileStyle = Reflect.on(mobileStyleClazz).create().get(); this.widget.setMobileStyle(mobileStyle); this.customBeanPane.updateBean(); mobileStyle.setCommonCustom(customCombo.getSelectedIndex() == 1);