Merge pull request #3919 in DESIGN/design from final/10.0 to persist/10.0

* commit 'cad52a3e5e6b8447fc4b9984ac539579a19c6c5c':
  REPORT-50788 删除数据集更新缓存 漏交
  REPORT-50788 删除数据集更新缓存
  REPORT-50788 【10.0.15】参数面板不会自动生成第二个数据集设置的参数
  CHART-18772  frm下初始化需要选中gisButton
  REPORT-50662 fix ;
  REPORT-50662 设计器运行一段时间后会卡死

designer-base/src/main/java/com/fr/design/DesignModelAdapter.java

@@ -21,6 +21,8 @@ import com.fr.stable.StringUtils;
 import com.fr.stable.js.WidgetName;
 
 import com.fr.util.ParameterApplyHelper;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -309,13 +311,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 +329,33 @@ 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);
+        }
+    }
+
+    public void removeTableDataParameters(String tdName) {
+        ParameterProvider[] tableDataParameters =  tableDataParametersMap.remove(tdName);
+        List<Parameter> allParameterList = new ArrayList<>(Arrays.asList(parameters));
+        List<Parameter> tableDataParameterList = new ArrayList<>();
+        for (ParameterProvider parameterProvider : tableDataParameters) {
+            tableDataParameterList.add((Parameter) parameterProvider);
+        }
+        allParameterList.removeAll(tableDataParameterList);
+        parameters = allParameterList.toArray(new Parameter[0]);
+    }
+
+
+    public void updateAllParameters() {
+        parameters = getLatestParameters();
+    }
+
     protected void addGlobalParameters(Map<String, ParameterProvider> map) {
         // 添加全局参数
         Parameter[] glbParas = ParameterConfig.getInstance().getGlobalParameters();

designer-base/src/main/java/com/fr/design/actions/TableDataSourceAction.java

@@ -60,6 +60,7 @@ public class TableDataSourceAction extends TemplateComponentAction<JTemplate<?,
                 TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter());
                 TableDataSourceAction.this.getEditingComponent().fireTargetModified();
                 fireDSChanged(tableDataPane.getDsNameChangedMap());
+                DesignModelAdapter.getCurrentModelAdapter().updateAllParameters();
             }
         });
         reportTableDataDialog.setVisible(true);

designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java

@@ -288,6 +288,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
                 fireDSChanged();
                 checkButtonEnabled();
                 DesignTableDataManager.removeSelectedColumnNames(selectedNO.getName());
+                DesignModelAdapter.getCurrentModelAdapter().removeTableDataParameters(selectedNO.getName());
             }
         }
     }

designer-base/src/main/java/com/fr/design/utils/gui/GUIPaintUtils.java

@@ -4,12 +4,15 @@ import com.fr.base.vcs.DesignerMode;
 import com.fr.design.constants.UIConstants;
 import com.fr.stable.Constants;
 
+import com.fr.stable.os.OperatingSystem;
 import java.awt.*;
 import java.awt.geom.GeneralPath;
 import java.awt.geom.RoundRectangle2D;
 
 public class GUIPaintUtils {
 
+    private static boolean macos = OperatingSystem.isMacos();
+
     public static final void drawBorder(Graphics2D g2d, int x, int y, int width, int height, boolean isRound, int rectDirection) {
         drawBorder(g2d, x, y, width, height, isRound, rectDirection, false);
     }
@@ -39,10 +42,14 @@ public class GUIPaintUtils {
                 g2d.drawLine(x, y, x, height - 1);
                 g2d.drawLine(x, height - 1, x + 3, height - 1);
             } else {
-                double offsetX = Math.min(GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice().getDefaultConfiguration().getDefaultTransform().getScaleX() - 1, 0.5d);
-                double offsetY = Math.min(GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice().getDefaultConfiguration().getDefaultTransform().getScaleY() - 1, 0.5d);
-                Shape shape = new RoundRectangle2D.Double(x + offsetX,  y + offsetY, width - 1d, height - 1d, UIConstants.ARC, UIConstants.ARC);
-                g2d.draw(shape);
+                if (macos) {
+                    g2d.drawRoundRect(x, y, width - 1, height - 1, UIConstants.ARC, UIConstants.ARC);
+                } else {
+                    double offsetX = Math.min(GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice().getDefaultConfiguration().getDefaultTransform().getScaleX() - 1, 0.5d);
+                    double offsetY = Math.min(GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice().getDefaultConfiguration().getDefaultTransform().getScaleY() - 1, 0.5d);
+                    Shape shape = new RoundRectangle2D.Double(x + offsetX,  y + offsetY, width - 1d, height - 1d, UIConstants.ARC, UIConstants.ARC);
+                    g2d.draw(shape);
+                }
             }
             g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
         } else {

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