CHART-17573 && CHART-17567 && CHART-17434 bugfix

designer-chart/src/main/java/com/fr/design/chart/ChartSwingUtils.java

@@ -31,7 +31,7 @@ public class ChartSwingUtils {
 		});
 		textField.addKeyListener(new KeyAdapter() {
 			  public void keyTyped(KeyEvent e) {
-				  if(box.isSelected()) {
+				  if(box.isSelected() && !e.isControlDown()) {
 					  e.consume();
 					  showFormulaPane(textField, null);
 				  }

designer-chart/src/main/java/com/fr/van/chart/map/VanChartMapSeriesPane.java

@@ -17,6 +17,7 @@ import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.design.utils.gui.UIComponentUtils;
 import com.fr.design.widget.FRWidgetFactory;
 import com.fr.general.ComparatorUtils;
+import com.fr.general.GeneralUtils;
 import com.fr.plugin.chart.VanChartAttrHelper;
 import com.fr.plugin.chart.base.AttrBorderWithAlpha;
 import com.fr.plugin.chart.base.AttrEffect;
@@ -30,6 +31,7 @@ import com.fr.plugin.chart.map.line.condition.AttrCurve;
 import com.fr.plugin.chart.map.line.condition.AttrLineEffect;
 import com.fr.plugin.chart.type.MapMarkerType;
 import com.fr.plugin.chart.type.MapType;
+import com.fr.stable.StringUtils;
 import com.fr.van.chart.bubble.component.VanChartBubblePane;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 import com.fr.van.chart.designer.component.border.VanChartBorderWithAlphaPane;
@@ -173,22 +175,29 @@ public class VanChartMapSeriesPane extends VanChartColorValueSeriesPane {
     }
 
     private void checkPointCompsEnabledWithLarge(Plot plot) {
-        boolean largeModel = largeModel(plot);
+        checkPointEffectPane(plot);
-        if (pointEffectPane != null) {
-            GUICoreUtils.setEnabled(pointEffectPane, !largeModel);
-        }
 
         if (markerTypeCom == null) {
             return;
         }
 
         VanChartMapPlot mapPlot = (VanChartMapPlot) plot;
+        boolean largeModel = largeModel(plot);
         refreshMarkerComboboxModel(mapPlot);
         if (largeModel) {
             checkLargeModelPlotSelectedItem(mapPlot);
         }
     }
 
+    private void checkPointEffectPane(Plot plot) {
+        if (pointEffectPane != null) {
+            boolean largeModel = largeModel(plot);
+            boolean imageMark = markerTypeCom == null ? false :
+                    StringUtils.equals(MapMarkerType.IMAGE.toLocalString(), GeneralUtils.objectToString(markerTypeCom.getSelectedItem()));
+            GUICoreUtils.setEnabled(pointEffectPane, !largeModel && !imageMark);
+        }
+    }
+
     private void checkLineCompsEnabledWithLarge(Plot plot) {
         if (lineMapEffectPane != null) {
             //大数据模式 恢复用注释。下面1行删除。
@@ -483,6 +492,7 @@ public class VanChartMapSeriesPane extends VanChartColorValueSeriesPane {
             @Override
             public void itemStateChanged(ItemEvent e) {
                 markerTypeLayout.show(markerContentPane, (String) markerTypeCom.getSelectedItem());
+                checkPointEffectPane(plot);
             }
         });
 

designer-chart/src/main/java/com/fr/van/chart/map/designer/style/label/VanChartMapLabelPane.java

@@ -45,12 +45,8 @@ public class VanChartMapLabelPane extends AbstractVanChartScrollPane<Chart> {
                 contentPane.add(pointLabelPane, BorderLayout.NORTH);
                 break;
             case CUSTOM:
-                areaLabelPane = createAreaMapPlotLabelPane();
-                pointLabelPane = new VanChartPlotLabelPane(mapPlot, parent);
-                contentPane.add(new VanMapAreaAndPointGroupPane(areaLabelPane, pointLabelPane), BorderLayout.NORTH);
-                break;
             case DRILL_CUSTOM:
-                areaLabelPane = new VanChartPlotLabelPane(mapPlot, parent);
+                areaLabelPane = createAreaMapPlotLabelPane();
                 pointLabelPane = new VanChartPlotLabelPane(mapPlot, parent);
                 contentPane.add(new VanMapAreaAndPointGroupPane(areaLabelPane, pointLabelPane), BorderLayout.NORTH);
                 break;