Merge pull request #1477 in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0

* commit '6e7686df98562759b13579abb7d10ab97f0c366e':
  CHART-12932 无法触发保存的问题
  CHART-12915 弹窗的位置
  CHART-12940  下拉框样式

designer-chart/src/main/java/com/fr/design/chartx/component/MapAreaMatchPane.java

@@ -18,7 +18,6 @@ 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.FRGUIPaneFactory;
-import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.chart.gui.data.table.DataPaneHelper;
 import com.fr.design.parameter.ParameterInputPane;
 import com.fr.general.GeneralUtils;
@@ -35,6 +34,7 @@ import javax.swing.BorderFactory;
 import javax.swing.Icon;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
+import javax.swing.SwingUtilities;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.tree.DefaultMutableTreeNode;
 import java.util.HashMap;
@@ -226,7 +226,7 @@ public class MapAreaMatchPane extends BasicBeanPane<MapMatchResult> {
 
         if (ArrayUtils.isNotEmpty(parameters)) {
             final ParameterInputPane pPane = new ParameterInputPane(parameters);
-            pPane.showSmallWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
+            pPane.showSmallWindow(SwingUtilities.getWindowAncestor(this), new DialogActionAdapter() {
                 @Override
                 public void doOk() {
                     parameterMap.putAll(pPane.update());

designer-chart/src/main/java/com/fr/design/chartx/component/TableTreeComboBox.java

@@ -2,7 +2,6 @@ package com.fr.design.chartx.component;
 
 import com.fr.design.gui.icombobox.FRTreeComboBox;
 import com.fr.design.gui.itextfield.UITextField;
-import com.fr.general.IOUtils;
 import com.fr.plugin.chart.map.server.ChartGEOJSONHelper;
 
 import javax.swing.JTextField;
@@ -86,9 +85,6 @@ public class TableTreeComboBox extends FRTreeComboBox {
             if (value instanceof DefaultMutableTreeNode) {
                 DefaultMutableTreeNode node = (DefaultMutableTreeNode) value;
                 Object userObj = node.getUserObject();
-                if (node.getChildCount() > 0) {
-                    this.setIcon(IOUtils.readIcon("com/fr/design/images/m_insert/expandCell.gif"));
-                }
                 if (userObj != null) {
                     this.setText(ChartGEOJSONHelper.getPresentNameWithPath(userObj.toString()));
                 }

designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/table/VanAreaMapPlotTableDataContentPane.java

@@ -9,6 +9,7 @@ import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.plugin.chart.map.VanChartMapPlot;
+import com.fr.plugin.chart.map.data.MapMatchResult;
 import com.fr.plugin.chart.map.data.VanMapTableDefinitionProvider;
 import com.fr.van.chart.map.designer.data.component.SeriesTypeUseComboxPaneWithOutFilter;
 
@@ -139,7 +140,7 @@ public class VanAreaMapPlotTableDataContentPane extends VanMapTableDataContentPa
         TopDefinitionProvider topDefinitionProvider = collection.getSelectedChart().getFilterDefinition();
         if (topDefinitionProvider instanceof VanMapTableDefinitionProvider) {
             VanMapTableDefinitionProvider mapTableDefinitionProvider = (VanMapTableDefinitionProvider) topDefinitionProvider;
-            mapTableDefinitionProvider.setMatchResult(this.getMatchResult());
+            mapTableDefinitionProvider.setMatchResult((MapMatchResult) this.getMatchResult().clone());
             updateDefinition(mapTableDefinitionProvider);
         }
     }
@@ -157,7 +158,7 @@ public class VanAreaMapPlotTableDataContentPane extends VanMapTableDataContentPa
         TopDefinitionProvider topDefinitionProvider = collection.getSelectedChart().getFilterDefinition();
         if (topDefinitionProvider instanceof VanMapTableDefinitionProvider) {
             VanMapTableDefinitionProvider mapTableDefinitionProvider = (VanMapTableDefinitionProvider) topDefinitionProvider;
-            this.setMatchResult(mapTableDefinitionProvider.getMatchResult());
+            this.setMatchResult((MapMatchResult) mapTableDefinitionProvider.getMatchResult().clone());
             populateDefinition(mapTableDefinitionProvider);
         }
     }