Merge pull request #3911 in DESIGN/design from final/10.0 to bugfix/10.0

* commit 'f23a823916bd5f4449ececd8d754539a103f56c2':
  REPORT-50788 【10.0.15】参数面板不会自动生成第二个数据集设置的参数
  CHART-18772  frm下初始化需要选中gisButton

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();
                 }
-
-                if (filter != null) {
-                    ParameterApplyHelper.addPara2Map(map, parameterProviders, filter);
-                } else {
-                    ParameterApplyHelper.addPara2Map(map, parameterProviders);
+                updateParaMap(map, parameterProviders, filter);
             }
 
+            // 处理非初始化(已存在数据集参数)时 添加逻辑
+            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();

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();