From e70787b8c48e6037ac390b77d09b3b6ef19eb0d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com>
Date: Wed, 7 Apr 2021 14:35:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?CHART-18772=20=20frm=E4=B8=8B=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96=E9=9C=80=E8=A6=81=E9=80=89=E4=B8=ADgisButton?=
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 insertion(+)

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 e94c79818..4a43d7619 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
@@ -79,6 +79,7 @@ public class GisLayerPane extends JPanel implements UIObserver {
 
     private JPanel createGISLayerPane() {
         gisButton = new UIButtonGroup(new String[]{Toolkit.i18nText("Fine-Design_Form_Widget_Style_Standard"), Toolkit.i18nText("Fine-Design_Chart_Custom")});
+        gisButton.setSelectedIndex(0);
         gisGaoDeLayer = new UIComboBox(MapLayerConfigManager.getGaoDeLayerItems());
         gisButton.addActionListener(event -> {
             refreshZoomLevel();

From e2cc87e26d6daf38ca5d2d29a04e9809e6e848c7 Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Wed, 7 Apr 2021 16:13:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=20REPORT-50788=20=E3=80=9010.0.15=E3=80=91?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=9D=A2=E6=9D=BF=E4=B8=8D=E4=BC=9A=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E7=94=9F=E6=88=90=E7=AC=AC=E4=BA=8C=E4=B8=AA=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=E8=AE=BE=E7=BD=AE=E7=9A=84=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/DesignModelAdapter.java     | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/DesignModelAdapter.java b/designer-base/src/main/java/com/fr/design/DesignModelAdapter.java
index 9d5ed06e2..73d82f862 100644
--- a/designer-base/src/main/java/com/fr/design/DesignModelAdapter.java
+++ b/designer-base/src/main/java/com/fr/design/DesignModelAdapter.java
@@ -309,13 +309,13 @@ public abstract class DesignModelAdapter<T extends BaseBook, S extends JTemplate
                 } else {
                     parameterProviders = entry.getValue();
                 }
+                updateParaMap(map, parameterProviders, filter);
+            }
 
-                if (filter != null) {
-                    ParameterApplyHelper.addPara2Map(map, parameterProviders, filter);
-                } else {
-                    ParameterApplyHelper.addPara2Map(map, parameterProviders);
-                }
-
+            // 处理非初始化(已存在数据集参数)时 添加逻辑
+            if (!tableDataParametersMap.containsKey(tdName)) {
+                providers = DataOperator.getInstance().getTableDataParameters(tableData);
+                updateParaMap(map, providers, filter);
             }
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
@@ -327,6 +327,17 @@ public abstract class DesignModelAdapter<T extends BaseBook, S extends JTemplate
         }
     }
 
+    /**
+     *  更新全部参数中的数据集参数
+     */
+    private void updateParaMap(Map<String, ParameterProvider> map, ParameterProvider[] parameterProviders, Filter<ParameterProvider> filter) {
+        if (filter != null) {
+            ParameterApplyHelper.addPara2Map(map, parameterProviders, filter);
+        } else {
+            ParameterApplyHelper.addPara2Map(map, parameterProviders);
+        }
+    }
+
     protected void addGlobalParameters(Map<String, ParameterProvider> map) {
         // 添加全局参数
         Parameter[] glbParas = ParameterConfig.getInstance().getGlobalParameters();