From f8b241baa117c39c993433891a0ccc5ce6246f79 Mon Sep 17 00:00:00 2001 From: "Sky.Luo" Date: Mon, 17 Jul 2023 15:12:03 +0800 Subject: [PATCH 01/18] =?UTF-8?q?REPORT-96966=20fix:=20=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=B8=8B=E6=8B=89=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../widget/editors/DataBindingEditor.java | 13 +++++++++--- .../widget/editors/WidgetValueEditor.java | 20 ++++++++++++++++++- .../component/FormWidgetValuePane.java | 2 +- 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataBindingEditor.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataBindingEditor.java index 018bc75aeb..bad481e7af 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataBindingEditor.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataBindingEditor.java @@ -29,8 +29,8 @@ public class DataBindingEditor extends Editor { private final static int HORI_GAP = 1; private final static int VER_GAP = 7; - private TableDataComboBox tableDataComboBox; - private LazyComboBox columnNameComboBox; + protected TableDataComboBox tableDataComboBox; + protected LazyComboBox columnNameComboBox; private ItemListener tableDataComboBoxListener = new ItemListener() { public void itemStateChanged(ItemEvent evt) { boolean isInit = columnNameComboBox.getSelectedIndex() == -1; @@ -87,9 +87,16 @@ public class DataBindingEditor extends Editor { } }); columnNameComboBox.setEditable(true); + addComboBoxesAndSetPosition(); + columnNameComboBox.addItemListener(columnNameComboboxListener); + } + + /** + * 根据需求不同调整下拉框的位置 + */ + protected void addComboBoxesAndSetPosition() { this.add(tableDataComboBox, BorderLayout.NORTH); this.add(columnNameComboBox, BorderLayout.CENTER); - columnNameComboBox.addItemListener(columnNameComboboxListener); } protected TableDataSource getTableDataSource() { diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/WidgetValueEditor.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/WidgetValueEditor.java index 4f5c7f28f3..48199a5e6b 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/WidgetValueEditor.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/WidgetValueEditor.java @@ -5,6 +5,7 @@ package com.fr.design.mainframe.widget.editors; import java.awt.Component; +import java.awt.BorderLayout; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -30,6 +31,7 @@ public class WidgetValueEditor extends AbstractPropertyEditor { /** * 根据类型创建 + * 服务器 - 控件管理 * @param type 类型 * @param onlyServer 是否是服务器 * @return 编辑器 @@ -41,7 +43,7 @@ public class WidgetValueEditor extends AbstractPropertyEditor { case DataControl.TYPE_FORMULA: return new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula")); case DataControl.TYPE_DATABINDING: - return onlyServer ? new ServerDataBindingEditor() : new DataBindingEditor(); + return onlyServer ? new WidgetValueServerDataBindingEditor() : new WidgetValueDataBindingEditor(); case DataControl.TYPE_STRING: return new TextEditor(); case DataControl.TYPE_BOOLEAN: @@ -70,6 +72,22 @@ public class WidgetValueEditor extends AbstractPropertyEditor { } return editor; } + + private static class WidgetValueDataBindingEditor extends DataBindingEditor { + @Override + protected void addComboBoxesAndSetPosition() { + this.add(tableDataComboBox, BorderLayout.CENTER); + this.add(columnNameComboBox, BorderLayout.EAST); + } + } + + private static class WidgetValueServerDataBindingEditor extends ServerDataBindingEditor { + @Override + protected void addComboBoxesAndSetPosition() { + this.add(tableDataComboBox, BorderLayout.CENTER); + this.add(columnNameComboBox, BorderLayout.EAST); + } + } public WidgetValueEditor(Object o) { this(o, false); diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/FormWidgetValuePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/FormWidgetValuePane.java index 6943085ecf..7a69292ce5 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/FormWidgetValuePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/FormWidgetValuePane.java @@ -63,7 +63,7 @@ public class FormWidgetValuePane extends JPanel { /** * 根据类型创建 - * + * 设计器右侧控件设置 - 属性 * @param type 类型 * @param onlyServer 是否是服务器 * @return 编辑器 From 612c4a6fe0ef2ed604453ea32d18bd38dd43f23a Mon Sep 17 00:00:00 2001 From: Carlson Date: Tue, 1 Aug 2023 09:55:21 +0800 Subject: [PATCH 02/18] =?UTF-8?q?REPORT-79271=20feat:FVS=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E5=8D=95=E5=85=83=E6=A0=BC=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9D=A5=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/mainframe/chart/gui/data/NormalChartDataPane.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java index 86f7e4da87..c4b1e69b3c 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java @@ -7,7 +7,6 @@ import com.fr.design.gui.frpane.AttributeChangeListener; import com.fr.design.gui.frpane.UIComboBoxPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.mainframe.chart.gui.ChartDataPane; -import com.fr.design.mainframe.chart.mode.ChartEditContext; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.van.chart.designer.AbstractVanChartScrollPane; @@ -68,9 +67,7 @@ public class NormalChartDataPane extends DataContentsPane { label1.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH,ChartDataPane.LABEL_HEIGHT)); northPane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{jcb, null, null, label1, null})); northPane.setBorder(BorderFactory.createEmptyBorder(0,5,0,8)); - if (ChartEditContext.normalMode()) { - this.add(northPane, BorderLayout.NORTH); - } + this.add(northPane, BorderLayout.NORTH); this.add(cardPane, BorderLayout.CENTER); } From 22a75e42c8070238c48bdcf2283360ce8e0d7438 Mon Sep 17 00:00:00 2001 From: Carlson Date: Tue, 1 Aug 2023 15:52:09 +0800 Subject: [PATCH 03/18] =?UTF-8?q?REPORT-79271=20feat:=E8=80=83=E8=99=91?= =?UTF-8?q?=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/mode/ChartEditContext.java | 27 +++++++++++++++++++ .../chart/mode/ChartEditSupportDataType.java | 13 +++++++++ .../chart/gui/data/NormalChartDataPane.java | 5 +++- 3 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 designer-base/src/main/java/com/fr/design/mainframe/chart/mode/ChartEditSupportDataType.java diff --git a/designer-base/src/main/java/com/fr/design/mainframe/chart/mode/ChartEditContext.java b/designer-base/src/main/java/com/fr/design/mainframe/chart/mode/ChartEditContext.java index 51fe2f816a..2aa862292f 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/chart/mode/ChartEditContext.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/chart/mode/ChartEditContext.java @@ -13,8 +13,28 @@ public class ChartEditContext { private static ChartEditMode current = ChartEditMode.NORMAL; + private static ChartEditSupportDataType supportDataType = ChartEditSupportDataType.BOTH; + + /** + * 切换图表编辑模式 + * @param mode 图表编辑模式 + */ public static void switchTo(ChartEditMode mode) { + if (mode == ChartEditMode.NORMAL) { + switchTo(mode, ChartEditSupportDataType.BOTH); + } else if (mode == ChartEditMode.DUCHAMP) { + switchTo(mode, ChartEditSupportDataType.TABLE_DATA); + } + } + + /** + * 切换图表编辑模式 + * @param mode 图表编辑模式 + * @param type 图表支持的数据来源 + */ + public static void switchTo(ChartEditMode mode, ChartEditSupportDataType type) { current = mode; + supportDataType = type; } public static boolean duchampMode() { @@ -33,4 +53,11 @@ public class ChartEditContext { public static boolean supportTheme() { return !DesignModeContext.isDuchampMode(); } + + /** + * 当前模式下是否支持单元格数据来源 + */ + public static boolean supportReportData() { + return supportDataType == ChartEditSupportDataType.REPORT || supportDataType == ChartEditSupportDataType.BOTH; + } } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/chart/mode/ChartEditSupportDataType.java b/designer-base/src/main/java/com/fr/design/mainframe/chart/mode/ChartEditSupportDataType.java new file mode 100644 index 0000000000..5c8236133a --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/mainframe/chart/mode/ChartEditSupportDataType.java @@ -0,0 +1,13 @@ +package com.fr.design.mainframe.chart.mode; + +/** + * @author Carlson + * @version 11.0 + * Created by Carlson on 2023/8/1 14:25 + * @description 图表数据来源，兼容用 + **/ +public enum ChartEditSupportDataType { + TABLE_DATA, // 数据集数据 + REPORT, // 单元格数据 + BOTH // 包含二者 +} diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java index c4b1e69b3c..ba1701710e 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java @@ -7,6 +7,7 @@ import com.fr.design.gui.frpane.AttributeChangeListener; import com.fr.design.gui.frpane.UIComboBoxPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.mainframe.chart.gui.ChartDataPane; +import com.fr.design.mainframe.chart.mode.ChartEditContext; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.van.chart.designer.AbstractVanChartScrollPane; @@ -67,7 +68,9 @@ public class NormalChartDataPane extends DataContentsPane { label1.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH,ChartDataPane.LABEL_HEIGHT)); northPane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{jcb, null, null, label1, null})); northPane.setBorder(BorderFactory.createEmptyBorder(0,5,0,8)); - this.add(northPane, BorderLayout.NORTH); + if (ChartEditContext.supportReportData()) { + this.add(northPane, BorderLayout.NORTH); + } this.add(cardPane, BorderLayout.CENTER); } From 0c4d4294887ee33f577956ba647c58862b4ddd48 Mon Sep 17 00:00:00 2001 From: Carlson Date: Wed, 2 Aug 2023 10:29:30 +0800 Subject: [PATCH 04/18] =?UTF-8?q?REPORT-79271=20feat:=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E5=A4=84=E7=90=86=E8=B0=83=E6=95=B4=E4=B8=BA=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/mode/ChartEditContext.java | 45 ++++++++++++------- .../chart/mode/ChartEditSupportDataType.java | 13 ------ 2 files changed, 29 insertions(+), 29 deletions(-) delete mode 100644 designer-base/src/main/java/com/fr/design/mainframe/chart/mode/ChartEditSupportDataType.java diff --git a/designer-base/src/main/java/com/fr/design/mainframe/chart/mode/ChartEditContext.java b/designer-base/src/main/java/com/fr/design/mainframe/chart/mode/ChartEditContext.java index 2aa862292f..30ff6c8911 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/chart/mode/ChartEditContext.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/chart/mode/ChartEditContext.java @@ -3,6 +3,9 @@ package com.fr.design.mainframe.chart.mode; import com.fr.common.annotations.Open; import com.fr.design.base.mode.DesignModeContext; +import java.util.HashSet; +import java.util.Set; + /** * @author shine * @version 10.0 @@ -13,28 +16,21 @@ public class ChartEditContext { private static ChartEditMode current = ChartEditMode.NORMAL; - private static ChartEditSupportDataType supportDataType = ChartEditSupportDataType.BOTH; + private static final Set features = new HashSet<>(); + + /** + * 功能点枚举 + */ + public enum DuchampFeature { + SUPPORT_REPORT_DATA + } /** * 切换图表编辑模式 * @param mode 图表编辑模式 */ public static void switchTo(ChartEditMode mode) { - if (mode == ChartEditMode.NORMAL) { - switchTo(mode, ChartEditSupportDataType.BOTH); - } else if (mode == ChartEditMode.DUCHAMP) { - switchTo(mode, ChartEditSupportDataType.TABLE_DATA); - } - } - - /** - * 切换图表编辑模式 - * @param mode 图表编辑模式 - * @param type 图表支持的数据来源 - */ - public static void switchTo(ChartEditMode mode, ChartEditSupportDataType type) { current = mode; - supportDataType = type; } public static boolean duchampMode() { @@ -54,10 +50,27 @@ public class ChartEditContext { return !DesignModeContext.isDuchampMode(); } + /** + * 注册功能点 + */ + public static void addDuchampFeature(DuchampFeature feature) { + features.add(feature); + } + + /** + * 移除功能点 + */ + public static void removeDuchampFeature(DuchampFeature feature) { + features.remove(feature); + } + /** * 当前模式下是否支持单元格数据来源 */ public static boolean supportReportData() { - return supportDataType == ChartEditSupportDataType.REPORT || supportDataType == ChartEditSupportDataType.BOTH; + if (normalMode()) { + return true; + } + return features.contains(DuchampFeature.SUPPORT_REPORT_DATA); } } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/chart/mode/ChartEditSupportDataType.java b/designer-base/src/main/java/com/fr/design/mainframe/chart/mode/ChartEditSupportDataType.java deleted file mode 100644 index 5c8236133a..0000000000 --- a/designer-base/src/main/java/com/fr/design/mainframe/chart/mode/ChartEditSupportDataType.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.fr.design.mainframe.chart.mode; - -/** - * @author Carlson - * @version 11.0 - * Created by Carlson on 2023/8/1 14:25 - * @description 图表数据来源，兼容用 - **/ -public enum ChartEditSupportDataType { - TABLE_DATA, // 数据集数据 - REPORT, // 单元格数据 - BOTH // 包含二者 -} From b0846831719104a7a0164216c9ae1d45e1f4f18e Mon Sep 17 00:00:00 2001 From: obo Date: Mon, 7 Aug 2023 21:22:51 +0800 Subject: [PATCH 05/18] =?UTF-8?q?REPORT-96204=20FRBI=E6=B5=B7=E5=A4=96?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=9C=B0=E5=9B=BE=E7=BB=84=E4=BB=B6=E7=9A=84?= =?UTF-8?q?GIS=E5=9B=BE=E5=B1=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/map/designer/type/GisLayerPane.java | 86 ++++++++++++------- 1 file changed, 55 insertions(+), 31 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 43a770beae..b9ca8f11f1 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 @@ -11,6 +11,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.mode.ChartEditContext; import com.fr.general.ComparatorUtils; +import com.fr.general.GeneralContext; import com.fr.plugin.chart.base.GisLayer; import com.fr.plugin.chart.map.VanChartMapPlot; import com.fr.plugin.chart.map.server.MapLayerConfigManager; @@ -29,6 +30,7 @@ import java.awt.CardLayout; import java.awt.Component; import java.awt.Dimension; import java.awt.event.ItemEvent; +import java.util.Locale; /** * @author Bjorn @@ -39,8 +41,16 @@ public class GisLayerPane extends JPanel implements UIObserver { private UIButtonGroup gisButton; private JPanel layerPaneCheckPane; - private UIComboBox gisGaoDeLayer; - private UIComboBox gisLayer; + + /** + * 标准图层 + */ + private UIComboBox standardLayers; + + /** + * 自定义图层 + */ + private UIComboBox customLayers; private JPanel layerCardPane; private WMSLayerPane wmsLayerPane; @@ -48,7 +58,7 @@ public class GisLayerPane extends JPanel implements UIObserver { private UIComboBox zoomLevel; - private String[] layers = MapLayerConfigManager.getLayerItems(); + private String[] layers = MapLayerConfigManager.getCustomLayerItems(); public GisLayerPane() { initComps(); @@ -86,15 +96,12 @@ public class GisLayerPane extends JPanel implements UIObserver { gisButton = new UIButtonGroup(new String[]{Toolkit.i18nText("Fine-Design_Chart_Mode_Auto"), Toolkit.i18nText("Fine-Design_Form_Widget_Style_Standard"), Toolkit.i18nText("Fine-Design_Chart_Custom")}); gisButton.setSelectedIndex(ChartEditContext.supportTheme() ? 0 : 1); - gisGaoDeLayer = new UIComboBox(MapLayerConfigManager.getGaoDeLayerItems()); gisButton.addActionListener(event -> { refreshZoomLevel(); checkLayerCardPane(); }); - gisGaoDeLayer.addItemListener(event -> refreshZoomLevel()); - - initCustomGISLayerPane(); + initLayer(); initLayerCardPane(); layerPaneCheckPane = new JPanel(new CardLayout()) { @@ -104,15 +111,15 @@ public class GisLayerPane extends JPanel implements UIObserver { return new Dimension(0, 0); } if (isStandardGis()) { - return gisGaoDeLayer.getPreferredSize(); + return standardLayers.getPreferredSize(); } else { - return gisLayer.getPreferredSize(); + return customLayers.getPreferredSize(); } } }; layerPaneCheckPane.add(new JPanel(), "auto"); - layerPaneCheckPane.add(gisGaoDeLayer, "standard"); - layerPaneCheckPane.add(gisLayer, "custom"); + layerPaneCheckPane.add(standardLayers, "standard"); + layerPaneCheckPane.add(customLayers, "custom"); double p = TableLayout.PREFERRED; @@ -142,7 +149,7 @@ public class GisLayerPane extends JPanel implements UIObserver { if (isStandardGis() || isAuto()) { return new Dimension(0, 0); } - String itemName = Utils.objectToString(gisLayer.getSelectedItem()); + String itemName = Utils.objectToString(customLayers.getSelectedItem()); if (MapLayerConfigManager.isCustomLayer(itemName)) { return tileLayerPane.getPreferredSize(); } else if (MapLayerConfigManager.isCustomWmsLayer(itemName)) { @@ -163,10 +170,12 @@ public class GisLayerPane extends JPanel implements UIObserver { } } - private void initCustomGISLayerPane() { - gisLayer = new UIComboBox(layers); + private void initLayer() { + standardLayers = new UIComboBox(MapLayerConfigManager.getStandardLayerItems()); + customLayers = new UIComboBox(layers); - gisLayer.addItemListener(e -> + standardLayers.addItemListener(event -> refreshZoomLevel()); + customLayers.addItemListener(e -> { if (e.getStateChange() == ItemEvent.SELECTED) { checkCustomLayerCardPane(); @@ -175,7 +184,7 @@ public class GisLayerPane extends JPanel implements UIObserver { } ); - gisLayer.addPopupMenuListener(new PopupMenuListener() { + customLayers.addPopupMenuListener(new PopupMenuListener() { public void popupMenuCanceled(PopupMenuEvent e) { } @@ -184,12 +193,12 @@ public class GisLayerPane extends JPanel implements UIObserver { public void popupMenuWillBecomeVisible(PopupMenuEvent e) { - String selected = Utils.objectToString(gisLayer.getSelectedItem()); + String selected = Utils.objectToString(customLayers.getSelectedItem()); ZoomLevel zoomSelected = (ZoomLevel) zoomLevel.getSelectedItem(); - gisLayer.setModel(new DefaultComboBoxModel(MapLayerConfigManager.getLayerItems())); + customLayers.setModel(new DefaultComboBoxModel(MapLayerConfigManager.getCustomLayerItems())); - gisLayer.setSelectedItem(selected); + customLayers.setSelectedItem(selected); zoomLevel.setSelectedItem(zoomSelected); } }); @@ -201,15 +210,15 @@ public class GisLayerPane extends JPanel implements UIObserver { if (isAuto()) { levels = MapStatusPane.ZOOM_LEVELS; } else if (isStandardGis()) { - if (gisGaoDeLayer.getSelectedIndex() == gisGaoDeLayer.getItemCount() - 1) { + if (standardLayers.getSelectedIndex() == standardLayers.getItemCount() - 1) { levels = MapStatusPane.ZOOM_LEVELS; } else { levels = MapStatusPane.GAODE_ZOOM_LEVELS; } } else { - if (ComparatorUtils.equals(gisLayer.getSelectedItem(), Toolkit.i18nText("Fine-Design_Chart_Layer_Blue"))) { + if (ComparatorUtils.equals(customLayers.getSelectedItem(), Toolkit.i18nText("Fine-Design_Chart_Layer_Blue"))) { levels = MapStatusPane.BLUE_ZOOM_LEVELS; - } else if (ComparatorUtils.equals(gisLayer.getSelectedItem(), Toolkit.i18nText("Fine-Design_Chart_Layer_GaoDe"))) { + } else if (ComparatorUtils.equals(customLayers.getSelectedItem(), Toolkit.i18nText("Fine-Design_Chart_Layer_GaoDe"))) { levels = MapStatusPane.GAODE_ZOOM_LEVELS; } else { levels = MapStatusPane.ZOOM_LEVELS; @@ -233,7 +242,7 @@ public class GisLayerPane extends JPanel implements UIObserver { private void checkCustomLayerCardPane() { CardLayout cardLayout = (CardLayout) layerCardPane.getLayout(); - cardLayout.show(layerCardPane, Utils.objectToString(gisLayer.getSelectedItem())); + cardLayout.show(layerCardPane, Utils.objectToString(customLayers.getSelectedItem())); } public void resetGisLayer(VanChartMapPlot mapPlot) { @@ -256,8 +265,12 @@ public class GisLayerPane extends JPanel implements UIObserver { switch (layer.getGisLayerType()) { case AUTO: gisButton.setSelectedIndex(0); + layer.setGisLayerType(GISLayerType.AUTO); + layer.setLayerName(GISLayerType.getLocString(GISLayerType.AUTO)); + //dealWithTemplateTheme(layer); break; - case GAO_DE_API: + case STANDARD: + populateStandardGis(layer); case LAYER_NULL: populateStandardGis(layer); break; @@ -272,16 +285,23 @@ public class GisLayerPane extends JPanel implements UIObserver { private void populateStandardGis(GisLayer layer) { gisButton.setSelectedIndex(1); + String layerName = layer.getLayerName(); if (layer.getGisLayerType() == GISLayerType.LAYER_NULL) { - gisGaoDeLayer.setSelectedIndex(gisGaoDeLayer.getItemCount() - 1); + layer.setGisLayerType(GISLayerType.LAYER_NULL); + standardLayers.setSelectedIndex(standardLayers.getItemCount() - 1); } else { - gisGaoDeLayer.setSelectedItem(layer.getGaoDeGisType().getTypeName()); + if(Locale.CHINA.equals(GeneralContext.getLocale())) { + standardLayers.setSelectedItem(layerName); + layer.setGaoDeGisType(GaoDeGisType.parseByLocaleName(layerName)); + } else { + standardLayers.setSelectedItem(layerName); + } } } private void populateCustomGis(GisLayer layer) { gisButton.setSelectedIndex(2); - gisLayer.setSelectedItem(layer.getShowItemName()); + customLayers.setSelectedItem(layer.getShowItemName()); switch (layer.getGisLayerType()) { case CUSTOM_WMS_LAYER: @@ -295,6 +315,8 @@ public class GisLayerPane extends JPanel implements UIObserver { public void update(GisLayer layer) { if (isAuto()) { + //如果是海外环境,切换为mapbox的内容 + //浅色主题为mapbox,深色主题为黑色 layer.setGisLayerType(GISLayerType.AUTO); layer.setLayerName(GISLayerType.getLocString(GISLayerType.AUTO)); } else if (isStandardGis()) { @@ -305,18 +327,20 @@ public class GisLayerPane extends JPanel implements UIObserver { } private void updateStandardGis(GisLayer layer) { - String layerName = Utils.objectToString(gisGaoDeLayer.getSelectedItem()); + //海外情况下 + //标准：黑色、mapbox、清新、素雅、午夜、无，默认选中mapbox + String layerName = Utils.objectToString(standardLayers.getSelectedItem()); layer.setLayerName(layerName); - if (gisGaoDeLayer.getSelectedIndex() == gisGaoDeLayer.getItemCount() - 1) { + if (standardLayers.getSelectedIndex() == standardLayers.getItemCount() - 1) { layer.setGisLayerType(MapLayerConfigManager.getGisLayerType(layerName)); } else { - layer.setGisLayerType(GISLayerType.GAO_DE_API); + layer.setGisLayerType(GISLayerType.STANDARD); layer.setGaoDeGisType(GaoDeGisType.parseByLocaleName(layerName)); } } private void updateCustomGis(GisLayer layer) { - String layerName = Utils.objectToString(gisLayer.getSelectedItem()); + String layerName = Utils.objectToString(customLayers.getSelectedItem()); layer.setLayerName(layerName); layer.setGisLayerType(MapLayerConfigManager.getGisLayerType(layerName)); From 8f0b0db67b27bcf84313abdefad1a49ab9fa8d18 Mon Sep 17 00:00:00 2001 From: obo Date: Mon, 7 Aug 2023 21:24:37 +0800 Subject: [PATCH 06/18] =?UTF-8?q?REPORT-96204=20FRBI=E6=B5=B7=E5=A4=96?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=9C=B0=E5=9B=BE=E7=BB=84=E4=BB=B6=E7=9A=84?= =?UTF-8?q?GIS=E5=9B=BE=E5=B1=82=E4=BC=98=E5=8C=96?= 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, 4 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 b9ca8f11f1..d7e52d92a9 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 @@ -315,8 +315,6 @@ public class GisLayerPane extends JPanel implements UIObserver { public void update(GisLayer layer) { if (isAuto()) { - //如果是海外环境,切换为mapbox的内容 - //浅色主题为mapbox,深色主题为黑色 layer.setGisLayerType(GISLayerType.AUTO); layer.setLayerName(GISLayerType.getLocString(GISLayerType.AUTO)); } else if (isStandardGis()) { @@ -327,8 +325,6 @@ public class GisLayerPane extends JPanel implements UIObserver { } private void updateStandardGis(GisLayer layer) { - //海外情况下 - //标准：黑色、mapbox、清新、素雅、午夜、无，默认选中mapbox String layerName = Utils.objectToString(standardLayers.getSelectedItem()); layer.setLayerName(layerName); if (standardLayers.getSelectedIndex() == standardLayers.getItemCount() - 1) { From 53952c30332c71005ecd795b4b76d47fddf49236 Mon Sep 17 00:00:00 2001 From: obo Date: Tue, 8 Aug 2023 10:27:37 +0800 Subject: [PATCH 07/18] =?UTF-8?q?REPORT-96204=20GISLayerType=E4=B8=ADGAO?= =?UTF-8?q?=5FDE=5FAPI=E5=91=BD=E5=90=8D=E5=9B=9E=E9=80=80=E4=B8=8B?= =?UTF-8?q?=EF=BC=8C=E8=80=83=E8=99=91=E5=85=BC=E5=AE=B9=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=8C=E9=87=8D=E6=9E=84=E7=9B=B8=E5=85=B3=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E6=94=BE=E5=90=8E=E9=9D=A2?= 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 d7e52d92a9..57a0e04af4 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 @@ -269,7 +269,7 @@ public class GisLayerPane extends JPanel implements UIObserver { layer.setLayerName(GISLayerType.getLocString(GISLayerType.AUTO)); //dealWithTemplateTheme(layer); break; - case STANDARD: + case GAO_DE_API: populateStandardGis(layer); case LAYER_NULL: populateStandardGis(layer); @@ -330,7 +330,7 @@ public class GisLayerPane extends JPanel implements UIObserver { if (standardLayers.getSelectedIndex() == standardLayers.getItemCount() - 1) { layer.setGisLayerType(MapLayerConfigManager.getGisLayerType(layerName)); } else { - layer.setGisLayerType(GISLayerType.STANDARD); + layer.setGisLayerType(GISLayerType.GAO_DE_API); layer.setGaoDeGisType(GaoDeGisType.parseByLocaleName(layerName)); } } From 303448d148a579ff8fa4832ad9001df291834d92 Mon Sep 17 00:00:00 2001 From: obo Date: Tue, 8 Aug 2023 18:09:25 +0800 Subject: [PATCH 08/18] =?UTF-8?q?REPORT-96204=20=E6=A0=B9=E6=8D=AEpr?= =?UTF-8?q?=E5=BB=BA=E8=AE=AE=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= 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 | 1 - 1 file changed, 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 57a0e04af4..de07a7814d 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 @@ -287,7 +287,6 @@ public class GisLayerPane extends JPanel implements UIObserver { gisButton.setSelectedIndex(1); String layerName = layer.getLayerName(); if (layer.getGisLayerType() == GISLayerType.LAYER_NULL) { - layer.setGisLayerType(GISLayerType.LAYER_NULL); standardLayers.setSelectedIndex(standardLayers.getItemCount() - 1); } else { if(Locale.CHINA.equals(GeneralContext.getLocale())) { From 3d08f416a315c569425b56da9f6d46766c8650e9 Mon Sep 17 00:00:00 2001 From: Carlson Date: Wed, 9 Aug 2023 14:04:02 +0800 Subject: [PATCH 09/18] =?UTF-8?q?REPORT-102520=20fix:=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/gui/data/NormalChartDataPane.java | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java index ba1701710e..f8f43d232a 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java @@ -2,6 +2,7 @@ package com.fr.design.mainframe.chart.gui.data; import com.fr.chart.chartattr.ChartCollection; import com.fr.design.beans.FurtherBasicBeanPane; +import com.fr.design.chartx.data.DataLayoutHelper; import com.fr.design.constants.LayoutConstants; import com.fr.design.gui.frpane.AttributeChangeListener; import com.fr.design.gui.frpane.UIComboBoxPane; @@ -61,15 +62,22 @@ public class NormalChartDataPane extends DataContentsPane { JPanel contentPane = new JPanel(new BorderLayout()); dataPane = new UIComboBoxPane() { protected void initLayout() { - this.setLayout(new BorderLayout(LayoutConstants.HGAP_LARGE,6)); - JPanel northPane = new JPanel(new BorderLayout(LayoutConstants.HGAP_LARGE,0)); - northPane.add(jcb, BorderLayout.CENTER); - UILabel label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Source")); - label1.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH,ChartDataPane.LABEL_HEIGHT)); - northPane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{jcb, null, null, label1, null})); - northPane.setBorder(BorderFactory.createEmptyBorder(0,5,0,8)); if (ChartEditContext.supportReportData()) { - this.add(northPane, BorderLayout.NORTH); + if (ChartEditContext.normalMode()) { + this.setLayout(new BorderLayout(LayoutConstants.HGAP_LARGE,6)); + JPanel northPane = new JPanel(new BorderLayout(LayoutConstants.HGAP_LARGE,0)); + northPane.add(jcb, BorderLayout.CENTER); + UILabel label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Source")); + label1.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH,ChartDataPane.LABEL_HEIGHT)); + northPane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{jcb, null, null, label1, null})); + northPane.setBorder(BorderFactory.createEmptyBorder(0,5,0,8)); + this.add(northPane, BorderLayout.NORTH); + } else { + this.setLayout(new BorderLayout(0, 6)); + JPanel northPane = DataLayoutHelper.createDataLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Source"), jcb); + northPane.setBorder(BorderFactory.createEmptyBorder(0, DataLayoutHelper.LEFT_GAP, 0, DataLayoutHelper.RIGHT_GAP)); + this.add(northPane, BorderLayout.NORTH); + } } this.add(cardPane, BorderLayout.CENTER); From f902706eddae15b30aae0175fa20f4ca3735d29d Mon Sep 17 00:00:00 2001 From: Carlson Date: Wed, 9 Aug 2023 16:39:23 +0800 Subject: [PATCH 10/18] =?UTF-8?q?REPORT-102520=20fix:=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=B4=A8=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainframe/chart/gui/data/NormalChartDataPane.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java index f8f43d232a..8ea3858646 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java @@ -62,22 +62,21 @@ public class NormalChartDataPane extends DataContentsPane { JPanel contentPane = new JPanel(new BorderLayout()); dataPane = new UIComboBoxPane() { protected void initLayout() { + this.setLayout(new BorderLayout(ChartEditContext.normalMode() ? LayoutConstants.HGAP_LARGE : 0,6)); if (ChartEditContext.supportReportData()) { + JPanel northPane; if (ChartEditContext.normalMode()) { - this.setLayout(new BorderLayout(LayoutConstants.HGAP_LARGE,6)); - JPanel northPane = new JPanel(new BorderLayout(LayoutConstants.HGAP_LARGE,0)); + northPane = new JPanel(new BorderLayout(LayoutConstants.HGAP_LARGE, 0)); northPane.add(jcb, BorderLayout.CENTER); UILabel label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Source")); label1.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH,ChartDataPane.LABEL_HEIGHT)); northPane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{jcb, null, null, label1, null})); northPane.setBorder(BorderFactory.createEmptyBorder(0,5,0,8)); - this.add(northPane, BorderLayout.NORTH); } else { - this.setLayout(new BorderLayout(0, 6)); - JPanel northPane = DataLayoutHelper.createDataLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Source"), jcb); + northPane = DataLayoutHelper.createDataLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Source"), jcb); northPane.setBorder(BorderFactory.createEmptyBorder(0, DataLayoutHelper.LEFT_GAP, 0, DataLayoutHelper.RIGHT_GAP)); - this.add(northPane, BorderLayout.NORTH); } + this.add(northPane, BorderLayout.NORTH); } this.add(cardPane, BorderLayout.CENTER); From dc8285cb29808b50b31117cc5f6e5f4d1044b5a2 Mon Sep 17 00:00:00 2001 From: Carlson Date: Tue, 15 Aug 2023 11:38:36 +0800 Subject: [PATCH 11/18] =?UTF-8?q?REPORT-102440=20fix:=E6=B8=85=E9=99=A4?= =?UTF-8?q?=E5=85=AC=E5=BC=8F=E5=86=85=E5=AE=B9=E5=90=8E=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA"$$$"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/formula/TinyFormulaPane.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/formula/TinyFormulaPane.java b/designer-base/src/main/java/com/fr/design/formula/TinyFormulaPane.java index d3060b42b8..75ab40aaae 100644 --- a/designer-base/src/main/java/com/fr/design/formula/TinyFormulaPane.java +++ b/designer-base/src/main/java/com/fr/design/formula/TinyFormulaPane.java @@ -11,9 +11,11 @@ import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.TableLayout; import com.fr.design.mainframe.DesignerContext; - -import javax.swing.*; -import java.awt.*; +import javax.swing.BorderFactory; +import javax.swing.JPanel; +import java.awt.BorderLayout; +import java.awt.Cursor; +import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -63,11 +65,7 @@ public class TinyFormulaPane extends BasicBeanPane implements UIObserver } protected void populateTextField(BaseFormula fm) { - if (fm.getContent().length() <= 1) { - formulaTextField.setText("$$$"); - } else { - formulaTextField.setText(fm.getContent()); - } + formulaTextField.setText(fm.getContent()); } protected void initLayout() { From 999aab41c60b94a04b231c70d758a5f9f09d1be0 Mon Sep 17 00:00:00 2001 From: "Bruce.Deng" Date: Wed, 16 Aug 2023 15:22:34 +0800 Subject: [PATCH 12/18] =?UTF-8?q?REPORT-103247=20=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=99=A8=E6=9B=B4=E6=96=B0=E5=90=8E=EF=BC=8C=E6=9C=AA=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=8E=9F=E6=9D=A5=E7=9A=84=E3=80=90=E7=89=B9=E6=AE=8A?= =?UTF-8?q?=E5=AD=97=E7=AC=A6=E5=AF=BC=E5=87=BA=E4=BC=98=E5=8C=96=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/report/ExportUniversalPane.java | 30 ------------------- 1 file changed, 30 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/report/ExportUniversalPane.java b/designer-realize/src/main/java/com/fr/design/report/ExportUniversalPane.java index 4da3b89e81..9c07bd157b 100644 --- a/designer-realize/src/main/java/com/fr/design/report/ExportUniversalPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/ExportUniversalPane.java @@ -1,25 +1,17 @@ package com.fr.design.report; import com.fr.base.CustomConfig; -import com.fr.design.constants.UIConstants; import com.fr.design.dialog.BasicPane; import com.fr.design.gui.icheckbox.UICheckBox; -import com.fr.design.gui.ilable.ActionLabel; -import com.fr.design.gui.ilable.UILabel; import com.fr.design.i18n.LocaleLinkProvider; import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.utils.BrowseUtils; import com.fr.io.attr.ReportExportAttr; import com.fr.transaction.Configurations; import com.fr.transaction.WorkerFacade; import javax.swing.BorderFactory; import javax.swing.JPanel; -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; /** * 通用 @@ -42,7 +34,6 @@ public class ExportUniversalPane extends BasicPane { private static final String HELP_URL = LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY, PROPS_LINK_KEY_DEFAULT); - private UICheckBox specialCharacterExport; // 密码支持公式 private UICheckBox passwordSupportFormula; @@ -51,25 +42,6 @@ public class ExportUniversalPane extends BasicPane { this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); JPanel outerNorthPane = FRGUIPaneFactory.createTitledBorderPane(Toolkit.i18nText("Fine-Design_Report_Universal_Export_Config")); JPanel northPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_M_Pane(); - JPanel specialCharacterExportPane = FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane(); - specialCharacterExport = new UICheckBox(Toolkit.i18nText("Fine-Design_Report_Universal_Export_Special_Character")); - specialCharacterExport.setSelected(true); - specialCharacterExportPane.add(specialCharacterExport); - northPane.add(specialCharacterExportPane); - JPanel labelPane = new JPanel(new BorderLayout()); - labelPane.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 0)); - UILabel centerLabel = new UILabel(Toolkit.i18nText("Fine-Design_Report_Universal_Export_Special_Character_Tip")); - centerLabel.setForeground(Color.GRAY); - ActionLabel rightLabel = new ActionLabel(Toolkit.i18nText("Fine-Design_Report_Universal_Export_More_Alternative_Fonts"), UIConstants.FLESH_BLUE); - rightLabel.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - BrowseUtils.browser(HELP_URL); - } - }); - labelPane.add(centerLabel, BorderLayout.CENTER); - labelPane.add(rightLabel, BorderLayout.EAST); - northPane.add(labelPane); JPanel passwordSupportPane = FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane(); passwordSupportFormula = new UICheckBox(Toolkit.i18nText("Fine-Design_Report_Universal_Export_Password_Support_Formula")); passwordSupportFormula.setSelected(false); @@ -90,7 +62,6 @@ public class ExportUniversalPane extends BasicPane { * @param reportExportAttr 报表导出属性 */ public void populate(ReportExportAttr reportExportAttr) { - this.specialCharacterExport.setSelected(CustomConfig.getInstance().isOptimizedSpecialCharacterExport()); this.passwordSupportFormula.setSelected(reportExportAttr.isPwdSupportFormula()); } @@ -103,7 +74,6 @@ public class ExportUniversalPane extends BasicPane { Configurations.modify(new WorkerFacade(CustomConfig.class) { @Override public void run() { - CustomConfig.getInstance().setOptimizedSpecialCharacterExport(specialCharacterExport.isSelected()); reportExportAttr.setPwdSupportFormula(passwordSupportFormula.isSelected()); } }); From a145a559244492b4f6ff6499a15e55bceb2961ce Mon Sep 17 00:00:00 2001 From: Carlson Date: Thu, 17 Aug 2023 15:00:02 +0800 Subject: [PATCH 13/18] =?UTF-8?q?fix:=20=E6=9B=BF=E6=8D=A2=E5=9B=BE?= =?UTF-8?q?=E8=A1=A8=E7=94=A8=E5=88=B0=E7=9A=84TinyFormulaPane=20#REPORT-1?= =?UTF-8?q?02440?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../formula/DefaultTinyFormulaPane.java | 22 +++++++++++++++++++ .../fr/design/formula/TinyFormulaPane.java | 6 ++++- .../report/GisMapReportDataContentPane.java | 17 +++++++++----- .../chart/report/MapMoreReportIndexPane.java | 15 ++++++++----- .../chart/report/MapReportDataSinglePane.java | 16 +++++++++----- .../component/MultiTinyFormulaPane.java | 5 +++-- .../MultiTinyFormulaPaneWithUISpinner.java | 3 ++- .../TinyFormulaPaneEditorComponent.java | 9 ++------ .../LineMapAreaLngLatPaneWithTinyFormula.java | 17 +++++++------- ...PointMapAreaLngLatPaneWithTinyFormula.java | 9 ++++---- .../diff/AreaMapCellDataFieldsPane.java | 3 ++- .../fields/diff/GaugeCellDataFieldsPane.java | 5 +++-- .../diff/LineMapCellDataFieldsPane.java | 3 ++- .../diff/MultiPieCellDataFieldsPane.java | 3 ++- .../SingleCategoryCellDataFieldsPane.java | 3 ++- .../diff/StructureCellDataFieldsPane.java | 9 ++++---- .../diff/WordCloudCellDataFieldsPane.java | 5 +++-- .../mainframe/chart/gui/ChangeConfigPane.java | 3 ++- .../report/AbstractReportDataContentPane.java | 17 +++++++------- .../CategoryPlotReportDataContentPane.java | 11 +++------- .../MeterPlotReportDataContentPane.java | 7 +++--- .../StockPlotReportDataContentPane.java | 12 +++++----- .../table/MeterPlotTableDataContentPane.java | 5 +++-- .../chart/gui/style/ChartAxisTitlePane.java | 12 ++++++---- .../series/ColorPickerPaneWithFormula.java | 3 ++- .../series/ColorPickerPaneWithMaxMin.java | 3 ++- .../series/MapColorPickerPaneWithFormula.java | 3 ++- .../chart/gui/style/title/ChartTitlePane.java | 11 ++++++---- .../AbstractExtendedChartReportDataPane.java | 5 +++-- .../BoxPlotReportResultDataSeriesPane.java | 3 ++- .../data/report/TinyFormulaWithEditLabel.java | 3 ++- ...eDimensionalPlotReportDataContentPane.java | 4 ++-- .../other/VanChartInteractivePane.java | 5 +++-- .../chart/designer/other/zoom/ZoomPane.java | 5 +++-- .../designer/style/VanChartTitlePane.java | 3 ++- .../style/axis/VanChartBaseAxisPane.java | 3 ++- .../background/VanChartAlertValuePane.java | 7 +++--- .../VanChartCustomIntervalBackgroundPane.java | 6 ++--- .../component/GanttReportDataContentPane.java | 4 ++-- .../component/TinyFormulaWithButtonPane.java | 3 ++- .../link/GanttLinkReportDataContentPane.java | 4 ++-- .../data/component/report/AreaPane.java | 3 ++- .../component/report/LongLatAreaPane.java | 7 +++--- .../VanAreaMapPlotReportDataContentPane.java | 3 ++- .../MultiPiePlotReportDataContentPane.java | 6 ++--- .../StructurePlotReportDataContentPane.java | 9 ++++---- .../WordCloudPlotReportDataContentPane.java | 6 ++--- 47 files changed, 199 insertions(+), 127 deletions(-) create mode 100644 designer-base/src/main/java/com/fr/design/formula/DefaultTinyFormulaPane.java diff --git a/designer-base/src/main/java/com/fr/design/formula/DefaultTinyFormulaPane.java b/designer-base/src/main/java/com/fr/design/formula/DefaultTinyFormulaPane.java new file mode 100644 index 0000000000..8725a23669 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/formula/DefaultTinyFormulaPane.java @@ -0,0 +1,22 @@ +package com.fr.design.formula; + +import com.fr.base.BaseFormula; +import com.fr.stable.StringUtils; + +/** + * @author Carlson + * @version 11.0 + * Created by Carlson on 2023/8/14 17:15 + * @description + **/ +public class DefaultTinyFormulaPane extends TinyFormulaPane{ + + @Override + protected void populateTextField(BaseFormula fm) { + if (fm.getContent().length() <= 1) { + formulaTextField.setText(StringUtils.EMPTY); + } else { + formulaTextField.setText(fm.getContent()); + } + } +} diff --git a/designer-base/src/main/java/com/fr/design/formula/TinyFormulaPane.java b/designer-base/src/main/java/com/fr/design/formula/TinyFormulaPane.java index 75ab40aaae..e5594ddd11 100644 --- a/designer-base/src/main/java/com/fr/design/formula/TinyFormulaPane.java +++ b/designer-base/src/main/java/com/fr/design/formula/TinyFormulaPane.java @@ -65,7 +65,11 @@ public class TinyFormulaPane extends BasicBeanPane implements UIObserver } protected void populateTextField(BaseFormula fm) { - formulaTextField.setText(fm.getContent()); + if (fm.getContent().length() <= 1) { + formulaTextField.setText("$$$"); + } else { + formulaTextField.setText(fm.getContent()); + } } protected void initLayout() { diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/GisMapReportDataContentPane.java b/designer-chart/src/main/java/com/fr/design/chart/report/GisMapReportDataContentPane.java index 6b646ce83c..583b0a54fc 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/report/GisMapReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/report/GisMapReportDataContentPane.java @@ -10,6 +10,7 @@ import com.fr.design.constants.LayoutConstants; import com.fr.design.constants.UIConstants; import com.fr.design.event.UIObserver; import com.fr.design.event.UIObserverListener; +import com.fr.design.formula.DefaultTinyFormulaPane; import com.fr.design.formula.TinyFormulaPane; import com.fr.design.gui.frpane.UICorrelationPane; import com.fr.design.gui.ibutton.UIButtonGroup; @@ -18,14 +19,18 @@ import com.fr.design.gui.itable.UITableEditor; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; - import com.fr.stable.StableUtils; import com.fr.stable.StringUtils; -import javax.swing.*; +import javax.swing.JComponent; +import javax.swing.JPanel; +import javax.swing.JTable; +import javax.swing.SwingConstants; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import java.awt.*; +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.Dimension; import java.awt.event.FocusAdapter; import java.awt.event.FocusEvent; import java.util.ArrayList; @@ -53,8 +58,8 @@ public class GisMapReportDataContentPane extends FurtherBasicBeanPane(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Address"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_LatLng")}); lnglatOrder = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Longitude_First"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Latitude_First")}); - addressPane = new TinyFormulaPane(); - addressNamePane = new TinyFormulaPane(); + addressPane = new DefaultTinyFormulaPane(); + addressNamePane = new DefaultTinyFormulaPane(); double p = TableLayout.PREFERRED; double f = TableLayout.FILL; double[] columnSize = new double[]{p, f}; @@ -259,7 +264,7 @@ public class GisMapReportDataContentPane extends FurtherBasicBeanPane { @Override protected TinyFormulaPane createJComponent() { - return new TinyFormulaPane(); + return new DefaultTinyFormulaPane(); } @Override diff --git a/designer-chart/src/main/java/com/fr/design/chartx/component/correlation/TinyFormulaPaneEditorComponent.java b/designer-chart/src/main/java/com/fr/design/chartx/component/correlation/TinyFormulaPaneEditorComponent.java index 7470ef62d2..5f18eb2549 100644 --- a/designer-chart/src/main/java/com/fr/design/chartx/component/correlation/TinyFormulaPaneEditorComponent.java +++ b/designer-chart/src/main/java/com/fr/design/chartx/component/correlation/TinyFormulaPaneEditorComponent.java @@ -1,9 +1,9 @@ package com.fr.design.chartx.component.correlation; -import com.fr.base.BaseFormula; import com.fr.base.Utils; import com.fr.design.constants.UIConstants; import com.fr.design.event.UIObserverListener; +import com.fr.design.formula.DefaultTinyFormulaPane; import com.fr.design.formula.TinyFormulaPane; import com.fr.design.gui.frpane.UICorrelationPane; @@ -20,17 +20,12 @@ public class TinyFormulaPaneEditorComponent extends AbstractEditorComponent { result = Utils.objectToString(content); } } - TinyFormulaPane title = new TinyFormulaPane(); + TinyFormulaPane title = new DefaultTinyFormulaPane(); title.populateBean(result); switchTitles.add(title); switchTitlePane.add(title, collection.getChartName(chartIndex)); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/AbstractReportDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/AbstractReportDataContentPane.java index 7a6a1f38d5..1073f0e410 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/AbstractReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/AbstractReportDataContentPane.java @@ -8,6 +8,7 @@ import com.fr.chart.chartdata.SeriesDefinition; import com.fr.design.beans.BasicBeanPane; import com.fr.design.constants.UIConstants; import com.fr.design.event.UIObserverListener; +import com.fr.design.formula.DefaultTinyFormulaPane; import com.fr.design.formula.TinyFormulaPane; import com.fr.design.gui.frpane.UICorrelationPane; import com.fr.design.gui.itable.UITable; @@ -15,10 +16,15 @@ import com.fr.design.gui.itable.UITableEditor; import com.fr.design.layout.TableLayout; import com.fr.stable.StableUtils; -import javax.swing.*; +import javax.swing.BorderFactory; +import javax.swing.JPanel; +import javax.swing.JSeparator; +import javax.swing.JTable; import javax.swing.border.Border; import javax.swing.event.ChangeEvent; -import java.awt.*; +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.Dimension; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -171,17 +177,12 @@ public abstract class AbstractReportDataContentPane extends BasicBeanPane { } private JPanel createDefaultAttrPane(){ - titleContent = new TinyFormulaPane(); + titleContent = new DefaultTinyFormulaPane(); textAttrPane = new ChartTextAttrPane(); Icon[] alignmentIconArray = {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_left_normal.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_center_normal.png"), diff --git a/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java b/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java index b8758b9f5e..e11fec903a 100644 --- a/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java +++ b/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java @@ -2,6 +2,7 @@ package com.fr.extended.chart; import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.ChartCollection; +import com.fr.design.formula.DefaultTinyFormulaPane; import com.fr.design.formula.TinyFormulaPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayout; @@ -42,8 +43,8 @@ public abstract class AbstractExtendedChartReportDataPane { private JPanel createScaleAxisPane() { zoomResize = new UIButtonGroup(new String[]{Toolkit.i18nText("Fine-Design_Chart_Change"), Toolkit.i18nText("Fine-Design_Chart_Non_Adjustment")}); - from = new TinyFormulaPane(); - to = new TinyFormulaPane(); + from = new DefaultTinyFormulaPane(); + to = new DefaultTinyFormulaPane(); Component[][] components = new Component[][]{ new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Widget_Boundary")), zoomResize}, new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_From")), from}, diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/zoom/ZoomPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/zoom/ZoomPane.java index dfbf2d640a..3fa7f5ff47 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/zoom/ZoomPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/zoom/ZoomPane.java @@ -4,6 +4,7 @@ import com.fr.chartx.attr.ZoomAttribute; import com.fr.chartx.attr.ZoomInitialDisplayType; import com.fr.chartx.attr.ZoomModeType; import com.fr.design.beans.BasicBeanPane; +import com.fr.design.formula.DefaultTinyFormulaPane; import com.fr.design.formula.TinyFormulaPane; import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.gui.icombobox.UIComboBox; @@ -140,8 +141,8 @@ public class ZoomPane extends BasicBeanPane { final JPanel topPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components1, new double[]{p}, columnSize); - leftFormulaPane = new TinyFormulaPane(); - rightFormulaPane = new TinyFormulaPane(); + leftFormulaPane = new DefaultTinyFormulaPane(); + rightFormulaPane = new DefaultTinyFormulaPane(); Component[][] components2 = new Component[][]{ new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Left_Boundary")), leftFormulaPane}, new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Right_Boundary")), rightFormulaPane} diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartTitlePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartTitlePane.java index 87d6fbfda7..3469e26246 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartTitlePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartTitlePane.java @@ -5,6 +5,7 @@ import com.fr.base.BaseUtils; import com.fr.base.Utils; import com.fr.chart.base.TextAttr; import com.fr.chartx.config.info.constant.ConfigType; +import com.fr.design.formula.DefaultTinyFormulaPane; import com.fr.design.formula.TinyFormulaPane; import com.fr.design.gui.frpane.UIBubbleFloatPane; import com.fr.design.gui.frpane.UINumberDragPane; @@ -152,7 +153,7 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane { } private JPanel createTitleContentPane(double[] row, double[] col) { - titleContent = new TinyFormulaPane(); + titleContent = new DefaultTinyFormulaPane(); useHtml = new UIToggleButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Html")); UIComponentUtils.setLineWrap(useHtml); Component[][] components = new Component[][]{ diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java index 1197d16b7c..fed96db681 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java @@ -8,6 +8,7 @@ import com.fr.chart.base.TextAttr; import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Title; import com.fr.design.beans.FurtherBasicBeanPane; +import com.fr.design.formula.DefaultTinyFormulaPane; import com.fr.design.formula.TinyFormulaPane; import com.fr.design.gui.frpane.UINumberDragPane; import com.fr.design.gui.frpane.UINumberDragPaneWithPercent; @@ -157,7 +158,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { showTitle = new UIButtonGroup(new String[]{Toolkit.i18nText("Fine-Design_Chart_Use_Show"), Toolkit.i18nText("Fine-Design_Chart_Hidden")}); titleAlignPane = isXAxis ? getXAxisTitleAlignPane() : getYAxisTitleAlignPane(); titleAlignPane.setSelectedItem(Constants.CENTER); - titleContent = new TinyFormulaPane(); + titleContent = new DefaultTinyFormulaPane(); titleUseHtml = new UIToggleButton(Toolkit.i18nText("Fine-Design_Chart_Html")); UIComponentUtils.setLineWrap(titleUseHtml); titleTextAttrPane = getChartTextAttrPane(); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAlertValuePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAlertValuePane.java index 49e7f3fa99..e4ceae7fa9 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAlertValuePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAlertValuePane.java @@ -5,14 +5,15 @@ import com.fr.base.Utils; import com.fr.chart.base.AttrColor; import com.fr.chart.base.AttrLineStyle; import com.fr.design.beans.BasicBeanPane; +import com.fr.design.formula.DefaultTinyFormulaPane; import com.fr.design.formula.TinyFormulaPane; import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.gui.ispinner.chart.UISpinnerWithPx; -import com.fr.design.i18n.Toolkit; import com.fr.design.gui.style.FRFontPane; +import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; @@ -86,7 +87,7 @@ public class VanChartAlertValuePane extends BasicBeanPane { } private void initComponents() { - alertValue = new TinyFormulaPane(); + alertValue = new DefaultTinyFormulaPane(); //設置大小，防止文本過長導致界面“變形” alertValue.setPreferredSize(new Dimension(VALUE_WD, HT)); @@ -95,7 +96,7 @@ public class VanChartAlertValuePane extends BasicBeanPane { lineWidthSpinner = new UISpinnerWithPx(LINE_WIDTH_MIN_VALUE, Integer.MAX_VALUE, LINE_WIDTH_DIERTA_VALUE, LINE_WIDTH_DEFAULT_VALUE); alertLineColor = new ColorSelectBox(PREFERRED_WIDTH); alertTextPosition = new UIButtonGroup(new String[]{Toolkit.i18nText("Fine-Design_Chart_Axis_Top"), Toolkit.i18nText("Fine-Design_Chart_Axis_Bottom")}); - alertText = new TinyFormulaPane(); + alertText = new DefaultTinyFormulaPane(); //設置大小，防止文本過長導致界面“變形” alertText.setPreferredSize(new Dimension(TEXT_WD, HT)); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java index ef6dc0e111..42fcdad8eb 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java @@ -3,6 +3,7 @@ package com.fr.van.chart.designer.style.background; import com.fr.base.BaseFormula; import com.fr.base.Utils; import com.fr.design.beans.BasicBeanPane; +import com.fr.design.formula.DefaultTinyFormulaPane; import com.fr.design.formula.TinyFormulaPane; import com.fr.design.gui.frpane.UINumberDragPane; import com.fr.design.gui.frpane.UINumberDragPaneWithPercent; @@ -13,7 +14,6 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.style.color.ColorSelectBox; import com.fr.design.utils.gui.GUICoreUtils; - import com.fr.plugin.chart.VanChartAttrHelper; import com.fr.plugin.chart.attr.axis.VanChartCustomIntervalBackground; import com.fr.van.chart.designer.TableLayout4VanChartHelper; @@ -48,8 +48,8 @@ public class VanChartCustomIntervalBackgroundPane extends BasicBeanPane(); for (int i = 0; i < levelNum; i++){ - levelNameList.add(new TinyFormulaPane()); + levelNameList.add(new DefaultTinyFormulaPane()); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/data/StructurePlotReportDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/data/StructurePlotReportDataContentPane.java index 1e26e2f55c..11f94ef87b 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/data/StructurePlotReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/data/StructurePlotReportDataContentPane.java @@ -2,6 +2,7 @@ package com.fr.van.chart.structure.desinger.data; import com.fr.base.chart.chartdata.TopDefinitionProvider; import com.fr.chart.chartattr.ChartCollection; +import com.fr.design.formula.DefaultTinyFormulaPane; import com.fr.design.formula.TinyFormulaPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; @@ -33,11 +34,11 @@ public class StructurePlotReportDataContentPane extends AbstractReportDataConten double[] columnSize = {p, f}; double[] rowSize = {p, p, p, p, p}; - nodeName = new TinyFormulaPane(); - nodeID = new TinyFormulaPane(); - parentID = new TinyFormulaPane(); + nodeName = new DefaultTinyFormulaPane(); + nodeID = new DefaultTinyFormulaPane(); + parentID = new DefaultTinyFormulaPane(); seriesName = new UITextField(); - nodeValue = new TinyFormulaPane(); + nodeValue = new DefaultTinyFormulaPane(); Component[][] components = new Component[][]{ new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Node_Name")), nodeName}, diff --git a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/data/WordCloudPlotReportDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/data/WordCloudPlotReportDataContentPane.java index d95a9ddc19..d924004881 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/data/WordCloudPlotReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/data/WordCloudPlotReportDataContentPane.java @@ -2,13 +2,13 @@ package com.fr.van.chart.wordcloud.designer.data; import com.fr.base.chart.chartdata.TopDefinitionProvider; import com.fr.chart.chartattr.ChartCollection; +import com.fr.design.formula.DefaultTinyFormulaPane; import com.fr.design.formula.TinyFormulaPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; - import com.fr.plugin.chart.wordcloud.data.WordCloudReportDefinition; import javax.swing.BorderFactory; @@ -32,8 +32,8 @@ public class WordCloudPlotReportDataContentPane extends AbstractReportDataConten double[] rowSize = { p, p, p}; name = new UITextField(); - wordName = new TinyFormulaPane(); - wordValue = new TinyFormulaPane(); + wordName = new DefaultTinyFormulaPane(); + wordValue = new DefaultTinyFormulaPane(); Component[][] components = new Component[][]{ new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name")), name}, From befb07057e615a4ffca3149a774004c6e50c125c Mon Sep 17 00:00:00 2001 From: Carlson Date: Fri, 18 Aug 2023 13:49:32 +0800 Subject: [PATCH 14/18] =?UTF-8?q?fix:=20=E4=BF=9D=E7=95=99=E2=80=9C=3D?= =?UTF-8?q?=E2=80=9D=20#none?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/formula/DefaultTinyFormulaPane.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/formula/DefaultTinyFormulaPane.java b/designer-base/src/main/java/com/fr/design/formula/DefaultTinyFormulaPane.java index 8725a23669..5a106ea38c 100644 --- a/designer-base/src/main/java/com/fr/design/formula/DefaultTinyFormulaPane.java +++ b/designer-base/src/main/java/com/fr/design/formula/DefaultTinyFormulaPane.java @@ -1,7 +1,6 @@ package com.fr.design.formula; import com.fr.base.BaseFormula; -import com.fr.stable.StringUtils; /** * @author Carlson @@ -13,10 +12,6 @@ public class DefaultTinyFormulaPane extends TinyFormulaPane{ @Override protected void populateTextField(BaseFormula fm) { - if (fm.getContent().length() <= 1) { - formulaTextField.setText(StringUtils.EMPTY); - } else { - formulaTextField.setText(fm.getContent()); - } + formulaTextField.setText(fm.getContent()); } } From d24fda3bb736224dacc30d6a24b284665c1d31d7 Mon Sep 17 00:00:00 2001 From: Carlson Date: Mon, 21 Aug 2023 16:51:11 +0800 Subject: [PATCH 15/18] =?UTF-8?q?REPORT-101812=20fix:=20=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E6=96=87=E6=9C=AC=E6=88=AA=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/van/chart/column/VanChartColumnSeriesPane.java | 10 +++++----- .../chart/designer/other/VanChartInteractivePane.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java index 27c5882221..a542f100cb 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java @@ -3,13 +3,13 @@ package com.fr.van.chart.column; import com.fr.base.background.ImageBackground; import com.fr.chart.chartattr.Plot; import com.fr.chart.chartglyph.ConditionAttr; -import com.fr.design.gui.frpane.UINumberDragPaneWithPercent; -import com.fr.design.gui.ispinner.chart.UISpinnerWithPx; -import com.fr.design.i18n.Toolkit; import com.fr.design.gui.frpane.UINumberDragPane; +import com.fr.design.gui.frpane.UINumberDragPaneWithPercent; import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ispinner.UISpinner; +import com.fr.design.gui.ispinner.chart.UISpinnerWithPx; +import com.fr.design.i18n.Toolkit; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.backgroundpane.ImageBackgroundQuickPane; @@ -91,8 +91,8 @@ public class VanChartColumnSeriesPane extends VanChartAbstractPlotSeriesPane { panel1.add(columnWidth, BorderLayout.CENTER); Component[][] components2 = new Component[][]{ - new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Gap_Series")),seriesGap}, - new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Gap_Category")),categoryGap}, + new Component[]{FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Chart_Gap_Series")),seriesGap}, + new Component[]{FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Chart_Gap_Category")),categoryGap}, }; JPanel panel2 = TableLayout4VanChartHelper.createGapTableLayoutPane(components2, row, col); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java index 3c2345e2db..01854225dc 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java @@ -498,7 +498,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane { protected JPanel createAnimationPane() { isChartAnimation = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Close")}); - chartAnimationLabel = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Animation_Effects")); + chartAnimationLabel = FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Chart_Animation_Effects")); double p = TableLayout.PREFERRED; double f = TableLayout.FILL; double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; From 096fb14523189a0bdb31095eac7b09f1e3dbd7ae Mon Sep 17 00:00:00 2001 From: Carlson Date: Mon, 21 Aug 2023 17:02:57 +0800 Subject: [PATCH 16/18] =?UTF-8?q?=E5=8A=A0=E4=B8=AA=E6=B3=A8=E9=87=8A=20#n?= =?UTF-8?q?one?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/formula/DefaultTinyFormulaPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/formula/DefaultTinyFormulaPane.java b/designer-base/src/main/java/com/fr/design/formula/DefaultTinyFormulaPane.java index 5a106ea38c..05053eec4f 100644 --- a/designer-base/src/main/java/com/fr/design/formula/DefaultTinyFormulaPane.java +++ b/designer-base/src/main/java/com/fr/design/formula/DefaultTinyFormulaPane.java @@ -6,7 +6,7 @@ import com.fr.base.BaseFormula; * @author Carlson * @version 11.0 * Created by Carlson on 2023/8/14 17:15 - * @description + * @description 默认的公式输入面板（包含一个输入框和一个F(x)按钮），清空公式内容后不会显示“$$$”，主要在图表配置面板里使用 **/ public class DefaultTinyFormulaPane extends TinyFormulaPane{ From fea42a047fd3336b0454af84cc3a48197c64df9b Mon Sep 17 00:00:00 2001 From: obo Date: Wed, 23 Aug 2023 11:06:56 +0800 Subject: [PATCH 17/18] =?UTF-8?q?REPORT-103732=20=E6=B5=B7=E5=A4=96?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=9C=B0=E5=9B=BE=E7=BB=84=E4=BB=B6=E7=9A=84?= =?UTF-8?q?GIS=E5=9B=BE=E5=B1=82=E4=BC=98=E5=8C=96-fvs=E4=B8=8B=E6=A0=87?= =?UTF-8?q?=E5=87=86=E8=87=AA=E5=8A=A8=E9=85=8D=E7=BD=AE=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/map/designer/type/GisLayerPane.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) 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 de07a7814d..253e5dcf19 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 @@ -3,12 +3,14 @@ package com.fr.van.chart.map.designer.type; import com.fr.base.Utils; import com.fr.design.event.UIObserver; import com.fr.design.event.UIObserverListener; +import com.fr.design.file.HistoryTemplateListCache; import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.i18n.Toolkit; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; +import com.fr.design.mainframe.JTemplate; import com.fr.design.mainframe.chart.mode.ChartEditContext; import com.fr.general.ComparatorUtils; import com.fr.general.GeneralContext; @@ -316,6 +318,7 @@ public class GisLayerPane extends JPanel implements UIObserver { if (isAuto()) { layer.setGisLayerType(GISLayerType.AUTO); layer.setLayerName(GISLayerType.getLocString(GISLayerType.AUTO)); + adaptEditingTemplateTheme(layer); } else if (isStandardGis()) { updateStandardGis(layer); } else { @@ -348,4 +351,18 @@ public class GisLayerPane extends JPanel implements UIObserver { break; } } + + /** + * 切换图层时根据主题切换图层名称 + * + * @param layer 图层 + */ + private void adaptEditingTemplateTheme(GisLayer layer) { + JTemplate currentEditingTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); + 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); + } + } } From 3f3bd4376b009080836cfefc3dc6df479746b2d3 Mon Sep 17 00:00:00 2001 From: obo Date: Thu, 24 Aug 2023 17:12:46 +0800 Subject: [PATCH 18/18] =?UTF-8?q?REPORT-98466=20FileNodeConstants=E4=B8=AD?= =?UTF-8?q?=E4=BD=BF=E7=94=A8List=E5=AD=98=E5=82=A8=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=8F=AF=E8=83=BD=E5=AF=BC=E8=87=B4=E9=87=8D?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/gui/itree/filetree/FileNodeConstants.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/FileNodeConstants.java b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/FileNodeConstants.java index f5da5302c4..60d727fda0 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/FileNodeConstants.java +++ b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/FileNodeConstants.java @@ -11,9 +11,8 @@ import com.fr.plugin.observer.PluginEventListener; import com.fr.report.ExtraReportClassManager; import com.fr.report.fun.ReportSupportedFileProvider; -import java.util.ArrayList; import java.util.Arrays; -import java.util.List; +import java.util.LinkedHashSet; import java.util.Set; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; @@ -23,7 +22,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; */ public class FileNodeConstants { - private static List supportFileType; + private static Set supportFileType; private static ReadWriteLock rwl = new ReentrantReadWriteLock(); private FileNodeConstants() { @@ -47,16 +46,14 @@ public class FileNodeConstants { private static void addAppExtensions(FileExtension[] extensions) { for (int i = 0, size = extensions.length; i < size; i++) { - if (!supportFileType.contains(extensions[i].getExtension())) { - supportFileType.add(extensions[i].getExtension()); - } + supportFileType.add(extensions[i].getExtension()); } } private static void initSupportedTypes() { try { rwl.writeLock().lock(); - supportFileType = new ArrayList(); + supportFileType = new LinkedHashSet<>(); //通过插件扩展的 Set providers = ExtraReportClassManager.getInstance().getArray(ReportSupportedFileProvider.XML_TAG); for (ReportSupportedFileProvider provider : providers) {