Pull request #5942: CHART-20939 design fix: 三维组合地图有类型界面

Merge in DESIGN/design from ~ZHENG/c-design:feature/10.0 to feature/10.0

* commit '79dbdc48eba1d71d0fe4ebe90eb459ba7741eaa0':
  CHART-20939 design fix: 三维组合地图有类型界面

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

@@ -149,7 +149,7 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
 
     public static WidgetOption[] initWidgetOption() {
 
-        String[] chartIDs = ChartTypeManager.getInstance().getAllChartIDs();
+        String[] chartIDs = ChartTypeManager.getInstance().getChartIDs4Create();
         ChartWidgetOption[] child = new ChartWidgetOption[chartIDs.length];
         int index = 0;
 

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

@@ -31,7 +31,7 @@ import java.awt.Component;
 public class ChartTypePane extends ChartCommonWizardPane implements CallbackEvent {
     private static final long serialVersionUID = -1175602484968520546L;
 
-    private String[] chartIDs = ChartTypeManager.getInstanceWithCheck().getAllChartIDs();
+    private String[] chartIDs = ChartTypeManager.getInstanceWithCheck().getChartIDs4Create();
 
     private JList mainTypeList = null;
     private JList iconViewList = null;

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

@@ -4,6 +4,7 @@ import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chart.charttypes.ChartTypeManager;
 import com.fr.chartx.attr.ChartProvider;
 import com.fr.design.ChartTypeInterfaceManager;
+import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.beans.FurtherBasicBeanPane;
 import com.fr.design.dialog.BasicScrollPane;
 import com.fr.design.dialog.DialogActionAdapter;
@@ -173,7 +174,7 @@ public class ChartTypePane extends AbstractChartAttrPane {
                                             Map<Integer, Map<String, FurtherBasicBeanPane<? extends ChartProvider>>> allChartTypePane,
                                             ActionListener autoButtonListener) {
 
-        String[] chartIDs = ChartTypeManager.getInstance().getAllChartIDsIncludeDisabled();
+        String[] chartIDs = ChartTypeManager.getInstance().getAllChartIDs();
 
         for (String id : chartIDs) {
 
@@ -288,9 +289,11 @@ public class ChartTypePane extends AbstractChartAttrPane {
                 Map.Entry<String, FurtherBasicBeanPane<? extends ChartProvider>> entry = iterator.next();
                 String plotID = entry.getKey();
                 if (ignore || ChartTypeManager.enabledChart(plotID)) {
+                    if (ChartTypeManager.getInstance().isShowInDesigner(plotID)) {
                         cards.add(entry.getValue());
                     }
                 }
+            }
 
         }
 
@@ -310,7 +313,9 @@ public class ChartTypePane extends AbstractChartAttrPane {
 
             //第一步就是重构cards
             cards.clear();
-            if (enabledChart) {
+            if (DesignModeContext.isDuchampMode()) {
+                addOnePlotIDCards(priority, chartID);
+            } else if (enabledChart) {
                 if (collection.getChartCount() == 1) {
                     addAllCards();
                 } else {

designer-realize/src/main/java/com/fr/poly/PolyComponentsBar.java

@@ -46,7 +46,7 @@ public class PolyComponentsBar extends JToolBar {
         setFloatable(false);
         setBackground(UIConstants.TOOLBARUI_BACKGROUND);
         setLayout(FRGUIPaneFactory.create1ColumnGridLayout());
-        String[] iDs = ChartTypeManager.getInstance().getAllChartIDs();
+        String[] iDs = ChartTypeManager.getInstance().getChartIDs4Create();
         int typeLen = iDs.length < MAX_BAR_NUM ? iDs.length : MAX_BAR_NUM;
         serIcons = new SerIcon[typeLen + 1];
         serIcons[0] = new SerIcon(