Merge pull request #8322 in DESIGN/design from final/11.0 to release/11.0

* commit 'd8c871bbff750351cfeb6b106274f3eb9bfb77ff':
  REPORT-68175 release合并final
  REPORT-68127 【专题】jdk11的设计器用bat脚本启动失败，exe启动正常
  REPORT-68062 单元格数据列高级设置-格式设置不生效
  REPORT-68061 单元格元素-数据设置-自定义分组设置无法点击确定
  REPORT-68161 填报-模板web属性-切换设置时，编辑行背景设置的点击逻辑确认
  CHART-22972 HyperlinkProvider接口对图表超链不起作用
  CHART-23227 钻取点地图&钻取区域地图切换类型，预览无法展示

designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartEditPane.java

@@ -29,6 +29,7 @@ import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.chart.custom.VanChartCustomPlot;
 import com.fr.plugin.chart.vanchart.VanChart;
 
+import com.fr.van.chart.drillmap.designer.data.VanChartDrillMapDataPane;
 import javax.swing.JPanel;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
@@ -148,7 +149,12 @@ public class ChartEditPane extends BasicPane implements AttributeChange, Prepare
             ChartInfoCollector.getInstance().updateChartPropertyTime(collection.getSelectedChartProvider(ChartProvider.class));
 
             selectedPane.update(collection);
-
+            for (int i = 0; i < paneList.size(); i++) {
+                if (paneList.get(i) instanceof VanChartDrillMapDataPane && i != tabsHeaderIconPane.getSelectedIndex()) {
+                    paneList.get(i).populateBean(collection);
+                    break;
+                }
+            }
             if (!ComparatorUtils.equals(collection, lastCollection)) {
                 VanChart vanChart = collection.getSelectedChartProvider(VanChart.class);
                 if (vanChart != null) {

designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartHyperLinkPane.java

@@ -150,17 +150,19 @@ public class VanChartHyperLinkPane extends VanChartUIListControlPane {
 
         //安装平台内打开插件时,添加相应按钮
         Set<HyperlinkProvider> providers = ExtraDesignClassManager.getInstance().getArray(HyperlinkProvider.XML_TAG);
-        for (HyperlinkProvider provider : providers) {
-            NameableCreator nc = provider.createHyperlinkCreator();
-                paneMap.put(nc.getHyperlink(), nc.getUpdatePane());
-        }
-
         java.util.List<UIMenuNameableCreator> list = refreshList(paneMap);
-        NameObjectCreator[] creators = new NameObjectCreator[list.size()];
-        for (int i = 0; list != null && i < list.size(); i++) {
+        int size = list.size();
+        NameObjectCreator[] creators = new NameObjectCreator[size + providers.size()];
+        for (int i = 0; i < size; i++) {
             UIMenuNameableCreator uiMenuNameableCreator = list.get(i);
             creators[i] = new NameObjectCreator(uiMenuNameableCreator.getName(), uiMenuNameableCreator.getObj().getClass(), uiMenuNameableCreator.getPaneClazz());
-
+        }
+        for (HyperlinkProvider provider : providers) {
+            NameableCreator creator = provider.createHyperlinkCreator();
+            if (creator != null) {
+                creators[size] = new NameObjectCreator(creator.menuName(), creator.getHyperlink(), creator.getUpdatePane());
+                size++;
+            }
         }
 
         refreshNameableCreator(creators);

designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java

@@ -282,7 +282,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
         private  void initComponents(){
             dataPane = new SelectedDataColumnPane(true, true);
             groupPane = new ResultSetGroupDockingPane();
-
+			initListener();
             double[] rowSize = {P}, columnSize = {60, F};
             UILabel uiLabel = FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Report_Filter_Conditions"));
             condition = new DSColumnConditionAction();
@@ -299,6 +299,35 @@ public class CellDSColumnEditor extends CellQuickEditor {
             conditionPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, HGAP, VGAP);
             this.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
         }
+		
+		
+        private void initListener() {
+            dataPane.setListener(new ItemListener() {
+                @Override
+                public void itemStateChanged(ItemEvent e) {
+                    if (e.getStateChange() == ItemEvent.SELECTED) {
+                        dataPane.update(cellElement);
+                        fireTargetModified();
+                    }
+                }
+            });
+            groupPane.setListener(new ItemListener() {
+                @Override
+                public void itemStateChanged(ItemEvent e) {
+                    if (e == null) {
+                        //分组-高级-自定义点确定的时候传进来null的e,但是这时候应该触发保存
+                        groupPane.update();
+                        fireTargetModified();
+                        return;
+                    }
+                    if (e.getStateChange() == ItemEvent.DESELECTED) {
+                        groupPane.update();
+                        fireTargetModified();
+                    }
+                }
+            });
+        }
+		
         @Override
         protected AttributeChangeListener getAttributeChangeListener() {
             return new AttributeChangeListener() {