Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~lanlan/design into release/10.0

designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java

@@ -49,6 +49,7 @@ import com.fr.design.menu.ShortCut;
 import com.fr.design.preview.PagePreview;
 import com.fr.design.write.submit.DBManipulationInWidgetEventPane;
 import com.fr.design.write.submit.DBManipulationPane;
+import com.fr.event.EventDispatcher;
 import com.fr.file.FILE;
 import com.fr.file.FILEChooserPane;
 import com.fr.file.MemFILE;
@@ -107,7 +108,6 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     private DesignModelAdapter<T, ?> designModel;
     private PreviewProvider previewType;
     protected TimeConsumeTimer consumeTimer = new TimeConsumeTimer();
-    public int resolution = ScreenResolution.getScreenResolution();
 
     private PluginEventListener pluginListener;
 
@@ -125,6 +125,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
 
     public JTemplate(T t, FILE file, boolean isNewFile) {
         super(t);
+        beforeInit();
         // 判断是否切换设计器状态到禁止拷贝剪切
         if (t.getAttrMark(DesignBanCopyAttrMark.XML_TAG) != null) {
             DesignModeContext.switchTo(com.fr.design.base.mode.DesignerMode.BAN_COPY_AND_CUT);
@@ -301,6 +302,20 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
 
     }
 
+    /**
+     * 模板初始化之前
+     */
+    private void beforeInit() {
+        EventDispatcher.fire(JTemplateEvent.BEFORE_TEMPLATE_INIT, this);
+    }
+
+    /**
+     * 模板激活之前之前
+     */
+    protected void beforeActive() {
+        EventDispatcher.fire(JTemplateEvent.BEFORE_TEMPLATE_ACTIVE, this);
+    }
+
     /**
      * 模板关闭时
      */
@@ -309,6 +324,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         PluginListenerRegistration.getInstance().stopListen(this.pluginListener);
     }
 
+
     /**
      * 刷新内部资源
      *
@@ -1076,6 +1092,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
      * 激活指定的template
      */
     public void activeJTemplate(int index, JTemplate jt) {
+        beforeActive();
         DesignerContext.getDesignerFrame().activateJTemplate(this);
     }
 
@@ -1083,6 +1100,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
      * 激活已存在的模板
      */
     public void activeOldJTemplate() {
+        beforeActive();
         DesignerContext.getDesignerFrame().activateJTemplate(this);
     }
 
@@ -1090,6 +1108,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
      * 激活新的模板
      */
     public void activeNewJTemplate() {
+        beforeActive();
         DesignerContext.getDesignerFrame().addAndActivateJTemplate(this);
     }
 

designer-base/src/main/java/com/fr/design/mainframe/JTemplateEvent.java

@@ -0,0 +1,19 @@
+package com.fr.design.mainframe;
+
+import com.fr.event.Event;
+
+/**
+ * Created by kerry on 2020-12-11
+ */
+public enum JTemplateEvent implements Event<JTemplate> {
+    /**
+     * 模板初始化之前
+     */
+    BEFORE_TEMPLATE_INIT,
+
+    /**
+     * 模板激活之前
+     */
+    BEFORE_TEMPLATE_ACTIVE
+
+}

designer-base/src/main/java/com/fr/design/mainframe/JVirtualTemplate.java

@@ -208,6 +208,7 @@ public class JVirtualTemplate extends JTemplate {
 
     @Override
     public void activeJTemplate(int index, JTemplate jt) {
+        beforeActive();
         List<JTemplate<?, ?>> historyList = HistoryTemplateListPane.getInstance().getHistoryList();
         historyList.set(index, jt);
         DesignerContext.getDesignerFrame().addAndActivateJTemplate(jt);
@@ -217,11 +218,13 @@ public class JVirtualTemplate extends JTemplate {
 
     @Override
     public void activeOldJTemplate() {
+        beforeActive();
         DesignerContext.getDesignerFrame().openTemplate(this.getEditingFILE());
     }
 
     @Override
     public void activeNewJTemplate() {
+        beforeActive();
         DesignerContext.getDesignerFrame().openTemplate(this.getEditingFILE());
     }
 

designer-base/src/main/java/com/fr/design/present/dict/DictionaryPane.java

@@ -24,6 +24,13 @@ import java.util.List;
 public class DictionaryPane extends UIComboBoxPane<Dictionary> implements DataCreatorUI, Prepare4DataSourceChange {
     private TableDataDictPane tableDataDictPane;
 
+    public DictionaryPane() {
+    }
+
+    public DictionaryPane(boolean needTableDataChange) {
+        this.tableDataDictPane.setNeedTableDataChange(needTableDataChange);
+    }
+
     @Override
     protected void initLayout() {
         this.setLayout(new BorderLayout(0, 4));

designer-base/src/main/java/com/fr/design/present/dict/TableDataDictPane.java

@@ -31,17 +31,20 @@ import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.ComparatorUtils;
-
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.StringUtils;
 
-import javax.swing.*;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import java.awt.*;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.SwingWorker;
+import java.awt.BorderLayout;
+import java.awt.Component;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.ExecutionException;
 
 /**
  * 数据字典的数据查询面板
@@ -60,6 +63,8 @@ public class TableDataDictPane extends FurtherBasicBeanPane<TableDataDictionary>
     private DoubleDeckValueEditorPane valueDictPane;
     private ItemListener itemListener;
     private UIObserverListener uiObserverListener;
+    private FormulaEditor localFormulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula"));
+    private boolean needTableDataChange = true;
 
     public TableDataDictPane() {
         initBasicComponets();
@@ -67,6 +72,14 @@ public class TableDataDictPane extends FurtherBasicBeanPane<TableDataDictionary>
         iniListener();
     }
 
+    /**
+     * 设置为true后，一旦触发TableDataComboBox的itemChange，就会通过数据连接，更换当前数据字典的列名List
+     * @param needTableDataChange
+     */
+    public void setNeedTableDataChange(boolean needTableDataChange) {
+        this.needTableDataChange = needTableDataChange;
+    }
+
     public static void main(String[] args) {
         JFrame jf = new JFrame("test");
         jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
@@ -80,12 +93,10 @@ public class TableDataDictPane extends FurtherBasicBeanPane<TableDataDictionary>
 
     private void initBasicComponets() {
         tableDataNameComboBox = new TableDataComboBox(DesignTableDataManager.getEditingTableDataSource());
-        tableDataNameComboBox.addItemListener(new ItemListener() {
-            public void itemStateChanged(ItemEvent e) {
+        tableDataNameComboBox.addItemListener(e -> {
             if (e.getStateChange() == ItemEvent.SELECTED) {
                 tdChange(e);
             }
-            }
         });
 //        keyColumnPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor()});
         keyColumnPane = new DoubleDeckValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor()});
@@ -158,39 +169,58 @@ public class TableDataDictPane extends FurtherBasicBeanPane<TableDataDictionary>
         if (tableDataWrappe == null) {
             return;
         }
+        if (itemListener != null) {
+            itemListener.itemStateChanged(e);
+            localFormulaEditor.addChangeListener(event -> itemListener.itemStateChanged(e));
+        }
+        if (isNeedTableDataChange()) {
+            changeColumnsName();
+        }
+    }
+
+    private void changeColumnsName() {
+        TableDataWrapper tableDataWrappe = this.tableDataNameComboBox.getSelectedItem();
+        SwingWorker<List<String>, Object> worker = new SwingWorker<List<String>, Object>() {
+            @Override
+            protected List<String> doInBackground() {
+                if (tableDataWrappe == null) {
+                    return new ArrayList<>();
+                }
+                return tableDataWrappe.calculateColumnNameList();
+            }
 
-        List<String> namelist = tableDataWrappe.calculateColumnNameList();
+            @Override
+            protected void done() {
+                try {
+                    List<String> namelist = get();
                     String[] columnNames = null;
                     if (!namelist.isEmpty()) {
                         columnNames = namelist.toArray(ArrayUtils.EMPTY_STRING_ARRAY);
                     } else {
-            columnNames = new String[]{""};
+                        columnNames = new String[]{StringUtils.EMPTY};
+                    }
+                    // 实际值列名
+                    ColumnNameEditor actualColumnNameEditor = new ColumnNameEditor(columnNames);
+                    actualColumnNameEditor.addItemListener(itemListener);
+                    // 实际值列序号
+                    ColumnIndexEditor actualColumnIndexEditor = new ColumnIndexEditor(columnNames.length);
+                    actualColumnIndexEditor.addItemListener(itemListener);
+                    keyColumnPane.setEditors(new Editor[]{actualColumnNameEditor, actualColumnIndexEditor}, columnNames[0]);
+
+                    localFormulaEditor.setEnabled(true);
+                    // 显示值列名
+                    ColumnNameEditor displayColumnNameEditor = new ColumnNameEditor(columnNames);
+                    displayColumnNameEditor.addItemListener(itemListener);
+                    // 显示值列序号
+                    ColumnIndexEditor displayColumnIndexEditor = new ColumnIndexEditor(columnNames.length);
+                    displayColumnIndexEditor.addItemListener(itemListener);
+                    valueDictPane.setEditors(new Editor[]{displayColumnNameEditor, displayColumnIndexEditor, localFormulaEditor}, columnNames[0]);
+                } catch (InterruptedException | ExecutionException e) {
+                    FineLoggerFactory.getLogger().error(e.getMessage(), e);
                 }
-        ColumnNameEditor columnNameEditor1 = new ColumnNameEditor(columnNames);
-        columnNameEditor1.addItemListener(itemListener);
-        ColumnIndexEditor columnIndexEditor1 = new ColumnIndexEditor(columnNames.length);
-        columnIndexEditor1.addItemListener(itemListener);
-        keyColumnPane.setEditors(new Editor[]{columnNameEditor1, columnIndexEditor1}, columnNames[0]);
-
-        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula"));
-        formulaEditor.setEnabled(true);
-        formulaEditor.addChangeListener(new ChangeListener() {
-
-            @Override
-            public void stateChanged(ChangeEvent ee) {
-                if (itemListener != null) {
-                    itemListener.itemStateChanged(e);
-                }
-            }
-        });
-        ColumnNameEditor columnNameEditor2 = new ColumnNameEditor(columnNames);
-        columnNameEditor2.addItemListener(itemListener);
-        ColumnIndexEditor columnIndexEditor2 = new ColumnIndexEditor(columnNames.length);
-        columnIndexEditor2.addItemListener(itemListener);
-        valueDictPane.setEditors(new Editor[]{columnNameEditor2, columnIndexEditor2, formulaEditor}, columnNames[0]);
-        if (itemListener != null) {
-            itemListener.itemStateChanged(e);
             }
+        };
+        worker.execute();
     }
 
     @Override
@@ -374,4 +404,8 @@ public class TableDataDictPane extends FurtherBasicBeanPane<TableDataDictionary>
     public void registerDSChangeListener() {
         tableDataNameComboBox.registerGlobalDSChangeListener();
     }
+
+    public boolean isNeedTableDataChange() {
+        return needTableDataChange;
+    }
 }

designer-chart/src/main/java/com/fr/design/chartx/data/drillMap/DrillMapLayerPane.java

@@ -14,7 +14,7 @@ import com.fr.plugin.chart.type.MapType;
 import com.fr.plugin.chart.type.ZoomLevel;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 import com.fr.van.chart.drillmap.designer.data.comp.MapDataTree;
-import com.fr.van.chart.map.designer.type.VanChartMapSourceChoosePane;
+import com.fr.van.chart.map.designer.type.MapStatusPane;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
@@ -154,7 +154,7 @@ public class DrillMapLayerPane extends BasicBeanPane<VanChartDrillMapPlot> {
             rowSize[i + 1] = p;
             int d = i + 1;
             UILabel label = new UILabel(String.format("%s%d%s", Toolkit.i18nText("Fine-Design_Chart_Index_Article"), d, Toolkit.i18nText("Fine-Design_Chart_Index_Layer")));
-            UIComboBox level = new UIComboBox(VanChartMapSourceChoosePane.ZOOM_LEVELS);
+            UIComboBox level = new UIComboBox(MapStatusPane.ZOOM_LEVELS);
             level.setEnabled(i != 0);
             UIComboBox type = new UIComboBox(items);
             detailComps[i + 1] = new Component[]{label, level, type};

designer-chart/src/main/java/com/fr/van/chart/designer/PlotFactory.java

@@ -35,6 +35,7 @@ import com.fr.van.chart.designer.style.VanChartRangeLegendPane;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 import com.fr.van.chart.designer.style.VanLegendPaneWidthOutHighlight;
 import com.fr.van.chart.designer.style.label.VanChartGaugePlotLabelPane;
+import com.fr.van.chart.designer.style.label.VanChartPiePlotLabelPane;
 import com.fr.van.chart.designer.style.label.VanChartPlotLabelDetailPane;
 import com.fr.van.chart.designer.style.label.VanChartPlotLabelPane;
 import com.fr.van.chart.designer.style.tooltip.VanChartPlotRefreshTooltipPane;
@@ -209,6 +210,8 @@ public class PlotFactory {
     public static VanChartPlotLabelPane createPlotLabelPane(Plot plot, VanChartStylePane stylePane, boolean inCondition) {
         if (plot instanceof VanChartGaugePlot) {
             return new VanChartGaugePlotLabelPane(plot, stylePane);
+        } else if (plot instanceof PiePlot4VanChart) {
+            return new VanChartPiePlotLabelPane(plot, stylePane, inCondition);
         }
         return new VanChartPlotLabelPane(plot, stylePane, inCondition);
     }

designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderWithShapePane.java

@@ -46,6 +46,10 @@ public class VanChartBorderWithShapePane extends BasicPane {
         createBorderPane();
     }
 
+    public LineComboBox getLineTypeBox() {
+        return lineTypeBox;
+    }
+
     private void initComponents() {
         lineTypeBox = new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART);
         lineColorButton = new UIButtonGroup<>(new String[]{
@@ -106,7 +110,7 @@ public class VanChartBorderWithShapePane extends BasicPane {
         borderRadius.setEnabled(borderShape.getSelectedIndex() == RECTANGULAR_INDEX || borderShape.getSelectedIndex() == DIALOG_INDEX);
     }
 
-    private JPanel createLineTypePane() {
+    protected JPanel createLineTypePane() {
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
         double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;

designer-chart/src/main/java/com/fr/van/chart/designer/component/format/SummaryValueFormatPaneWithCheckBox.java

@@ -0,0 +1,23 @@
+package com.fr.van.chart.designer.component.format;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import javax.swing.JPanel;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2020-12-10
+ */
+public class SummaryValueFormatPaneWithCheckBox extends VanChartFormatPaneWithCheckBox {
+
+    public SummaryValueFormatPaneWithCheckBox(VanChartStylePane parent, JPanel showOnPane) {
+        super(parent, showOnPane);
+    }
+
+    @Override
+    protected String getCheckBoxText() {
+        return Toolkit.i18nText("Fine-Design_Chart_Use_Summary_Value");
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/designer/component/format/SummaryValueFormatPaneWithoutCheckBox.java

@@ -0,0 +1,23 @@
+package com.fr.van.chart.designer.component.format;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import javax.swing.JPanel;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2020-12-10
+ */
+public class SummaryValueFormatPaneWithoutCheckBox extends VanChartFormatPaneWithoutCheckBox {
+
+    public SummaryValueFormatPaneWithoutCheckBox(VanChartStylePane parent, JPanel showOnPane) {
+        super(parent, showOnPane);
+    }
+
+    protected String getCheckBoxText() {
+        return Toolkit.i18nText("Fine-Design_Chart_Use_Summary_Value");
+    }
+}
+

designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/gauge/VanChartGaugeDetailAxisPane.java

@@ -176,6 +176,7 @@ public class VanChartGaugeDetailAxisPane extends VanChartValueAxisPane {
             gaugeStyle = gaugePlot.getGaugeStyle();
             reLayoutPane(false);
             parent.initAllListeners();
+            setParentPane(parent);
         }
         populateBean(gaugePlot.getGaugeAxis());
     }

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

@@ -0,0 +1,64 @@
+package com.fr.van.chart.designer.style.label;
+
+import com.fr.chart.chartattr.Plot;
+import com.fr.design.gui.ibutton.UIButtonGroup;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.stable.Constants;
+import com.fr.van.chart.designer.TableLayout4VanChartHelper;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+import com.fr.van.chart.pie.style.VanChartPieCategoryLabelContentPane;
+
+import javax.swing.JPanel;
+import java.awt.Component;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2020-12-09
+ */
+public class VanChartPieCategoryLabelDetailPane extends VanChartPlotLabelDetailPane {
+
+    public VanChartPieCategoryLabelDetailPane(Plot plot, VanChartStylePane parent, boolean inCondition) {
+        super(plot, parent, inCondition);
+    }
+
+    protected void initToolTipContentPane(Plot plot) {
+        setDataLabelContentPane(new VanChartPieCategoryLabelContentPane(getParentPane(), this, isInCondition()));
+    }
+
+    protected JPanel createLabelPositionPane(String title, Plot plot) {
+        String[] positionName = new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Axis_Bottom"),
+                Toolkit.i18nText("Fine-Design_Form_Center"),
+                Toolkit.i18nText("Fine-Design_Chart_Axis_Top")
+        };
+
+        Integer[] positionValue = new Integer[]{Constants.BOTTOM, Constants.CENTER, Constants.TOP};
+
+        UIButtonGroup<Integer> position = new UIButtonGroup<>(positionName, positionValue);
+        setPosition(position);
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
+        double[] row = {p, p};
+        double[] col = {f, e};
+
+        Component[][] components = new Component[][]{
+                new Component[]{null, null},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Layout_Position")), position},
+        };
+
+        return TableLayoutHelper.createTableLayoutPane(components, row, col);
+    }
+
+    protected void checkPositionPane(String title) {
+
+    }
+
+    protected JPanel createBorderAndBackgroundPane() {
+        return null;
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.fr.van.chart.designer.style.label;
+
+import com.fr.chart.chartattr.Plot;
+import com.fr.design.i18n.Toolkit;
+import com.fr.plugin.chart.attr.plot.VanChartPlot;
+import com.fr.plugin.chart.base.AttrLabel;
+import com.fr.plugin.chart.base.AttrLabelDetail;
+import com.fr.van.chart.designer.TableLayout4VanChartHelper;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2020-12-09
+ */
+public class VanChartPiePlotLabelPane extends VanChartPlotLabelPane {
+
+    private VanChartPlotLabelDetailPane pieCategoryLabelPane;
+
+    public VanChartPiePlotLabelPane(Plot plot, VanChartStylePane parent, boolean inCondition) {
+        super(plot, parent, inCondition);
+    }
+
+    protected void createLabelPane() {
+        setLabelPane(new JPanel(new BorderLayout(0, 4)));
+        setLabelDetailPane(new VanChartPieValueLabelDetailPane(getPlot(), getParentPane(), isInCondition()));
+        JPanel valuePane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Value_Label"), getLabelDetailPane());
+        getLabelPane().add(valuePane, BorderLayout.NORTH);
+
+        if (!isInCondition()) {
+            pieCategoryLabelPane = new VanChartPieCategoryLabelDetailPane(getPlot(), getParentPane(), isInCondition());
+            JPanel categoryPane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Category_Label"), pieCategoryLabelPane);
+            getLabelPane().add(categoryPane, BorderLayout.CENTER);
+        }
+    }
+
+    public void populate(AttrLabel attrLabel) {
+        if (attrLabel == null) {
+            attrLabel = ((VanChartPlot) this.getPlot()).getDefaultAttrLabel();
+        }
+        super.populate(attrLabel);
+        if (pieCategoryLabelPane != null) {
+            AttrLabelDetail labelDetail = attrLabel.getSecondLabelDetail();
+            pieCategoryLabelPane.populate(labelDetail);
+        }
+    }
+
+    public AttrLabel update() {
+        AttrLabel attrLabel = super.update();
+        if (pieCategoryLabelPane != null) {
+            AttrLabelDetail labelDetail = attrLabel.getSecondLabelDetail();
+            pieCategoryLabelPane.update(labelDetail);
+        } else {
+            attrLabel.setSecondLabelDetail(null);
+        }
+        return attrLabel;
+    }
+}

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

@@ -0,0 +1,72 @@
+package com.fr.van.chart.designer.style.label;
+
+import com.fr.chart.chartattr.Plot;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.utils.gui.UIComponentUtils;
+import com.fr.design.widget.FRWidgetFactory;
+import com.fr.van.chart.designer.TableLayout4VanChartHelper;
+import com.fr.van.chart.designer.component.background.VanChartBackgroundWithOutImagePane;
+import com.fr.van.chart.designer.component.border.VanChartBorderWithShapePane;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+import com.fr.van.chart.pie.style.VanChartPieValueLabelContentPane;
+
+import javax.swing.JPanel;
+import java.awt.Component;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2020-12-09
+ */
+public class VanChartPieValueLabelDetailPane extends VanChartPlotLabelDetailPane {
+
+    public VanChartPieValueLabelDetailPane(Plot plot, VanChartStylePane parent, boolean inCondition) {
+        super(plot, parent, inCondition);
+    }
+
+    protected void initToolTipContentPane(Plot plot) {
+        setDataLabelContentPane(new VanChartPieValueLabelContentPane(getParentPane(), this, isInCondition()));
+    }
+
+    protected JPanel getLabelLayoutPane(JPanel panel, String title) {
+        return panel;
+    }
+
+    protected JPanel createLabelBorderPane() {
+        VanChartBorderWithShapePane borderPane = new VanChartBorderWithShapePane() {
+            @Override
+            protected JPanel createLineTypePane() {
+                double p = TableLayout.PREFERRED;
+                double f = TableLayout.FILL;
+                double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
+
+                double[] columnSize = {f, e};
+                double[] rowSize = {p};
+
+                Component[][] components = new Component[][]{
+                        new Component[]{FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Chart_Border")),
+                                UIComponentUtils.wrapWithBorderLayoutPane(getLineTypeBox())}};
+
+                return TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize);
+            }
+        };
+        setBorderPane(borderPane);
+        return borderPane;
+    }
+
+    protected JPanel createLabelBackgroundPane() {
+        VanChartBackgroundWithOutImagePane backgroundPane = new VanChartBackgroundWithOutImagePane() {
+            protected Component[][] getPaneComponents() {
+                return new Component[][]{
+                        new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_Utils_Background")), typeComboBox},
+                        new Component[]{null, centerPane},
+                        new Component[]{getTransparentLabel(), transparent},
+                };
+            }
+        };
+        setBackgroundPane(backgroundPane);
+        return backgroundPane;
+    }
+}

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

@@ -83,6 +83,19 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
         return parent;
     }
 
+    public void setPosition(UIButtonGroup<Integer> position) {
+        this.position = position;
+    }
+
+    public void setBorderPane(VanChartBorderWithShapePane borderPane) {
+        this.borderPane = borderPane;
+    }
+
+    public void setBackgroundPane(VanChartBackgroundWithOutImagePane backgroundPane) {
+        this.backgroundPane = backgroundPane;
+    }
+
+
     protected void initLabelDetailPane(Plot plot) {
         this.setLayout(new BorderLayout());
         initToolTipContentPane(plot);
@@ -137,7 +150,7 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
         };
     }
 
-    private JPanel createBorderAndBackgroundPane() {
+    protected JPanel createBorderAndBackgroundPane() {
         JPanel jPanel = new JPanel();
         jPanel.setLayout(new BorderLayout(0, 5));
         jPanel.add(createLabelBorderPane(), BorderLayout.NORTH);
@@ -145,14 +158,14 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
         return jPanel;
     }
 
-    private JPanel createLabelBorderPane() {
+    protected JPanel createLabelBorderPane() {
         borderPane = new VanChartBorderWithShapePane();
         borderPaneWithTitle = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Border"), borderPane);
 
         return borderPaneWithTitle;
     }
 
-    private JPanel createLabelBackgroundPane() {
+    protected JPanel createLabelBackgroundPane() {
         backgroundPane = new VanChartBackgroundWithOutImagePane() {
 
             protected Component[][] getPaneComponents() {

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

@@ -44,6 +44,10 @@ public class VanChartPlotLabelPane extends BasicPane {
         addComponents();
     }
 
+    public boolean isInCondition() {
+        return inCondition;
+    }
+
     public VanChartPlotLabelDetailPane getLabelDetailPane() {
         return labelDetailPane;
     }

designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/DrillMapLayerPane.java

@@ -14,7 +14,7 @@ import com.fr.plugin.chart.map.server.CompatibleGeoJSONTreeHelper;
 import com.fr.plugin.chart.type.MapType;
 import com.fr.plugin.chart.type.ZoomLevel;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
-import com.fr.van.chart.map.designer.type.VanChartMapSourceChoosePane;
+import com.fr.van.chart.map.designer.type.MapStatusPane;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
@@ -105,7 +105,7 @@ public class DrillMapLayerPane extends BasicScrollPane<ChartCollection> {
             rowSize[i + 1] = p;
             int d = i + 1;
             UILabel label = new UILabel(String.format("%s%d%s", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Index_Article"), d, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Index_Layer")));
-            UIComboBox level = new UIComboBox(VanChartMapSourceChoosePane.ZOOM_LEVELS);
+            UIComboBox level = new UIComboBox(MapStatusPane.ZOOM_LEVELS);
             level.setEnabled(i != 0);
             UIComboBox type = new UIComboBox(TEMP.get(oldMapType));
             detailComps[i + 1] = new Component[]{label, level, type};

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

@@ -8,11 +8,14 @@ import com.fr.plugin.chart.base.VanChartTools;
 import com.fr.plugin.chart.drillmap.DrillMapIndependentVanChart;
 import com.fr.plugin.chart.drillmap.VanChartDrillMapPlot;
 import com.fr.plugin.chart.drillmap.data.DrillMapDefinition;
+import com.fr.plugin.chart.map.designer.type.GEOJSONTreeHelper;
 import com.fr.plugin.chart.type.MapType;
 import com.fr.plugin.chart.type.ZoomLevel;
+import com.fr.van.chart.map.designer.type.GeoUrlPane;
 import com.fr.van.chart.map.designer.type.VanChartMapPlotPane;
 import com.fr.van.chart.map.designer.type.VanChartMapSourceChoosePane;
 
+import javax.swing.tree.TreeNode;
 import java.util.ArrayList;
 
 /**
@@ -32,8 +35,13 @@ public class VanChartDrillMapPlotPane extends VanChartMapPlotPane {
     protected VanChartMapSourceChoosePane createSourceChoosePane() {
         return new VanChartMapSourceChoosePane() {
             @Override
-            protected boolean supportParam(){
-                return false;
+            protected void initGeoUrlPane() {
+                setGeoUrlPane(new GeoUrlPane() {
+                    @Override
+                    protected TreeNode getRootNode() {
+                        return GEOJSONTreeHelper.getInstance().getRootNodeWithoutPara();
+                    }
+                });
             }
         };
     }

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

@@ -1,15 +0,0 @@
-package com.fr.van.chart.heatmap.designer.type;
-
-import com.fr.design.gui.ilable.UILabel;
-
-import com.fr.van.chart.map.designer.type.VanChartMapSourceChoosePane;
-
-/**
- * Created by Mitisky on 16/10/20.
- */
-public class VanChartHeatMapSourceChoosePane extends VanChartMapSourceChoosePane {
-    @Override
-    protected UILabel createSourceTitleLabel() {
-        return new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Area_And_Point"));
-    }
-}

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

@@ -3,6 +3,8 @@ package com.fr.van.chart.heatmap.designer.type;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.chartx.data.ChartDataDefinitionProvider;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.chart.attr.plot.VanChartPlot;
@@ -11,6 +13,7 @@ import com.fr.plugin.chart.heatmap.HeatMapIndependentVanChart;
 import com.fr.plugin.chart.heatmap.VanChartHeatMapPlot;
 import com.fr.plugin.chart.map.server.CompatibleGEOJSONHelper;
 import com.fr.plugin.chart.vanchart.VanChart;
+import com.fr.van.chart.map.designer.type.GeoUrlPane;
 import com.fr.van.chart.map.designer.type.VanChartMapPlotPane;
 import com.fr.van.chart.map.designer.type.VanChartMapSourceChoosePane;
 
@@ -27,7 +30,17 @@ public class VanChartHeatMapTypePane extends VanChartMapPlotPane {
 
     @Override
     protected VanChartMapSourceChoosePane createSourceChoosePane() {
-        return new VanChartHeatMapSourceChoosePane();
+        return new VanChartMapSourceChoosePane() {
+            @Override
+            protected void initGeoUrlPane() {
+                setGeoUrlPane(new GeoUrlPane() {
+                    @Override
+                    protected UILabel createSourceTitleLabel() {
+                        return new UILabel(Toolkit.i18nText("Fine-Design_Chart_Map_Area_And_Point"));
+                    }
+                });
+            }
+        };
     }
 
     //适用一种图表只有一种类型的
@@ -38,7 +51,6 @@ public class VanChartHeatMapTypePane extends VanChartMapPlotPane {
 
         boolean enabled = !CompatibleGEOJSONHelper.isDeprecated(plot.getGeoUrl());
         GUICoreUtils.setEnabled(this.getTypePane(), enabled);
-        GUICoreUtils.setEnabled(this.getSourceChoosePane().getSourceComboBox(), enabled);
 
         checkDemosBackground();
     }

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

@@ -0,0 +1,258 @@
+package com.fr.van.chart.map.designer.type;
+
+import com.fr.base.Parameter;
+import com.fr.decision.webservice.v10.map.geojson.helper.GEOJSONHelper;
+import com.fr.design.constants.LayoutConstants;
+import com.fr.design.event.UIObserver;
+import com.fr.design.event.UIObserverListener;
+import com.fr.design.file.HistoryTemplateListCache;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.icombobox.FRTreeComboBox;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.itextfield.UITextField;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.mainframe.JTemplate;
+import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.general.ComparatorUtils;
+import com.fr.general.IOUtils;
+import com.fr.plugin.chart.map.VanChartMapPlot;
+import com.fr.plugin.chart.map.designer.type.GEOJSONTreeHelper;
+import com.fr.plugin.chart.map.server.ChartGEOJSONHelper;
+import com.fr.plugin.chart.map.server.CompatibleGEOJSONHelper;
+import com.fr.plugin.chart.type.MapType;
+import com.fr.van.chart.designer.TableLayout4VanChartHelper;
+import com.fr.van.chart.drillmap.designer.data.comp.MapDataTree;
+import com.fr.workspace.WorkContext;
+
+import javax.swing.JPanel;
+import javax.swing.event.PopupMenuEvent;
+import javax.swing.event.PopupMenuListener;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.TreeNode;
+import javax.swing.tree.TreePath;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2020-12-07
+ */
+public class GeoUrlPane extends JPanel implements UIObserver {
+
+    private UILabel sourceTitleLabel;
+    private FRTreeComboBox sourceComboBox;
+    private MapDataTree mapDataTree;
+    private TreePath selectTreePath;
+
+    private UIObserverListener listener;
+
+    private String[] oldParams;
+
+    public GeoUrlPane() {
+        initComps();
+    }
+
+    private void initComps() {
+        this.setLayout(new BorderLayout());
+        this.add(createMapSourcesPane(), BorderLayout.CENTER);
+    }
+
+
+    @Override
+    public void registerChangeListener(UIObserverListener listener) {
+        this.listener = listener;
+    }
+
+    @Override
+    public boolean shouldResponseChangeListener() {
+        return true;
+    }
+
+    private JPanel createMapSourcesPane() {
+
+        mapDataTree = new MapDataTree(this.getRootNode());
+        mapDataTree.setEditable(false);
+        mapDataTree.selectDefaultTreeNode();
+        sourceComboBox = new FRTreeComboBox(mapDataTree, mapDataTree.getCellRenderer()) {
+            //搜索
+            protected void dealSamePath(TreePath parent, TreeNode node, UITextField textField) {
+                String searchText = textField.getText();
+                GeoUrlPane.this.mapDataTree.search(searchText);
+            }
+
+            //选中 tree---combobox
+            public void setSelectedItem(Object o) {
+                TreePath oldPath = mapDataTree.getSelectionPath();
+                Object oldText = getSelectedItem();
+                if (o != null && o instanceof TreePath) {
+                    selectTreePath = (TreePath) o;
+                    this.tree.setSelectionPath(selectTreePath);
+                    this.getModel().setSelectedItem(pathToString(selectTreePath));
+                    if (ComparatorUtils.equals(oldText, getSelectedItem()) && !ComparatorUtils.equals(oldPath, selectTreePath)) {
+                        //point的江苏省切换到area的江苏省
+                        listener.doChange();
+                    }
+                } else if (o instanceof String) {//list里面没有
+                    selectTreePath = null;
+                    this.tree.setSelectionPath(null);
+                    this.getModel().setSelectedItem(ChartGEOJSONHelper.getPresentNameWithPath((String) o));
+                }
+            }
+
+            @Override
+            protected String pathToString(TreePath path) {
+                DefaultMutableTreeNode node = (DefaultMutableTreeNode) path.getLastPathComponent();
+                //不显示后缀
+                return ChartGEOJSONHelper.getPresentNameWithPath(node.toString());
+            }
+
+            @Override
+            protected boolean customSelectable(DefaultMutableTreeNode node) {
+                return GEOJSONTreeHelper.isSelectableTreeNode(node);
+            }
+        };
+        sourceComboBox.setEditable(true);
+        sourceComboBox.setOnlyLeafSelectable(false);
+        sourceComboBox.addPopupMenuListener(popupMenuListener);
+        sourceTitleLabel = createSourceTitleLabel();
+
+
+        boolean hasRefreshButton = !WorkContext.getCurrent().isLocal();
+        UIButton button = new UIButton(IOUtils.readIcon("/com/fr/design/images/control/refresh.png"));
+        button.setToolTipText(Toolkit.i18nText("Fine-Design_Chart_Update_Remote_Map_JSON"));
+        button.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                GEOJSONHelper.reset();
+                GEOJSONHelper.getInstance();
+            }
+        });
+
+        double p = TableLayout.PREFERRED;
+        double d = TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH;
+        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
+        double f = TableLayout.FILL;
+        double[] rowSize = {p, p};
+        double[] columnSize = hasRefreshButton ? new double[]{d + 10, e - 20, 20} : new double[]{f, e};
+
+        Component[] comps = hasRefreshButton
+                ? new Component[]{sourceTitleLabel, sourceComboBox, button}
+                : new Component[]{sourceTitleLabel, sourceComboBox};
+
+        double hGap = hasRefreshButton ? 0 : TableLayout4VanChartHelper.COMPONENT_INTERVAL;
+        Component[][] components = new Component[][]{
+                new Component[]{null, null},
+                comps,
+        };
+        return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, hGap, LayoutConstants.VGAP_LARGE);
+    }
+
+    protected UILabel createSourceTitleLabel() {
+        return new UILabel(Toolkit.i18nText("Fine-Design_Chart_Map_Area"));
+    }
+
+    protected TreeNode getRootNode() {
+        return GEOJSONTreeHelper.getInstance().getRootNodeWithPara();
+    }
+
+    private String[] getParamsName() {
+        JTemplate jTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+
+        if (jTemplate == null) {
+            return new String[0];
+        }
+
+        Parameter[] parameters = jTemplate.getJTemplateParameters();
+
+        int len = parameters.length;
+        String[] names = new String[len];
+
+        for (int i = 0; i < len; i++) {
+            names[i] = parameters[i].getName();
+        }
+
+        return names;
+    }
+
+    private PopupMenuListener popupMenuListener = new PopupMenuListener() {
+        public void popupMenuCanceled(PopupMenuEvent e) {
+        }
+
+        public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
+        }
+
+        public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
+
+            GEOJSONTreeHelper.reset();
+            mapDataTree.changeRootNode(GeoUrlPane.this.getRootNode());
+            GEOJSONTreeHelper.getInstance().updateParamRootNode(GeoUrlPane.this.getParamsName());
+
+            if (selectTreePath != null) {
+                mapDataTree.setSelectNodePath(CompatibleGEOJSONHelper.completeJSONName(selectTreePath.getLastPathComponent().toString()));
+                selectTreePath = mapDataTree.getSelectionPath();
+            }
+
+            mapDataTree.updateUI();//因为服务器那边可能随时编辑,所以这边要重画
+            mapDataTree.setSelectionPath(selectTreePath);
+            mapDataTree.scrollPathToVisible(selectTreePath);
+        }
+    };
+
+    public void populate(VanChartMapPlot mapPlot) {
+        resetComponentValue(mapPlot, false);
+        String geoUrl = mapPlot.getGeoUrl();
+        mapDataTree.setSelectNodePath(geoUrl);
+        selectTreePath = mapDataTree.getSelectionPath();
+
+        if (selectTreePath == null) {//此url当前环境没有
+            sourceComboBox.setSelectedItem(geoUrl);
+        } else {
+            sourceComboBox.setSelectedItem(selectTreePath);
+        }
+        boolean enabled = !CompatibleGEOJSONHelper.isDeprecated(mapPlot.getGeoUrl());
+        GUICoreUtils.setEnabled(sourceComboBox, enabled);
+    }
+
+    public String update() {
+        return mapDataTree.getSelectNodeJSONPath();
+    }
+
+    protected void resetComponentValue(VanChartMapPlot mapPlot, boolean samePlotChange) {
+        MapType mapType = mapPlot.getMapType();
+
+        //获取最新的参数
+        String[] params = getParamsName();
+
+        if (!ComparatorUtils.equals(oldParams, params)) {
+            oldParams = params;
+            GEOJSONTreeHelper.getInstance().updateParamRootNode(params);
+        }
+
+        mapDataTree.changeRootNode(this.getRootNode());
+        if (samePlotChange) {
+            String nodePath = ChartGEOJSONHelper.getDefaultJSONURL();
+            mapPlot.setGeoUrl(nodePath);
+            mapDataTree.setSelectNodePath(nodePath);
+            selectTreePath = mapDataTree.getSelectionPath();
+            sourceComboBox.setSelectedItem(selectTreePath);
+        }
+        switch (mapType) {
+            case CUSTOM:
+                sourceTitleLabel.setText(Toolkit.i18nText("Fine-Design_Chart_Map_Area_And_Point"));
+                break;
+            case POINT:
+                sourceTitleLabel.setText(Toolkit.i18nText("Fine-Design_Chart_Map_Point"));
+                break;
+            case LINE:
+                sourceTitleLabel.setText(Toolkit.i18nText("Fine-Design_Chart_Map_Point"));
+                break;
+            default:
+                sourceTitleLabel.setText(Toolkit.i18nText("Fine-Design_Chart_Map_Area"));
+        }
+    }
+}

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

@@ -0,0 +1,303 @@
+package com.fr.van.chart.map.designer.type;
+
+import com.fr.base.Utils;
+import com.fr.design.event.UIObserver;
+import com.fr.design.event.UIObserverListener;
+import com.fr.design.gui.ibutton.UIButtonGroup;
+import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.general.ComparatorUtils;
+import com.fr.plugin.chart.base.GisLayer;
+import com.fr.plugin.chart.map.VanChartMapPlot;
+import com.fr.plugin.chart.map.server.MapLayerConfigManager;
+import com.fr.plugin.chart.type.GISLayerType;
+import com.fr.plugin.chart.type.GaoDeGisType;
+import com.fr.plugin.chart.type.ZoomLevel;
+import com.fr.van.chart.designer.TableLayout4VanChartHelper;
+
+import javax.swing.BorderFactory;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JPanel;
+import javax.swing.event.PopupMenuEvent;
+import javax.swing.event.PopupMenuListener;
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.event.ItemEvent;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2020-12-07
+ */
+public class GisLayerPane extends JPanel implements UIObserver {
+
+    private UIButtonGroup gisButton;
+    private JPanel layerPaneCheckPane;
+    private UIComboBox gisGaoDeLayer;
+    private UIComboBox gisLayer;
+    private JPanel layerCardPane;
+
+    private WMSLayerPane wmsLayerPane;
+    private TileLayerPane tileLayerPane;
+
+    private UIComboBox zoomLevel;
+
+    private String[] layers = MapLayerConfigManager.getLayerItems();
+
+    public GisLayerPane() {
+        initComps();
+    }
+
+    private void initComps() {
+        this.setLayout(new BorderLayout());
+        this.add(createGISLayerPane(), BorderLayout.CENTER);
+    }
+
+    @Override
+    public void registerChangeListener(UIObserverListener listener) {
+        this.wmsLayerPane.registerChangeListener(listener);
+    }
+
+    @Override
+    public boolean shouldResponseChangeListener() {
+        return true;
+    }
+
+    public void registerZoomLevel(UIComboBox zoomLevel) {
+        this.zoomLevel = zoomLevel;
+    }
+
+    private boolean isStandardGis() {
+        return gisButton.getSelectedIndex() == 0;
+    }
+
+
+    private JPanel createGISLayerPane() {
+        gisButton = new UIButtonGroup(new String[]{Toolkit.i18nText("Fine-Design_Form_Widget_Style_Standard"), Toolkit.i18nText("Fine-Design_Chart_Custom")});
+        gisGaoDeLayer = new UIComboBox(MapLayerConfigManager.getGaoDeLayerItems());
+        gisButton.addActionListener(event -> {
+            refreshZoomLevel();
+            checkLayerCardPane();
+        });
+
+        gisGaoDeLayer.addItemListener(event -> refreshZoomLevel());
+
+        initCustomGISLayerPane();
+        initLayerCardPane();
+
+        layerPaneCheckPane = new JPanel(new CardLayout()) {
+            @Override
+            public Dimension getPreferredSize() {
+                if (isStandardGis()) {
+                    return gisGaoDeLayer.getPreferredSize();
+                } else {
+                    return gisLayer.getPreferredSize();
+                }
+            }
+        };
+        layerPaneCheckPane.add(gisGaoDeLayer, "standard");
+        layerPaneCheckPane.add(gisLayer, "custom");
+
+
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
+        double[] row = {p, p, p};
+        double[] col = {f, e};
+
+        Component[][] components = new Component[][]{
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Gis_Layer")), gisButton},
+                new Component[]{null, layerPaneCheckPane},
+                new Component[]{layerCardPane, null},
+        };
+
+        JPanel panel = TableLayoutHelper.createTableLayoutPane(components, row, col);
+        panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
+        return panel;
+    }
+
+    private void initLayerCardPane() {
+        tileLayerPane = new TileLayerPane();
+        wmsLayerPane = new WMSLayerPane();
+
+        layerCardPane = new JPanel(new CardLayout()) {
+            @Override
+            public Dimension getPreferredSize() {
+                if (isStandardGis()) {
+                    return new Dimension(0, 0);
+                }
+                String itemName = Utils.objectToString(gisLayer.getSelectedItem());
+                if (MapLayerConfigManager.isCustomLayer(itemName)) {
+                    return tileLayerPane.getPreferredSize();
+                } else if (MapLayerConfigManager.isCustomWmsLayer(itemName)) {
+                    return wmsLayerPane.getPreferredSize();
+                }
+                return new Dimension(0, 0);
+            }
+        };
+
+        for (String itemName : layers) {
+            JPanel pane = new JPanel();
+            if (MapLayerConfigManager.isCustomLayer(itemName)) {
+                pane = tileLayerPane;
+            } else if (MapLayerConfigManager.isCustomWmsLayer(itemName)) {
+                pane = wmsLayerPane;
+            }
+            layerCardPane.add(pane, itemName);
+        }
+    }
+
+    private void initCustomGISLayerPane() {
+        gisLayer = new UIComboBox(layers);
+
+        gisLayer.addItemListener(e ->
+                {
+                    if (e.getStateChange() == ItemEvent.SELECTED) {
+                        checkCustomLayerCardPane();
+                    }
+                    refreshZoomLevel();
+                }
+        );
+
+        gisLayer.addPopupMenuListener(new PopupMenuListener() {
+            public void popupMenuCanceled(PopupMenuEvent e) {
+            }
+
+            public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
+            }
+
+            public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
+
+                String selected = Utils.objectToString(gisLayer.getSelectedItem());
+                ZoomLevel zoomSelected = (ZoomLevel) zoomLevel.getSelectedItem();
+
+                gisLayer.setModel(new DefaultComboBoxModel(MapLayerConfigManager.getLayerItems()));
+
+                gisLayer.setSelectedItem(selected);
+                zoomLevel.setSelectedItem(zoomSelected);
+            }
+        });
+    }
+
+    private void refreshZoomLevel() {
+        //gis图层不同，对应的缩放等级不同。
+        ZoomLevel[] levels;
+        if (isStandardGis()) {
+            if (gisGaoDeLayer.getSelectedIndex() == gisGaoDeLayer.getItemCount() - 1) {
+                levels = MapStatusPane.ZOOM_LEVELS;
+            } else {
+                levels = MapStatusPane.GAODE_ZOOM_LEVELS;
+            }
+        } else {
+            if (ComparatorUtils.equals(gisLayer.getSelectedItem(), Toolkit.i18nText("Fine-Design_Chart_Layer_Blue"))) {
+                levels = MapStatusPane.BLUE_ZOOM_LEVELS;
+            } else if (ComparatorUtils.equals(gisLayer.getSelectedItem(), Toolkit.i18nText("Fine-Design_Chart_Layer_GaoDe"))) {
+                levels = MapStatusPane.GAODE_ZOOM_LEVELS;
+            } else {
+                levels = MapStatusPane.ZOOM_LEVELS;
+            }
+        }
+        zoomLevel.setModel(new DefaultComboBoxModel(levels));
+    }
+
+
+    private void checkLayerCardPane() {
+        CardLayout cardLayout = (CardLayout) layerPaneCheckPane.getLayout();
+        cardLayout.show(layerPaneCheckPane, isStandardGis() ? "standard" : "custom");
+    }
+
+    private void checkCustomLayerCardPane() {
+        CardLayout cardLayout = (CardLayout) layerCardPane.getLayout();
+        cardLayout.show(layerCardPane, Utils.objectToString(gisLayer.getSelectedItem()));
+    }
+
+    public void resetGisLayer(VanChartMapPlot mapPlot) {
+        //TODO Bjorn 地图gis图层自动逻辑
+       /* mapPlot.getGisLayer().setGisLayerType(GISLayerType.AUTO);
+        mapPlot.getGisLayer().setLayerName(GISLayerType.getLocString(GISLayerType.AUTO));*/
+
+        GaoDeGisType gaoDeGisType= mapPlot.getDefaultGisLayerType();
+
+        mapPlot.getGisLayer().setGisLayerType(GISLayerType.GAO_DE_API);
+        mapPlot.getGisLayer().setLayerName(gaoDeGisType.getTypeName());
+        mapPlot.getGisLayer().setGaoDeGisType(gaoDeGisType);
+        populate(mapPlot.getGisLayer());
+    }
+
+    public void populate(GisLayer layer) {
+        switch (layer.getGisLayerType()) {
+            case GAO_DE_API:
+            case LAYER_NULL:
+                populateStandardGis(layer);
+                break;
+            default:
+                populateCustomGis(layer);
+        }
+        refreshZoomLevel();
+
+        checkCustomLayerCardPane();
+        checkLayerCardPane();
+    }
+
+    private void populateStandardGis(GisLayer layer) {
+        gisButton.setSelectedIndex(0);
+        if (layer.getGisLayerType() == GISLayerType.LAYER_NULL) {
+            gisGaoDeLayer.setSelectedIndex(gisGaoDeLayer.getItemCount() - 1);
+        } else {
+            gisGaoDeLayer.setSelectedItem(layer.getGaoDeGisType().getTypeName());
+        }
+    }
+
+    private void populateCustomGis(GisLayer layer) {
+        gisButton.setSelectedIndex(1);
+        gisLayer.setSelectedItem(layer.getShowItemName());
+
+        switch (layer.getGisLayerType()) {
+            case CUSTOM_WMS_LAYER:
+                wmsLayerPane.populate(layer);
+                break;
+            case CUSTOM_TILE_LAYER:
+                tileLayerPane.populate(layer);
+                break;
+        }
+    }
+
+    public void update(GisLayer layer) {
+        if (isStandardGis()) {
+            updateStandardGis(layer);
+        } else {
+            updateCustomGis(layer);
+        }
+    }
+
+    private void updateStandardGis(GisLayer layer) {
+        String layerName = Utils.objectToString(gisGaoDeLayer.getSelectedItem());
+        layer.setLayerName(layerName);
+        if (gisGaoDeLayer.getSelectedIndex() == gisGaoDeLayer.getItemCount() - 1) {
+            layer.setGisLayerType(MapLayerConfigManager.getGisLayerType(layerName));
+        } else {
+            layer.setGisLayerType(GISLayerType.GAO_DE_API);
+            layer.setGaoDeGisType(GaoDeGisType.parseByLocaleName(layerName));
+        }
+    }
+
+    private void updateCustomGis(GisLayer layer) {
+        String layerName = Utils.objectToString(gisLayer.getSelectedItem());
+        layer.setLayerName(layerName);
+        layer.setGisLayerType(MapLayerConfigManager.getGisLayerType(layerName));
+
+        switch (layer.getGisLayerType()) {
+            case CUSTOM_WMS_LAYER:
+                wmsLayerPane.update(layer);
+                break;
+            case CUSTOM_TILE_LAYER:
+                tileLayerPane.update(layer);
+                break;
+        }
+    }
+}

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

@@ -0,0 +1,167 @@
+package com.fr.van.chart.map.designer.type;
+
+import com.fr.design.gui.ibutton.UIButtonGroup;
+import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.ispinner.UISpinner;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.TableLayout;
+import com.fr.plugin.chart.base.ViewCenter;
+import com.fr.plugin.chart.map.VanChartMapPlot;
+import com.fr.plugin.chart.type.ZoomLevel;
+import com.fr.stable.ArrayUtils;
+import com.fr.van.chart.designer.TableLayout4VanChartHelper;
+
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2020-12-07
+ */
+public class MapStatusPane extends JPanel {
+
+    public static final ZoomLevel[] ZOOM_LEVELS = new ZoomLevel[]{
+            ZoomLevel.AUTO,
+            ZoomLevel.ZERO, ZoomLevel.ZEROPOINTFIVE,
+            ZoomLevel.ONE, ZoomLevel.ONEPOINTFIVE,
+            ZoomLevel.TWO, ZoomLevel.TWOPOINTFIVE,
+            ZoomLevel.THREE, ZoomLevel.THREEPOINTFIVE,
+            ZoomLevel.FOUR, ZoomLevel.FOURPOINTFIVE,
+            ZoomLevel.FIVE, ZoomLevel.FIVEPOINTFIVE,
+            ZoomLevel.SIX, ZoomLevel.SIXPOINTFIVE,
+            ZoomLevel.SEVEN, ZoomLevel.SEVENPOINTFIVE,
+            ZoomLevel.EIGHT, ZoomLevel.EIGHTPOINTFIVE,
+            ZoomLevel.NINE, ZoomLevel.NINEPOINTFIVE,
+            ZoomLevel.TEN, ZoomLevel.TENPOINTFIVE,
+            ZoomLevel.ELEVEN, ZoomLevel.ELEVENTPOINTFIVE,
+            ZoomLevel.TWELVE, ZoomLevel.TWELVEPOINTFIVE,
+            ZoomLevel.THIRTEEN, ZoomLevel.THIRTEENPOINTFIVE,
+            ZoomLevel.FOURTEEN, ZoomLevel.FOURTEENPOINTFIVE,
+            ZoomLevel.FIFTEEN, ZoomLevel.FIFTEENPOINTFIVE,
+            ZoomLevel.SIXTEEN, ZoomLevel.SIXTEENPOINTFIVE,
+            ZoomLevel.SEVENTEEN, ZoomLevel.SEVENTEENPOINTFIVE,
+            ZoomLevel.EIGHTEEN
+    };
+    //深蓝和高德地图下拉框层级
+    public static final ZoomLevel[] BLUE_ZOOM_LEVELS = ArrayUtils.subarray(ZOOM_LEVELS, 0, 34);
+    public static final ZoomLevel[] GAODE_ZOOM_LEVELS = ArrayUtils.addAll(new ZoomLevel[]{ZoomLevel.AUTO}, (ZoomLevel[]) ArrayUtils.subarray(ZOOM_LEVELS, 7, 38));
+    private static final String AUTO_CENTER_STRING = Toolkit.i18nText("Fine-Design_Chart_Automatic");
+    private static final String CUSTOM_CENTER_STRING = Toolkit.i18nText("Fine-Design_Chart_Custom");
+
+
+    private JPanel levelAndCenterPane;
+    private JPanel longAndLatPane;
+
+    private UIComboBox zoomLevel;
+    private UIButtonGroup viewCenterCom;
+    private UISpinner longitude;
+    private UISpinner latitude;
+
+    public MapStatusPane() {
+        initComps();
+    }
+
+    public UIComboBox getZoomLevel() {
+        return zoomLevel;
+    }
+
+    private void initComps() {
+        zoomLevel = new UIComboBox(ZOOM_LEVELS);
+        viewCenterCom = new UIButtonGroup(new String[]{AUTO_CENTER_STRING, CUSTOM_CENTER_STRING});
+        longitude = new UISpinner(-Double.MAX_VALUE, Double.MAX_VALUE, 1, 0.0);
+        latitude = new UISpinner(-Double.MAX_VALUE, Double.MAX_VALUE, 1, 0.0);
+
+        double p = TableLayout.PREFERRED;
+        double d = TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH;
+        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
+        double s = TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH;
+        double[] rowSize = {p, p, p};
+        double[] columnSize = {d, e};
+        double[] column = {d, s};
+
+        Component[][] comps = new Component[][]{
+                new Component[]{null, null},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Zoom_Layer")), zoomLevel},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_View_Center")), viewCenterCom},
+        };
+        levelAndCenterPane = TableLayout4VanChartHelper.createGapTableLayoutPane(comps, rowSize, columnSize);
+
+        Component[][] longAndLatComps = new Component[][]{
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Longitude")), longitude},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Latitude")), latitude}
+        };
+        longAndLatPane = TableLayout4VanChartHelper.createGapTableLayoutPane(longAndLatComps, rowSize, column);
+        longAndLatPane.setBorder(BorderFactory.createEmptyBorder(0, 12, 0, 0));
+        longAndLatPane.setVisible(false);
+
+        this.setLayout(new BorderLayout(0, 6));
+
+        this.add(levelAndCenterPane, BorderLayout.NORTH);
+        this.add(longAndLatPane, BorderLayout.CENTER);
+
+        viewCenterCom.addActionListener(event ->
+                longAndLatPane.setVisible(!isAutoViewCenter()));
+    }
+
+    @Override
+    public Dimension getPreferredSize() {
+        if (longAndLatPane.isVisible()) {
+            return super.getPreferredSize();
+        } else {
+            return levelAndCenterPane.getPreferredSize();
+        }
+    }
+
+    private boolean isAutoViewCenter() {
+        return viewCenterCom.getSelectedIndex() == 0;
+    }
+
+
+    public void resetViewCenter(VanChartMapPlot mapPlot) {
+        mapPlot.setViewCenter(new ViewCenter());
+        viewCenterCom.setSelectedIndex(0);
+        longitude.setValue(0);
+        latitude.setValue(0);
+        longAndLatPane.setVisible(false);
+    }
+
+    public void resetZoomLevel(VanChartMapPlot mapPlot) {
+        mapPlot.setZoomLevel(ZoomLevel.AUTO);
+        zoomLevel.setSelectedItem(mapPlot.getZoomLevel());
+    }
+
+    public void populate(VanChartMapPlot mapPlot) {
+        zoomLevel.setSelectedItem(mapPlot.getZoomLevel());
+
+        ViewCenter viewCenter = mapPlot.getViewCenter();
+        if (viewCenter.isAuto()) {
+            viewCenterCom.setSelectedIndex(0);
+            longitude.setValue(0);
+            latitude.setValue(0);
+        } else {
+            viewCenterCom.setSelectedIndex(1);
+            longitude.setValue(viewCenter.getLongitude());
+            latitude.setValue(viewCenter.getLatitude());
+        }
+
+        longAndLatPane.setVisible(!isAutoViewCenter());
+    }
+
+    public void update(VanChartMapPlot mapPlot) {
+        mapPlot.setZoomLevel((ZoomLevel) zoomLevel.getSelectedItem());
+
+        ViewCenter viewCenter = mapPlot.getViewCenter();
+        if (isAutoViewCenter()) {
+            viewCenter.setAuto(true);
+        } else {
+            viewCenter.setAuto(false);
+            viewCenter.setLongitude(longitude.getValue());
+            viewCenter.setLatitude(latitude.getValue());
+        }
+    }
+}

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

@@ -0,0 +1,51 @@
+package com.fr.van.chart.map.designer.type;
+
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.itextarea.UITextArea;
+import com.fr.design.layout.TableLayout;
+import com.fr.plugin.chart.base.GisLayer;
+import com.fr.van.chart.designer.TableLayout4VanChartHelper;
+
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Component;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2020-12-07
+ */
+public class TileLayerPane extends JPanel {
+
+    private UITextArea customTileLayer;
+    private UITextArea attribution;
+
+
+    public TileLayerPane() {
+        double p = TableLayout.PREFERRED;
+        double[] rowSize = {p, p};
+        double[] COLUMN_SIZE = {TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH - 3};
+
+        customTileLayer = new UITextArea();
+        attribution = new UITextArea();
+        Component[][] comps = new Component[][]{
+                new Component[]{new UILabel("url"), customTileLayer},
+                new Component[]{new UILabel("Attribution"), attribution}
+        };
+        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(comps, rowSize, COLUMN_SIZE);
+        panel.setBorder(TableLayout4VanChartHelper.SECOND_EDIT_AREA_BORDER);
+
+        this.setLayout(new BorderLayout());
+        this.add(panel, BorderLayout.CENTER);
+    }
+
+    public void populate(GisLayer layer) {
+        customTileLayer.setText(layer.getCustomTileLayer());
+        attribution.setText(layer.getAttribution());
+    }
+
+    public void update(GisLayer layer) {
+        layer.setCustomTileLayer(customTileLayer.getText());
+        layer.setAttribution(attribution.getText());
+    }
+}

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

@@ -78,7 +78,6 @@ public class VanChartMapPlotPane extends AbstractVanChartTypePane {
 
         boolean enabled = !CompatibleGEOJSONHelper.isDeprecated(plot.getGeoUrl());
         GUICoreUtils.setEnabled(this.getTypePane(), enabled);
-        GUICoreUtils.setEnabled(this.sourceChoosePane.getSourceComboBox(), enabled);
 
         checkDemosBackground();
     }

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

@@ -1,152 +1,37 @@
 package com.fr.van.chart.map.designer.type;
 
-import com.fr.base.Parameter;
-import com.fr.base.Utils;
-import com.fr.decision.webservice.v10.map.WMSFactory;
-import com.fr.decision.webservice.v10.map.geojson.helper.GEOJSONHelper;
-import com.fr.design.constants.LayoutConstants;
-import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.event.UIObserver;
 import com.fr.design.event.UIObserverListener;
-import com.fr.design.file.HistoryTemplateListPane;
-import com.fr.design.gui.ibutton.UIButton;
-import com.fr.design.gui.ibutton.UIButtonGroup;
-import com.fr.design.gui.icheckbox.UICheckBox;
-import com.fr.design.gui.icombobox.FRTreeComboBox;
-import com.fr.design.gui.icombobox.UIComboBox;
-import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.gui.ispinner.UISpinner;
-import com.fr.design.gui.itextarea.UITextArea;
-import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
-import com.fr.design.mainframe.JTemplate;
-import com.fr.general.ComparatorUtils;
-import com.fr.general.IOUtils;
-import com.fr.general.http.HttpClient;
-import com.fr.plugin.chart.base.GisLayer;
-import com.fr.plugin.chart.base.ViewCenter;
 import com.fr.plugin.chart.map.VanChartMapPlot;
-import com.fr.plugin.chart.map.designer.type.GEOJSONTreeHelper;
-import com.fr.plugin.chart.map.layer.WMSLayer;
-import com.fr.plugin.chart.map.server.ChartGEOJSONHelper;
 import com.fr.plugin.chart.map.server.CompatibleGEOJSONHelper;
-import com.fr.plugin.chart.map.server.MapLayerConfigManager;
-import com.fr.plugin.chart.type.GISLayerType;
-import com.fr.plugin.chart.type.MapType;
-import com.fr.plugin.chart.type.ZoomLevel;
-import com.fr.stable.ArrayUtils;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
-import com.fr.van.chart.drillmap.designer.data.comp.MapDataTree;
-import com.fr.workspace.WorkContext;
 
 import javax.swing.BorderFactory;
-import javax.swing.DefaultComboBoxModel;
 import javax.swing.JPanel;
-import javax.swing.SwingConstants;
-import javax.swing.SwingWorker;
-import javax.swing.event.PopupMenuEvent;
-import javax.swing.event.PopupMenuListener;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.TreeNode;
-import javax.swing.tree.TreePath;
-import java.util.ArrayList;
-import java.util.List;
 import java.awt.BorderLayout;
-import java.awt.CardLayout;
 import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
 
 /**
  * Created by Mitisky on 16/5/11.
  * 地图类型选择面板,关于json资源路径/gis图层等设置面板
  */
 public class VanChartMapSourceChoosePane extends JPanel implements UIObserver {
-    private static final double[] COLUMN_SIZE = {48, TableLayout.FILL, TableLayout.PREFERRED};
 
-    public static final ZoomLevel[] ZOOM_LEVELS = new ZoomLevel[]{
-            ZoomLevel.AUTO,
-            ZoomLevel.ZERO, ZoomLevel.ZEROPOINTFIVE,
-            ZoomLevel.ONE, ZoomLevel.ONEPOINTFIVE,
-            ZoomLevel.TWO, ZoomLevel.TWOPOINTFIVE,
-            ZoomLevel.THREE, ZoomLevel.THREEPOINTFIVE,
-            ZoomLevel.FOUR, ZoomLevel.FOURPOINTFIVE,
-            ZoomLevel.FIVE, ZoomLevel.FIVEPOINTFIVE,
-            ZoomLevel.SIX, ZoomLevel.SIXPOINTFIVE,
-            ZoomLevel.SEVEN, ZoomLevel.SEVENPOINTFIVE,
-            ZoomLevel.EIGHT, ZoomLevel.EIGHTPOINTFIVE,
-            ZoomLevel.NINE, ZoomLevel.NINEPOINTFIVE,
-            ZoomLevel.TEN, ZoomLevel.TENPOINTFIVE,
-            ZoomLevel.ELEVEN, ZoomLevel.ELEVENTPOINTFIVE,
-            ZoomLevel.TWELVE, ZoomLevel.TWELVEPOINTFIVE,
-            ZoomLevel.THIRTEEN, ZoomLevel.THIRTEENPOINTFIVE,
-            ZoomLevel.FOURTEEN, ZoomLevel.FOURTEENPOINTFIVE,
-            ZoomLevel.FIFTEEN, ZoomLevel.FIFTEENPOINTFIVE,
-            ZoomLevel.SIXTEEN, ZoomLevel.SIXTEENPOINTFIVE,
-            ZoomLevel.SEVENTEEN, ZoomLevel.SEVENTEENPOINTFIVE,
-            ZoomLevel.EIGHTEEN
-    };
-    //深蓝和高德地图下拉框层级
-    private static final ZoomLevel[] BLUE_ZOOM_LEVELS =(ZoomLevel[]) ArrayUtils.subarray(ZOOM_LEVELS, 0, 34);
-    private static final ZoomLevel[] GAODE_ZOOM_LEVELS =ArrayUtils.addAll(new ZoomLevel[]{ZoomLevel.AUTO}, (ZoomLevel[])ArrayUtils.subarray(ZOOM_LEVELS, 7, 38));
-    private static final String AUTO_CENTER_STRING = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Automatic");
-    private static final String CUSTOM_CENTER_STRING = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom");
-
-    private UILabel sourceTitleLabel;
-    private FRTreeComboBox sourceComboBox;
-    private MapDataTree mapDataTree;
-    private TreePath selectTreePath;
-
-    private UIComboBox gisLayer;
-    private JPanel layerCardPane;
-
-    private UITextArea wmsUrl;
-    private UIButton connectButton;
-    private JPanel wmsLayerPane;
 
-    private java.util.List<UICheckBox> wmsLayerCheckBoxs = new ArrayList<UICheckBox>();
+    private GeoUrlPane geoUrlPane;
 
-    private UITextArea customTileLayer;
-    private UITextArea attribution;
+    private GisLayerPane gisLayerPane;
 
-    private UIComboBox zoomLevel;
-    private UIButtonGroup viewCenterCom;
-    private JPanel longAndLatPane;
-    private UISpinner longitude;
-    private UISpinner latitude;
-
-    private String[] oldParams;
-
-    private UIObserverListener listener;
-    private String[] layers = MapLayerConfigManager.getLayerItems();
-    /**
-     * 给组件登记一个观察者监听事件
-     *
-     * @param listener 观察者监听事件
-     */
-    @Override
-    public void registerChangeListener(UIObserverListener listener) {
-        this.listener = listener;
-    }
-
-    /**
-     * 组件是否需要响应添加的观察者事件
-     *
-     * @return 如果需要响应观察者事件则返回true，否则返回false
-     */
-    @Override
-    public boolean shouldResponseChangeListener() {
-        return true;
-    }
+    private MapStatusPane mapStatusPane;
 
     public VanChartMapSourceChoosePane() {
+        initGeoUrlPane();
+        initMapStatusPane();
+        initGisLayerPane();
+
         this.setLayout(new BorderLayout());
         this.setBorder(BorderFactory.createEmptyBorder(10, 5, 0, 0));
 
@@ -155,585 +40,74 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver {
         double[] rowSize = {p, p, p, p, p, p, p, p};
 
         JPanel panel = new JPanel(new BorderLayout());
-        panel.add(createMapSourcesPane(), BorderLayout.NORTH);
-        panel.add(createGISLayerPane(), BorderLayout.CENTER);
 
-        JPanel BasePane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Basic"), panel);
+        panel.add(geoUrlPane, BorderLayout.NORTH);
+        panel.add(gisLayerPane, BorderLayout.CENTER);
+
+        JPanel basePane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Report_Basic"), panel);
 
+        JPanel mapStatusPaneWithTitle = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Map_Init_Status"), mapStatusPane);
         Component[][] comps = new Component[][]{
-                new Component[]{BasePane},
-                new Component[]{createMapInitStatusPane()}
+                new Component[]{basePane},
+                new Component[]{mapStatusPaneWithTitle}
         };
         JPanel contentPane = TableLayoutHelper.createTableLayoutPane(comps, rowSize, columnSize);
 
         this.add(contentPane, BorderLayout.CENTER);
     }
 
-    protected boolean supportParam(){
-        return true;
-    }
-
-    protected TreeNode getRootNode() {
-        return supportParam() ? GEOJSONTreeHelper.getInstance().getRootNodeWithPara() : GEOJSONTreeHelper.getInstance().getRootNodeWithoutPara();
-    }
-
-    protected UILabel createSourceTitleLabel() {
-        return new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Area"));
-    }
-
-    private JPanel createMapSourcesPane() {
-        mapDataTree = new MapDataTree(this.getRootNode());
-        mapDataTree.setEditable(false);
-        mapDataTree.selectDefaultTreeNode();
-        sourceComboBox = new FRTreeComboBox(mapDataTree, mapDataTree.getCellRenderer()){
-            //搜索
-            protected void dealSamePath(TreePath parent, TreeNode node, UITextField textField){
-                String searchText = textField.getText();
-                VanChartMapSourceChoosePane.this.mapDataTree.search(searchText);
-            }
-
-            //选中 tree---combobox
-            public void setSelectedItem(Object o) {
-                TreePath oldPath = mapDataTree.getSelectionPath();
-                Object oldText = getSelectedItem();
-                if(o != null && o instanceof TreePath){
-                    selectTreePath =(TreePath)o;
-                    this.tree.setSelectionPath(selectTreePath);
-                    this.getModel().setSelectedItem(pathToString(selectTreePath));
-                    if(ComparatorUtils.equals(oldText, getSelectedItem()) && !ComparatorUtils.equals(oldPath, selectTreePath)) {
-                        //point的江苏省切换到area的江苏省
-                        listener.doChange();
-                    }
-                } else if(o instanceof String){//list里面没有
-                    selectTreePath = null;
-                    this.tree.setSelectionPath(null);
-                    this.getModel().setSelectedItem(ChartGEOJSONHelper.getPresentNameWithPath((String) o));
-                }
-            }
-
-            @Override
-            protected String pathToString(TreePath path) {
-                DefaultMutableTreeNode node = (DefaultMutableTreeNode) path.getLastPathComponent();
-                //不显示后缀
-                return ChartGEOJSONHelper.getPresentNameWithPath(node.toString());
-            }
-
-            @Override
-            protected boolean customSelectable(DefaultMutableTreeNode node){
-                return GEOJSONTreeHelper.isSelectableTreeNode(node);
-            }
-        };
-        sourceComboBox.setEditable(true);
-        sourceComboBox.setOnlyLeafSelectable(false);
-        sourceComboBox.addPopupMenuListener(popupMenuListener);
-
-        sourceTitleLabel = createSourceTitleLabel();
-
-        boolean hasRefreshButton = !WorkContext.getCurrent().isLocal();
-
-        UIButton button = new UIButton(IOUtils.readIcon("/com/fr/design/images/control/refresh.png"));
-        button.setToolTipText(Toolkit.i18nText("Fine-Design_Chart_Update_Remote_Map_JSON"));
-        button.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                GEOJSONHelper.reset();
-                GEOJSONHelper.getInstance();
-            }
-        });
-
-
-        double p = TableLayout.PREFERRED;
-        double d = TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH;
-        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
-        double[] rowSize = {p, p};
-
-        double[] columnSize = hasRefreshButton ? new double[]{d + 10, e - 20, 20} : new double[]{d, e};
-        Component[] comps = hasRefreshButton ? new Component[]{sourceTitleLabel, sourceComboBox, button} : new Component[]{sourceTitleLabel, sourceComboBox};
-        double hGap = hasRefreshButton ? 0 : TableLayout4VanChartHelper.COMPONENT_INTERVAL;
-        Component[][] components = new Component[][]{
-                new Component[]{null,null},
-                comps,
-
-        };
-        return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, hGap, LayoutConstants.VGAP_LARGE);
-    }
-
-    private JPanel createGISLayerPane() {
-        JPanel panel = new JPanel(new BorderLayout(0, 8));
-
-        gisLayer = new UIComboBox(layers);
-
-        gisLayer.addItemListener(new ItemListener() {
-            @Override
-            public void itemStateChanged(ItemEvent e) {
-                refreshZoomLevel();
-            }
-        });
-
-        gisLayer.addPopupMenuListener(new PopupMenuListener() {
-            public void popupMenuCanceled(PopupMenuEvent e) {
-            }
-
-            public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
-            }
-
-            public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
-
-                String selected = Utils.objectToString(gisLayer.getSelectedItem());
-                ZoomLevel zoomSelected = (ZoomLevel) zoomLevel.getSelectedItem();
-
-                gisLayer.setModel(new DefaultComboBoxModel(MapLayerConfigManager.getLayerItems()));
-
-                gisLayer.setSelectedItem(selected);
-                zoomLevel.setSelectedItem(zoomSelected);
-            }
-        });
-
-
-        gisLayer.addItemListener(new ItemListener() {
-            @Override
-            public void itemStateChanged(ItemEvent e) {
-                if (e.getStateChange() == ItemEvent.SELECTED) {
-                    checkLayerCardPane();
-                }
-            }
-        });
-
-        final JPanel tileLyaerPane = createCustomTileLayer();
-        final JPanel wmsLayerPane = createWMSPanel();
-
-        layerCardPane = new JPanel(new CardLayout()){
-            @Override
-            public Dimension getPreferredSize() {
-                String itemName = Utils.objectToString(gisLayer.getSelectedItem());
-                if (MapLayerConfigManager.isCustomLayer(itemName)) {
-                    return tileLyaerPane.getPreferredSize();
-                } else if (MapLayerConfigManager.isCustomWmsLayer(itemName)) {
-                    return wmsLayerPane.getPreferredSize();
-                }
-                return new Dimension(0,0);
-            }
-        };
-
-        for(String itemName : layers){
-            JPanel pane = new JPanel();
-            if (MapLayerConfigManager.isCustomLayer(itemName)) {
-                pane = tileLyaerPane;
-            } else if (MapLayerConfigManager.isCustomWmsLayer(itemName)) {
-                pane = wmsLayerPane;
-            }
-
-            layerCardPane.add(pane, itemName);
-        }
-
-        JPanel panel1 = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gis_Layer"), gisLayer);
-
-        panel.add(panel1, BorderLayout.CENTER);
-        panel.add(layerCardPane, BorderLayout.SOUTH);
-
-        return panel;
-    }
-
-    private void refreshZoomLevel(){
-        //gis图层不同，对应的缩放等级不同。
-        ZoomLevel[] levels;
-        if (ComparatorUtils.equals(gisLayer.getSelectedItem(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layer_Blue"))) {
-            levels = BLUE_ZOOM_LEVELS;
-        } else if (ComparatorUtils.equals(gisLayer.getSelectedItem(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layer_GaoDe"))) {
-            levels = GAODE_ZOOM_LEVELS;
-        } else {
-            levels = ZOOM_LEVELS;
-        }
-        zoomLevel.setModel(new DefaultComboBoxModel(levels));
-    }
-
-
-    private JPanel createCustomTileLayer() {
-        double p = TableLayout.PREFERRED;
-        double[] rowSize = {p, p};
-        double[] COLUMN_SIZE = {TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH-3};
-
-        customTileLayer = new UITextArea();
-        attribution = new UITextArea();
-        Component[][] comps = new Component[][]{
-                new Component[]{new UILabel("url"), customTileLayer},
-                new Component[]{new UILabel("Attribution"), attribution}
-        };
-        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(comps, rowSize, COLUMN_SIZE);
-        panel.setBorder(TableLayout4VanChartHelper.SECOND_EDIT_AREA_BORDER);
-        return panel;
-    }
-
-    private JPanel createWMSPanel() {
-
-        final double p = TableLayout.PREFERRED;
-        double[] rowSize = {p};
-        double[] COLUMN_SIZE = {TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH, 84,44};
-
-
-        wmsUrl = new UITextArea();
-        connectButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Connect_WMP"));
-
-        Component[][] comps = new Component[][]{
-                new Component[]{new UILabel("url"), wmsUrl, connectButton}
-        };
-        JPanel northPane = TableLayout4VanChartHelper.createGapTableLayoutPane(comps, rowSize, COLUMN_SIZE);
-        northPane.setBorder(TableLayout4VanChartHelper.SECOND_EDIT_AREA_BORDER);
-        JPanel wmsPanel = new JPanel(new BorderLayout(0, 4));
-        wmsLayerPane = new JPanel(new BorderLayout());
-        resetWMSLayerPane(new ArrayList<WMSLayer>());
-        wmsPanel.add(northPane, BorderLayout.NORTH);
-        wmsPanel.add(wmsLayerPane, BorderLayout.CENTER);
-
-        connectButton.addActionListener(actionListener);
-
-        addMouseListener();
-
-        return wmsPanel;
-    }
-
-    ActionListener actionListener = new ActionListener() {
-        @Override
-        public void actionPerformed(ActionEvent e) {
-
-            new SwingWorker<Void, Double>() {
-                private java.util.List<WMSLayer> list = new ArrayList<>();
-
-                @Override
-                protected Void doInBackground() throws Exception {
-                    HttpClient httpClient = new HttpClient(wmsUrl.getText() + "service=WMS&request=GetCapabilities");
-                    httpClient.asGet();
-
-                    if (!httpClient.isServerAlive()) {
-                        return null;
-                    }
-
-                    String res =  httpClient.getResponseText();
-                    List<String> layers = WMSFactory.readLayers(res);
-                    list.clear();
-                    for (String layer : layers) {
-                        list.add(new WMSLayer(layer, false));
+    public void setGeoUrlPane(GeoUrlPane geoUrlPane) {
+        this.geoUrlPane = geoUrlPane;
     }
-                    return null;
-                }
-
-                @Override
-                protected void done() {
-                    connectButton.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Connect_WMP"));
-                    if(list != null && list.size() > 0) {
-                        resetWMSLayerPane(list);
-                    } else {
-                        FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Invalid_WMS"));
-                    }
-                }
-            }.execute();
-        }
-    };
 
-    private void addMouseListener() {
-        connectButton.addMouseListener(new MouseListener() {
     @Override
-            public void mouseClicked(MouseEvent e) {
-
-            }
-
-            @Override
-            public void mousePressed(MouseEvent e) {
-                connectButton.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Connecting_WMP"));
-            }
-
-            @Override
-            public void mouseReleased(MouseEvent e) {
-
-            }
-
-            @Override
-            public void mouseEntered(MouseEvent e) {
-
-            }
-
-            @Override
-            public void mouseExited(MouseEvent e) {
-
-            }
-        });
-    }
-
-    private void resetWMSLayerPane(java.util.List<WMSLayer> wmsLayers) {
-
-        int size = wmsLayers.size();
-        double[] rowSize = new double[size];
-        Component[][] comps = new Component[size][2];
-        wmsLayerCheckBoxs.clear();
-        wmsLayerPane.removeAll();
-        for(int i =0; i < size; i++){
-            rowSize[i] = TableLayout.PREFERRED;
-            comps[i][0] = i == 0 ? new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_WMS_Layers"), SwingConstants.RIGHT) : null;
-            WMSLayer layer = wmsLayers.get(i);
-            UICheckBox checkBox = new UICheckBox(layer.getLayer());
-            checkBox.registerChangeListener(listener);
-            checkBox.setToolTipText(layer.getLayer());
-            checkBox.setSelected(layer.isSelected());
-            comps[i][1] = checkBox;
-            wmsLayerCheckBoxs.add(checkBox);
-        }
-
-        wmsLayerPane.add(TableLayoutHelper.createCommonTableLayoutPane(comps,rowSize, COLUMN_SIZE,0), BorderLayout.CENTER);
-
-        VanChartMapSourceChoosePane.this.updateUI();
-    }
-
-    private JPanel createMapInitStatusPane() {
-        zoomLevel = new UIComboBox(ZOOM_LEVELS);
-        viewCenterCom = new UIButtonGroup(new String[]{AUTO_CENTER_STRING, CUSTOM_CENTER_STRING});
-        longitude = new UISpinner(-Double.MAX_VALUE,Double.MAX_VALUE,1,0.0);
-        latitude = new UISpinner(-Double.MAX_VALUE,Double.MAX_VALUE,1,0.0);
-
-        double p = TableLayout.PREFERRED;
-        double f = TableLayout.FILL;
-        double d = TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH;
-        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
-        double s = TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH;
-        double[] rowSize = {p,p,p};
-        double[] columnSize = {d, e};
-        double[] column = {d, s};
-
-        Component[][] comps = new Component[][]{
-                new Component[]{null, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Zoom_Layer")), zoomLevel},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_View_Center")), viewCenterCom},
-        };
-        final JPanel northPane = TableLayout4VanChartHelper.createGapTableLayoutPane(comps,rowSize,columnSize);
-
-        Component[][] longAndLatComps = new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Longitude")), longitude},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Latitude")), latitude}
-        };
-        longAndLatPane =TableLayout4VanChartHelper.createGapTableLayoutPane(longAndLatComps,rowSize,column);
-        longAndLatPane.setBorder(BorderFactory.createEmptyBorder(0,12,0,0));
-        longAndLatPane.setVisible(false);
-
-        JPanel contentPane = new JPanel(new BorderLayout(0, 6)){
-
-            @Override
-            public Dimension getPreferredSize() {
-                if(longAndLatPane.isVisible()) {
-                    return super.getPreferredSize();
-                } else {
-                    return northPane.getPreferredSize();
-                }
+    public void registerChangeListener(UIObserverListener listener) {
+        geoUrlPane.registerChangeListener(listener);
+        gisLayerPane.registerChangeListener(listener);
     }
-        };
-        contentPane.add(northPane, BorderLayout.NORTH);
-        contentPane.add(longAndLatPane, BorderLayout.CENTER);
 
-        viewCenterCom.addActionListener(new ActionListener() {
     @Override
-            public void actionPerformed(ActionEvent e) {
-                longAndLatPane.setVisible(!isAutoViewCenter());
-            }
-        });
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Init_Status"), contentPane);
-    }
-
-    private boolean isAutoViewCenter() {
-        return viewCenterCom.getSelectedIndex()==0;
-    }
-
-    private PopupMenuListener popupMenuListener = new PopupMenuListener() {
-        public void popupMenuCanceled(PopupMenuEvent e) {
-        }
-
-        public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
+    public boolean shouldResponseChangeListener() {
+        return true;
     }
 
-        public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
-
-            GEOJSONTreeHelper.reset();
-            mapDataTree.changeRootNode(VanChartMapSourceChoosePane.this.getRootNode());
-            GEOJSONTreeHelper.getInstance().updateParamRootNode(VanChartMapSourceChoosePane.this.getParams());
-
-            if(selectTreePath != null){
-                mapDataTree.setSelectNodePath(CompatibleGEOJSONHelper.completeJSONName(selectTreePath.getLastPathComponent().toString()));
-                selectTreePath = mapDataTree.getSelectionPath();
+    protected void initGeoUrlPane() {
+        geoUrlPane = new GeoUrlPane();
     }
 
-            mapDataTree.updateUI();//因为服务器那边可能随时编辑,所以这边要重画
-            mapDataTree.setSelectionPath(selectTreePath);
-            mapDataTree.scrollPathToVisible(selectTreePath);
+    private void initGisLayerPane() {
+        gisLayerPane = new GisLayerPane();
+        gisLayerPane.registerZoomLevel(mapStatusPane.getZoomLevel());
     }
-    };
 
-    private void checkLayerCardPane() {
-        CardLayout cardLayout = (CardLayout) layerCardPane.getLayout();
-        cardLayout.show(layerCardPane, Utils.objectToString(gisLayer.getSelectedItem()));
+    private void initMapStatusPane() {
+        mapStatusPane = new MapStatusPane();
     }
 
     public void resetComponentValue(VanChartMapPlot mapPlot) {
-        resetComponentValue(mapPlot, true);
+        geoUrlPane.resetComponentValue(mapPlot, true);
         //重置图层属性
-        resetGisLayer(mapPlot);
+        gisLayerPane.resetGisLayer(mapPlot);
         //重置缩放等级
-        resetZoomLevel(mapPlot);
+        mapStatusPane.resetZoomLevel(mapPlot);
         //重置中心点位置
-        resetViewCenter(mapPlot);
+        mapStatusPane.resetViewCenter(mapPlot);
     }
 
-    protected void resetComponentValue(VanChartMapPlot mapPlot, boolean samePlotChange) {
-        MapType mapType = mapPlot.getMapType();
-
-        //获取最新的参数
-        String[] params = getParams();
-
-        if (!ComparatorUtils.equals(oldParams, params)){
-            oldParams = params;
-            GEOJSONTreeHelper.getInstance().updateParamRootNode(params);
-        }
-
-        mapDataTree.changeRootNode(this.getRootNode());
-        if(samePlotChange) {
-            String nodePath = ChartGEOJSONHelper.getDefaultJSONURL();
-            mapPlot.setGeoUrl(nodePath);
-            mapDataTree.setSelectNodePath(nodePath);
-            selectTreePath = mapDataTree.getSelectionPath();
-            sourceComboBox.setSelectedItem(selectTreePath);
-        }
-        switch (mapType){
-            case CUSTOM:
-                sourceTitleLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Area_And_Point"));
-                break;
-            case POINT:
-                sourceTitleLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Point"));
-                break;
-            case LINE:
-                sourceTitleLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Point"));
-                break;
-            default:
-                sourceTitleLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Area"));
-        }
-
-    }
-
-    private String[] getParams() {
-        JTemplate jTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
-        if (jTemplate == null){
-            return new String[0];
-        }
-
-        return getParamsName((jTemplate.getJTemplateParameters()));
-    }
-
-    private String[] getParamsName(Parameter[] parameters) {
-        String[] names = new String[parameters.length];
-        for (int i = 0; i < parameters.length; i++){
-            names[i] =  parameters[i].getName();
-        }
-        return names;
-    }
-
-    private void resetViewCenter(VanChartMapPlot mapPlot) {
-        mapPlot.setViewCenter(new ViewCenter());
-        viewCenterCom.setSelectedIndex(0);
-        longitude.setValue(0);
-        latitude.setValue(0);
-        longAndLatPane.setVisible(false);
-    }
-
-    private void resetZoomLevel(VanChartMapPlot mapPlot) {
-        mapPlot.setZoomLevel(ZoomLevel.AUTO);
-        zoomLevel.setSelectedItem(mapPlot.getZoomLevel());
-    }
-
-    private void resetGisLayer(VanChartMapPlot mapPlot) {
-        //TODO Bjorn 地图gis图层自动逻辑
-       /* mapPlot.getGisLayer().setGisLayerType(GISLayerType.AUTO);
-        mapPlot.getGisLayer().setLayerName(GISLayerType.getLocString(GISLayerType.AUTO));*/
-
-        String layerName = mapPlot.getDefaultGisLayerName();
-
-        mapPlot.getGisLayer().setGisLayerType(GISLayerType.PREDEFINED_LAYER);
-        mapPlot.getGisLayer().setLayerName(layerName);
-        gisLayer.setSelectedItem(mapPlot.getGisLayer().getShowItemName());
-    }
 
     public void populateBean(VanChartMapPlot mapPlot) {
-        resetComponentValue(mapPlot, false);
-
-        mapDataTree.setSelectNodePath(mapPlot.getGeoUrl());
-        selectTreePath = mapDataTree.getSelectionPath();
-
-        if(selectTreePath == null){//此url当前环境没有
-            sourceComboBox.setSelectedItem(mapPlot.getGeoUrl());
-        } else {
-            sourceComboBox.setSelectedItem(selectTreePath);
-        }
-
-        GisLayer layer = mapPlot.getGisLayer();
-        gisLayer.setSelectedItem(layer.getShowItemName());
-
-        wmsUrl.setText(layer.getWmsUrl());
-        resetWMSLayerPane(layer.getWmsLayers());
-        customTileLayer.setText(layer.getCustomTileLayer());
-        attribution.setText(layer.getAttribution());
-
-        refreshZoomLevel();
-        zoomLevel.setSelectedItem(mapPlot.getZoomLevel());
-
-        ViewCenter viewCenter = mapPlot.getViewCenter();
-        if(viewCenter.isAuto()){
-            viewCenterCom.setSelectedIndex(0);
-            longitude.setValue(0);
-            latitude.setValue(0);
-        } else {
-            viewCenterCom.setSelectedIndex(1);
-            longitude.setValue(viewCenter.getLongitude());
-            latitude.setValue(viewCenter.getLatitude());
-        }
-
-        longAndLatPane.setVisible(!isAutoViewCenter());
-
-        checkLayerCardPane();
+        geoUrlPane.populate(mapPlot);
+        gisLayerPane.populate(mapPlot.getGisLayer());
+        mapStatusPane.populate(mapPlot);
     }
 
     public void updateBean(VanChartMapPlot mapPlot) {
 
         if (!CompatibleGEOJSONHelper.isDeprecated(mapPlot.getGeoUrl())) {
-            mapPlot.setGeoUrl(mapDataTree.getSelectNodeJSONPath());
-        }
-
-        GisLayer layer = mapPlot.getGisLayer();
-        String layerName = Utils.objectToString(gisLayer.getSelectedItem());
-
-        layer.setLayerName(layerName);
-        layer.setGisLayerType(MapLayerConfigManager.getGisLayerType(layerName));
-
-        switch (layer.getGisLayerType()){
-            case CUSTOM_WMS_LAYER:
-                layer.setWmsUrl(wmsUrl.getText());
-                layer.setWmsLayers(new ArrayList<WMSLayer>());
-                for(UICheckBox checkBox : wmsLayerCheckBoxs){
-                    layer.addWmsLayer(new WMSLayer(checkBox.getText(), checkBox.isSelected()));
-                }
-                break;
-            case CUSTOM_TILE_LAYER:
-                layer.setCustomTileLayer(customTileLayer.getText());
-                layer.setAttribution(attribution.getText());
-                break;
-        }
-
-        mapPlot.setZoomLevel((ZoomLevel) zoomLevel.getSelectedItem());
-
-        ViewCenter viewCenter = mapPlot.getViewCenter();
-        if(isAutoViewCenter()){
-            viewCenter.setAuto(true);
-        } else {
-            viewCenter.setAuto(false);
-            viewCenter.setLongitude(longitude.getValue());
-            viewCenter.setLatitude(latitude.getValue());
-        }
+            mapPlot.setGeoUrl(geoUrlPane.update());
         }
 
-    public UIComboBox getSourceComboBox(){
-        return this.sourceComboBox;
+        gisLayerPane.update(mapPlot.getGisLayer());
+        mapStatusPane.update(mapPlot);
     }
 }

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

@@ -0,0 +1,165 @@
+package com.fr.van.chart.map.designer.type;
+
+import com.fr.decision.webservice.v10.map.WMSFactory;
+import com.fr.design.dialog.FineJOptionPane;
+import com.fr.design.event.UIObserver;
+import com.fr.design.event.UIObserverListener;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.icheckbox.UICheckBox;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.itextarea.UITextArea;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.general.http.HttpClient;
+import com.fr.plugin.chart.base.GisLayer;
+import com.fr.plugin.chart.map.layer.WMSLayer;
+import com.fr.van.chart.designer.TableLayout4VanChartHelper;
+
+import javax.swing.JPanel;
+import javax.swing.SwingConstants;
+import javax.swing.SwingWorker;
+import java.util.ArrayList;
+import java.util.List;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2020-12-07
+ */
+public class WMSLayerPane extends JPanel implements UIObserver {
+    private static final double[] COLUMN_SIZE = {48, TableLayout.FILL, TableLayout.PREFERRED};
+
+    private UITextArea wmsUrl;
+    private UIButton connectButton;
+    private JPanel wmsLayerPane;
+
+    private List<UICheckBox> wmsLayerCheckBoxs = new ArrayList<>();
+
+    private UIObserverListener listener;
+
+    @Override
+    public void registerChangeListener(UIObserverListener listener) {
+        this.listener = listener;
+    }
+
+    @Override
+    public boolean shouldResponseChangeListener() {
+        return true;
+    }
+
+
+    public WMSLayerPane() {
+        final double p = TableLayout.PREFERRED;
+        double[] rowSize = {p};
+        double[] COLUMN_SIZE = {TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH, 84, 44};
+
+
+        wmsUrl = new UITextArea();
+        connectButton = new UIButton(Toolkit.i18nText("Fine-Design_Chart_Connect_WMP"));
+
+        Component[][] comps = new Component[][]{
+                new Component[]{new UILabel("url"), wmsUrl, connectButton}
+        };
+        JPanel northPane = TableLayout4VanChartHelper.createGapTableLayoutPane(comps, rowSize, COLUMN_SIZE);
+        northPane.setBorder(TableLayout4VanChartHelper.SECOND_EDIT_AREA_BORDER);
+
+        wmsLayerPane = new JPanel(new BorderLayout());
+        resetWMSLayerPane(new ArrayList<>());
+
+        this.setLayout(new BorderLayout(0, 6));
+        this.add(northPane, BorderLayout.NORTH);
+        this.add(wmsLayerPane, BorderLayout.CENTER);
+        addListener();
+    }
+
+    private void addListener() {
+        connectButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+
+                new SwingWorker<Void, Double>() {
+                    private java.util.List<WMSLayer> list = new ArrayList<>();
+
+                    @Override
+                    protected Void doInBackground() {
+                        HttpClient httpClient = new HttpClient(wmsUrl.getText() + "service=WMS&request=GetCapabilities");
+                        httpClient.asGet();
+
+                        if (!httpClient.isServerAlive()) {
+                            return null;
+                        }
+
+                        String res = httpClient.getResponseText();
+                        List<String> layers = WMSFactory.readLayers(res);
+                        list.clear();
+                        for (String layer : layers) {
+                            list.add(new WMSLayer(layer, false));
+                        }
+                        return null;
+                    }
+
+                    @Override
+                    protected void done() {
+                        connectButton.setText(Toolkit.i18nText("Fine-Design_Chart_Connect_WMP"));
+                        if (list != null && list.size() > 0) {
+                            resetWMSLayerPane(list);
+                        } else {
+                            FineJOptionPane.showMessageDialog(null, Toolkit.i18nText("Fine-Design_Chart_Invalid_WMS"));
+                        }
+                    }
+                }.execute();
+            }
+        });
+
+        connectButton.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mousePressed(MouseEvent e) {
+                connectButton.setText(Toolkit.i18nText("Fine-Design_Chart_Connecting_WMP"));
+            }
+        });
+    }
+
+    private void resetWMSLayerPane(java.util.List<WMSLayer> wmsLayers) {
+        int size = wmsLayers.size();
+        double[] rowSize = new double[size];
+        Component[][] comps = new Component[size][2];
+        wmsLayerCheckBoxs.clear();
+        wmsLayerPane.removeAll();
+        for (int i = 0; i < size; i++) {
+            rowSize[i] = TableLayout.PREFERRED;
+            comps[i][0] = i == 0 ? new UILabel(Toolkit.i18nText("Fine-Design_Chart_WMS_Layers"), SwingConstants.RIGHT) : null;
+            WMSLayer layer = wmsLayers.get(i);
+            UICheckBox checkBox = new UICheckBox(layer.getLayer());
+            checkBox.registerChangeListener(listener);
+            checkBox.setToolTipText(layer.getLayer());
+            checkBox.setSelected(layer.isSelected());
+            comps[i][1] = checkBox;
+            wmsLayerCheckBoxs.add(checkBox);
+        }
+
+        wmsLayerPane.add(TableLayoutHelper.createCommonTableLayoutPane(comps, rowSize, COLUMN_SIZE, 0), BorderLayout.CENTER);
+
+        updateUI();
+    }
+
+    public void populate(GisLayer layer) {
+        wmsUrl.setText(layer.getWmsUrl());
+        resetWMSLayerPane(layer.getWmsLayers());
+    }
+
+    public void update(GisLayer layer) {
+        layer.setWmsUrl(wmsUrl.getText());
+        layer.setWmsLayers(new ArrayList<>());
+        for (UICheckBox checkBox : wmsLayerCheckBoxs) {
+            layer.addWmsLayer(new WMSLayer(checkBox.getText(), checkBox.isSelected()));
+        }
+    }
+}
+

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

@@ -0,0 +1,130 @@
+package com.fr.van.chart.pie.style;
+
+import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane;
+import com.fr.plugin.chart.base.AttrTooltipContent;
+import com.fr.plugin.chart.base.AttrTooltipRichText;
+import com.fr.plugin.chart.base.format.AttrTooltipFormat;
+import com.fr.plugin.chart.pie.attr.PieCategoryLabelContent;
+import com.fr.van.chart.designer.component.VanChartLabelContentPane;
+import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithoutCheckBox;
+import com.fr.van.chart.designer.component.format.SummaryValueFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.SummaryValueFormatPaneWithoutCheckBox;
+import com.fr.van.chart.designer.component.format.VanChartFormatPaneWithoutCheckBox;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import javax.swing.JPanel;
+import java.awt.Component;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2020-12-10
+ */
+public class VanChartPieCategoryLabelContentPane extends VanChartLabelContentPane {
+
+    private SummaryValueFormatPaneWithCheckBox summaryValueFormatPane;
+
+    private SummaryValueFormatPaneWithoutCheckBox richTextSummaryValueFormatPane;
+
+    public VanChartPieCategoryLabelContentPane(VanChartStylePane parent, JPanel showOnPane, boolean inCondition) {
+        super(parent, showOnPane, inCondition);
+    }
+
+    @Override
+    protected JPanel getLabelContentPane(JPanel contentPane) {
+        return contentPane;
+    }
+
+    @Override
+    protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+        setCategoryNameFormatPane(new CategoryNameFormatPaneWithCheckBox(parent, showOnPane));
+        summaryValueFormatPane = new SummaryValueFormatPaneWithCheckBox(parent, showOnPane);
+    }
+
+    @Override
+    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+        setRichTextCategoryNameFormatPane(new CategoryNameFormatPaneWithoutCheckBox(parent, showOnPane));
+        richTextSummaryValueFormatPane = new SummaryValueFormatPaneWithoutCheckBox(parent, showOnPane);
+    }
+
+    @Override
+    protected Component[][] getPaneComponents() {
+        return new Component[][]{
+                new Component[]{getCategoryNameFormatPane(), null},
+                new Component[]{summaryValueFormatPane, null},
+        };
+    }
+
+    @Override
+    protected Component[][] getRichTextComponents() {
+        return new Component[][]{
+                new Component[]{getRichTextCategoryNameFormatPane(), null},
+                new Component[]{richTextSummaryValueFormatPane, null},
+        };
+    }
+
+    @Override
+    protected double[] getRowSize(double p) {
+        return new double[]{p, p};
+    }
+
+    public JPanel createCommonStylePane() {
+        setTextAttrPane(new ChartTextAttrPane());
+        return getTextAttrPane();
+    }
+
+    @Override
+    protected void populateFormatPane(AttrTooltipContent attrTooltipContent) {
+        PieCategoryLabelContent pieCategoryLabelContent = (PieCategoryLabelContent) attrTooltipContent;
+        super.populateFormatPane(pieCategoryLabelContent);
+        summaryValueFormatPane.populate(pieCategoryLabelContent.getSummaryValueFormat());
+    }
+
+    protected void populateRichEditor(AttrTooltipContent attrTooltipContent) {
+        PieCategoryLabelContent pieCategoryLabelContent = (PieCategoryLabelContent) attrTooltipContent;
+        VanChartFormatPaneWithoutCheckBox[] formatPaneGroup = new VanChartFormatPaneWithoutCheckBox[]{
+                getRichTextCategoryNameFormatPane(),
+                richTextSummaryValueFormatPane
+        };
+
+        AttrTooltipFormat[] formatGroup = new AttrTooltipFormat[]{
+                pieCategoryLabelContent.getRichTextCategoryFormat(),
+                pieCategoryLabelContent.getRichTextSummaryValueFormat()
+        };
+
+        setRichTextAttr(new AttrTooltipRichText());
+        populateRichTextFormat(formatPaneGroup, formatGroup);
+        populateRichText(pieCategoryLabelContent.getRichTextAttr());
+
+        checkRichEditorState(pieCategoryLabelContent);
+    }
+
+    @Override
+    protected void updateFormatPane(AttrTooltipContent attrTooltipContent) {
+        PieCategoryLabelContent pieCategoryLabelContent = (PieCategoryLabelContent) attrTooltipContent;
+        super.updateFormatPane(pieCategoryLabelContent);
+        summaryValueFormatPane.update(pieCategoryLabelContent.getSummaryValueFormat());
+    }
+
+    protected void updateRichEditor(AttrTooltipContent attrTooltipContent) {
+        PieCategoryLabelContent pieCategoryLabelContent = (PieCategoryLabelContent) attrTooltipContent;
+        super.updateRichEditor(pieCategoryLabelContent);
+        richTextSummaryValueFormatPane.update(pieCategoryLabelContent.getRichTextSummaryValueFormat());
+    }
+
+    @Override
+    public void setDirty(boolean isDirty) {
+        getCategoryNameFormatPane().setDirty(isDirty);
+        summaryValueFormatPane.setDirty(isDirty);
+    }
+
+    @Override
+    public boolean isDirty() {
+        return getCategoryNameFormatPane().isDirty() || summaryValueFormatPane.isDirty();
+    }
+
+    protected AttrTooltipContent createAttrTooltip() {
+        return new PieCategoryLabelContent();
+    }
+}

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

@@ -0,0 +1,79 @@
+package com.fr.van.chart.pie.style;
+
+import com.fr.van.chart.designer.component.VanChartLabelContentPane;
+import com.fr.van.chart.designer.component.format.PercentFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.PercentFormatPaneWithoutCheckBox;
+import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithoutCheckBox;
+import com.fr.van.chart.designer.component.format.ValueFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ValueFormatPaneWithoutCheckBox;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import javax.swing.JPanel;
+import java.awt.Component;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2020-12-09
+ */
+public class VanChartPieValueLabelContentPane extends VanChartLabelContentPane {
+
+    public VanChartPieValueLabelContentPane(VanChartStylePane parent, JPanel showOnPane, boolean inCondition) {
+        super(parent, showOnPane, inCondition);
+    }
+
+    @Override
+    protected JPanel getLabelContentPane(JPanel contentPane) {
+        return contentPane;
+    }
+
+    @Override
+    protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+        setSeriesNameFormatPane(new SeriesNameFormatPaneWithCheckBox(parent, showOnPane));
+        setValueFormatPane(new ValueFormatPaneWithCheckBox(parent, showOnPane));
+        setPercentFormatPane(new PercentFormatPaneWithCheckBox(parent, showOnPane));
+    }
+
+    @Override
+    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+        setRichTextSeriesNameFormatPane(new SeriesNameFormatPaneWithoutCheckBox(parent, showOnPane));
+        setRichTextValueFormatPane(new ValueFormatPaneWithoutCheckBox(parent, showOnPane));
+        setRichTextPercentFormatPane(new PercentFormatPaneWithoutCheckBox(parent, showOnPane));
+    }
+
+    @Override
+    protected double[] getRowSize(double p) {
+        return new double[]{p, p, p};
+    }
+
+    @Override
+    protected Component[][] getPaneComponents() {
+        return new Component[][]{
+                new Component[]{getSeriesNameFormatPane(), null},
+                new Component[]{getValueFormatPane(), null},
+                new Component[]{getPercentFormatPane(), null},
+        };
+    }
+
+    @Override
+    protected Component[][] getRichTextComponents() {
+        return new Component[][]{
+                new Component[]{getRichTextSeriesNameFormatPane(), null},
+                new Component[]{getRichTextValueFormatPane(), null},
+                new Component[]{getRichTextPercentFormatPane(), null}
+        };
+    }
+
+    @Override
+    public void setDirty(boolean isDirty) {
+        getSeriesNameFormatPane().setDirty(isDirty);
+        getValueFormatPane().setDirty(isDirty);
+        getPercentFormatPane().setDirty(isDirty);
+    }
+
+    @Override
+    public boolean isDirty() {
+        return getSeriesNameFormatPane().isDirty() || getValueFormatPane().isDirty() || getPercentFormatPane().isDirty();
+    }
+}

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

@@ -1,7 +1,6 @@
 package com.fr.design.mainframe;
 
 import com.fr.base.GraphHelper;
-import com.fr.base.ScreenResolution;
 import com.fr.base.Utils;
 import com.fr.base.iofile.attr.WatermarkAttr;
 import com.fr.base.vcs.DesignerMode;
@@ -49,7 +48,6 @@ public class FormDesignerUI extends ComponentUI {
     private FormDesigner designer;
     private SelectionModel selectionModel;
     private Rectangle2D.Double back_or_selection_rect = new Rectangle2D.Double(0, 0, 0, 0);
-    private float time;
 
     public FormDesignerUI() {
     }
@@ -71,7 +69,6 @@ public class FormDesignerUI extends ComponentUI {
     @Override
     public void paint(final Graphics g, JComponent c) {
         XCreator rootComponent = designer.getRootComponent();
-        this.time = (float) designer.getResolution() / ScreenResolution.getScreenResolution();
         AffineTransform at = new AffineTransform();
         if (rootComponent.getParent() != null) {
             at.translate(designer.getPaintX(), designer.getPaintY());

designer-form/src/main/java/com/fr/design/widget/ui/designer/CheckBoxGroupDefinePane.java

@@ -29,7 +29,7 @@ public class CheckBoxGroupDefinePane extends ButtonGroupDefinePane<CheckBoxGroup
 	protected void initComponents() {
 		super.initComponents();
 
-		dictPane = new DictionaryPane();
+		dictPane = new DictionaryPane(false);
 	}
 
 	@Override