Pull request #4793: CHART-18787 design 细节调整

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

* commit '8a689f647ea4b70c321f08b2ea1c872ad8229ab7':
  feat:其他组合图不需要类型界面，自定义组合图需要
  refactor:plugin use 10.0 not compatible xxx copy from 10.0 code
  feat:类型和特性面板如果没有其他设置项 则拿掉

designer-chart/src/main/java/com/fr/design/chart/fun/impl/AbstractChartTypeUI.java

@@ -5,6 +5,7 @@ import com.fr.design.chartx.impl.AbstractDataPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.mainframe.chart.AbstractChartAttrPane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.stable.fun.impl.AbstractProvider;
 import com.fr.stable.fun.mark.API;
 
@@ -16,7 +17,7 @@ public abstract class AbstractChartTypeUI extends AbstractProvider implements Ch
 
     @Override
     public AbstractChartTypePane getPlotTypePane() {
-        return new DefaultChartTypePane();
+        return ChartEditContext.duchampMode() ? new InvisibleChartTypePane() : new DefaultChartTypePane();
     }
 
     @Override

designer-chart/src/main/java/com/fr/design/chart/fun/impl/InvisibleChartTypePane.java

@@ -0,0 +1,15 @@
+package com.fr.design.chart.fun.impl;
+
+import com.fr.design.ChartTypeInterfaceManager;
+
+/**
+ * @author shine
+ * @version 10.0
+ * Created by shine on 2021/6/25
+ */
+public class InvisibleChartTypePane extends DefaultChartTypePane {
+    @Override
+    public String title4PopupWindow() {
+        return ChartTypeInterfaceManager.TYPE_PANE_DEFAULT_TITLE;
+    }
+}

designer-chart/src/main/java/com/fr/design/chartx/data/map/LineMapAreaLngLatPaneWithComboBox.java

@@ -2,7 +2,7 @@ package com.fr.design.chartx.data.map;
 
 import com.fr.chartx.data.field.diff.LineMapColumnFieldCollection;
 import com.fr.design.chartx.fields.AbstractDataSetFieldsPane;
-import com.fr.design.chartx.fields.diff.LineMapDataSetFieldsPane;
+import com.fr.design.chartx.fields.diff.MapDataSetFieldsPane;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.i18n.Toolkit;
 
@@ -24,15 +24,15 @@ public class LineMapAreaLngLatPaneWithComboBox extends LineMapAreaLngLatPaneWith
     private UIComboBox toLng_tab1;
     private UIComboBox toLat_tab1;
 
-    private LineMapDataSetFieldsPane lineMapDataSetFieldsPane;
+    private MapDataSetFieldsPane mapDataSetFieldsPane;
 
-    public LineMapAreaLngLatPaneWithComboBox(LineMapDataSetFieldsPane lineMapDataSetFieldsPane) {
+    public LineMapAreaLngLatPaneWithComboBox(MapDataSetFieldsPane mapDataSetFieldsPane) {
-        this.lineMapDataSetFieldsPane = lineMapDataSetFieldsPane;
+        this.mapDataSetFieldsPane = mapDataSetFieldsPane;
         initComponents();
     }
 
     protected void initComponents() {
-        if (lineMapDataSetFieldsPane == null) {
+        if (mapDataSetFieldsPane == null) {
             return;
         }
         super.initComponents();
@@ -48,7 +48,7 @@ public class LineMapAreaLngLatPaneWithComboBox extends LineMapAreaLngLatPaneWith
         return createPane(
                 new String[]{Toolkit.i18nText("Fine-Design_Chart_Start_Area_Name"),
                         Toolkit.i18nText("Fine-Design_Chart_End_Area_Name")},
-                lineMapDataSetFieldsPane.createAreaPanel(fromArea_tab0), lineMapDataSetFieldsPane.createAreaPanel(toArea_tab0)
+                mapDataSetFieldsPane.createAreaPanel(fromArea_tab0), mapDataSetFieldsPane.createAreaPanel(toArea_tab0)
         );
     }
 
@@ -64,18 +64,19 @@ public class LineMapAreaLngLatPaneWithComboBox extends LineMapAreaLngLatPaneWith
         }
         return createPane(
                 new String[]{
-                        Toolkit.i18nText("Fine-Design_Chart_Start_Area_Name"),
                         Toolkit.i18nText("Fine-Design_Chart_Start_Longitude"),
                         Toolkit.i18nText("Fine-Design_Chart_Start_Latitude"),
-                        Toolkit.i18nText("Fine-Design_Chart_End_Area_Name"),
+                        Toolkit.i18nText("Fine-Design_Chart_Start_Area_Name"),
                         Toolkit.i18nText("Fine-Design_Chart_End_Longitude"),
-                        Toolkit.i18nText("Fine-Design_Chart_End_Latitude")},
+                        Toolkit.i18nText("Fine-Design_Chart_End_Latitude"),
-                lineMapDataSetFieldsPane.createAreaPanel(fromArea_tab1),
+                        Toolkit.i18nText("Fine-Design_Chart_End_Area_Name")
+                },
                 fromLng_tab1,
                 fromLat_tab1,
-                lineMapDataSetFieldsPane.createAreaPanel(toArea_tab1),
+                fromArea_tab1,
                 toLng_tab1,
-                toLat_tab1);
+                toLat_tab1,
+                toArea_tab1);
     }
 
     protected void populateTab0(LineMapColumnFieldCollection fieldCollection) {

designer-chart/src/main/java/com/fr/design/chartx/data/map/PointMapAreaLngLatPaneWithComboBox.java

@@ -2,7 +2,7 @@ package com.fr.design.chartx.data.map;
 
 import com.fr.chartx.data.field.diff.PointMapColumnFieldCollection;
 import com.fr.design.chartx.fields.AbstractDataSetFieldsPane;
-import com.fr.design.chartx.fields.diff.PointMapDataSetFieldsPane;
+import com.fr.design.chartx.fields.diff.MapDataSetFieldsPane;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.i18n.Toolkit;
 
@@ -20,15 +20,15 @@ public class PointMapAreaLngLatPaneWithComboBox extends PointMapAreaLngLatPaneWi
     private UIComboBox lng_tab1;
     private UIComboBox lat_tab1;
 
-    private PointMapDataSetFieldsPane pointMapDataSetFieldsPane;
+    private MapDataSetFieldsPane mapDataSetFieldsPane;
 
-    public PointMapAreaLngLatPaneWithComboBox(PointMapDataSetFieldsPane pointMapDataSetFieldsPane) {
+    public PointMapAreaLngLatPaneWithComboBox(MapDataSetFieldsPane pointMapDataSetFieldsPane) {
-        this.pointMapDataSetFieldsPane = pointMapDataSetFieldsPane;
+        this.mapDataSetFieldsPane = pointMapDataSetFieldsPane;
         initComponents();
     }
 
     protected void initComponents() {
-        if (pointMapDataSetFieldsPane == null) {
+        if (mapDataSetFieldsPane == null) {
             return;
         }
         super.initComponents();
@@ -41,7 +41,7 @@ public class PointMapAreaLngLatPaneWithComboBox extends PointMapAreaLngLatPaneWi
         }
         return createPane(
                 new String[]{Toolkit.i18nText("Fine-Design_Chart_Area_Name")},
-                pointMapDataSetFieldsPane.createAreaPanel(area_tab0)
+                mapDataSetFieldsPane.createAreaPanel(area_tab0)
         );
     }
 
@@ -53,8 +53,8 @@ public class PointMapAreaLngLatPaneWithComboBox extends PointMapAreaLngLatPaneWi
             lat_tab1 = new UIComboBox();
         }
         return createPane(
-                new String[]{Toolkit.i18nText("Fine-Design_Chart_Area_Name"), Toolkit.i18nText("Fine-Design_Chart_Longitude"), Toolkit.i18nText("Fine-Design_Chart_Latitude")},
+                new String[]{Toolkit.i18nText("Fine-Design_Chart_Longitude"), Toolkit.i18nText("Fine-Design_Chart_Latitude"), Toolkit.i18nText("Fine-Design_Chart_Area_Name")},
-                pointMapDataSetFieldsPane.createAreaPanel(area_tab1), lng_tab1, lat_tab1
+                lng_tab1, lat_tab1, area_tab1
         );
     }
 

designer-chart/src/main/java/com/fr/design/chartx/fields/diff/AbstractDataSetFieldsWithSeriesValuePane.java

@@ -5,8 +5,8 @@ import com.fr.design.chartx.component.SeriesValueFieldComboBoxPane;
 import com.fr.design.chartx.fields.AbstractDataSetFieldsPane;
 
 import javax.swing.JPanel;
-import java.util.List;
 import java.awt.BorderLayout;
+import java.util.List;
 
 /**
  * Created by shine on 2019/5/16.
@@ -20,7 +20,7 @@ public abstract class AbstractDataSetFieldsWithSeriesValuePane<T extends ColumnF
     @Override
     protected JPanel createCenterPane() {
         JPanel normalCenter = super.createCenterPane();
-        seriesValueFieldComboBoxPane = new SeriesValueFieldComboBoxPane();
+        getSeriesValueFieldComboBoxPane();
 
         if (normalCenter != null) {
             JPanel panel = new JPanel(new BorderLayout(0, 6));
@@ -34,7 +34,14 @@ public abstract class AbstractDataSetFieldsWithSeriesValuePane<T extends ColumnF
 
     public SeriesValueFieldComboBoxPane getSeriesValueFieldComboBoxPane() {
         if (seriesValueFieldComboBoxPane == null) {
-            seriesValueFieldComboBoxPane = new SeriesValueFieldComboBoxPane();
+            seriesValueFieldComboBoxPane = new SeriesValueFieldComboBoxPane() {
+
+                protected boolean seriesComboBoxHasNone() {
+                    return true;
+                }
+
+            };
+
         }
         return seriesValueFieldComboBoxPane;
     }

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

@@ -20,6 +20,7 @@ import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.ChartOtherPane;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.ChartTypePane;
+import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
 import com.fr.design.mainframe.chart.info.ChartInfoCollector;
 import com.fr.general.ComparatorUtils;
 import com.fr.log.FineLoggerFactory;
@@ -175,13 +176,13 @@ public class ChartEditPane extends BasicPane implements AttributeChange, Prepare
      */
     public void reLayout(ChartProvider currentChart) {
         if (currentChart != null) {
-            int chartIndex = getSelectedChartIndex(currentChart);
             this.removeAll();
             this.setLayout(new BorderLayout());
             paneList = new ArrayList<AbstractChartAttrPane>();
-            addTypePane();
-
             String chartID = currentChart.getID();
+
+            addTypePane(currentChart);
+
             boolean isDefault = ChartTypeInterfaceManager.getInstance().isUseDefaultPane(chartID);
 
             if (isDefault) {
@@ -214,9 +215,18 @@ public class ChartEditPane extends BasicPane implements AttributeChange, Prepare
         return chartDataPane;
     }
 
-    protected void addTypePane() {
+    protected void addTypePane(ChartProvider chart) {
+        if (visibleTypePane(chart)) {
             paneList.add(typePane);
         }
+    }
+
+    private boolean visibleTypePane(ChartProvider chart) {
+        AbstractChartTypePane pane = ChartTypeInterfaceManager.getInstance().getPlotTypePane(chart.getID());
+        return pane != null
+                && !ChartTypeInterfaceManager.TYPE_PANE_DEFAULT_TITLE.equals(pane.title4PopupWindow())
+                && pane.visible(chart);
+    }
 
     protected void setSelectedTab() {
     }

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

@@ -2,6 +2,7 @@ package com.fr.design.mainframe.chart;
 
 import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chart.web.ChartHyperPoplink;
+import com.fr.chartx.attr.ChartProvider;
 import com.fr.design.ChartTypeInterfaceManager;
 import com.fr.design.chart.gui.ChartComponent;
 import com.fr.design.chart.series.SeriesCondition.impl.ChartHyperPopAttrPane;
@@ -48,7 +49,7 @@ public class ChartHyperEditPane  extends ChartEditPane {
 		return dataPane;
 	}
 
-    protected void addTypePane() {
+    protected void addTypePane(ChartProvider chart) {
         paneList.add(attrPane);
         paneList.add(typePane);
     }

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

@@ -162,7 +162,7 @@ public class ChartTypePane extends AbstractChartAttrPane {
         for (String id : chartIDs) {
 
             AbstractChartTypePane pane = ChartTypeInterfaceManager.getInstance().getPlotTypePane(id);
-            if (AssistUtils.equals(pane.title4PopupWindow(), ChartTypeInterfaceManager.TYPE_PANE_DEFAULT_TITLE)) {
+            if (pane == null || AssistUtils.equals(pane.title4PopupWindow(), ChartTypeInterfaceManager.TYPE_PANE_DEFAULT_TITLE)) {
                 continue;
             }
             pane.reLayout(id);

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

@@ -217,6 +217,10 @@ public abstract class AbstractChartTypePane<T extends ChartProvider> extends Fur
         return plotID;
     }
 
+    public boolean visible(ChartProvider chart) {
+        return true;
+    }
+
     /**
      * @param ob 对象
      * @return

designer-chart/src/main/java/com/fr/van/chart/area/AreaIndependentVanChartInterface.java

@@ -2,10 +2,12 @@ package com.fr.van.chart.area;
 
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.chart.fun.impl.InvisibleChartTypePane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.van.chart.vanchart.AbstractMultiCategoryVanChartUI;
 
 /**
@@ -47,7 +49,7 @@ public class AreaIndependentVanChartInterface extends AbstractMultiCategoryVanCh
 
     @Override
     public AbstractChartTypePane getPlotTypePane() {
-        return new VanChartAreaPlotPane();
+        return ChartEditContext.duchampMode() ? new InvisibleChartTypePane() : new VanChartAreaPlotPane();
     }
 
     public ConditionAttributesPane getPlotConditionPane(Plot plot){

designer-chart/src/main/java/com/fr/van/chart/bar/BarIndependentVanChartInterface.java

@@ -3,12 +3,14 @@ package com.fr.van.chart.bar;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.chart.fun.impl.InvisibleChartTypePane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.AbstractChartAttrPane;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.van.chart.column.VanChartColumnConditionPane;
 import com.fr.van.chart.column.VanChartColumnSeriesPane;
 import com.fr.van.chart.designer.other.VanChartInteractivePane;
@@ -57,7 +59,7 @@ public class BarIndependentVanChartInterface extends AbstractMultiCategoryVanCha
 
     @Override
     public AbstractChartTypePane getPlotTypePane() {
-        return new VanChartBarPlotPane();
+        return ChartEditContext.duchampMode() ? new InvisibleChartTypePane() : new VanChartBarPlotPane();
     }
 
     public ConditionAttributesPane getPlotConditionPane(Plot plot) {

designer-chart/src/main/java/com/fr/van/chart/box/BoxIndependentVanChartInterface.java

@@ -3,6 +3,7 @@ package com.fr.van.chart.box;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.chart.fun.impl.InvisibleChartTypePane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.i18n.Toolkit;
@@ -12,6 +13,7 @@ import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.van.chart.box.data.report.BoxPlotReportDataContentPane;
 import com.fr.van.chart.box.data.table.BoxPlotTableDataContentPane;
@@ -56,7 +58,7 @@ public class BoxIndependentVanChartInterface extends AbstractIndependentVanChart
     }
 
     public AbstractChartTypePane getPlotTypePane() {
-        return new VanChartBoxPlotPane();
+        return ChartEditContext.duchampMode() ? new InvisibleChartTypePane() : new VanChartBoxPlotPane();
     }
 
     public ConditionAttributesPane getPlotConditionPane(Plot plot) {

designer-chart/src/main/java/com/fr/van/chart/bubble/BubbleIndependentVanChartInterface.java

@@ -3,6 +3,7 @@ package com.fr.van.chart.bubble;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.chart.fun.impl.InvisibleChartTypePane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.i18n.Toolkit;
@@ -13,6 +14,7 @@ import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPa
 import com.fr.design.mainframe.chart.gui.data.report.BubblePlotReportDataContentPane;
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.plugin.chart.base.VanChartConstants;
 import com.fr.plugin.chart.bubble.VanChartBubblePlot;
 import com.fr.van.chart.bubble.data.VanChartBubblePlotTableDataContentPane;
@@ -54,7 +56,7 @@ public class BubbleIndependentVanChartInterface extends AbstractIndependentVanCh
      */
     @Override
     public AbstractChartTypePane getPlotTypePane() {
-        return new VanChartBubblePlotPane();
+        return ChartEditContext.duchampMode() ? new InvisibleChartTypePane() : new VanChartBubblePlotPane();
     }
 
     /**

designer-chart/src/main/java/com/fr/van/chart/column/VanColumnChartTypeUI.java

@@ -2,10 +2,12 @@ package com.fr.van.chart.column;
 
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.chart.fun.impl.InvisibleChartTypePane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.van.chart.vanchart.AbstractMultiCategoryVanChartUI;
 
 /**
@@ -48,7 +50,7 @@ public class VanColumnChartTypeUI extends AbstractMultiCategoryVanChartUI {
 
     @Override
     public AbstractChartTypePane getPlotTypePane() {
-        return new VanChartColumnPlotPane();
+        return ChartEditContext.duchampMode() ? new InvisibleChartTypePane() : new VanChartColumnPlotPane();
     }
 
 

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

@@ -60,8 +60,10 @@ public class VanChartCustomDataPane extends ChartDataPane {
      */
     public void addAttributeChangeListener(AttributeChangeListener listener) {
         super.addAttributeChangeListener(listener);
+        if (contentsTabPane != null) {
             contentsTabPane.addAttributeChangeListener(listener);
         }
+    }
 
     @Override
     /**

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

@@ -3,15 +3,19 @@ package com.fr.van.chart.custom;
 import com.fr.base.chart.chartdata.TopDefinitionProvider;
 import com.fr.chart.base.DataSeriesCondition;
 import com.fr.chart.chartattr.Chart;
+import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chart.chartattr.Plot;
 import com.fr.chart.chartglyph.ConditionAttr;
 import com.fr.chart.chartglyph.ConditionCollection;
+import com.fr.chartx.attr.ChartProvider;
 import com.fr.chartx.data.AbstractDataDefinition;
 import com.fr.chartx.data.ChartDataDefinitionProvider;
 import com.fr.chartx.data.CustomChartDataDefinition;
+import com.fr.design.ChartTypeInterfaceManager;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.gui.type.ChartImagePane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.plugin.chart.base.VanChartAttrLine;
@@ -28,12 +32,12 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane;
 
 import javax.swing.JPanel;
 import javax.swing.JSeparator;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
 import java.awt.CardLayout;
 import java.awt.Component;
 import java.awt.Dimension;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 /**
  * Created by Mitisky on 16/2/16.
@@ -54,11 +58,27 @@ public class VanChartCustomPlotPane extends AbstractVanChartTypePane {
     //自定义和自动版面的容器，cardLayOut布局
     private JPanel contentPane;
 
+    @Override
+    public boolean visible(ChartProvider chart) {
+        if (ChartEditContext.duchampMode() && chart instanceof VanChart) {
+            Plot plot = ((VanChart) chart).getPlot();
+
+            if (plot instanceof VanChartCustomPlot) {
+               CustomStyle customStyle = ((VanChartCustomPlot) plot).getCustomStyle();
+               return customStyle == CustomStyle.CUSTOM;
+            }
+        }
+        return super.visible(chart);
+    }
+
     protected Component[][] getPaneComponents(JPanel typePane) {
 
         initContent();
 
-        return new Component[][]{
+        return ChartEditContext.duchampMode() ? new Component[][]{
+                new Component[]{contentPane},
+                new Component[]{buttonPane},
+        }:  new Component[][]{
                 new Component[]{typePane},
                 new Component[]{stylePane},
                 new Component[]{contentPane},

designer-chart/src/main/java/com/fr/van/chart/funnel/designer/FunnelIndependentVanChartInterface.java

@@ -3,6 +3,7 @@ package com.fr.van.chart.funnel.designer;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.chart.fun.impl.InvisibleChartTypePane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.i18n.Toolkit;
@@ -13,6 +14,7 @@ import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPa
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.data.table.PiePlotTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.van.chart.designer.data.OneDimensionalPlotReportDataContentPane;
 import com.fr.van.chart.designer.other.VanChartInteractivePaneWithOutSort;
 import com.fr.van.chart.designer.other.VanChartOtherPane;
@@ -45,7 +47,7 @@ public class FunnelIndependentVanChartInterface extends AbstractIndependentVanCh
      */
     @Override
     public AbstractChartTypePane getPlotTypePane() {
-        return new VanChartFunnelTypePane();
+        return ChartEditContext.duchampMode() ? new InvisibleChartTypePane() : new VanChartFunnelTypePane();
     }
 
     public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){

designer-chart/src/main/java/com/fr/van/chart/gantt/designer/GanttIndependentVanChartInterface.java

@@ -3,6 +3,7 @@ package com.fr.van.chart.gantt.designer;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.chart.fun.impl.InvisibleChartTypePane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.i18n.Toolkit;
@@ -12,6 +13,7 @@ import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.van.chart.designer.other.VanChartOtherPane;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 import com.fr.van.chart.gantt.designer.data.VanChartGanttDataPane;
@@ -42,7 +44,7 @@ public class GanttIndependentVanChartInterface extends AbstractIndependentVanCha
 
     @Override
     public AbstractChartTypePane getPlotTypePane() {
-        return new VanChartGanttPlotPane();
+        return ChartEditContext.duchampMode() ? new InvisibleChartTypePane() : new VanChartGanttPlotPane();
     }
 
     @Override

designer-chart/src/main/java/com/fr/van/chart/gauge/GaugeIndependentVanChartInterface.java

@@ -2,6 +2,7 @@ package com.fr.van.chart.gauge;
 
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.chart.fun.impl.InvisibleChartTypePane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.AbstractChartAttrPane;
@@ -14,6 +15,7 @@ import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane
 import com.fr.design.mainframe.chart.gui.data.table.CategoryPlotTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.data.table.MeterPlotTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.plugin.chart.gauge.VanChartGaugePlot;
 import com.fr.van.chart.custom.component.CategoryCustomPlotTableDataContentPane;
 import com.fr.van.chart.custom.component.MeterCustomPlotReportDataContentPane;
@@ -61,7 +63,7 @@ public class GaugeIndependentVanChartInterface extends AbstractIndependentVanCha
 
     @Override
     public AbstractChartTypePane getPlotTypePane() {
-        return new VanChartGaugePlotPane();
+        return ChartEditContext.duchampMode() ? new InvisibleChartTypePane() : new VanChartGaugePlotPane();
     }
 
     public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) {

designer-chart/src/main/java/com/fr/van/chart/line/LineIndependentVanChartInterface.java

@@ -2,10 +2,12 @@ package com.fr.van.chart.line;
 
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.chart.fun.impl.InvisibleChartTypePane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.van.chart.vanchart.AbstractMultiCategoryVanChartUI;
 
 /**
@@ -42,7 +44,7 @@ public class LineIndependentVanChartInterface extends AbstractMultiCategoryVanCh
 
     @Override
     public AbstractChartTypePane getPlotTypePane() {
-        return new VanChartLinePlotPane();
+        return ChartEditContext.duchampMode() ? new InvisibleChartTypePane() : new VanChartLinePlotPane();
     }
 
     public ConditionAttributesPane getPlotConditionPane(Plot plot){

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

@@ -7,6 +7,7 @@ import com.fr.chartx.data.ChartDataDefinitionProvider;
 import com.fr.chartx.data.MapChartDataDefinition;
 import com.fr.design.mainframe.chart.gui.type.ChartImagePane;
 import com.fr.design.mainframe.chart.info.ChartInfoCollector;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.chart.attr.plot.VanChartPlot;
@@ -21,9 +22,9 @@ import com.fr.plugin.chart.vanchart.VanChart;
 import com.fr.van.chart.designer.type.AbstractVanChartTypePane;
 
 import javax.swing.JPanel;
+import java.awt.Component;
 import java.util.HashSet;
 import java.util.Set;
-import java.awt.Component;
 
 /**
  * Created by Mitisky on 16/5/4.
@@ -55,7 +56,9 @@ public class VanChartMapPlotPane extends AbstractVanChartTypePane {
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
-        return new Component[][]{
+        return ChartEditContext.duchampMode() ? new Component[][]{
+                new Component[]{sourceChoosePane}
+        } : new Component[][]{
                 new Component[]{typePane},
                 new Component[]{buttonPane},
                 new Component[]{sourceChoosePane}

designer-chart/src/main/java/com/fr/van/chart/multilayer/MultiPieIndependentVanChartInterface.java

@@ -2,6 +2,7 @@ package com.fr.van.chart.multilayer;
 
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.chart.fun.impl.InvisibleChartTypePane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
@@ -9,6 +10,7 @@ import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.van.chart.multilayer.data.MultiPiePlotReportDataContentPane;
 import com.fr.van.chart.multilayer.data.MultiPiePlotTableDataContentPane;
 import com.fr.van.chart.multilayer.other.VanChartMultiPieConditionPane;
@@ -21,7 +23,7 @@ import com.fr.van.chart.vanchart.AbstractIndependentVanChartUI;
 public class MultiPieIndependentVanChartInterface extends AbstractIndependentVanChartUI {
     @Override
     public AbstractChartTypePane getPlotTypePane() {
-        return new VanChartMultiPiePlotPane();
+        return ChartEditContext.duchampMode() ? new InvisibleChartTypePane() : new VanChartMultiPiePlotPane();
     }
 
     @Override

designer-chart/src/main/java/com/fr/van/chart/pie/PieIndependentVanChartInterface.java

@@ -2,6 +2,7 @@ package com.fr.van.chart.pie;
 
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.chart.fun.impl.InvisibleChartTypePane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
@@ -9,6 +10,7 @@ import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.data.table.CategoryPlotTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.van.chart.custom.component.CategoryCustomPlotTableDataContentPane;
 import com.fr.van.chart.custom.component.VanChartDataPane;
 import com.fr.van.chart.vanchart.AbstractIndependentVanChartUI;
@@ -50,7 +52,7 @@ public class PieIndependentVanChartInterface extends AbstractIndependentVanChart
 
     @Override
     public AbstractChartTypePane getPlotTypePane() {
-        return new VanChartPiePlotPane();
+        return ChartEditContext.duchampMode() ? new InvisibleChartTypePane() : new VanChartPiePlotPane();
     }
 
     public ConditionAttributesPane getPlotConditionPane(Plot plot){

designer-chart/src/main/java/com/fr/van/chart/radar/RadarIndependentVanChartInterface.java

@@ -2,10 +2,12 @@ package com.fr.van.chart.radar;
 
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.chart.fun.impl.InvisibleChartTypePane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.van.chart.vanchart.AbstractIndependentVanChartUI;
 
 /**
@@ -40,7 +42,7 @@ public class RadarIndependentVanChartInterface extends AbstractIndependentVanCha
 
     @Override
     public AbstractChartTypePane getPlotTypePane() {
-        return new VanChartRadarPlotPane();
+        return ChartEditContext.duchampMode() ? new InvisibleChartTypePane() : new VanChartRadarPlotPane();
     }
 
     public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot){

designer-chart/src/main/java/com/fr/van/chart/scatter/ScatterIndependentVanChartInterface.java

@@ -4,6 +4,7 @@ package com.fr.van.chart.scatter;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.chart.fun.impl.InvisibleChartTypePane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.i18n.Toolkit;
@@ -14,6 +15,7 @@ import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPa
 import com.fr.design.mainframe.chart.gui.data.report.BubblePlotReportDataContentPane;
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.van.chart.designer.other.VanChartInteractivePaneWithOutSort;
 import com.fr.van.chart.designer.other.VanChartOtherPane;
 import com.fr.van.chart.designer.other.zoom.ZoomPane;
@@ -33,7 +35,7 @@ public class ScatterIndependentVanChartInterface extends AbstractIndependentVanC
      */
     @Override
     public AbstractChartTypePane getPlotTypePane() {
-        return new VanChartScatterPlotPane();
+        return ChartEditContext.duchampMode() ? new InvisibleChartTypePane() : new VanChartScatterPlotPane();
     }
 
     @Override

designer-chart/src/main/java/com/fr/van/chart/structure/desinger/VanStructureChartTypeUI.java

@@ -3,6 +3,7 @@ package com.fr.van.chart.structure.desinger;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.chart.fun.impl.InvisibleChartTypePane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.i18n.Toolkit;
@@ -12,6 +13,7 @@ import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.plugin.chart.base.VanChartConstants;
 import com.fr.van.chart.designer.other.VanChartInteractivePaneWithOutSort;
 import com.fr.van.chart.designer.other.VanChartOtherPane;
@@ -31,7 +33,7 @@ import com.fr.van.chart.vanchart.AbstractIndependentVanChartUI;
 public class VanStructureChartTypeUI extends AbstractIndependentVanChartUI {
     @Override
     public AbstractChartTypePane getPlotTypePane() {
-        return new VanChartStructureTypePane();
+        return ChartEditContext.duchampMode() ? new InvisibleChartTypePane() : new VanChartStructureTypePane();
     }
 
     @Override

designer-chart/src/main/java/com/fr/van/chart/treemap/TreeMapIndependentVanChartInterface.java

@@ -3,11 +3,13 @@ package com.fr.van.chart.treemap;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.chart.fun.impl.InvisibleChartTypePane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.AbstractChartAttrPane;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.van.chart.designer.other.VanChartInteractivePaneWithOutSort;
 import com.fr.van.chart.designer.other.VanChartOtherPane;
 import com.fr.van.chart.designer.style.VanChartStylePane;
@@ -20,7 +22,7 @@ import com.fr.van.chart.treemap.style.VanChartTreeMapSeriesPane;
 public class TreeMapIndependentVanChartInterface extends MultiPieIndependentVanChartInterface {
     @Override
     public AbstractChartTypePane getPlotTypePane() {
-        return new VanChartTreeMapPlotPane();
+        return ChartEditContext.duchampMode() ? new InvisibleChartTypePane() : new VanChartTreeMapPlotPane();
     }
 
     @Override

designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/WordCloudIndependentVanChartInterface.java

@@ -3,6 +3,7 @@ package com.fr.van.chart.wordcloud.designer;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.chart.fun.impl.InvisibleChartTypePane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
@@ -13,6 +14,7 @@ import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.plugin.chart.base.VanChartConstants;
 import com.fr.van.chart.designer.other.VanChartInteractivePaneWithOutSort;
 import com.fr.van.chart.designer.other.VanChartOtherPane;
@@ -39,7 +41,7 @@ public class WordCloudIndependentVanChartInterface extends AbstractIndependentVa
      */
     @Override
     public AbstractChartTypePane getPlotTypePane() {
-        return new VanChartWordCloudTypePane();
+        return ChartEditContext.duchampMode() ? new InvisibleChartTypePane() : new VanChartWordCloudTypePane();
     }
 
     @Override