CHART-13666 图表自动类型推荐

designer-base/src/main/java/com/fr/design/ExtraDesignClassManager.java

@@ -8,6 +8,7 @@ import com.fr.base.BaseUtils;
 import com.fr.common.annotations.Open;
 import com.fr.design.data.datapane.TableDataNameObjectCreator;
 import com.fr.design.fun.CellWidgetOptionProvider;
+import com.fr.design.fun.ChartWidgetOptionProvider;
 import com.fr.design.fun.FormWidgetOptionProvider;
 import com.fr.design.fun.MobileWidgetStyleProvider;
 import com.fr.design.fun.ParameterWidgetOptionProvider;
@@ -193,6 +194,42 @@ public class ExtraDesignClassManager extends AbstractExtraClassManager implement
         return result.toArray(new WidgetOption[result.size()]);
     }
 
+    public Map<Class<? extends Widget>, Class<?>> getChartWidgetOptionsMap() {
+        Set<ChartWidgetOptionProvider> set = getArray(ChartWidgetOptionProvider.XML_TAG);
+        Map<Class<? extends Widget>, Class<?>> map = new HashMap<>();
+        for (ChartWidgetOptionProvider provider : set) {
+            map.put(provider.classForWidget(), provider.appearanceForWidget());
+        }
+        return map;
+    }
+
+    public WidgetOption[] getBeforeChartWidgetOptions() {
+        return getChartUnits(true);
+    }
+
+    public WidgetOption[] getAfterChartWidgetOptions() {
+        return getChartUnits(false);
+    }
+
+    private WidgetOption[] getChartUnits(boolean isBefore) {
+        Set<ChartWidgetOptionProvider> set = getArray(ChartWidgetOptionProvider.XML_TAG);
+        if (set.isEmpty()) {
+            return new WidgetOption[0];
+        }
+        Set<WidgetOption> result = new HashSet<>();
+        for (ChartWidgetOptionProvider provider : set) {
+            if (provider.isBefore() == isBefore) {
+                WidgetOption option = WidgetOptionFactory.createByWidgetClass(
+                        provider.nameForWidget(),
+                        BaseUtils.readIcon(provider.iconPathForWidget()),
+                        provider.classForWidget()
+                );
+                result.add(option);
+            }
+        }
+        return result.toArray(new WidgetOption[result.size()]);
+    }
+
 
     public WidgetOption[] getCellWidgetOptions() {
         Set<CellWidgetOptionProvider> set = getArray(CellWidgetOptionProvider.XML_TAG);

designer-base/src/main/java/com/fr/design/fun/ChartWidgetOptionProvider.java

@@ -0,0 +1,14 @@
+package com.fr.design.fun;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2020-06-12
+ */
+public interface ChartWidgetOptionProvider extends ParameterWidgetOptionProvider {
+
+    String XML_TAG = "ChartWidgetOptionProvider";
+
+    //在图表区域的开头还是结尾插入
+    boolean isBefore();
+}

designer-base/src/main/java/com/fr/design/fun/impl/AbstractChartWidgetOptionProvider.java

@@ -0,0 +1,30 @@
+package com.fr.design.fun.impl;
+
+import com.fr.design.fun.ChartWidgetOptionProvider;
+import com.fr.design.fun.FormWidgetOptionProvider;
+import com.fr.stable.fun.impl.AbstractProvider;
+import com.fr.stable.fun.mark.API;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2020-06-12
+ */
+@API(level = FormWidgetOptionProvider.CURRENT_LEVEL)
+public abstract class AbstractChartWidgetOptionProvider extends AbstractProvider implements ChartWidgetOptionProvider {
+
+    public int currentAPILevel() {
+        return CURRENT_LEVEL;
+    }
+
+    @Override
+    public String mark4Provider() {
+        return getClass().getName();
+    }
+
+    @Override
+    public boolean isBefore() {
+        return false;
+    }
+
+}

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

@@ -104,6 +104,7 @@ import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.awt.event.ActionListener;
 
 import static com.fr.chart.charttypes.ChartTypeManager.DEFAULT_PRIORITY;
 import static com.fr.chart.charttypes.ChartTypeManager.DEPRECATED_CHART_PRIORITY;
@@ -259,17 +260,21 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
      *
      * @param paneList pane容器
      */
-    public void addPlotTypePaneList(List<FurtherBasicBeanPane<? extends ChartProvider>> paneList, Map<String, Map<String, FurtherBasicBeanPane<? extends ChartProvider>>> allChartTypePane) {
+    public void addPlotTypePaneList(List<FurtherBasicBeanPane<? extends ChartProvider>> paneList,
+                                    Map<String, Map<String, FurtherBasicBeanPane<? extends ChartProvider>>> allChartTypePane,
+                                    ActionListener autoButtonListener) {
 
         List<Integer> priorityList = getPriorityInOrder();
         for (Integer aPriorityList : priorityList) {
             String priority = String.valueOf(aPriorityList);
-            addPlotTypePaneList(priority, paneList, allChartTypePane);
+            addPlotTypePaneList(priority, paneList, allChartTypePane, autoButtonListener);
         }
     }
 
 
-    public void addPlotTypePaneList(String priority, List<FurtherBasicBeanPane<? extends ChartProvider>> paneList, Map<String, Map<String, FurtherBasicBeanPane<? extends ChartProvider>>> allChartTypePane) {
+    public void addPlotTypePaneList(String priority, List<FurtherBasicBeanPane<? extends ChartProvider>> paneList,
+                                    Map<String, Map<String, FurtherBasicBeanPane<? extends ChartProvider>>> allChartTypePane,
+                                    ActionListener autoButtonListener) {
 
         if (chartTypeInterfaces != null && chartTypeInterfaces.containsKey(priority)) {
 
@@ -286,6 +291,7 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
                         continue;
                     }
                     pane.reLayout(plotID);
+                    pane.registerButtonListener(autoButtonListener);
                     paneList.add(pane);
 
                     if (allChartTypePane.get(priority) == null) {

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

@@ -1,7 +1,11 @@
 package com.fr.design.chart;
 
 import com.fr.base.chart.BaseChartCollection;
+import com.fr.base.chart.chartdata.TopDefinitionProvider;
 import com.fr.chart.chartattr.ChartCollection;
+import com.fr.chartx.TwoTuple;
+import com.fr.design.i18n.Toolkit;
+import com.fr.plugin.chart.vanchart.VanChart;
 
 import java.awt.Component;
 import java.awt.Dialog;
@@ -46,10 +50,30 @@ public class AutoChartDialog extends ChartDialog {
         };
     }
 
+    protected String getDialogTitle() {
+        return Toolkit.i18nText("Fine-Design_Chart_M_Popup_Auto_Chart_Type");
+    }
+
     /**
      * 更新新建的图表 ChartCollection
      */
     public void populate(BaseChartCollection cc) {
         super.populate(cc);
+        ChartCollection chartCollection = (ChartCollection) getChartCollection();
+        VanChart vanChart = chartCollection.getSelectedChartProvider(VanChart.class);
+        if (vanChart == null) {
+            return;
+        }
+        TopDefinitionProvider filterDefinition = vanChart.getFilterDefinition();
+        if (filterDefinition == null) {
+            return;
+        }
+        TwoTuple<String, String[]> tableNameAndDataFields = filterDefinition.getTableNameAndDataFields();
+        if (tableNameAndDataFields == null) {
+            return;
+        }
+        String tableName = tableNameAndDataFields.getFirst();
+        String[] dataFields = tableNameAndDataFields.getSecond();
+        autoChartTypePane.populate(tableName, dataFields);
     }
 }

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

@@ -5,6 +5,7 @@ import com.fr.chart.chartattr.ChartCollection;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.gui.chart.MiddleChartDialog;
 import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.third.joda.time.DateTime;
 
@@ -46,7 +47,7 @@ public class ChartDialog extends MiddleChartDialog {
         createTime = DateTime.now().toString("yyyy-MM-dd HH:mm:ss");
         this.setModal(true);
         this.setLayout(new BorderLayout());
-        setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Popup_Chart_Type"));
+        setTitle(getDialogTitle());
 
         this.applyClosingAction();
         this.applyEscapeAction();
@@ -73,6 +74,10 @@ public class ChartDialog extends MiddleChartDialog {
         GUICoreUtils.setWindowCenter(getOwner(), this);
     }
 
+    protected String getDialogTitle() {
+        return Toolkit.i18nText("Fine-Design_Chart_M_Popup_Chart_Type");
+    }
+
     protected Component initCenterPane() {
         chartTypePane = new ChartTypePane();
         return chartTypePane;

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

@@ -9,9 +9,7 @@ import com.fr.design.dialog.BasicScrollPane;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.gui.chart.MiddleChartDialog;
 import com.fr.design.gui.frpane.UIComboBoxPane;
-import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icombobox.UIComboBox;
-import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.chart.AbstractChartAttrPane;
 import com.fr.design.mainframe.chart.ChartEditPane;
@@ -39,364 +37,366 @@ import java.awt.event.ItemListener;
 
 /**
  * 图表 属性表, 类型选择 界面.
-* @author kunsnat E-mail:kunsnat@gmail.com
-* @version 创建时间：2012-12-26 上午10:56:51
+ *
+ * @author kunsnat E-mail:kunsnat@gmail.com
+ * @version 创建时间：2012-12-26 上午10:56:51
  */
-public class ChartTypePane extends AbstractChartAttrPane{
-	private ComboBoxPane chartTypeComBox;
-	private ChartTypeButtonPane buttonPane;
+public class ChartTypePane extends AbstractChartAttrPane {
+    private ComboBoxPane chartTypeComBox;
+    private ChartTypeButtonPane buttonPane;
     private ChartEditPane editPane;
     private ChartCollection editingCollection;
-	private UIButton autoButton;
-
-	@Override
-	protected JPanel createContentPane() {
-		JPanel content = new JPanel(new BorderLayout());
-
-		buttonPane = new ChartTypeButtonPane(this);
-		content.add(buttonPane, BorderLayout.NORTH);
-
-		if (editingCollection != null) {
-			relayoutChartTypePane(editingCollection);
-		}else {
-			chartTypeComBox = new ComboBoxPane();
-		}
-
-		BasicScrollPane scrollPane = new BasicScrollPane() {
-			@Override
-			protected JPanel createContentPane() {
-				return chartTypeComBox;
-			}
-
-			@Override
-			protected void layoutContentPane() {
-
-				leftcontentPane = createContentPane();
-				this.add(leftcontentPane);
-			}
-
-			@Override
-			public void populateBean(Object ob) {
-			}
-
-			@Override
-			protected String title4PopupWindow() {
-				return null;
-			}
-		};
-		content.add(scrollPane, BorderLayout.CENTER);
-
-		buttonPane.setEditingChartPane(chartTypeComBox);
-
-		if(ChartTypeManager.AUTO_CHART) {
-			initAutoButton();
-			content.add(autoButton, BorderLayout.SOUTH);
-		}
-
-		return content;
-	}
-
-	/**
-	 * 界面做为按钮时的图片位置. design_base
-	 */
-	public String getIconPath() {
-		return "com/fr/design/images/chart/ChartType.png";
-	}
-
-	/**
-	 * 界面标题
+    private ActionListener autoButtonListener;
+
+    @Override
+    protected JPanel createContentPane() {
+        initButtonListener();
+        JPanel content = new JPanel(new BorderLayout());
+
+        buttonPane = new ChartTypeButtonPane(this);
+        content.add(buttonPane, BorderLayout.NORTH);
+
+        if (editingCollection != null) {
+            relayoutChartTypePane(editingCollection);
+        } else {
+            chartTypeComBox = new ComboBoxPane();
+        }
+
+        BasicScrollPane scrollPane = new BasicScrollPane() {
+            @Override
+            protected JPanel createContentPane() {
+                return chartTypeComBox;
+            }
+
+            @Override
+            protected void layoutContentPane() {
+
+                leftcontentPane = createContentPane();
+                this.add(leftcontentPane);
+            }
+
+            @Override
+            public void populateBean(Object ob) {
+            }
+
+            @Override
+            protected String title4PopupWindow() {
+                return null;
+            }
+        };
+        content.add(scrollPane, BorderLayout.CENTER);
+
+        buttonPane.setEditingChartPane(chartTypeComBox);
+
+        return content;
+    }
+
+    /**
+     * 界面做为按钮时的图片位置. design_base
+     */
+    public String getIconPath() {
+        return "com/fr/design/images/chart/ChartType.png";
+    }
+
+    /**
+     * 界面标题
+     *
      * @return 界面标题
-	 */
-	public String title4PopupWindow() {
-		return PaneTitleConstants.CHART_TYPE_TITLE;
-	}
-
-	private void initAutoButton(){
-		//TODO @Bjorn 视觉样式优化
-		autoButton = new UIButton(Toolkit.i18nText("Fine-Design_Chart_M_Popup_Auto_Chart_Type"));
-		autoButton.addActionListener(new ActionListener() {
-			@Override
-			public void actionPerformed(ActionEvent e) {
-				final MiddleChartDialog autoChartDialog = DesignModuleFactory.getAutoChartDialog(DesignerContext.getDesignerFrame());
-				autoChartDialog.populate(editingCollection);
-				autoChartDialog.addDialogActionListener(new DialogActionAdapter() {
-					@Override
-					public void doOk() {
-						populate(editingCollection);
-					}
-				});
-				autoChartDialog.setVisible(true);
-			}
-		});
-	}
-
-	class ComboBoxPane extends UIComboBoxPane<ChartProvider> {
-		private Map<String, Map<String, FurtherBasicBeanPane<? extends ChartProvider>>> allChartTypePane;
-
-		@Override
-		protected List<FurtherBasicBeanPane<? extends ChartProvider>> initPaneList() {
-			List<FurtherBasicBeanPane<? extends ChartProvider>> paneList = new ArrayList<FurtherBasicBeanPane<? extends ChartProvider>>();
-			allChartTypePane = new LinkedHashMap<String, Map<String, FurtherBasicBeanPane<? extends ChartProvider>>>();
-			ChartTypeInterfaceManager.getInstance().addPlotTypePaneList(paneList, allChartTypePane);
-			return paneList;
-		}
-
-		@Override
-		protected String title4PopupWindow() {
-			return null;
-		}
-
-		/**
-		 * 不同图表切换分同一个selected的不同图表切换和不同selected的不同图表切换
-		 * 如果是切换图表的某个图表发生变化，则collection的选择下标不会变
-		 * 如果是切换图表的不同图表之间切换，则collection的选择下标会改变
-		 * @param chart
-		 */
-		public void updateBean(ChartProvider chart) {
-
-			String lastPlotID = chart.getID();
-
-            try{
-				AbstractChartTypePane selectedPane = (AbstractChartTypePane) getSelectedPane();
-				ChartProvider newDefaultChart =(ChartProvider) ChartTypeManager.getInstanceWithCheck().getCharts(selectedPane.getPlotID())[0].clone();
-				if (!ComparatorUtils.equals(chart.getClass(), newDefaultChart.getClass())) {
-					//vanChart 和 chart 之间切换
-					//不同chart之间切换
+     */
+    public String title4PopupWindow() {
+        return PaneTitleConstants.CHART_TYPE_TITLE;
+    }
+
+    public void initButtonListener() {
+        autoButtonListener = new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                final MiddleChartDialog autoChartDialog = DesignModuleFactory.getAutoChartDialog(DesignerContext.getDesignerFrame());
+                autoChartDialog.populate(editingCollection);
+                autoChartDialog.addDialogActionListener(new DialogActionAdapter() {
+                    @Override
+                    public void doOk() {
+                        populate(editingCollection);
+                    }
+                });
+                autoChartDialog.setVisible(true);
+            }
+        };
+    }
+
+    class ComboBoxPane extends UIComboBoxPane<ChartProvider> {
+        private Map<String, Map<String, FurtherBasicBeanPane<? extends ChartProvider>>> allChartTypePane;
+
+        @Override
+        protected List<FurtherBasicBeanPane<? extends ChartProvider>> initPaneList() {
+            List<FurtherBasicBeanPane<? extends ChartProvider>> paneList = new ArrayList<FurtherBasicBeanPane<? extends ChartProvider>>();
+            allChartTypePane = new LinkedHashMap<String, Map<String, FurtherBasicBeanPane<? extends ChartProvider>>>();
+            ChartTypeInterfaceManager.getInstance().addPlotTypePaneList(paneList, allChartTypePane, autoButtonListener);
+            return paneList;
+        }
+
+        @Override
+        protected String title4PopupWindow() {
+            return null;
+        }
+
+        /**
+         * 不同图表切换分同一个selected的不同图表切换和不同selected的不同图表切换
+         * 如果是切换图表的某个图表发生变化，则collection的选择下标不会变
+         * 如果是切换图表的不同图表之间切换，则collection的选择下标会改变
+         *
+         * @param chart
+         */
+        public void updateBean(ChartProvider chart) {
+
+            String lastPlotID = chart.getID();
+
+            try {
+                AbstractChartTypePane selectedPane = (AbstractChartTypePane) getSelectedPane();
+                ChartProvider newDefaultChart = (ChartProvider) ChartTypeManager.getInstanceWithCheck().getCharts(selectedPane.getPlotID())[0].clone();
+                if (!ComparatorUtils.equals(chart.getClass(), newDefaultChart.getClass())) {
+                    //vanChart 和 chart 之间切换
+                    //不同chart之间切换
                     editingCollection.removeNameObject(editingCollection.getSelectedIndex());
                     editingCollection.addChart(newDefaultChart);
                     chart = newDefaultChart;
                 }
-            }catch (CloneNotSupportedException e){
+            } catch (CloneNotSupportedException e) {
                 FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
-			//这一步会替换plot
-            ((AbstractChartTypePane)getSelectedPane()).updateBean(chart);
-
-			String chartID = chart.getID();
-
-			//chartID改变的话图表类型就算改变了
-			if (StringUtils.isNotEmpty(chartID)) {
-
-				boolean isUseDefault = ChartTypeInterfaceManager.getInstance().isUseDefaultPane(chartID);
-
-				if (editPane.isDefaultPane() != isUseDefault || (!isUseDefault && !ComparatorUtils.equals(lastPlotID, chartID))) {
-					editPane.reLayout(chart);
-				}
-			}
-		}
-
-		protected UIComboBox createComboBox() {
-			return new FlexibleComboBox();
-		}
-
-		@Override
-		protected void addItemChangeEvent() {
-			jcb.addItemListener(new ItemListener() {
-				@Override
-				public void itemStateChanged(ItemEvent e) {
-					FlexibleComboBox fcb = (FlexibleComboBox)jcb;
-					if (fcb.isReactor()){
-						return;
-					}
-					comboBoxItemStateChanged();
-					CardLayout cl = (CardLayout)cardPane.getLayout();
-					cl.show(cardPane, cardNames[jcb.getSelectedIndex()]);
-				}
-			});
-		}
-
-		private void addAllCards() {
-			Iterator<String> iterator = allChartTypePane.keySet().iterator();
-
-			while (iterator.hasNext()) {
-				addOnePriorityCards(iterator.next(), false);
-			}
-		}
-
-		private void addOnePriorityCards(String priority) {
-			addOnePriorityCards(priority, true);
-		}
-
-		private void addOnePriorityCards(String priority, boolean ignore) {
-
-			Map<String, FurtherBasicBeanPane<? extends ChartProvider>> map = allChartTypePane.get(priority);
-
-			Iterator<Map.Entry<String, FurtherBasicBeanPane<? extends ChartProvider>>> iterator = map.entrySet().iterator();
-
-			while (iterator.hasNext()) {
-				Map.Entry<String, FurtherBasicBeanPane<? extends ChartProvider>> entry = iterator.next();
-				String plotID = entry.getKey();
-				if (ignore || ChartTypeManager.enabledChart(plotID)) {
-					cards.add(entry.getValue());
-				}
-			}
-
-		}
-
-		private void addOnePlotIDCards(String priority, String plotID) {
-			cards.add(allChartTypePane.get(priority).get(plotID));
-		}
-
-		//因为饼图（新特性）把（新特性）去掉了，和老的饼图同名，下拉框选项和typePane不能一一对应了
-		//处理办法：这边除了重构 下拉项选项和cardNames 还需要把cards重构下（不需要init pane，只需要我需要的拿出来就好了）
-		private void relayout(ChartCollection collection){
-			//重构需要重构下拉框选项和cardNames
-			ChartProvider chart = collection.getSelectedChartProvider(ChartProvider.class);
-			String chartID = chart.getID();
-			String priority = ChartTypeManager.getInstanceWithCheck().getPriority(chartID);
-			boolean enabledChart = ChartTypeManager.enabledChart(chartID);
-			String item = ChartTypeInterfaceManager.getInstance().getName(chartID);
-
-			//第一步就是重构cards
-			cards.clear();
-			if (enabledChart) {
-				if (collection.getChartCount() == 1) {
-					addAllCards();
-				} else {
-					addOnePriorityCards(priority);
-				}
-			} else {
-				addOnePlotIDCards(priority, chartID);
-			}
-
-			//下拉框重构开始。为了防止重构是触发update
-			((FlexibleComboBox)jcb).setItemEvenType(ItemEventType.REACTOR);
-			//重构下拉框选项
-			cardNames = new String[cards.size()];
-			cardPane.removeAll();
-			jcb.removeAllItems();
-			for (int i = 0; i < this.cards.size(); i++) {
-				String name = this.cards.get(i).title4PopupWindow();// Name从各自的pane里面获取
-				cardNames[i] = name;
-				cardPane.add(this.cards.get(i), cardNames[i]);
-				addComboBoxItem(cards, i);
-			}
-			//重新选择选中的下拉项
-			jcb.setSelectedItem(item);
-			jcb.setEnabled(enabledChart);
-			//下拉框重构结束
-			((FlexibleComboBox)jcb).setItemEvenType(ItemEventType.DEFAULT);
-			//重新选中
-			checkPlotPane();
-		}
-
-		private void checkPlotPane() {
-			CardLayout cl = (CardLayout)cardPane.getLayout();
-			cl.show(cardPane, cardNames[jcb.getSelectedIndex()]);
-		}
-
-		@Override
-		public void populateBean(ChartProvider ob) {
-			for (int i = 0; i < this.cards.size(); i++) {
-				FurtherBasicBeanPane pane = cards.get(i);
-				if (pane.accept(ob)) {
-					pane.populateBean(ob);
-					Object item = pane.title4PopupWindow();
-					for (int j = 0; j < cardNames.length; j++) {
-						if (ComparatorUtils.equals(item, cardNames[j])) {
-							jcb.setSelectedIndex(j);
-						}
-					}
-					return;
-				}
-			}
-		}
-
-		@Override
-		public ChartProvider updateBean() {
-			return getSelectedPane().updateBean();
-		}
-
-		@Override
-		public FurtherBasicBeanPane<? extends ChartProvider> getSelectedPane() {
-			Object item = jcb.getSelectedItem();
-			for (int i = 0; i < cards.size(); i++){
-				if (ComparatorUtils.equals(item, cards.get(i).title4PopupWindow())){
-					return cards.get(i);
-				}
-			}
-			return cards.get(0);
-		}
-
-	}
-
-
-	/**
-	 * 面板重构
-	 * @param lastPlotID
-	 * @param collection
-	 */
-	public void reLayoutEditPane(String lastPlotID, ChartCollection collection){
-		if (editPane == null) {
-			return;
-		}
-		ChartProvider chart = collection.getSelectedChartProvider(ChartProvider.class);
-		String plotID = chart.getID();
-		boolean isUseDefault = ChartTypeInterfaceManager.getInstance().isUseDefaultPane(plotID);
-		if (editPane.isDefaultPane() != isUseDefault || (!isUseDefault && !ComparatorUtils.equals(lastPlotID, plotID))) {
-			editPane.reLayout(chart);
-		}
-	}
-
-
-	public void relayoutChartTypePane(ChartCollection collection){
-		chartTypeComBox.relayout(collection);
-	}
-
-	/**
-	 * 更新界面属性 用于展示
-	 */
-	public void populate(ChartCollection collection) {
-		editingCollection = collection;
-
-		ChartProvider chart = collection.getSelectedChartProvider(ChartProvider.class);
-		this.remove(leftContentPane);
-		initContentPane();
-
-		buttonPane.populateBean(collection);
-		chartTypeComBox.populateBean(chart);
-
-		buttonPane.setVisible(ChartTypeInterfaceManager.getInstance().needChartChangePane(chart));
-
-		this.initAllListeners();
-	}
-
-	/**
-	 * 保存界面属性
-	 */
-	public void update(ChartCollection collection) {
+            //这一步会替换plot
+            ((AbstractChartTypePane) getSelectedPane()).updateBean(chart);
+
+            String chartID = chart.getID();
+
+            //chartID改变的话图表类型就算改变了
+            if (StringUtils.isNotEmpty(chartID)) {
+
+                boolean isUseDefault = ChartTypeInterfaceManager.getInstance().isUseDefaultPane(chartID);
+
+                if (editPane.isDefaultPane() != isUseDefault || (!isUseDefault && !ComparatorUtils.equals(lastPlotID, chartID))) {
+                    editPane.reLayout(chart);
+                }
+            }
+        }
+
+        protected UIComboBox createComboBox() {
+            return new FlexibleComboBox();
+        }
+
+        @Override
+        protected void addItemChangeEvent() {
+            jcb.addItemListener(new ItemListener() {
+                @Override
+                public void itemStateChanged(ItemEvent e) {
+                    FlexibleComboBox fcb = (FlexibleComboBox) jcb;
+                    if (fcb.isReactor()) {
+                        return;
+                    }
+                    comboBoxItemStateChanged();
+                    CardLayout cl = (CardLayout) cardPane.getLayout();
+                    cl.show(cardPane, cardNames[jcb.getSelectedIndex()]);
+                }
+            });
+        }
+
+        private void addAllCards() {
+            Iterator<String> iterator = allChartTypePane.keySet().iterator();
+
+            while (iterator.hasNext()) {
+                addOnePriorityCards(iterator.next(), false);
+            }
+        }
+
+        private void addOnePriorityCards(String priority) {
+            addOnePriorityCards(priority, true);
+        }
+
+        private void addOnePriorityCards(String priority, boolean ignore) {
+
+            Map<String, FurtherBasicBeanPane<? extends ChartProvider>> map = allChartTypePane.get(priority);
+
+            Iterator<Map.Entry<String, FurtherBasicBeanPane<? extends ChartProvider>>> iterator = map.entrySet().iterator();
+
+            while (iterator.hasNext()) {
+                Map.Entry<String, FurtherBasicBeanPane<? extends ChartProvider>> entry = iterator.next();
+                String plotID = entry.getKey();
+                if (ignore || ChartTypeManager.enabledChart(plotID)) {
+                    cards.add(entry.getValue());
+                }
+            }
+
+        }
+
+        private void addOnePlotIDCards(String priority, String plotID) {
+            cards.add(allChartTypePane.get(priority).get(plotID));
+        }
+
+        //因为饼图（新特性）把（新特性）去掉了，和老的饼图同名，下拉框选项和typePane不能一一对应了
+        //处理办法：这边除了重构 下拉项选项和cardNames 还需要把cards重构下（不需要init pane，只需要我需要的拿出来就好了）
+        private void relayout(ChartCollection collection) {
+            //重构需要重构下拉框选项和cardNames
+            ChartProvider chart = collection.getSelectedChartProvider(ChartProvider.class);
+            String chartID = chart.getID();
+            String priority = ChartTypeManager.getInstanceWithCheck().getPriority(chartID);
+            boolean enabledChart = ChartTypeManager.enabledChart(chartID);
+            String item = ChartTypeInterfaceManager.getInstance().getName(chartID);
+
+            //第一步就是重构cards
+            cards.clear();
+            if (enabledChart) {
+                if (collection.getChartCount() == 1) {
+                    addAllCards();
+                } else {
+                    addOnePriorityCards(priority);
+                }
+            } else {
+                addOnePlotIDCards(priority, chartID);
+            }
+
+            //下拉框重构开始。为了防止重构是触发update
+            ((FlexibleComboBox) jcb).setItemEvenType(ItemEventType.REACTOR);
+            //重构下拉框选项
+            cardNames = new String[cards.size()];
+            cardPane.removeAll();
+            jcb.removeAllItems();
+            for (int i = 0; i < this.cards.size(); i++) {
+                String name = this.cards.get(i).title4PopupWindow();// Name从各自的pane里面获取
+                cardNames[i] = name;
+                cardPane.add(this.cards.get(i), cardNames[i]);
+                addComboBoxItem(cards, i);
+            }
+            //重新选择选中的下拉项
+            jcb.setSelectedItem(item);
+            jcb.setEnabled(enabledChart);
+            //下拉框重构结束
+            ((FlexibleComboBox) jcb).setItemEvenType(ItemEventType.DEFAULT);
+            //重新选中
+            checkPlotPane();
+        }
+
+        private void checkPlotPane() {
+            CardLayout cl = (CardLayout) cardPane.getLayout();
+            cl.show(cardPane, cardNames[jcb.getSelectedIndex()]);
+        }
+
+        @Override
+        public void populateBean(ChartProvider ob) {
+            for (int i = 0; i < this.cards.size(); i++) {
+                FurtherBasicBeanPane pane = cards.get(i);
+                if (pane.accept(ob)) {
+                    pane.populateBean(ob);
+                    Object item = pane.title4PopupWindow();
+                    for (int j = 0; j < cardNames.length; j++) {
+                        if (ComparatorUtils.equals(item, cardNames[j])) {
+                            jcb.setSelectedIndex(j);
+                        }
+                    }
+                    return;
+                }
+            }
+        }
+
+        @Override
+        public ChartProvider updateBean() {
+            return getSelectedPane().updateBean();
+        }
+
+        @Override
+        public FurtherBasicBeanPane<? extends ChartProvider> getSelectedPane() {
+            Object item = jcb.getSelectedItem();
+            for (int i = 0; i < cards.size(); i++) {
+                if (ComparatorUtils.equals(item, cards.get(i).title4PopupWindow())) {
+                    return cards.get(i);
+                }
+            }
+            return cards.get(0);
+        }
+
+    }
+
+
+    /**
+     * 面板重构
+     *
+     * @param lastPlotID
+     * @param collection
+     */
+    public void reLayoutEditPane(String lastPlotID, ChartCollection collection) {
+        if (editPane == null) {
+            return;
+        }
+        ChartProvider chart = collection.getSelectedChartProvider(ChartProvider.class);
+        String plotID = chart.getID();
+        boolean isUseDefault = ChartTypeInterfaceManager.getInstance().isUseDefaultPane(plotID);
+        if (editPane.isDefaultPane() != isUseDefault || (!isUseDefault && !ComparatorUtils.equals(lastPlotID, plotID))) {
+            editPane.reLayout(chart);
+        }
+    }
+
+
+    public void relayoutChartTypePane(ChartCollection collection) {
+        chartTypeComBox.relayout(collection);
+    }
+
+    /**
+     * 更新界面属性 用于展示
+     */
+    public void populate(ChartCollection collection) {
+        editingCollection = collection;
+
+        ChartProvider chart = collection.getSelectedChartProvider(ChartProvider.class);
+        this.remove(leftContentPane);
+        initContentPane();
+
+        buttonPane.populateBean(collection);
+        chartTypeComBox.populateBean(chart);
+
+        buttonPane.setVisible(ChartTypeInterfaceManager.getInstance().needChartChangePane(chart));
+
+        this.initAllListeners();
+    }
+
+    /**
+     * 保存界面属性
+     */
+    public void update(ChartCollection collection) {
         editingCollection = collection;
-		buttonPane.update(collection);// 内部操作时 已经做过处理.
-		ChartProvider chart = collection.getSelectedChartProvider(ChartProvider.class);
-		chartTypeComBox.updateBean(chart);
-	}
+        buttonPane.update(collection);// 内部操作时 已经做过处理.
+        ChartProvider chart = collection.getSelectedChartProvider(ChartProvider.class);
+        chartTypeComBox.updateBean(chart);
+    }
 
     /**
      * 所有图表的类型界面
+     *
      * @return 类型界面
      */
-    public FurtherBasicBeanPane[] getPaneList(){
+    public FurtherBasicBeanPane[] getPaneList() {
         return chartTypeComBox.getCards().toArray(new FurtherBasicBeanPane[0]);
     }
 
     /**
      * 当前选中的图表的index
+     *
      * @return 当前选中的图表的index
      */
-    public int getSelectedIndex(){
+    public int getSelectedIndex() {
         return chartTypeComBox.getSelectedIndex();
     }
 
     /**
      * 返回选中的图表的index
+     *
      * @return 选中的图标的序号
      */
-    public int getSelectedChartIndex(){
+    public int getSelectedChartIndex() {
         return chartTypeComBox.getSelectedIndex();
     }
 
     /**
      * 设置下编辑的面板
+     *
      * @param currentEditPane 设置下编辑的面板
      */
     public void registerChartEditPane(ChartEditPane currentEditPane) {

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

@@ -22,6 +22,7 @@ import java.util.List;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
+import java.awt.event.ActionListener;
 
 
 public abstract class AbstractChartTypePane<T extends ChartProvider> extends FurtherBasicBeanPane<T> {
@@ -240,4 +241,8 @@ public abstract class AbstractChartTypePane<T extends ChartProvider> extends Fur
     public ChartProvider getDefaultChart() {
         return BarIndependentChart.barChartTypes[0];
     }
+
+    public void registerButtonListener(ActionListener autoButtonListener) {
+
+    }
 }

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

@@ -61,7 +61,8 @@ public class VanChartCustomPlotPane extends AbstractVanChartTypePane {
         return new Component[][]{
                 new Component[]{typePane},
                 new Component[]{stylePane},
-                new Component[]{contentPane}
+                new Component[]{contentPane},
+                new Component[]{buttonPane},
         };
     }
 

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

@@ -1,5 +1,6 @@
 package com.fr.van.chart.designer.type;
 
+import com.fr.base.BaseUtils;
 import com.fr.chart.base.AttrFillStyle;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Legend;
@@ -7,13 +8,16 @@ import com.fr.chart.chartattr.Plot;
 import com.fr.chart.chartglyph.ConditionAttr;
 import com.fr.chart.chartglyph.ConditionCollection;
 import com.fr.chart.chartglyph.DataSheet;
+import com.fr.chart.charttypes.ChartTypeManager;
 import com.fr.chartx.data.AbstractDataDefinition;
 import com.fr.chartx.data.ChartDataDefinitionProvider;
 import com.fr.chartx.data.field.AbstractColumnFieldCollection;
 import com.fr.chartx.data.field.diff.MultiCategoryColumnFieldCollection;
 import com.fr.design.ChartTypeInterfaceManager;
+import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.MultilineLabel;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
 import com.fr.design.mainframe.chart.gui.type.ChartImagePane;
 import com.fr.design.mainframe.chart.info.ChartInfoCollector;
@@ -25,21 +29,53 @@ import com.fr.plugin.chart.base.VanChartTools;
 import com.fr.plugin.chart.base.VanChartZoom;
 import com.fr.plugin.chart.vanchart.VanChart;
 
+import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.event.ActionListener;
 
 public abstract class AbstractVanChartTypePane extends AbstractChartTypePane<Chart> {
     private static final long serialVersionUID = 7743244512351499265L;
     private UICheckBox largeModelCheckBox;
 
+    protected JPanel buttonPane;
+
+    protected UIButton autoButton;
+
     private boolean samePlot;
 
     protected boolean isSamePlot() {
         return samePlot;
     }
 
+    public AbstractVanChartTypePane() {
+        buttonPane = new JPanel();
+        buttonPane.setLayout(new BorderLayout());
+        if (ChartTypeManager.AUTO_CHART) {
+            autoButton = new UIButton(Toolkit.i18nText("Fine-Design_Chart_M_Popup_Auto_Chart_Type"),
+                    BaseUtils.readIcon("/com/fr/design/images/m_insert/auto_chart.png")) {
+                @Override
+                public Dimension getPreferredSize() {
+                    return new Dimension((int) super.getPreferredSize().getWidth(), 25);
+                }
+            };
+            buttonPane.setBorder((BorderFactory.createEmptyBorder(5, 0, 0, 0)));
+            buttonPane.add(autoButton);
+        }
+    }
+
+    @Override
+    protected Component[][] getPaneComponents(JPanel typePane) {
+        return new Component[][]{
+                new Component[]{typePane},
+                new Component[]{buttonPane},
+                new Component[]{stylePane},
+        };
+    }
+
     //新图表暂时还没有平面3d，渐变高光等布局。
     @Override
     protected String[] getTypeLayoutPath() {
@@ -66,7 +102,7 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane<Cha
         return getPlotID();
     }
 
-    protected Component[][] getComponentsWithLargeData(JPanel typePane){
+    protected Component[][] getComponentsWithLargeData(JPanel typePane) {
         largeModelCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open_Large_Data_Model"));
         MultilineLabel prompt = new MultilineLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Large_Data_Model_Prompt"));
         prompt.setForeground(Color.red);
@@ -84,7 +120,7 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane<Cha
      * 更新界面内容
      */
     public void populateBean(Chart chart) {
-        for(ChartImagePane imagePane : typeDemo) {
+        for (ChartImagePane imagePane : typeDemo) {
             imagePane.isPressing = false;
         }
         Plot plot = chart.getPlot();
@@ -100,13 +136,13 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane<Cha
         VanChartPlot newPlot = getSelectedClonedPlot();
         checkTypeChange(oldPlot);
         samePlot = accept(chart);
-        if(typeChanged && samePlot){
+        if (typeChanged && samePlot) {
             //同一中图表切换不同类型
             cloneOldPlot2New(oldPlot, newPlot);
             chart.setPlot(newPlot);
             resetChartAttr4SamePlot(chart);
             ChartInfoCollector.getInstance().updateChartMiniType(chart);
-        } else if(!samePlot){
+        } else if (!samePlot) {
             //不同的图表类型切換
             resetChartAttr(chart, newPlot);
             //切换图表时，数据配置不变,分类个数也不变
@@ -114,55 +150,55 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane<Cha
             //切换类型埋点
             ChartInfoCollector.getInstance().updateChartTypeTime(chart, oldPlot.getPlotID());
         }
-        if(chart instanceof VanChart
+        if (chart instanceof VanChart
                 && !acceptDefinition(((VanChart) chart).getChartDataDefinition(), newPlot)) {
             ((VanChart) chart).setChartDataDefinition(null);
         }
     }
 
     protected boolean acceptDefinition(ChartDataDefinitionProvider definition, VanChartPlot vanChartPlot) {
-        if(definition instanceof AbstractDataDefinition) {
+        if (definition instanceof AbstractDataDefinition) {
             AbstractColumnFieldCollection columnFieldCollection = ((AbstractDataDefinition) definition).getColumnFieldCollection();
             return columnFieldCollection instanceof MultiCategoryColumnFieldCollection;
         }
         return false;
     }
 
-    protected void resetChartAttr4SamePlot(Chart chart){
+    protected void resetChartAttr4SamePlot(Chart chart) {
         resetRefreshMoreLabelAttr((VanChart) chart);
     }
 
-    protected void resetChartAttr(Chart chart, Plot newPlot){
+    protected void resetChartAttr(Chart chart, Plot newPlot) {
         chart.setPlot(newPlot);
-        if(newPlot.isSupportZoomDirection() && !newPlot.isSupportZoomCategoryAxis()){
+        if (newPlot.isSupportZoomDirection() && !newPlot.isSupportZoomCategoryAxis()) {
             //图表缩放新设计 恢复用注释。下面一行删除。
             ((VanChart) chart).setVanChartZoom(new VanChartZoom());
             //图表缩放新设计 恢复用注释。下面一行取消注释。
             // ((VanChart) chart).setZoomAttribute(new ZoomAttribute());
         }
         //重置工具栏选项
-        ((VanChart)chart).setVanChartTools(createVanChartTools());
+        ((VanChart) chart).setVanChartTools(createVanChartTools());
         //重置标题选项
         resetTitleAttr(chart);
         //重置监控刷新选项
-        resetRefreshMoreLabelAttr((VanChart)chart);
+        resetRefreshMoreLabelAttr((VanChart) chart);
         resetFilterDefinition(chart);
 
     }
 
     //默认有标题
-    protected void resetTitleAttr(Chart chart){
+    protected void resetTitleAttr(Chart chart) {
         VanChartPlot vanChartPlot = (VanChartPlot) chart.getPlot();
         chart.setTitle(vanChartPlot.getDefaultTitle());
     }
 
     //重置数据配置
-    protected void resetFilterDefinition(Chart chart){
+    protected void resetFilterDefinition(Chart chart) {
 
     }
 
     //重置监控刷新面板
-    protected void resetRefreshMoreLabelAttr(VanChart chart){
+    protected void resetRefreshMoreLabelAttr(VanChart chart) {
         chart.setRefreshMoreLabel(chart.getDefaultAutoAttrtooltip(chart));
     }
 
@@ -170,9 +206,9 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane<Cha
         return new VanChartTools();
     }
 
-    protected void checkTypeChange(Plot oldPlot){
-        for(int i = 0; i < typeDemo.size(); i++){
-            if(typeDemo.get(i).isPressing && i != oldPlot.getDetailType()){
+    protected void checkTypeChange(Plot oldPlot) {
+        for (int i = 0; i < typeDemo.size(); i++) {
+            if (typeDemo.get(i).isPressing && i != oldPlot.getDetailType()) {
                 typeChanged = true;
                 break;
             }
@@ -193,15 +229,15 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane<Cha
             cloneHotHyperLink(oldPlot, newPlot);
 
             if (oldPlot.getPlotFillStyle() != null) {
-                newPlot.setPlotFillStyle((AttrFillStyle)oldPlot.getPlotFillStyle().clone());
+                newPlot.setPlotFillStyle((AttrFillStyle) oldPlot.getPlotFillStyle().clone());
             }
             newPlot.setPlotStyle(oldPlot.getPlotStyle());
             if (oldPlot.getDataSheet() != null) {
-                newPlot.setDataSheet((DataSheet)oldPlot.getDataSheet().clone());
+                newPlot.setDataSheet((DataSheet) oldPlot.getDataSheet().clone());
             }
 
             if (oldPlot.getBackground() != null) {
-                newPlot.setBackground((Background)oldPlot.getBackground().clone());
+                newPlot.setBackground((Background) oldPlot.getBackground().clone());
             }
             if (oldPlot.getBorderColor() != null) {
                 newPlot.setBorderColor(oldPlot.getBorderColor());
@@ -211,20 +247,20 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane<Cha
             newPlot.setAlpha(oldPlot.getAlpha());
             newPlot.setShadow(oldPlot.isShadow());
 
-            ((VanChartPlot)newPlot).setCategoryNum( ((VanChartPlot)oldPlot).getCategoryNum());
+            ((VanChartPlot) newPlot).setCategoryNum(((VanChartPlot) oldPlot).getCategoryNum());
 
         } catch (CloneNotSupportedException e) {
             FineLoggerFactory.getLogger().error("Error in change plot");
         }
     }
 
-    protected void cloneHotHyperLink(Plot oldPlot, Plot newPlot) throws CloneNotSupportedException{
+    protected void cloneHotHyperLink(Plot oldPlot, Plot newPlot) throws CloneNotSupportedException {
         if (oldPlot.getHotHyperLink() != null) {
-            newPlot.setHotHyperLink((NameJavaScriptGroup)oldPlot.getHotHyperLink().clone());
+            newPlot.setHotHyperLink((NameJavaScriptGroup) oldPlot.getHotHyperLink().clone());
         }
     }
 
-    protected void cloneOldDefaultAttrConditionCollection(Plot oldPlot, Plot newPlot) throws CloneNotSupportedException{
+    protected void cloneOldDefaultAttrConditionCollection(Plot oldPlot, Plot newPlot) throws CloneNotSupportedException {
         if (oldPlot.getConditionCollection() != null) {
             ConditionCollection newCondition = new ConditionCollection();
             newCondition.setDefaultAttr((ConditionAttr) oldPlot.getConditionCollection().getDefaultAttr().clone());
@@ -232,9 +268,16 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane<Cha
         }
     }
 
-    protected void cloneOldConditionCollection(Plot oldPlot, Plot newPlot) throws CloneNotSupportedException{
+    protected void cloneOldConditionCollection(Plot oldPlot, Plot newPlot) throws CloneNotSupportedException {
         if (oldPlot.getConditionCollection() != null) {
-            newPlot.setConditionCollection((ConditionCollection)oldPlot.getConditionCollection().clone());
+            newPlot.setConditionCollection((ConditionCollection) oldPlot.getConditionCollection().clone());
+        }
+    }
+
+    @Override
+    public void registerButtonListener(ActionListener autoButtonListener) {
+        if (autoButton != null) {
+            autoButton.addActionListener(autoButtonListener);
         }
     }
 }

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

@@ -42,6 +42,7 @@ public class VanChartMapPlotPane extends AbstractVanChartTypePane {
         }
         return new Component[][]{
                 new Component[]{typePane},
+                new Component[]{buttonPane},
                 new Component[]{sourceChoosePane}
         };
     }

designer-form/src/main/java/com/fr/design/designer/creator/XAutoChartCreator.java

@@ -2,6 +2,7 @@ package com.fr.design.designer.creator;
 
 import com.fr.base.GraphHelper;
 import com.fr.base.chart.BaseChartCollection;
+import com.fr.common.annotations.Open;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.gui.chart.MiddleChartComponent;
 import com.fr.design.gui.chart.MiddleChartDialog;
@@ -11,21 +12,23 @@ import com.fr.design.mainframe.EditingMouseListener;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.module.DesignModuleFactory;
 import com.fr.form.ui.ChartAutoEditor;
+import com.fr.general.IOUtils;
+import com.fr.stable.Constants;
 import com.fr.stable.bridge.StableFactory;
 
 import javax.swing.JComponent;
 import javax.swing.JPanel;
-import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics;
-import java.awt.Rectangle;
 import java.awt.event.MouseEvent;
+import java.awt.image.BufferedImage;
 
 /**
  * @author Bjorn
  * @version 10.0
  * Created by Bjorn on 2020-05-26
  */
+@Open
 public class XAutoChartCreator extends XChartEditor {
 
     private MiddleChartDialog autoChartDialog;
@@ -76,6 +79,7 @@ public class XAutoChartCreator extends XChartEditor {
                     initChart(autoChartDialog.getChartCollection());
                     formDesigner.fireTargetModified();
                 }
+
                 @Override
                 public void doCancel() {
                     editingMouseListener.stopEditing();
@@ -99,9 +103,13 @@ public class XAutoChartCreator extends XChartEditor {
 
 
     public void paint(Graphics g) {
-        //TODO @Bjorn 视觉样式优化
-        g.setColor(Color.RED);
-        GraphHelper.fill(g, new Rectangle(0, 0, getWidth(), getHeight()));
+        BufferedImage bufferedImage = IOUtils.readImage("com/fr/design/form/images/auto_chart_preview.png");
+        GraphHelper.paintImage(
+                g, this.getWidth(), this.getHeight(), bufferedImage,
+                Constants.IMAGE_ADJUST,
+                0,
+                0, -1, -1
+        );
         super.paint(g);
     }
 

designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java

@@ -19,7 +19,6 @@ import com.fr.form.parameter.FormSubmitButton;
 import com.fr.form.ui.Button;
 import com.fr.form.ui.CardAddButton;
 import com.fr.form.ui.CardSwitchButton;
-import com.fr.form.ui.ChartAutoEditor;
 import com.fr.form.ui.CheckBox;
 import com.fr.form.ui.CheckBoxGroup;
 import com.fr.form.ui.ComboBox;
@@ -170,12 +169,12 @@ public class XCreatorUtils {
         extraObjectMap.clear();
         extraObjectMap.putAll(ExtraDesignClassManager.getInstance().getParameterWidgetOptionsMap());
         extraObjectMap.putAll(ExtraDesignClassManager.getInstance().getFormWidgetOptionsMap());
+        extraObjectMap.putAll(ExtraDesignClassManager.getInstance().getChartWidgetOptionsMap());
     }
     
     private static void putExtraEditor() {
         if (DesignModuleFactory.getChartEditorClass() != null) {
             objectMap.put(DesignModuleFactory.getChartEditorClass(), XChartEditor.class);
-            objectMap.put(ChartAutoEditor.class, XAutoChartCreator.class);
         }
     }
     

designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java

@@ -34,6 +34,10 @@ import javax.swing.JComponent;
 import javax.swing.JPanel;
 import javax.swing.JSeparator;
 import javax.swing.SwingConstants;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Dimension;
@@ -42,10 +46,6 @@ import java.awt.event.ComponentAdapter;
 import java.awt.event.ComponentEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
 
 /**
  * @author null
@@ -318,11 +318,11 @@ public class FormParaWidgetPane extends JPanel {
             @Override
             public void mouseClicked(MouseEvent e) {
                 initWidgetTypePopUp();
-                if(jSeparatorChart != null) {
+                if (jSeparatorChart != null) {
                     widgetTypePopupMenu.show(FormParaWidgetPane.this,
                             (int) jSeparatorChart.getLocation().getX() + BORDER,
                             (int) jSeparatorChart.getLocation().getY());
-                }else{
+                } else {
                     widgetTypePopupMenu.show(FormParaWidgetPane.this,
                             (int) jSeparatorLayout.getLocation().getX() + BORDER,
                             (int) jSeparatorLayout.getLocation().getY());
@@ -440,7 +440,9 @@ public class FormParaWidgetPane extends JPanel {
 
     private WidgetOption[] loadChartOptions() {
         if (chartOptions == null) {
-            chartOptions = DesignModuleFactory.getExtraWidgetOptions();
+            ExtraDesignClassManager instance = ExtraDesignClassManager.getInstance();
+            WidgetOption[] widgetOptions = ArrayUtils.addAll(instance.getBeforeChartWidgetOptions(), DesignModuleFactory.getExtraWidgetOptions());
+            chartOptions = ArrayUtils.addAll(widgetOptions, instance.getAfterChartWidgetOptions());
         }
         return chartOptions;
     }

designer-realize/src/main/java/com/fr/design/actions/insert/cell/AutoChartCellAction.java

@@ -2,6 +2,7 @@ package com.fr.design.actions.insert.cell;
 
 import com.fr.base.BaseUtils;
 import com.fr.chart.chartattr.AutoChartCollection;
+import com.fr.common.annotations.Open;
 import com.fr.design.actions.core.WorkBookSupportable;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.ElementCasePane;
@@ -14,6 +15,7 @@ import javax.swing.KeyStroke;
  * @version 10.0
  * Created by Bjorn on 2020-05-28
  */
+@Open
 public class AutoChartCellAction extends AbstractCellAction implements WorkBookSupportable {
 
     public AutoChartCellAction() {
@@ -29,7 +31,6 @@ public class AutoChartCellAction extends AbstractCellAction implements WorkBookS
         this.setMenuKeySet(INSERT_AUTO_CHART);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        //TODO @Bjorn 视觉样式优化icon
         this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_insert/auto_chart.png"));
     }
 

designer-realize/src/main/java/com/fr/design/cell/editor/AutoChartCellEditor.java

@@ -1,5 +1,6 @@
 package com.fr.design.cell.editor;
 
+import com.fr.common.annotations.Open;
 import com.fr.design.gui.chart.MiddleChartDialog;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.module.DesignModuleFactory;
@@ -12,6 +13,7 @@ import java.awt.Window;
  * @version 10.0
  * Created by Bjorn on 2020-05-28
  */
+@Open
 public class AutoChartCellEditor extends ChartCellEditor {
 
     public AutoChartCellEditor(ElementCasePane<? extends TemplateElementCase> ePane) {

designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java

@@ -9,7 +9,6 @@ import com.fr.base.Formula;
 import com.fr.base.ScreenResolution;
 import com.fr.base.Style;
 import com.fr.base.vcs.DesignerMode;
-import com.fr.chart.chartattr.AutoChartCollection;
 import com.fr.design.DesignState;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.ExtraDesignClassManager;
@@ -53,8 +52,6 @@ import com.fr.design.cell.bar.DynamicScrollBar;
 import com.fr.design.cell.clipboard.CellElementsClip;
 import com.fr.design.cell.clipboard.ElementsTransferable;
 import com.fr.design.cell.clipboard.FloatElementsClip;
-import com.fr.design.cell.editor.AutoChartCellEditor;
-import com.fr.design.cell.editor.AutoChartFloatEditor;
 import com.fr.design.cell.editor.BiasTextPainterCellEditor;
 import com.fr.design.cell.editor.CellEditor;
 import com.fr.design.cell.editor.ChartCellEditor;
@@ -402,8 +399,6 @@ public abstract class ElementCasePane<T extends TemplateElementCase> extends Tar
             grid.setDefaultFloatEditor(chartClass, new ChartFloatEditor());
         }
 
-        grid.setDefaultCellEditor(AutoChartCollection.class, new AutoChartCellEditor(this));
-        grid.setDefaultFloatEditor(AutoChartCollection.class, new AutoChartFloatEditor());
 
         addExtraCellEditor(grid);
 
@@ -427,7 +422,7 @@ public abstract class ElementCasePane<T extends TemplateElementCase> extends Tar
                 editor = (CellEditor) c.newInstance();
             } catch (NoSuchMethodException e) {
                 try {
-                    c = clazz.getConstructor(ElementCase.class);
+                    c = clazz.getConstructor(ElementCasePane.class);
                     editor = (CellEditor) c.newInstance(this);
                 } catch (Exception e1) {
                     FineLoggerFactory.getLogger().error(e1.getMessage(), e1);

designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java

@@ -350,6 +350,9 @@ public class DesignerActivator extends Activator {
         Set<ElementUIProvider> providers = ExtraDesignClassManager.getInstance().getArray(ElementUIProvider.MARK_STRING);
         for (ElementUIProvider provider : providers) {
             try {
+                if (provider.quickEditor() == null) {
+                    continue;
+                }
                 ActionFactory.registerCellEditor(provider.targetObjectClass(), provider.quickEditor().newInstance());
             } catch (Exception e) {
                 FineLoggerFactory.getLogger().error(e.getMessage(), e);