接口评审出的两个问题 1.demopath放到typeUI接口中 2.typepane.tipPath 默认调用1

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

@@ -4,6 +4,7 @@ import com.fr.chart.base.ChartConstants;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.chart.charttypes.ChartTypeManager;
+import com.fr.chart.fun.ChartTypeProvider;
 import com.fr.chartx.attr.ChartProvider;
 import com.fr.common.annotations.Compatible;
 import com.fr.design.beans.BasicBeanPane;
@@ -39,10 +40,12 @@ 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.type.AbstractChartTypePane;
 import com.fr.design.module.DesignModuleFactory;
+import com.fr.extended.chart.AbstractChart;
 import com.fr.form.ui.ChartEditor;
 import com.fr.general.GeneralContext;
 import com.fr.general.IOUtils;
 import com.fr.invoke.Reflect;
+import com.fr.locale.InterProviderFactory;
 import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.chart.PiePlot4VanChart;
 import com.fr.plugin.chart.area.VanChartAreaPlot;
@@ -325,9 +328,62 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
         return StringUtils.EMPTY;
     }
 
-    public String[] getSubName(String id) {
+    public String[] getDemoImagePath(String chartID) {
+
+        if (chartTypeInterfaces != null) {
+            ChartTypeUIProvider provider = getChartTypeInterface(chartID);
+            if (provider != null) {
+                String[] result = null;
+                try {
+                    result = provider.getDemoImagePath();
+                } catch (Throwable e) {
+                    //do nothing
+                }
+                return ArrayUtils.isEmpty(result) ? getCompatibleDemoImagePath(chartID) : result;
+            }
+        }
+
+        return new String[0];
+    }
+
+    private String[] getCompatibleDemoImagePath(String chartID) {
+        String[] result = null;
+        try {
+            //AbstractIndependentChartsProvider
+            ChartTypeProvider chartTypeProvider = Reflect.on(ChartTypeManager.getInstanceWithCheck()).call("getChartType", chartID).get();
+            result = new String[]{
+                    Reflect.on(chartTypeProvider).call("getChartImagePath").get()
+            };
+
+            if (ArrayUtils.isNotEmpty(result)) {
+                return result;
+            }
+        } catch (Exception e) {
+            //do nothing
+        }
+
+        try {
+            //兼容 图表类型选择界面会调到这边
+            ChartProvider[] charts = ChartTypeManager.getInstanceWithCheck().getChartTypes(chartID);
+            result = new String[charts.length];
+            for (int i = 0; i < charts.length; i++) {
+                //Chart && AbstractChart
+                ChartProvider chart = charts[i];
+                if (!(chart instanceof AbstractChart)) {//扩展图表
+                    chart = Reflect.on(chart).field("subChart").get();
+                }
+                result[i] = Reflect.on(chart).call("demoImagePath").get();
+            }
+        } catch (Exception e) {
+            //do nothing
+        }
+
+        return new String[0];
+    }
+
+    public String[] getSubName(String chartID) {
         if (chartTypeInterfaces != null) {
-            ChartTypeUIProvider provider = getChartTypeInterface(id);
+            ChartTypeUIProvider provider = getChartTypeInterface(chartID);
             if (provider != null) {
                 String[] subNames = null;
                 try {
@@ -335,31 +391,32 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
                 } catch (Throwable throwable) {
                     //do nothing
                 }
-                return ArrayUtils.isEmpty(subNames) ? getCompatibleSubName(id, provider) : subNames;
+                return ArrayUtils.isEmpty(subNames) ? getCompatibleSubName(chartID, provider) : subNames;
             }
         }
         return new String[0];
     }
 
     //兼容
-    private String[] getCompatibleSubName(String id, ChartTypeUIProvider provider) {
-        ChartProvider[] chartProviders = ChartTypeManager.getInstanceWithCheck().getChartTypes(id);
+    private String[] getCompatibleSubName(String chartID, ChartTypeUIProvider provider) {
+        ChartProvider[] chartProviders = ChartTypeManager.getInstanceWithCheck().getChartTypes(chartID);
 
         if (chartProviders.length == 1) {
-            return new String[]{getName(id)};
+            return new String[]{getName(chartID)};
         }
         String[] result = new String[chartProviders.length];
         for (int i = 0; i < chartProviders.length; i++) {
             if (chartProviders[i] instanceof Chart) {
+                //Chart && AbstractChart
                 result[i] = ((Chart) chartProviders[i]).getChartName();
             }
         }
         return result;
     }
 
-    public String getName(String id) {
+    public String getName(String chartID) {
         if (chartTypeInterfaces != null) {
-            ChartTypeUIProvider provider = getChartTypeInterface(id);
+            ChartTypeUIProvider provider = getChartTypeInterface(chartID);
             if (provider != null) {
                 String name = null;
                 try {
@@ -368,31 +425,41 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
                     //do nothing
                 }
 
-                return StringUtils.isEmpty(name) ? getCompatibleName(id, provider) : name;
+                return StringUtils.isEmpty(name) ? getCompatibleName(chartID, provider) : name;
             }
         }
         return StringUtils.EMPTY;
     }
 
     //兼容
-    private static String getCompatibleName(String id, ChartTypeUIProvider provider) {
+    private static String getCompatibleName(String chartID, ChartTypeUIProvider provider) {
 
         String result = null;
         try {
-            result = Reflect.on(provider).call("getPlotTypeTitle4PopupWindow").get();
+            //AbstractIndependentChartsProvider
+            ChartTypeProvider chartTypeProvider = Reflect.on(ChartTypeManager.getInstanceWithCheck()).call("getChartType", chartID).get();
+            result = Reflect.on(chartTypeProvider).call("getChartName").get();//国际化的key
+            result = InterProviderFactory.getProvider().getLocText(result);
+            if (StringUtils.isNotEmpty(result)) {
+                return result;
+            }
         } catch (Exception e) {
             //do nothing
         }
-        if (StringUtils.isNotEmpty(result)) {
-            return result;
-        }
 
-        ChartProvider chartProvider = ChartTypeManager.getInstanceWithCheck().getChartTypes(id)[0];
-        if (chartProvider instanceof Chart) {
-            result = ((Chart) chartProvider).getChartName();
-        }
-        if (StringUtils.isNotEmpty(result)) {
-            return result;
+
+        try {
+            ChartProvider chartProvider = ChartTypeManager.getInstanceWithCheck().getChartTypes(chartID)[0];
+            if (chartProvider instanceof Chart) {
+                //AbstractExtendedChartUIProvider
+                result = ((Chart) chartProvider).getChartName();
+            }
+            if (StringUtils.isNotEmpty(result) && !"Charts".equals(result)) {
+                return result;
+            }
+
+        } catch (Exception e) {
+            //do nothing
         }
 
         return provider.getPlotTypePane().title4PopupWindow();

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

@@ -94,7 +94,7 @@ public class ChartTypePane extends ChartCommonWizardPane {
             int main_index = mainTypeList.getSelectedIndex();
             String id = ChartTypePane.this.chartIDs[main_index];
 
-            String[] demoImagePath = ChartTypeManager.getInstanceWithCheck().getDemoImagePath(id);
+            String[] demoImagePath = ChartTypeInterfaceManager.getInstance().getDemoImagePath(id);
             String[] subName = ChartTypeInterfaceManager.getInstance().getSubName(id);
 
             ChartTypePane.this.iconListModel.clear();

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

@@ -19,7 +19,7 @@ import com.fr.stable.fun.Level;
  * Created by eason on 14/12/29.
  *
  * @since 8.0
- * 自定义图表类型设设计界面接口
+ * 自定义 图表类型 界面接口
  */
 public interface ChartTypeUIProvider extends Level {
     
@@ -66,8 +66,18 @@ public interface ChartTypeUIProvider extends Level {
     String[] getSubName();
 
     /**
-     * 图标路径
-     * 表单 工具栏 拖拽图表小图标
+     * 图表 demo图片路径
+     * 400*225
+     * 1.图表选择界面的图的路径 原样渲染
+     * 2.图表属性第一个界面 类型界面 缩放渲染
+     *
+     * @return demo图片路径
+     */
+    String[] getDemoImagePath();
+
+    /**
+     * 小图标路径
+     * 表单 工具栏 图表小图标
      * 16*16
      *
      * @return 图标路径

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

@@ -5,6 +5,7 @@ import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.chart.fun.ChartTypeUIProvider;
 import com.fr.design.chartx.impl.AbstractDataPane;
 import com.fr.design.chartx.impl.AbstractOtherPane;
+import com.fr.design.chartx.impl.DefaultTypePane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.mainframe.chart.ChartEditPane;
@@ -13,6 +14,7 @@ import com.fr.design.mainframe.chart.gui.ChartDataPane;
 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.stable.fun.impl.AbstractProvider;
 
 /**
@@ -20,6 +22,11 @@ import com.fr.stable.fun.impl.AbstractProvider;
  */
 public abstract class AbstractChartTypeUI extends AbstractProvider implements ChartTypeUIProvider {
 
+    @Override
+    public AbstractChartTypePane getPlotTypePane() {
+        return new DefaultTypePane();
+    }
+
     @Override
     public abstract AbstractDataPane getChartDataPane(AttributeChangeListener listener);
 
@@ -31,6 +38,16 @@ public abstract class AbstractChartTypeUI extends AbstractProvider implements Ch
         return new String[]{getName()};
     }
 
+    @Override
+    public int currentAPILevel() {
+        return CURRENT_API_LEVEL;
+    }
+
+    @Override
+    public String mark4Provider() {
+        return getClass().getName();
+    }
+
     @Override
     public boolean needChartChangePane() {
         return false;
@@ -51,16 +68,6 @@ public abstract class AbstractChartTypeUI extends AbstractProvider implements Ch
         return false;
     }
 
-    @Override
-    public int currentAPILevel() {
-        return CURRENT_API_LEVEL;
-    }
-
-    @Override
-    public String mark4Provider() {
-        return getClass().getName();
-    }
-
     @Override
     public ChartEditPane getChartEditPane(String plotID) {
         return new ChartEditPane();

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

@@ -48,6 +48,11 @@ public abstract class AbstractIndependentChartUIWithAPILevel implements ChartTyp
         return new String[0];
     }
 
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[0];
+    }
+
     /**
      * 是否使用默认的界面，为了避免界面来回切换
      * @return 是否使用默认的界面

designer-chart/src/main/java/com/fr/design/chartx/impl/DefaultTypePane.java

@@ -10,11 +10,11 @@ import com.fr.design.mainframe.chart.gui.type.ChartImagePane;
 /**
  * Created by shine on 2019/09/04.
  */
-public class CommonTypePane<T extends AbstractChartWithData> extends AbstractChartTypePane<AbstractChartWithData> {
+public class DefaultTypePane<T extends AbstractChartWithData> extends AbstractChartTypePane<AbstractChartWithData> {
 
     @Override
     protected String[] getTypeIconPath() {
-        return new String[0];
+        return ChartTypeInterfaceManager.getInstance().getDemoImagePath(getPlotID());
     }
 
     @Override

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

@@ -35,6 +35,16 @@ public class AreaIndependentVanChartInterface extends AbstractMultiCategoryVanCh
         };
     }
 
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/14.png",
+                "com/fr/plugin/chart/demo/image/15.png",
+                "com/fr/plugin/chart/demo/image/16.png",
+                "com/fr/plugin/chart/demo/image/17.png"
+        };
+    }
+
     @Override
     public AbstractChartTypePane getPlotTypePane() {
         return new VanChartAreaPlotPane();

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

@@ -37,6 +37,16 @@ public class BarIndependentVanChartInterface extends AbstractMultiCategoryVanCha
         };
     }
 
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/7.png",
+                "com/fr/plugin/chart/demo/image/8.png",
+                "com/fr/plugin/chart/demo/image/9.png",
+                "com/fr/plugin/chart/demo/image/10.png",
+        };
+    }
+
     @Override
     public String getIconPath() {
         return "com/fr/design/images/form/toolbar/bar.png";

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

@@ -35,6 +35,15 @@ public class BubbleIndependentVanChartInterface extends AbstractIndependentVanCh
                 Toolkit.i18nText("Fine-Design_Chart_New_Force_Bubble")
         };
     }
+
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/26.png",
+                "com/fr/plugin/chart/demo/image/27.png"
+        };
+    }
+
     /**
      * 图表的类型定义界面类型，就是属性表的第一个界面
      *

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

@@ -31,6 +31,16 @@ public class ColumnIndependentVanChartInterface extends AbstractMultiCategoryVan
         };
     }
 
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/3.png",
+                "com/fr/plugin/chart/demo/image/4.png",
+                "com/fr/plugin/chart/demo/image/5.png",
+                "com/fr/plugin/chart/demo/image/6.png",
+        };
+    }
+
     @Override
     public String getIconPath() {
         return "com/fr/design/images/form/toolbar/column.png";

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

@@ -30,6 +30,16 @@ public class CustomIndependentVanChartInterface extends AbstractIndependentVanCh
         };
     }
 
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/28.png",
+                "com/fr/plugin/chart/demo/image/29.png",
+                "com/fr/plugin/chart/demo/image/30.png",
+                "com/fr/plugin/chart/demo/image/31.png"
+        };
+    }
+
     /**
      * 图表的类型定义界面类型，就是属性表的第一个界面
      *

designer-chart/src/main/java/com/fr/van/chart/drillmap/DrillMapIndependentVanChartInterface.java

@@ -31,6 +31,15 @@ public class DrillMapIndependentVanChartInterface extends MapIndependentVanChart
         };
     }
 
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/37.png",
+                "com/fr/plugin/chart/demo/image/38.png",
+                "com/fr/plugin/chart/demo/image/39.png"
+        };
+    }
+
     /**
      * 图标路径
      *

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

@@ -31,6 +31,13 @@ public class FunnelIndependentVanChartInterface extends AbstractIndependentVanCh
         return Toolkit.i18nText("Fine-Design_Chart_New_Funnel");
     }
 
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/41.png"
+        };
+    }
+
     /**
      * 图表的类型定义界面类型，就是属性表的第一个界面
      *

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

@@ -33,6 +33,13 @@ public class GanttIndependentVanChartInterface extends AbstractIndependentVanCha
         return Toolkit.i18nText("Fine-Design_Chart_New_Gantt");
     }
 
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/44.png"
+        };
+    }
+
     @Override
     public AbstractChartTypePane getPlotTypePane() {
         return new VanChartGanttPlotPane();

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

@@ -48,6 +48,17 @@ public class GaugeIndependentVanChartInterface extends AbstractIndependentVanCha
         };
     }
 
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/18.png",
+                "com/fr/plugin/chart/demo/image/19.png",
+                "com/fr/plugin/chart/demo/image/20.png",
+                "com/fr/plugin/chart/demo/image/21.png",
+                "com/fr/plugin/chart/demo/image/22.png"
+        };
+    }
+
     @Override
     public AbstractChartTypePane getPlotTypePane() {
         return new VanChartGaugePlotPane();

designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/HeatMapIndependentVanChartInterface.java

@@ -38,6 +38,13 @@ public class HeatMapIndependentVanChartInterface extends MapIndependentVanChartI
         return Toolkit.i18nText("Fine-Design_Chart_New_HeatMap");
     }
 
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/42.png"
+        };
+    }
+
     public AbstractChartTypePane getPlotTypePane() {
         return new VanChartHeatMapTypePane();
     }

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

@@ -31,6 +31,15 @@ public class LineIndependentVanChartInterface extends AbstractMultiCategoryVanCh
         };
     }
 
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/11.png",
+                "com/fr/plugin/chart/demo/image/12.png",
+                "com/fr/plugin/chart/demo/image/13.png"
+        };
+    }
+
     @Override
     public AbstractChartTypePane getPlotTypePane() {
         return new VanChartLinePlotPane();

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

@@ -48,6 +48,18 @@ public class MapIndependentVanChartInterface extends AbstractIndependentVanChart
         };
     }
 
+
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/33.png",
+                "com/fr/plugin/chart/demo/image/34.png",
+                "com/fr/plugin/chart/demo/image/35.png",
+                "com/fr/plugin/chart/demo/image/36.png"
+        };
+    }
+
+
     /**
      * 图表的类型定义界面类型，就是属性表的第一个界面
      *

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

@@ -29,6 +29,13 @@ public class MultiPieIndependentVanChartInterface extends AbstractIndependentVan
         return Toolkit.i18nText("Fine-Design_Chart_New_MultiPie");
     }
 
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/32.png"
+        };
+    }
+
 //    @Override
 //    public ChartDataPane getChartDataPane(AttributeChangeListener listener) {
 //        return new AbstractDataPane(listener) {

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

@@ -38,6 +38,16 @@ public class PieIndependentVanChartInterface extends AbstractIndependentVanChart
         };
     }
 
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/0.png",
+                "com/fr/plugin/chart/demo/image/1.png",
+                "com/fr/plugin/chart/demo/image/2.png"
+        };
+    }
+
+
     @Override
     public AbstractChartTypePane getPlotTypePane() {
         return new VanChartPiePlotPane();

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

@@ -30,6 +30,14 @@ public class RadarIndependentVanChartInterface extends AbstractIndependentVanCha
         };
     }
 
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/23.png",
+                "com/fr/plugin/chart/demo/image/24.png"
+        };
+    }
+
     @Override
     public AbstractChartTypePane getPlotTypePane() {
         return new VanChartRadarPlotPane();

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

@@ -40,6 +40,13 @@ public class ScatterIndependentVanChartInterface extends AbstractIndependentVanC
         return Toolkit.i18nText("Fine-Design_Chart_New_Scatter");
     }
 
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/25.png"
+        };
+    }
+
     /**
      * 图标路径
      *

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

@@ -46,6 +46,15 @@ public class StructureIndependentVanChartInterface extends AbstractIndependentVa
         };
     }
 
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/45.png",
+                "com/fr/plugin/chart/demo/image/46.png",
+                "com/fr/plugin/chart/demo/image/47.png"
+        };
+    }
+
     @Override
     public String getIconPath() {
         return "com/fr/design/images/form/toolbar/structure.png";

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

@@ -28,6 +28,13 @@ public class TreeMapIndependentVanChartInterface extends MultiPieIndependentVanC
         return Toolkit.i18nText("Fine-Design_Chart_New_TreeMap");
     }
 
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/40.png"
+        };
+    }
+
     @Override
     public String getIconPath() {
         return "com/fr/design/images/form/toolbar/treeMap.png";

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

@@ -40,6 +40,13 @@ public class WordCloudIndependentVanChartInterface extends AbstractIndependentVa
         return Toolkit.i18nText("Fine-Design_Chart_Word_Cloud");
     }
 
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/43.png"
+        };
+    }
+
     /**
      * 图标路径
      *