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

designer-base/src/main/java/com/fr/design/actions/UpdateAction.java

@@ -17,6 +17,7 @@ import com.fr.design.mainframe.toolbar.UpdateActionManager;
 import com.fr.design.menu.ShortCut;
 import com.fr.design.selection.SelectionListener;
 import com.fr.general.ComparatorUtils;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 import com.fr.stable.pinyin.PinyinFormat;
 import com.fr.stable.pinyin.PinyinHelper;
@@ -562,7 +563,12 @@ public abstract class UpdateAction extends ShortCut implements Action {
 		for (int i = 0; i < component.getTabCount(); i++) {
 			String title = component.getTitleAt(i);
 			handleSearchText(separator, text, pinyin, shortPinyin, title);
-			Component tabComponent = component.getComponentAt(i);
+			Component tabComponent = null;
+			try {
+				tabComponent = component.getComponentAt(i);
+			} catch (Exception ignore) {
+				FineLoggerFactory.getLogger().info("AlphaFine index tabPane end");
+			}
             if (tabComponent instanceof JPanel) {
                 getComponentTexts((JPanel) tabComponent, separator, text, pinyin, shortPinyin);
             } else if (tabComponent instanceof JTabbedPane) {

designer-base/src/main/java/com/fr/design/actions/file/OpenRecentReportMenuDef.java

@@ -1,6 +1,7 @@
 package com.fr.design.actions.file;
 
 import java.awt.event.ActionEvent;
+import java.io.File;
 import java.util.List;
 
 import com.fr.base.BaseUtils;
@@ -11,6 +12,7 @@ import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.menu.KeySetUtils;
 import com.fr.design.menu.MenuDef;
 import com.fr.file.FILEFactory;
+import com.fr.file.FileFILE;
 
 /**
  * Open Resent MenuDef.
@@ -68,7 +70,12 @@ public class OpenRecentReportMenuDef extends MenuDef {
          * @param e 事件
          */
         public void actionPerformed(ActionEvent e) {
-            DesignerContext.getDesignerFrame().openTemplate(FILEFactory.createFILE(this.getPath()));
+            File file = new File(this.getPath());
+            if (file.exists()) {
+                DesignerContext.getDesignerFrame().openTemplate(new FileFILE(file));
+            } else {
+                DesignerContext.getDesignerFrame().openTemplate(FILEFactory.createFILE(this.getPath()));
+            }
         }
 
         public String getPath() {

designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java

@@ -76,7 +76,7 @@ public class AboutDialog extends JDialog implements ActionListener {
 
         this.getRootPane().setDefaultButton(okButton);
 
-        this.setSize(new Dimension(660, 600));
+        this.setSize(defaultPane.getPreferredSize().width, 600);
         GUICoreUtils.centerWindow(this);
     }
 

designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java

@@ -4,6 +4,7 @@
 package com.fr.design.actions.help;
 
 import com.fr.base.FRContext;
+import com.fr.base.GraphHelper;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.gui.ilable.ActionLabel;
 import com.fr.design.gui.ilable.BoldFontTextLabel;
@@ -36,9 +37,13 @@ public class AboutPane extends JPanel {
     private static final String COMPANY_TELEPHONE = CloudCenter.getInstance().acquireUrlByKind("help.compNo");
     private static final String PRESIDENT_PHONE = CloudCenter.getInstance().acquireUrlByKind("help.PNo");
 
+    private int maxWidth;
+
     public AboutPane() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
-
+        this.maxWidth = GraphHelper.getWidth(getBuildTitle() + GeneralUtils.readFullBuildNO() +
+                                                     com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Copy_Build_NO") +
+                                                     com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Copy_Build_NO_OK"));
         //center panel
         JPanel centerPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
         this.add(centerPane, BorderLayout.CENTER);
@@ -90,6 +95,11 @@ public class AboutPane extends JPanel {
         }
     }
 
+    @Override
+    public Dimension getPreferredSize() {
+        return new Dimension(this.maxWidth, super.getPreferredSize().height);
+    }
+
     private void addPhoneAndQQPane(JPanel contentPane) {
         BoxCenterAligmentPane boxCenterAlignmentPane;
         // 英文版不显示服务电话和QQ

designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java

@@ -189,34 +189,34 @@ public class AlphaFineConfigPane extends BasicPane {
     }
 
     public void populate(AlphaFineConfigManager alphaFineConfigManager) {
-        
+
         this.enabledCheckbox.setSelected(alphaFineConfigManager.isEnabled());
-        
+
-        boolean enabled4Locale = FRContext.isChineseEnv();
+        boolean enabled4Locale = FRContext.isChineseEnv() && alphaFineConfigManager.isSearchOnLine();
-        
+
-        this.searchOnlineCheckbox.setEnabled(enabled4Locale);
+        this.searchOnlineCheckbox.setEnabled(FRContext.isChineseEnv());
-        this.searchOnlineCheckbox.setSelected(alphaFineConfigManager.isSearchOnLine());
+        this.searchOnlineCheckbox.setSelected(enabled4Locale);
-        
+
         this.containActionCheckbox.setSelected(alphaFineConfigManager.isContainAction());
         this.containTemplateCheckbox.setSelected(alphaFineConfigManager.isContainTemplate());
         this.containFileContentCheckbox.setSelected(alphaFineConfigManager.isContainFileContent());
-        
+
-        this.containDocumentCheckbox.setSelected(alphaFineConfigManager.isContainDocument() && alphaFineConfigManager.isSearchOnLine());
+        this.containDocumentCheckbox.setSelected(alphaFineConfigManager.isContainDocument() && enabled4Locale);
         this.containDocumentCheckbox.setEnabled(enabled4Locale);
-        
+
-        this.containPluginCheckbox.setSelected(alphaFineConfigManager.isContainPlugin() && alphaFineConfigManager.isSearchOnLine());
+        this.containPluginCheckbox.setSelected(alphaFineConfigManager.isContainPlugin() && enabled4Locale);
         this.containPluginCheckbox.setEnabled(enabled4Locale);
-        
+
-        this.containRecommendCheckbox.setSelected(alphaFineConfigManager.isContainRecommend() && alphaFineConfigManager.isSearchOnLine());
+        this.containRecommendCheckbox.setSelected(alphaFineConfigManager.isContainRecommend() && enabled4Locale);
         this.containRecommendCheckbox.setEnabled(enabled4Locale);
-        
+
         this.shortcutsField.setText(getDisplayShortCut(alphaFineConfigManager.getShortcuts()));
 
         this.needSegmentationCheckbox.setSelected(alphaFineConfigManager.isNeedSegmentationCheckbox());
-        
+
-        this.needIntelligentCustomerService.setSelected(alphaFineConfigManager.isNeedIntelligentCustomerService() && alphaFineConfigManager.isSearchOnLine());
+        this.needIntelligentCustomerService.setSelected(alphaFineConfigManager.isNeedIntelligentCustomerService() && enabled4Locale);
         this.needIntelligentCustomerService.setEnabled(enabled4Locale);
-        
+
         shortCutKeyStore = convert2KeyStroke(alphaFineConfigManager.getShortcuts());
     }
 

designer-base/src/main/java/com/fr/design/cell/AbstractCellElementPropertyPane.java

@@ -0,0 +1,23 @@
+package com.fr.design.cell;
+
+import com.fr.design.designer.TargetComponent;
+import com.fr.design.dialog.BasicPane;
+
+import javax.swing.JPanel;
+
+/**
+ * @author zack
+ * @version 10.0
+ * Created by zack on 2020/7/14
+ */
+public abstract class AbstractCellElementPropertyPane extends BasicPane implements CellElementPropertyComponent {
+    @Override
+    public JPanel toPanel() {
+        return this;
+    }
+
+    @Override
+    public boolean accept(TargetComponent tc) {
+        return true;
+    }
+}

designer-base/src/main/java/com/fr/design/cell/CellElementPropertyComponent.java

@@ -0,0 +1,34 @@
+package com.fr.design.cell;
+
+import com.fr.design.designer.TargetComponent;
+
+import javax.swing.JPanel;
+
+/**
+ * 单元格属性配置面板接口
+ * @author zack
+ * @version 10.0
+ * Created by zack on 2020/7/14
+ */
+public interface CellElementPropertyComponent {
+
+    /**
+     * 判断当前编辑的对象是否显示当前实现
+     * @param tc
+     * @return
+     */
+    boolean accept(TargetComponent tc);
+
+    /**
+     * 加载数据
+     * @param tc
+     */
+    void populate(TargetComponent tc);
+
+    /**
+     * 返回当前属性面板,默认返回this
+     * @return
+     */
+    JPanel toPanel();
+
+}

designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java

@@ -446,7 +446,16 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
      * @param srcName 数据集来源(比如报表块，就是报表块的名称)
      * @param tableDataSource 数据集
      */
+    public Map<String, String> addTableData(String srcName, TableDataSource tableDataSource, boolean isCover) {
+        return new HashMap<>(0);
+    }
+
     public Map<String, String> addTableData(String srcName, TableDataSource tableDataSource) {
-         return new HashMap<>(0);
+        return addTableData(srcName, tableDataSource, false);
+    }
+
+    public void removeTableData(String sourceName) {
+
     }
+
 }

designer-base/src/main/java/com/fr/design/data/BasicTableDataUtils.java

@@ -1,5 +1,6 @@
 package com.fr.design.data;
 
+import com.fr.data.TableDataSource;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.i18n.Toolkit;
 import com.fr.stable.StringUtils;
@@ -10,6 +11,7 @@ import com.fr.stable.StringUtils;
  * Created by hades on 2020/4/27
  */
 public abstract class BasicTableDataUtils {
+    private static final String SEPARATOR = "-";
 
     private static final int LEN = 2;
 
@@ -33,4 +35,19 @@ public abstract class BasicTableDataUtils {
         }
         return false;
     }
+
+    public static String getTableDataName(boolean isCover, TableDataSource tds, String tdName, String srcName, boolean isDsNameRepeaded) {
+        if (isCover) {
+            return srcName + SEPARATOR + tdName;
+        }
+        if (tds.getTableData(tdName) != null || isDsNameRepeaded) {//如果有同名的就拼上来源名称
+            tdName = srcName + SEPARATOR + tdName;
+        }
+        int i = 0;
+        while (tds.getTableData(tdName) != null) {
+            i++;//如果拼上名字后依然已经存在就加编号
+            tdName += i;
+        }
+        return tdName;
+    }
 }

designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java

@@ -60,7 +60,10 @@ public class TableDataPaneListPane extends JListControlPane implements TableData
                 if (StringUtils.isEmpty(tempName)) {
                     isNamePermitted = false;
                     nameableList.stopEditing();
-                    FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), Toolkit.i18nText("Fine-Design_Basic_Table_Data_Empty_Name_Tips"));
+                    FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this),
+                                                      Toolkit.i18nText("Fine-Design_Basic_Table_Data_Empty_Name_Tips"),
+                                                      Toolkit.i18nText("Fine-Design_Report_Alert"),
+                                                      JOptionPane.WARNING_MESSAGE);
                     setIllegalIndex(editingIndex);
                     return;
                 }

designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java

@@ -9,6 +9,7 @@ import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.data.BasicTableDataTreePane;
+import com.fr.design.data.BasicTableDataUtils;
 import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.data.tabledata.StoreProcedureWorkerListener;
 import com.fr.design.data.tabledata.tabledatapane.AbstractTableDataPane;
@@ -59,7 +60,7 @@ import java.util.Map;
 
 public class TableDataTreePane extends BasicTableDataTreePane {
     private static TableDataTreePane singleton = new TableDataTreePane();
-    
+
     public static final int PLUGIN_LISTENER_PRIORITY = 1;
 
     public synchronized static BasicTableDataTreePane getInstance(DesignModelAdapter<?, ?> tc) {
@@ -96,10 +97,10 @@ public class TableDataTreePane extends BasicTableDataTreePane {
         addMenuDef.setIconPath(IconPathConstants.ADD_POPMENU_ICON_PATH);
 
         createAddMenuDef();
-    
+
         // 创建插件监听
         createPluginListener();
-    
+
         editAction = new EditAction();
         removeAction = new RemoveAction();
         previewTableDataAction = new PreviewTableDataAction(dataTree);
@@ -139,27 +140,27 @@ public class TableDataTreePane extends BasicTableDataTreePane {
         new TableDataTreeDragSource(dataTree, DnDConstants.ACTION_COPY);
         checkButtonEnabled();
     }
-    
+
     private void createPluginListener() {
-        
+
         //菜单栏监听
         GeneralContext.listenPluginRunningChanged(new PluginEventListener(PLUGIN_LISTENER_PRIORITY) {
-        
+
             @Override
             public void on(PluginEvent event) {
-            
+
                 addMenuDef.clearShortCuts();
                 createAddMenuDef();
             }
         }, new PluginFilter() {
-        
+
             @Override
             public boolean accept(PluginContext context) {
-    
+
                 return context.contain(PluginModule.ExtraDesign);
             }
         });
-        
+
         //监听数据集插件
         GeneralContext.listenPluginRunningChanged(new PluginEventListener() {
             @Override
@@ -188,8 +189,8 @@ public class TableDataTreePane extends BasicTableDataTreePane {
             }
         });
     }
-    
+
-    
+
     protected void checkButtonEnabled() {
         super.checkButtonEnabled(editAction, previewTableDataAction, removeAction, op, dataTree);
     }
@@ -339,10 +340,11 @@ public class TableDataTreePane extends BasicTableDataTreePane {
 
     /**
      * 合并数据集
-     * @param srcName 数据集来源(比如报表块，就是报表块的名称)
+     *
+     * @param srcName         数据集来源(比如报表块，就是报表块的名称)
      * @param tableDataSource 数据集
      */
-    public Map<String, String> addTableData(String srcName, TableDataSource tableDataSource) {
+    public Map<String, String> addTableData(String srcName, TableDataSource tableDataSource, boolean isCover) {
         Map<String, String> tdNameMap = new HashMap<>();
         allDSNames = DesignTableDataManager.getAllDSNames(tc.getBook());
         DesignTableDataManager.setThreadLocal(DesignTableDataManager.NO_PARAMETER);
@@ -352,14 +354,8 @@ public class TableDataTreePane extends BasicTableDataTreePane {
             String tdName = (String) tdIterator.next();
             String oldName = tdName;
             TableData td = tableDataSource.getTableData(tdName);
-            if (tds.getTableData(tdName) != null || isDsNameRepeaded(tdName)) {//如果有同名的就拼上来源名称
+            boolean isDsNameRepeaded = isDsNameRepeaded(tdName);
-                tdName = srcName + tdName;
+            tdName = BasicTableDataUtils.getTableDataName(isCover, tds, tdName, srcName, isDsNameRepeaded);
-            }
-            int i = 0;
-            while (tds.getTableData(tdName) != null) {
-                i++;//如果拼上名字后依然已经存在就加编号
-                tdName += i;
-            }
             tds.putTableData(tdName, td);
             if (!ComparatorUtils.equals(oldName, tdName)) {
                 tdNameMap.put(oldName, tdName);
@@ -367,8 +363,19 @@ public class TableDataTreePane extends BasicTableDataTreePane {
         }
         tc.parameterChanged();
         dataTree.refresh();
-        return  Collections.unmodifiableMap(tdNameMap);
+        return Collections.unmodifiableMap(tdNameMap);
     }
+
+    @Override
+    public void removeTableData(String sourceName) {
+        TableDataSource tds = tc.getBook();
+        tds.removeTableData(sourceName);
+        dataTree.refresh();
+    }
+
+
+
+
     public void addDataPane(final AbstractTableDataPane<?> uPanel, String paneName) {
         final NamePane nPanel = uPanel.asNamePane();
         nPanel.setObjectName(paneName);

designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java

@@ -1,5 +1,6 @@
 package com.fr.design.data.datapane.connect;
 
+import com.fr.base.GraphHelper;
 import com.fr.design.constants.UIConstants;
 import com.fr.data.impl.JDBCDatabaseConnection;
 import com.fr.data.pool.DBCPConnectionPoolAttr;
@@ -16,7 +17,9 @@ import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.editor.editor.IntegerEditor;
+import com.fr.design.utils.BrowseUtils;
 import com.fr.file.filter.ChooseFileFilter;
+import com.fr.general.CloudCenter;
 import com.fr.general.ComparatorUtils;
 
 import com.fr.stable.StringUtils;
@@ -32,351 +35,375 @@ import java.util.Map;
 import java.util.Map.Entry;
 
 public class JDBCDefPane extends JPanel {
-	public static final String DRIVER_TYPE = "driver_type";
+    public static final String DRIVER_TYPE = "driver_type";
-	public static final String USER_NAME = "user_name";
+    public static final String USER_NAME = "user_name";
     public static final int TIME_MULTIPLE = 1000;
-	private static final String OTHER_DB = "Others";
+    private static final String OTHER_DB = "Others";
-
+
-	private static Map<String, DriverURLName[]> jdbcMap = new HashMap<String, DriverURLName[]>();
+    private static Map<String, DriverURLName[]> jdbcMap = new HashMap<String, DriverURLName[]>();
-
+
-	static {
+    static {
-		jdbcMap.put(OTHER_DB, new DriverURLName[]{new DriverURLName("sun.jdbc.odbc.JdbcOdbcDriver", "jdbc:odbc:"),
+        jdbcMap.put(OTHER_DB, new DriverURLName[]{new DriverURLName("sun.jdbc.odbc.JdbcOdbcDriver", "jdbc:odbc:"),
-				new DriverURLName("org.hsqldb.jdbcDriver", "jdbc:hsqldb:file:[PATH_TO_DB_FILES]"), new DriverURLName("com.inet.tds.TdsDriver", "jdbc:inetdae7:localhost:1433/"),
+                new DriverURLName("org.hsqldb.jdbcDriver", "jdbc:hsqldb:file:[PATH_TO_DB_FILES]"), new DriverURLName("com.inet.tds.TdsDriver", "jdbc:inetdae7:localhost:1433/"),
-				new DriverURLName("COM.cloudscape.JDBCDriver", "jdbc:cloudscape:/cloudscape/"),
+                new DriverURLName("COM.cloudscape.JDBCDriver", "jdbc:cloudscape:/cloudscape/"),
-				new DriverURLName("com.internetcds.jdbc.tds.Driver", "jdbc:freetds:sqlserver://localhost/"),
+                new DriverURLName("com.internetcds.jdbc.tds.Driver", "jdbc:freetds:sqlserver://localhost/"),
-				new DriverURLName("com.fr.swift.jdbc.Driver", "jdbc:swift:emb://default")});
+                new DriverURLName("com.fr.swift.jdbc.Driver", "jdbc:swift:emb://default")});
-        jdbcMap.put("Inceptor",new DriverURLName[]{new DriverURLName("org.apache.hive.jdbc.HiveDriver","jdbc:inceptor2://localhost:10000/default"),
+        jdbcMap.put("Inceptor", new DriverURLName[]{new DriverURLName("org.apache.hive.jdbc.HiveDriver", "jdbc:inceptor2://localhost:10000/default"),
-				new DriverURLName("org.apache.hadoop.hive.jdbc.HiveDriver","jdbc:inceptor://localhost:10000/default")});
+                new DriverURLName("org.apache.hadoop.hive.jdbc.HiveDriver", "jdbc:inceptor://localhost:10000/default")});
-		jdbcMap.put("Oracle", new DriverURLName[]{new DriverURLName("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@localhost:1521:databaseName")});
+        jdbcMap.put("Oracle", new DriverURLName[]{new DriverURLName("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@localhost:1521:databaseName")});
-		jdbcMap.put("DB2", new DriverURLName[]{new DriverURLName("com.ibm.db2.jcc.DB2Driver", "jdbc:db2://localhost:50000/")});
+        jdbcMap.put("DB2", new DriverURLName[]{new DriverURLName("com.ibm.db2.jcc.DB2Driver", "jdbc:db2://localhost:50000/")});
-		jdbcMap.put("SQL Server", new DriverURLName[]{new DriverURLName("com.microsoft.sqlserver.jdbc.SQLServerDriver", "jdbc:sqlserver://localhost:1433;" + "databaseName=")});
+        jdbcMap.put("SQL Server", new DriverURLName[]{new DriverURLName("com.microsoft.sqlserver.jdbc.SQLServerDriver", "jdbc:sqlserver://localhost:1433;" + "databaseName=")});
-		jdbcMap.put("MySQL", new DriverURLName[]{new DriverURLName("com.mysql.jdbc.Driver", "jdbc:mysql://localhost/"),
+        jdbcMap.put("MySQL", new DriverURLName[]{new DriverURLName("com.mysql.jdbc.Driver", "jdbc:mysql://localhost/"),
-				new DriverURLName("org.gjt.mm.mysql.Driver", "jdbc:mysql://localhost/")});
+                new DriverURLName("org.gjt.mm.mysql.Driver", "jdbc:mysql://localhost/")});
-		jdbcMap.put("Sybase", new DriverURLName[]{new DriverURLName("com.sybase.jdbc2.jdbc.SybDriver", "jdbc:sybase:Tds:localhost:5000/")});
+        jdbcMap.put("Sybase", new DriverURLName[]{new DriverURLName("com.sybase.jdbc2.jdbc.SybDriver", "jdbc:sybase:Tds:localhost:5000/")});
-		jdbcMap.put("Access", new DriverURLName[]{new DriverURLName("sun.jdbc.odbc.JdbcOdbcDriver", "jdbc:odbc:Driver={Microsoft Access Driver (*.mdb, *.accdb)};DBQ=")});
+        jdbcMap.put("Access", new DriverURLName[]{new DriverURLName("sun.jdbc.odbc.JdbcOdbcDriver", "jdbc:odbc:Driver={Microsoft Access Driver (*.mdb, *.accdb)};DBQ=")});
-		jdbcMap.put("Derby", new DriverURLName[]{new DriverURLName("org.apache.derby.jdbc.ClientDriver", "jdbc:derby://localhost:1527/")});
+        jdbcMap.put("Derby", new DriverURLName[]{new DriverURLName("org.apache.derby.jdbc.ClientDriver", "jdbc:derby://localhost:1527/")});
-		jdbcMap.put("Postgre", new DriverURLName[]{new DriverURLName("org.postgresql.Driver", "jdbc:postgresql://localhost:5432/")});
+        jdbcMap.put("Postgre", new DriverURLName[]{new DriverURLName("org.postgresql.Driver", "jdbc:postgresql://localhost:5432/")});
-		jdbcMap.put("SQLite", new DriverURLName[]{new DriverURLName("org.sqlite.JDBC", "jdbc:sqlite://${ENV_HOME}/../help/FRDemo.db")});
+        jdbcMap.put("SQLite", new DriverURLName[]{new DriverURLName("org.sqlite.JDBC", "jdbc:sqlite://${ENV_HOME}/../help/FRDemo.db")});
-	}
+    }
-
+
-	private UIButton dbtypeButton;
+    private UIButton dbtypeButton;
-	private UIComboBox dbtypeComboBox;
+    private UIComboBox dbtypeComboBox;
-	private UIComboBox driverComboBox;
+    private UIComboBox driverComboBox;
-	private UITextField urlTextField;
+    private UITextField urlTextField;
-	private UITextField userNameTextField;
+    private UITextField userNameTextField;
-	private JPasswordField passwordTextField;
+    private JPasswordField passwordTextField;
-	// 请不要改动dbtype,只应该最后添加
+    private ActionLabel odbcTipsLink;
-	private final String[] dbtype = {"Oracle", "DB2", "SQL Server", "MySQL", "Sybase", "Access", "Derby", "Postgre","SQLite","Inceptor", OTHER_DB};
+    // 请不要改动dbtype,只应该最后添加
-
+    private final String[] dbtype = {"Oracle", "DB2", "SQL Server", "MySQL", "Sybase", "Access", "Derby", "Postgre", "SQLite", "Inceptor", OTHER_DB};
-	// carl:DBCP的一些属性
+
-	private IntegerEditor DBCP_INITIAL_SIZE = new IntegerEditor();
+    // carl:DBCP的一些属性
-	private IntegerEditor DBCP_MAX_ACTIVE = new IntegerEditor();
+    private IntegerEditor DBCP_INITIAL_SIZE = new IntegerEditor();
-	private IntegerEditor DBCP_MAX_IDLE = new IntegerEditor();
+    private IntegerEditor DBCP_MAX_ACTIVE = new IntegerEditor();
-	private IntegerEditor DBCP_MIN_IDLE = new IntegerEditor();
+    private IntegerEditor DBCP_MAX_IDLE = new IntegerEditor();
-	private IntegerEditor DBCP_MAX_WAIT = new IntegerEditor();
+    private IntegerEditor DBCP_MIN_IDLE = new IntegerEditor();
-	private UITextField DBCP_VALIDATION_QUERY = new UITextField();
+    private IntegerEditor DBCP_MAX_WAIT = new IntegerEditor();
-
+    private UITextField DBCP_VALIDATION_QUERY = new UITextField();
-	private UIComboBox DBCP_TESTONBORROW = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_No"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Yes")});
+
-	private UIComboBox DBCP_TESTONRETURN = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_No"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Yes")});
+    private UIComboBox DBCP_TESTONBORROW = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_No"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Yes")});
-	private UIComboBox DBCP_TESTWHILEIDLE = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_No"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Yes")});
+    private UIComboBox DBCP_TESTONRETURN = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_No"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Yes")});
-
+    private UIComboBox DBCP_TESTWHILEIDLE = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_No"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Yes")});
-	private IntegerEditor DBCP_TIMEBETWEENEVICTIONRUNSMILLS = new IntegerEditor();
+
-	private IntegerEditor DBCP_NUMTESTSPEREVICTIONRUN = new IntegerEditor();
+    private IntegerEditor DBCP_TIMEBETWEENEVICTIONRUNSMILLS = new IntegerEditor();
-	private IntegerEditor DBCP_MINEVICTABLEIDLETIMEMILLIS = new IntegerEditor();
+    private IntegerEditor DBCP_NUMTESTSPEREVICTIONRUN = new IntegerEditor();
-
+    private IntegerEditor DBCP_MINEVICTABLEIDLETIMEMILLIS = new IntegerEditor();
-	public JDBCDefPane() {
+
-		this.setBorder(UITitledBorder.createBorderWithTitle("JDBC" + ":"));
+    public JDBCDefPane() {
-		this.setLayout(FRGUIPaneFactory.createLabelFlowLayout());
+        this.setBorder(UITitledBorder.createBorderWithTitle("JDBC" + ":"));
-		JPanel innerthis = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
+        this.setLayout(FRGUIPaneFactory.createLabelFlowLayout());
-		innerthis.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+        JPanel innerthis = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
-		this.add(innerthis);
+        innerthis.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-		dbtypeComboBox = new UIComboBox();
+        this.add(innerthis);
-		dbtypeComboBox.setName(DRIVER_TYPE);
+        dbtypeComboBox = new UIComboBox();
-		for (int i = 0; i < dbtype.length; i++) {
+        dbtypeComboBox.setName(DRIVER_TYPE);
-			dbtypeComboBox.addItem(dbtype[i]);
+        for (int i = 0; i < dbtype.length; i++) {
-		}
+            dbtypeComboBox.addItem(dbtype[i]);
-		dbtypeComboBox.addActionListener(dbtypeActionListener);
+        }
-		dbtypeComboBox.setMaximumRowCount(10);
+        dbtypeComboBox.addActionListener(dbtypeActionListener);
-
+        dbtypeComboBox.setMaximumRowCount(10);
-		driverComboBox = new UIComboBox();
+
-		driverComboBox.setEditable(true);
+        driverComboBox = new UIComboBox();
-		driverComboBox.addActionListener(driverListener);
+        driverComboBox.setEditable(true);
-		urlTextField = new UITextField(15);
+        driverComboBox.addActionListener(driverListener);
-		userNameTextField = new UITextField(15);
+        urlTextField = new UITextField(15);
-		userNameTextField.setName(USER_NAME);
+        userNameTextField = new UITextField(15);
-		passwordTextField = new UIPassWordField(15);
+        userNameTextField.setName(USER_NAME);
-		dbtypeButton = new UIButton(".");
+        passwordTextField = new UIPassWordField(15);
-		dbtypeButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Click_Get_Default_URL"));
+        dbtypeButton = new UIButton(".");
-		dbtypeButton.addActionListener(dbtypeButtonActionListener);
+        dbtypeButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Click_Get_Default_URL"));
-
+        dbtypeButton.addActionListener(dbtypeButtonActionListener);
-		double p = TableLayout.PREFERRED;
+
-		double f = TableLayout.FILL;
+        double p = TableLayout.PREFERRED;
-		JPanel dbtypePane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
+        double f = TableLayout.FILL;
-		dbtypePane.add(new UILabel((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database") + ":")));
+        JPanel dbtypePane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
-		JPanel dbtypeComPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+        dbtypePane.add(new UILabel((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database") + ":")));
-		Component[][] dbtypeComComponents = {{dbtypeComboBox}};
+        JPanel dbtypeComPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
-		double[] dbtypeRowSize = {p};
+        Component[][] dbtypeComComponents = {{dbtypeComboBox}};
-		double[] dbtypeColumnSize = {p};
+        double[] dbtypeRowSize = {p};
-		dbtypeComPane = TableLayoutHelper.createTableLayoutPane(dbtypeComComponents, dbtypeRowSize, dbtypeColumnSize);
+        double[] dbtypeColumnSize = {p};
-
+        dbtypeComPane = TableLayoutHelper.createTableLayoutPane(dbtypeComComponents, dbtypeRowSize, dbtypeColumnSize);
-		JPanel driverPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
+
-		driverPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Driver") + ":"));
+        JPanel driverPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
-
+        driverPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Driver") + ":"));
-		JPanel urlPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
+        // 选择ODBC数据源的时候的提示链接
-		urlPane.add(new UILabel("URL:"));
+        JPanel odbcTipsPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
-		JPanel urlComPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+        odbcTipsLink = new ActionLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Odbc_Tips")) {
-		Component[][] urlComComponents = {{urlTextField, dbtypeButton}};
+            @Override
-		double[] urlRowSize = {p};
+            public void paintComponent(Graphics _gfx) {
-		double[] urlColumnSize = {f, 21};
+                super.paintComponent(_gfx);
-		urlComPane = TableLayoutHelper.createCommonTableLayoutPane(urlComComponents, urlRowSize, urlColumnSize, 4);
+                _gfx.setColor(Color.blue);
-
+                _gfx.drawLine(0, this.getHeight() - 1, GraphHelper.getWidth(this.getText()), this.getHeight() - 1);
-		JPanel userPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
+            }
-		userPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_UserName") + ":"));
+        };
-		JPanel userComPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+        odbcTipsPane.add(odbcTipsLink);
-		Component[][] userComComponents = {{userNameTextField, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Password") + ":"), passwordTextField}};
+        odbcTipsLink.setPreferredSize(new Dimension(GraphHelper.getWidth(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Odbc_Tips")), odbcTipsLink.getPreferredSize().height));
-		double[] userRowSize = {p};
+        odbcTipsLink.addActionListener(new ActionListener() {
-		double[] userColumnSize = {f, p, f};
+            public void actionPerformed(ActionEvent evt) {
-		userComPane = TableLayoutHelper.createCommonTableLayoutPane(userComComponents, userRowSize, userColumnSize, 4);
+                String url = CloudCenter.getInstance().acquireUrlByKind("odbc.help");
-
+                BrowseUtils.browser(url);
-		JPanel passwordPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
+            }
-		passwordPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Password") + ":"));
+        });
-
+
-		Component[][] components = {{dbtypePane, dbtypeComPane}, {driverPane, driverComboBox}, {urlPane, urlComPane}, {userPane, userComPane},};
+        JPanel driverComboBoxAndTips = new JPanel(new BorderLayout());
-
+        driverComboBoxAndTips.add(driverComboBox, BorderLayout.WEST);
-		double[] rowSize = {p, p, p, p};
+        driverComboBoxAndTips.add(odbcTipsPane, BorderLayout.CENTER);
-		double[] columnSize = {p, f, 22};
+
-		JPanel centerPanel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 0, 6);
+        JPanel urlPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
-		innerthis.add(centerPanel);
+        urlPane.add(new UILabel("URL:"));
-		JPanel southPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        JPanel urlComPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
-		innerthis.add(southPanel);
+        Component[][] urlComComponents = {{urlTextField, dbtypeButton}};
-		southPanel.setBorder(BorderFactory.createEmptyBorder(10, 0, 4, 20));
+        double[] urlRowSize = {p};
-		ActionLabel actionLabel = new ActionLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ConnectionPool_Attr"));
+        double[] urlColumnSize = {f, 21};
-		southPanel.add(actionLabel, BorderLayout.EAST);
+        urlComPane = TableLayoutHelper.createCommonTableLayoutPane(urlComComponents, urlRowSize, urlColumnSize, 4);
-		actionLabel.addActionListener(new ActionListener() {
+
-			public void actionPerformed(ActionEvent evt) {
+        JPanel userPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
-				JDialog wDialog = createJDialog();
+        userPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_UserName") + ":"));
-				wDialog.setVisible(true);
+        JPanel userComPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
-			}
+        Component[][] userComComponents = {{userNameTextField, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Password") + ":"), passwordTextField}};
-		});
+        double[] userRowSize = {p};
-	}
+        double[] userColumnSize = {f, p, f};
-
+        userComPane = TableLayoutHelper.createCommonTableLayoutPane(userComComponents, userRowSize, userColumnSize, 4);
-	public void populate(JDBCDatabaseConnection jdbcDatabase) {
+
-		if (jdbcDatabase == null) {
+        JPanel passwordPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
-			jdbcDatabase = new JDBCDatabaseConnection();
+        passwordPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Password") + ":"));
-		}
+
-		if (ComparatorUtils.equals(jdbcDatabase.getDriver(), "sun.jdbc.odbc.JdbcOdbcDriver")
+        Component[][] components = {{dbtypePane, dbtypeComPane}, {driverPane, driverComboBoxAndTips}, {urlPane, urlComPane}, {userPane, userComPane},};
-				&& jdbcDatabase.getURL().startsWith("jdbc:odbc:Driver={Microsoft")) {
+
-			this.dbtypeComboBox.setSelectedItem("Access");
+        double[] rowSize = {p, p, p, p};
-		} else {
+        double[] columnSize = {p, f, 22};
-			Iterator<Entry<String, DriverURLName[]>> jdbc = jdbcMap.entrySet().iterator();
+        JPanel centerPanel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 0, 6);
-			boolean out = false;
+        innerthis.add(centerPanel);
-			while (jdbc.hasNext()) {
+        JPanel southPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
-				Entry<String, DriverURLName[]> entry = jdbc.next();
+        innerthis.add(southPanel);
-				DriverURLName[] dus = entry.getValue();
+        southPanel.setBorder(BorderFactory.createEmptyBorder(10, 0, 4, 20));
-				for (int i = 0, len = dus.length; i < len; i++) {
+        ActionLabel actionLabel = new ActionLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ConnectionPool_Attr"));
-					if (ComparatorUtils.equals(dus[i].getDriver(), jdbcDatabase.getDriver())) {
+        southPanel.add(actionLabel, BorderLayout.EAST);
-						this.dbtypeComboBox.setSelectedItem(entry.getKey());
+        actionLabel.addActionListener(new ActionListener() {
-						out = true;
+            public void actionPerformed(ActionEvent evt) {
-						break;
+                JDialog wDialog = createJDialog();
-					}
+                wDialog.setVisible(true);
-				}
+            }
-				if (out) {
+        });
-					break;
+    }
-				}
+
-			}
+    public void populate(JDBCDatabaseConnection jdbcDatabase) {
-			if (!out) {
+        if (jdbcDatabase == null) {
-				this.dbtypeComboBox.setSelectedItem(OTHER_DB);
+            jdbcDatabase = new JDBCDatabaseConnection();
-			}
+        }
-		}
+        if (ComparatorUtils.equals(jdbcDatabase.getDriver(), "sun.jdbc.odbc.JdbcOdbcDriver")
-		this.driverComboBox.setSelectedItem(jdbcDatabase.getDriver());
+                && jdbcDatabase.getURL().startsWith("jdbc:odbc:Driver={Microsoft")) {
-		this.urlTextField.setText(jdbcDatabase.getURL());
+            this.dbtypeComboBox.setSelectedItem("Access");
-		this.userNameTextField.setText(jdbcDatabase.getUser());
+        } else {
-		this.passwordTextField.setText(jdbcDatabase.getPassword());
+            Iterator<Entry<String, DriverURLName[]>> jdbc = jdbcMap.entrySet().iterator();
-
+            boolean out = false;
-		DBCPConnectionPoolAttr dbcpAttr = jdbcDatabase.getDbcpAttr();
+            while (jdbc.hasNext()) {
-		if (dbcpAttr == null) {
+                Entry<String, DriverURLName[]> entry = jdbc.next();
-			dbcpAttr = new DBCPConnectionPoolAttr();
+                DriverURLName[] dus = entry.getValue();
-			jdbcDatabase.setDbcpAttr(dbcpAttr);
+                for (int i = 0, len = dus.length; i < len; i++) {
-		}
+                    if (ComparatorUtils.equals(dus[i].getDriver(), jdbcDatabase.getDriver())) {
-		this.DBCP_INITIAL_SIZE.setValue(dbcpAttr.getInitialSize());
+                        this.dbtypeComboBox.setSelectedItem(entry.getKey());
-		this.DBCP_MAX_ACTIVE.setValue(dbcpAttr.getMaxActive());
+                        out = true;
-		this.DBCP_MAX_IDLE.setValue(dbcpAttr.getMaxIdle());
+                        break;
-		this.DBCP_MAX_WAIT.setValue(dbcpAttr.getMaxWait());
+                    }
-		this.DBCP_MIN_IDLE.setValue(dbcpAttr.getMinIdle());
+                }
-		this.DBCP_VALIDATION_QUERY.setText(dbcpAttr.getValidationQuery());
+                if (out) {
-		this.DBCP_TESTONBORROW.setSelectedIndex(dbcpAttr.isTestOnBorrow() ? 1 : 0);
+                    break;
-		this.DBCP_TESTONRETURN.setSelectedIndex(dbcpAttr.isTestOnReturn() ? 1 : 0);
+                }
-		this.DBCP_TESTWHILEIDLE.setSelectedIndex(dbcpAttr.isTestWhileIdle() ? 1 : 0);
+            }
-		this.DBCP_MINEVICTABLEIDLETIMEMILLIS.setValue(dbcpAttr.getMinEvictableIdleTimeMillis() / TIME_MULTIPLE);
+            if (!out) {
-		this.DBCP_NUMTESTSPEREVICTIONRUN.setValue(dbcpAttr.getNumTestsPerEvictionRun());
+                this.dbtypeComboBox.setSelectedItem(OTHER_DB);
-		this.DBCP_TIMEBETWEENEVICTIONRUNSMILLS.setValue(dbcpAttr.getTimeBetweenEvictionRunsMillis());
+            }
-	}
+        }
-
+        this.driverComboBox.setSelectedItem(jdbcDatabase.getDriver());
-	public JDBCDatabaseConnection update() {
+        this.urlTextField.setText(jdbcDatabase.getURL());
-		JDBCDatabaseConnection jdbcDatabase = new JDBCDatabaseConnection();
+        this.userNameTextField.setText(jdbcDatabase.getUser());
-		Object driveItem = this.driverComboBox.getSelectedItem();
+        this.passwordTextField.setText(jdbcDatabase.getPassword());
-		jdbcDatabase.setDriver(driveItem == null ? null : driveItem.toString());
+
-		jdbcDatabase.setURL(this.urlTextField.getText().trim());
+        DBCPConnectionPoolAttr dbcpAttr = jdbcDatabase.getDbcpAttr();
-		jdbcDatabase.setUser(this.userNameTextField.getText().trim());
+        if (dbcpAttr == null) {
-		jdbcDatabase.setPassword(new String(this.passwordTextField.getPassword()).trim());
+            dbcpAttr = new DBCPConnectionPoolAttr();
-
+            jdbcDatabase.setDbcpAttr(dbcpAttr);
-		DBCPConnectionPoolAttr dbcpAttr = jdbcDatabase.getDbcpAttr();
+        }
-		if (dbcpAttr == null) {
+        this.DBCP_INITIAL_SIZE.setValue(dbcpAttr.getInitialSize());
-			dbcpAttr = new DBCPConnectionPoolAttr();
+        this.DBCP_MAX_ACTIVE.setValue(dbcpAttr.getMaxActive());
-			jdbcDatabase.setDbcpAttr(dbcpAttr);
+        this.DBCP_MAX_IDLE.setValue(dbcpAttr.getMaxIdle());
-		}
+        this.DBCP_MAX_WAIT.setValue(dbcpAttr.getMaxWait());
-		dbcpAttr.setInitialSize(this.DBCP_INITIAL_SIZE.getValue().intValue());
+        this.DBCP_MIN_IDLE.setValue(dbcpAttr.getMinIdle());
-		dbcpAttr.setMaxActive(this.DBCP_MAX_ACTIVE.getValue().intValue());
+        this.DBCP_VALIDATION_QUERY.setText(dbcpAttr.getValidationQuery());
-		dbcpAttr.setMaxIdle(this.DBCP_MAX_IDLE.getValue().intValue());
+        this.DBCP_TESTONBORROW.setSelectedIndex(dbcpAttr.isTestOnBorrow() ? 1 : 0);
-		dbcpAttr.setMaxWait(this.DBCP_MAX_WAIT.getValue().intValue());
+        this.DBCP_TESTONRETURN.setSelectedIndex(dbcpAttr.isTestOnReturn() ? 1 : 0);
-		dbcpAttr.setMinIdle(this.DBCP_MIN_IDLE.getValue().intValue());
+        this.DBCP_TESTWHILEIDLE.setSelectedIndex(dbcpAttr.isTestWhileIdle() ? 1 : 0);
-		dbcpAttr.setValidationQuery(this.DBCP_VALIDATION_QUERY.getText());
+        this.DBCP_MINEVICTABLEIDLETIMEMILLIS.setValue(dbcpAttr.getMinEvictableIdleTimeMillis() / TIME_MULTIPLE);
-		dbcpAttr.setTestOnBorrow(this.DBCP_TESTONBORROW.getSelectedIndex() == 0 ? false : true);
+        this.DBCP_NUMTESTSPEREVICTIONRUN.setValue(dbcpAttr.getNumTestsPerEvictionRun());
-		dbcpAttr.setTestOnReturn(this.DBCP_TESTONRETURN.getSelectedIndex() == 0 ? false : true);
+        this.DBCP_TIMEBETWEENEVICTIONRUNSMILLS.setValue(dbcpAttr.getTimeBetweenEvictionRunsMillis());
-		dbcpAttr.setTestWhileIdle(this.DBCP_TESTWHILEIDLE.getSelectedIndex() == 0 ? false : true);
+    }
-		dbcpAttr.setMinEvictableIdleTimeMillis(((Number) this.DBCP_MINEVICTABLEIDLETIMEMILLIS.getValue()).intValue() * TIME_MULTIPLE);
+
-		dbcpAttr.setNumTestsPerEvictionRun(((Number) this.DBCP_NUMTESTSPEREVICTIONRUN.getValue()).intValue());
+    public JDBCDatabaseConnection update() {
-		dbcpAttr.setTimeBetweenEvictionRunsMillis(((Number) this.DBCP_TIMEBETWEENEVICTIONRUNSMILLS.getValue()).intValue());
+        JDBCDatabaseConnection jdbcDatabase = new JDBCDatabaseConnection();
-
+        Object driveItem = this.driverComboBox.getSelectedItem();
-		return jdbcDatabase;
+        jdbcDatabase.setDriver(driveItem == null ? null : driveItem.toString());
-	}
+        jdbcDatabase.setURL(this.urlTextField.getText().trim());
-
+        jdbcDatabase.setUser(this.userNameTextField.getText().trim());
-	ActionListener dbtypeActionListener = new ActionListener() {
+        jdbcDatabase.setPassword(new String(this.passwordTextField.getPassword()).trim());
-		public void actionPerformed(ActionEvent evt) {
+
-
+        DBCPConnectionPoolAttr dbcpAttr = jdbcDatabase.getDbcpAttr();
-			urlTextField.setText(StringUtils.EMPTY);
+        if (dbcpAttr == null) {
-			driverComboBox.removeAllItems();
+            dbcpAttr = new DBCPConnectionPoolAttr();
-			if (ComparatorUtils.equals(dbtypeComboBox.getSelectedItem(), StringUtils.EMPTY)) {
+            jdbcDatabase.setDbcpAttr(dbcpAttr);
-				driverComboBox.setSelectedItem(StringUtils.EMPTY);
+        }
-				return;
+        dbcpAttr.setInitialSize(this.DBCP_INITIAL_SIZE.getValue().intValue());
-			}
+        dbcpAttr.setMaxActive(this.DBCP_MAX_ACTIVE.getValue().intValue());
-
+        dbcpAttr.setMaxIdle(this.DBCP_MAX_IDLE.getValue().intValue());
-			DriverURLName[] dus = jdbcMap.get(dbtypeComboBox.getSelectedItem());
+        dbcpAttr.setMaxWait(this.DBCP_MAX_WAIT.getValue().intValue());
-			for (int i = 0, len = dus.length; i < len; i++) {
+        dbcpAttr.setMinIdle(this.DBCP_MIN_IDLE.getValue().intValue());
-				driverComboBox.addItem(dus[i].getDriver());
+        dbcpAttr.setValidationQuery(this.DBCP_VALIDATION_QUERY.getText());
-				if (i == 0) {
+        dbcpAttr.setTestOnBorrow(this.DBCP_TESTONBORROW.getSelectedIndex() == 0 ? false : true);
-					driverComboBox.setSelectedItem(dus[i].getDriver());
+        dbcpAttr.setTestOnReturn(this.DBCP_TESTONRETURN.getSelectedIndex() == 0 ? false : true);
-					urlTextField.setText(dus[i].getURL());
+        dbcpAttr.setTestWhileIdle(this.DBCP_TESTWHILEIDLE.getSelectedIndex() == 0 ? false : true);
-				}
+        dbcpAttr.setMinEvictableIdleTimeMillis(((Number) this.DBCP_MINEVICTABLEIDLETIMEMILLIS.getValue()).intValue() * TIME_MULTIPLE);
-			}
+        dbcpAttr.setNumTestsPerEvictionRun(((Number) this.DBCP_NUMTESTSPEREVICTIONRUN.getValue()).intValue());
-		}
+        dbcpAttr.setTimeBetweenEvictionRunsMillis(((Number) this.DBCP_TIMEBETWEENEVICTIONRUNSMILLS.getValue()).intValue());
-	};
+
-
+        return jdbcDatabase;
-	ActionListener driverListener = new ActionListener() {
+    }
-		public void actionPerformed(ActionEvent e) {
+
-			if (driverComboBox.getSelectedItem() == null ||ComparatorUtils.equals(driverComboBox.getSelectedItem(), StringUtils.EMPTY)) {
+    ActionListener dbtypeActionListener = new ActionListener() {
-				return;
+        public void actionPerformed(ActionEvent evt) {
-			}
+
-			Iterator<Entry<String, DriverURLName[]>> jdbc = jdbcMap.entrySet().iterator();
+            urlTextField.setText(StringUtils.EMPTY);
-			while (jdbc.hasNext()) {
+            driverComboBox.removeAllItems();
-				Entry<String, DriverURLName[]> entry = jdbc.next();
+            if (ComparatorUtils.equals(dbtypeComboBox.getSelectedItem(), StringUtils.EMPTY)) {
-				DriverURLName[] dus = entry.getValue();
+                driverComboBox.setSelectedItem(StringUtils.EMPTY);
-				for (int i = 0, len = dus.length; i < len; i++) {
+                return;
-					if (ComparatorUtils.equals(dus[i].getDriver(), (driverComboBox.getSelectedItem()))) {
+            }
-						urlTextField.setText(dus[i].getURL());
+
-						return;
+            DriverURLName[] dus = jdbcMap.get(dbtypeComboBox.getSelectedItem());
-					}
+            for (int i = 0, len = dus.length; i < len; i++) {
-				}
+                driverComboBox.addItem(dus[i].getDriver());
-			}
+                if (i == 0) {
-		}
+                    driverComboBox.setSelectedItem(dus[i].getDriver());
-
+                    urlTextField.setText(dus[i].getURL());
-	};
+                }
-
+            }
-	ActionListener dbtypeButtonActionListener = new ActionListener() {
+        }
-		public void actionPerformed(ActionEvent evt) {
+    };
-			if (ComparatorUtils.equals(dbtypeComboBox.getSelectedItem(), StringUtils.EMPTY)) {
+
-				return;
+    ActionListener driverListener = new ActionListener() {
-			}
+        public void actionPerformed(ActionEvent e) {
-			DriverURLName[] dus = jdbcMap.get(dbtypeComboBox.getSelectedItem());
+            if (driverComboBox.getSelectedItem() == null || ComparatorUtils.equals(driverComboBox.getSelectedItem(), StringUtils.EMPTY)) {
-			for (int i = 0, len = dus.length; i < len; i++) {
+                return;
-				if (ComparatorUtils.equals(driverComboBox.getSelectedItem(), (dus[i].getDriver()))) {
+            }
-					urlTextField.setText(dus[i].getURL());
+            odbcTipsLink.setVisible(ComparatorUtils.equals("sun.jdbc.odbc.JdbcOdbcDriver", driverComboBox.getSelectedItem())); // 选择的如果是ODBC就显示提示
-					if (ComparatorUtils.equals(dbtypeComboBox.getSelectedItem(), ("Access"))) {
+            Iterator<Entry<String, DriverURLName[]>> jdbc = jdbcMap.entrySet().iterator();
-						// ben:这个能不能换种处理方案- -
+            while (jdbc.hasNext()) {
-						JFileChooser filechooser = new JFileChooser();
+                Entry<String, DriverURLName[]> entry = jdbc.next();
-						filechooser.setDialogTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Open"));
+                DriverURLName[] dus = entry.getValue();
-						filechooser.setMultiSelectionEnabled(false);
+                for (int i = 0, len = dus.length; i < len; i++) {
-						filechooser.addChoosableFileFilter(new ChooseFileFilter(new String[]{"accdb", "mdb"}, "Microsoft Office Access"));
+                    if (ComparatorUtils.equals(dus[i].getDriver(), (driverComboBox.getSelectedItem()))) {
-						int result = filechooser.showOpenDialog(DesignerContext.getDesignerFrame());
+                        urlTextField.setText(dus[i].getURL());
-						File selectedfile = null;
+                        return;
-
+                    }
-						if (result == JFileChooser.APPROVE_OPTION) {
+                }
-							selectedfile = filechooser.getSelectedFile();
+            }
-							if (selectedfile != null) {
+        }
-								String selectedName = selectedfile.getPath().substring(selectedfile.getPath().lastIndexOf('.') + 1);
+
-								if (selectedName.equalsIgnoreCase("mdb") || selectedName.equalsIgnoreCase("accdb")) {
+    };
-									urlTextField.setText(urlTextField.getText() + selectedfile.getPath());
+
-								}
+    ActionListener dbtypeButtonActionListener = new ActionListener() {
-							}
+        public void actionPerformed(ActionEvent evt) {
-						}
+            if (ComparatorUtils.equals(dbtypeComboBox.getSelectedItem(), StringUtils.EMPTY)) {
-					}
+                return;
-					break;
+            }
-				}
+            DriverURLName[] dus = jdbcMap.get(dbtypeComboBox.getSelectedItem());
-			}
+            for (int i = 0, len = dus.length; i < len; i++) {
-		}
+                if (ComparatorUtils.equals(driverComboBox.getSelectedItem(), (dus[i].getDriver()))) {
-	};
+                    urlTextField.setText(dus[i].getURL());
-
+                    if (ComparatorUtils.equals(dbtypeComboBox.getSelectedItem(), ("Access"))) {
-	private JDialog createJDialog() {
+                        // ben:这个能不能换种处理方案- -
-		return new DBCPAttrPane().showWindow(SwingUtilities.getWindowAncestor(JDBCDefPane.this));
+                        JFileChooser filechooser = new JFileChooser();
-	}
+                        filechooser.setDialogTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Open"));
-
+                        filechooser.setMultiSelectionEnabled(false);
-	class DBCPAttrPane extends BasicPane {
+                        filechooser.addChoosableFileFilter(new ChooseFileFilter(new String[]{"accdb", "mdb"}, "Microsoft Office Access"));
-		public DBCPAttrPane() {
+                        int result = filechooser.showOpenDialog(DesignerContext.getDesignerFrame());
-			JPanel defaultPane = this;
+                        File selectedfile = null;
-
+
-			// JPanel northFlowPane
+                        if (result == JFileChooser.APPROVE_OPTION) {
-			JPanel northFlowPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
+                            selectedfile = filechooser.getSelectedFile();
-			defaultPane.add(northFlowPane, BorderLayout.NORTH);
+                            if (selectedfile != null) {
-
+                                String selectedName = selectedfile.getPath().substring(selectedfile.getPath().lastIndexOf('.') + 1);
-			DBCP_VALIDATION_QUERY.setColumns(15);
+                                if (selectedName.equalsIgnoreCase("mdb") || selectedName.equalsIgnoreCase("accdb")) {
-			// ContextPane
+                                    urlTextField.setText(urlTextField.getText() + selectedfile.getPath());
-
+                                }
-			double f = TableLayout.FILL;
+                            }
-			// double p = TableLayout.PREFERRED;
+                        }
-			double[] rowSize = {f, f, f, f, f, f, f, f, f, f, f, f};
+                    }
-			double[] columnSize = {f, f};
+                    break;
-			Component[][] comps = {
+                }
-					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Initial_Size") + ":", SwingConstants.RIGHT), DBCP_INITIAL_SIZE},
+            }
-					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Max_Active") + ":", SwingConstants.RIGHT), DBCP_MAX_ACTIVE},
+        }
-					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Max_Idle") + ":", SwingConstants.RIGHT), DBCP_MAX_IDLE},
+    };
-					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Min_Idle") + ":", SwingConstants.RIGHT), DBCP_MIN_IDLE},
+
-					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Max_Wait_Time") + ":" , SwingConstants.RIGHT), DBCP_MAX_WAIT},
+    private JDialog createJDialog() {
-					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Validation_Query") + ":", SwingConstants.RIGHT), DBCP_VALIDATION_QUERY},
+        return new DBCPAttrPane().showWindow(SwingUtilities.getWindowAncestor(JDBCDefPane.this));
-					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_On_Borrow") + ":", SwingConstants.RIGHT), DBCP_TESTONBORROW},
+    }
-					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_On_Return") + ":", SwingConstants.RIGHT), DBCP_TESTONRETURN},
+
-					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_While_Idle") + ":", SwingConstants.RIGHT), DBCP_TESTWHILEIDLE},
+    class DBCPAttrPane extends BasicPane {
-					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Evictionruns_millis") + ":", SwingConstants.RIGHT),
+        public DBCPAttrPane() {
-							DBCP_TIMEBETWEENEVICTIONRUNSMILLS},
+            JPanel defaultPane = this;
-					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Num_Test_Per_Evction_Run") + ":", SwingConstants.RIGHT), DBCP_NUMTESTSPEREVICTIONRUN},
+
-					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Mix_Evictable_Idle_Time_Millis") + ":" , SwingConstants.RIGHT),
+            // JPanel northFlowPane
-							DBCP_MINEVICTABLEIDLETIMEMILLIS}};
+            JPanel northFlowPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
-
+            defaultPane.add(northFlowPane, BorderLayout.NORTH);
-			JPanel contextPane = TableLayoutHelper.createGapTableLayoutPane(comps, rowSize, columnSize, 10, 4);
+
-			contextPane.setBorder(BorderFactory.createMatteBorder(1, 1, 1, 1, UIConstants.LINE_COLOR));
+            DBCP_VALIDATION_QUERY.setColumns(15);
-			northFlowPane.add(contextPane);
+            // ContextPane
-		}
+
-
+            double f = TableLayout.FILL;
-		@Override
+            // double p = TableLayout.PREFERRED;
-		protected String title4PopupWindow() {
+            double[] rowSize = {f, f, f, f, f, f, f, f, f, f, f, f};
-			return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ConnectionPool_Attr");
+            double[] columnSize = {f, f};
-		}
+            Component[][] comps = {
-	}
+                    {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Initial_Size") + ":", SwingConstants.RIGHT), DBCP_INITIAL_SIZE},
-
+                    {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Max_Active") + ":", SwingConstants.RIGHT), DBCP_MAX_ACTIVE},
-	private static class DriverURLName {
+                    {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Max_Idle") + ":", SwingConstants.RIGHT), DBCP_MAX_IDLE},
-		public DriverURLName(String driver, String url) {
+                    {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Min_Idle") + ":", SwingConstants.RIGHT), DBCP_MIN_IDLE},
-			this.driver = driver;
+                    {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Max_Wait_Time") + ":", SwingConstants.RIGHT), DBCP_MAX_WAIT},
-			this.url = url;
+                    {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Validation_Query") + ":", SwingConstants.RIGHT), DBCP_VALIDATION_QUERY},
-		}
+                    {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_On_Borrow") + ":", SwingConstants.RIGHT), DBCP_TESTONBORROW},
-
+                    {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_On_Return") + ":", SwingConstants.RIGHT), DBCP_TESTONRETURN},
-		public String getDriver() {
+                    {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_While_Idle") + ":", SwingConstants.RIGHT), DBCP_TESTWHILEIDLE},
-			return this.driver;
+                    {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Evictionruns_millis") + ":", SwingConstants.RIGHT),
-		}
+                            DBCP_TIMEBETWEENEVICTIONRUNSMILLS},
-
+                    {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Num_Test_Per_Evction_Run") + ":", SwingConstants.RIGHT), DBCP_NUMTESTSPEREVICTIONRUN},
-		public String getURL() {
+                    {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Mix_Evictable_Idle_Time_Millis") + ":", SwingConstants.RIGHT),
-			return this.url;
+                            DBCP_MINEVICTABLEIDLETIMEMILLIS}};
-		}
+
-
+            JPanel contextPane = TableLayoutHelper.createGapTableLayoutPane(comps, rowSize, columnSize, 10, 4);
-		private String driver;
+            contextPane.setBorder(BorderFactory.createMatteBorder(1, 1, 1, 1, UIConstants.LINE_COLOR));
-		private String url;
+            northFlowPane.add(contextPane);
-	}
+        }
+
+        @Override
+        protected String title4PopupWindow() {
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ConnectionPool_Attr");
+        }
+    }
+
+    private static class DriverURLName {
+        public DriverURLName(String driver, String url) {
+            this.driver = driver;
+            this.url = url;
+        }
+
+        public String getDriver() {
+            return this.driver;
+        }
+
+        public String getURL() {
+            return this.url;
+        }
+
+        private String driver;
+        private String url;
+    }
 }

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java

@@ -1,5 +1,6 @@
 package com.fr.design.data.tabledata.tabledatapane;
 
+
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -11,6 +12,8 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ispinner.UISpinner;
 import com.fr.design.gui.itoolbar.UIToolbar;
+import com.fr.design.i18n.Toolkit;
+import com.fr.stable.StringUtils;
 
 
 public class MaxMemRowCountPanel extends UIToolbar {
@@ -19,7 +22,7 @@ public class MaxMemRowCountPanel extends UIToolbar {
 	private static final String[] CACHE_LIST = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Save_All_Records_In_Memory"),
 												com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Max_Mem_Row_Count") };
 	private static final int MAX_WIDTH = getMaxComBoBoxWidth() > 200 ? 350 : 250;
-
+	private static final int MAX_COMPONENT_COUNT_OF_MAX_MEMORY = 4;
 	private static int getMaxComBoBoxWidth() {
 		int maxWidth = GraphHelper.getWidth(CACHE_LIST[0]);
 		for (int i = 1; i < CACHE_LIST.length; i++) {
@@ -86,9 +89,13 @@ public class MaxMemRowCountPanel extends UIToolbar {
 		this.removeAll();
 		this.add(switchCache);
 		switchCache.setSelectedIndex(MAX_IN_MEMORY);
-		this.add(new UILabel(" "));
+		if (this.getComponentCount() == MAX_COMPONENT_COUNT_OF_MAX_MEMORY) {
+			//此处因为switchCache的setSelectedIndex可能会造成双层调用，然后因为重复添加组件产生bug，故而定义这个工具栏的正常最大组件数，做个判断
+			return;
+		}
+		this.add(new UILabel(StringUtils.BLANK));
 		this.add(numberSpinner);
-		this.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Row")));
+		this.add(new UILabel(StringUtils.BLANK + Toolkit.i18nText("Fine-Design_Basic_Row")));
 		this.validate();
 		this.repaint();
 	}

designer-base/src/main/java/com/fr/design/dialog/FineJOptionPane.java

@@ -1,6 +1,7 @@
 package com.fr.design.dialog;
 
 import com.fr.invoke.Reflect;
+import com.fr.stable.StringUtils;
 
 import javax.swing.Icon;
 import javax.swing.JDialog;
@@ -279,8 +280,11 @@ public class FineJOptionPane extends JOptionPane {
         dialog.show();
         dialog.dispose();
 
-        Object value = pane.getInputValue();
+        //点击取消按钮，返回null
+        if (StringUtils.equals((String) pane.getValue(), OPTION_OK_CANCEL[1]))
+            return null;
 
+        Object value = pane.getInputValue();
         if (value == UNINITIALIZED_VALUE) {
             return null;
         }

designer-base/src/main/java/com/fr/design/env/RemoteDesignerWorkspaceInfo.java

@@ -1,16 +1,39 @@
 package com.fr.design.env;
 
+import com.fr.design.DesignerEnvManager;
+import com.fr.general.ComparatorUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.security.SecurityToolbox;
 import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
+import com.fr.stable.project.ProjectConstants;
 import com.fr.stable.xml.XMLPrintWriter;
 import com.fr.stable.xml.XMLableReader;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.connect.WorkspaceConnectionInfo;
 
+import java.util.HashSet;
+import java.util.Set;
+
 public class RemoteDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
 
+    private static final Set<String> FILTER_SET = new HashSet<>();
+    private static final String HTTPS = "https://";
+    private static final String HTTP = "http://";
+    private static final String DEFAULT_SERVLET_NAME = "decision";
+    private static final String PATH = ProjectConstants.FORWARD_SLASH + ProjectConstants.WEBAPP_NAME + ProjectConstants.FORWARD_SLASH + DEFAULT_SERVLET_NAME;
+    private static final String HOST_NAME = "127.0.0.1";
+    private static final String LOCAL_HOTS_NAME = "localhost";
+    private static final String QUOTATION = ":";
+    private static final String PORT = Integer.toString(DesignerEnvManager.getEnvManager().getEmbedServerPort());
+
+    static {
+        FILTER_SET.add(HTTP + HOST_NAME + QUOTATION + PORT + PATH);
+        FILTER_SET.add(HTTPS + HOST_NAME + QUOTATION + PORT + PATH);
+        FILTER_SET.add(HTTP + LOCAL_HOTS_NAME + QUOTATION + PORT + PATH);
+        FILTER_SET.add(HTTPS + LOCAL_HOTS_NAME + QUOTATION + PORT + PATH);
+    }
+
     private String name;
 
     private String remindTime;
@@ -109,6 +132,10 @@ public class RemoteDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
     @Override
     public boolean checkValid() {
         boolean result = false;
+        if (FILTER_SET.contains(connection.getUrl())) {
+            FineLoggerFactory.getLogger().error("url is same with local designer");
+            return result;
+        }
         try {
             result = WorkContext.getConnector().testConnection(connection);
         } catch (Exception e) {

designer-base/src/main/java/com/fr/design/extra/exe/GetPluginCategoriesExecutor.java

@@ -1,10 +1,13 @@
 package com.fr.design.extra.exe;
 
+import com.fr.design.DesignerEnvManager;
 import com.fr.design.extra.PluginConstants;
 import com.fr.design.extra.Process;
 import com.fr.general.CloudCenter;
-import com.fr.general.http.HttpClient;
+import com.fr.general.http.HttpToolbox;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
+import java.util.Locale;
 
 /**
  * Created by vito on 16/5/16.
@@ -28,14 +31,17 @@ public class GetPluginCategoriesExecutor implements Executor {
 
                     @Override
                     public void run(Process<String> process) {
-                        String url = CloudCenter.getInstance().acquireUrlByKind("shop.plugin.category");
+                        Locale locale = DesignerEnvManager.getEnvManager().getLanguage();
+                        String url = CloudCenter.getInstance().acquireUrlByKind("shop.plugin.category") + "&locale=" + locale.toString();
                         if (StringUtils.isNotEmpty(url)) {
-                            HttpClient httpClient = new HttpClient(url);
+                            try {
-                            result = httpClient.getResponseText();
+                                result = HttpToolbox.get(url);
-                        } else {
+                                return;
-                            result = PluginConstants.CONNECTION_404;
+                            } catch (Exception e) {
+                                FineLoggerFactory.getLogger().error(e.getMessage(), e);
+                            }
                         }
-
+                        result = PluginConstants.CONNECTION_404;
                     }
                 }
         };

designer-base/src/main/java/com/fr/design/formula/FormulaPane.java

@@ -246,44 +246,69 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
     }
 
     public class DoubleClick extends MouseAdapter {
+        String singlePressContent;
+
+        String doublePressContent;
+
+        @Override
+        public void mousePressed(MouseEvent e) {
+            int index = tipsList.getSelectedIndex();
+            if (index != -1) {
+                if (e.getClickCount() == 1) {
+                    singlePressContent = (String) listModel.getElementAt(index);
+                } else if (e.getClickCount() == 2) {
+                    doublePressContent = (String) listModel.getElementAt(index);
+                }
+            }
+        }
 
         @Override
-        public void mouseClicked(MouseEvent e) {
+        public void mouseReleased(MouseEvent e) {
             int index = tipsList.getSelectedIndex();
             if (index != -1) {
-                String currentLineContent = (String) listModel.getElementAt(index);
+                if (e.getClickCount() == 1) {
-                if (e.getClickCount() == 2) {
+                    if (ComparatorUtils.equals((String) listModel.getElementAt(index), singlePressContent)) {
-                    if (ifHasBeenWriten == 0) {
+                        singleClickActuator(singlePressContent);
-                        formulaTextArea.setForeground(Color.black);
-                        formulaTextArea.setText("");
                     }
-                    formulaTextArea.setForeground(Color.black);
+                } else if (e.getClickCount() == 2) {
-                    currentPosition = formulaTextArea.getCaretPosition();
+                    if (ComparatorUtils.equals((String) listModel.getElementAt(index), doublePressContent)) {
-                    String output = currentLineContent + "()";
+                        doubleClickActuator(doublePressContent);
-                    String textAll = formulaTextArea.getText();
-                    String textReplaced;
-                    int position = 0;
-                    if (insertPosition <= currentPosition) {
-                        textReplaced = textAll.substring(0, insertPosition) + output + textAll.substring(currentPosition);
-                        position = insertPosition + output.length() - 1;
-                    } else {
-                        textReplaced = textAll.substring(0, currentPosition) + output + textAll.substring(insertPosition);
-                        position = currentPosition + output.length() - 1;
                     }
-                    formulaTextArea.setText(textReplaced);
-                    formulaTextArea.requestFocusInWindow();
-                    formulaTextArea.setCaretPosition(position);
-                    insertPosition = position;
-                    ifHasBeenWriten = 1;
-                    listModel.removeAllElements();
-                } else if (e.getClickCount() == 1) {
-                    refreshDescriptionTextArea(currentLineContent);
-
-                    formulaTextArea.requestFocusInWindow();
-                    fixFunctionNameList();
                 }
             }
         }
+
+        private void singleClickActuator(String currentLineContent) {
+            refreshDescriptionTextArea(currentLineContent);
+            formulaTextArea.requestFocusInWindow();
+            fixFunctionNameList();
+        }
+
+        private void doubleClickActuator(String currentLineContent) {
+            if (ifHasBeenWriten == 0) {
+                formulaTextArea.setForeground(Color.black);
+                formulaTextArea.setText("");
+            }
+            formulaTextArea.setForeground(Color.black);
+            currentPosition = formulaTextArea.getCaretPosition();
+            String output = currentLineContent + "()";
+            String textAll = formulaTextArea.getText();
+            String textReplaced;
+            int position = 0;
+            if (insertPosition <= currentPosition) {
+                textReplaced = textAll.substring(0, insertPosition) + output + textAll.substring(currentPosition);
+                position = insertPosition + output.length() - 1;
+            } else {
+                textReplaced = textAll.substring(0, currentPosition) + output + textAll.substring(insertPosition);
+                position = currentPosition + output.length() - 1;
+            }
+            formulaTextArea.setText(textReplaced);
+            formulaTextArea.requestFocusInWindow();
+            formulaTextArea.setCaretPosition(position);
+            insertPosition = position;
+            ifHasBeenWriten = 1;
+            listModel.removeAllElements();
+        }
     }
 
     @Override

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

@@ -4,8 +4,10 @@ import com.fr.design.gui.frpane.AbstractAttrNoScrollPane;
 import com.fr.stable.fun.mark.Immutable;
 
 /**
+ * 单元格属性面板扩展接口,接口基本逻辑不通且不符合接口设计规范,单元格属性扩展可以使用CellPropertyPaneProvider
  * Created by zhouping on 2015/11/11.
  */
+@Deprecated
 public interface CellAttributeProvider extends Immutable{
     String MARK_STRING = "CellAttributeProvider";
 

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

@@ -0,0 +1,18 @@
+package com.fr.design.fun;
+
+import com.fr.design.cell.CellElementPropertyComponent;
+
+/**
+ * 单元格设置(属性)扩展接口
+ * @author zack
+ * @version 10.0
+ * Created by zack on 2020/7/14
+ */
+public interface CellPropertyPaneProvider extends PropertyItemPaneProvider {
+
+    /**
+     * 构造单元格属性面板,面板实现需要使用单例模式实现
+     * @return 面板类
+     */
+    CellElementPropertyComponent getSingletonCelPropertyPane();
+}

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

@@ -0,0 +1,15 @@
+package com.fr.design.fun.impl;
+
+import com.fr.design.fun.CellPropertyPaneProvider;
+import com.fr.stable.fun.mark.API;
+
+/**
+ * Created by zhouping on 2015/11/11.
+ */
+@API(level = CellPropertyPaneProvider.CURRENT_LEVEL)
+public abstract class AbstractCellPropertyPaneProvider extends AbstractPropertyItemPaneProvider implements CellPropertyPaneProvider {
+
+    public int currentAPILevel() {
+        return CellPropertyPaneProvider.CURRENT_LEVEL;
+    }
+}

designer-base/src/main/java/com/fr/design/gui/controlpane/UIControlPane.java

@@ -9,12 +9,14 @@ import com.fr.design.gui.itoolbar.UIToolbar;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.menu.ShortCut;
+import com.fr.design.os.impl.PopupDialogSaveAction;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.design.widget.FRWidgetFactory;
 import com.fr.invoke.Reflect;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.StringUtils;
 import com.fr.stable.os.OperatingSystem;
+import com.fr.stable.os.support.OSSupportCenter;
 
 import javax.swing.BorderFactory;
 import javax.swing.JComponent;
@@ -273,6 +275,8 @@ abstract class UIControlPane extends JControlPane {
             }
             saveSettings();
             setVisible(false);
+            PopupDialogSaveAction saveAction = OSSupportCenter.getAction(PopupDialogSaveAction.class);
+            saveAction.unregister();
         }
 
         private void initListener() {

designer-base/src/main/java/com/fr/design/gui/controlpane/UIListControlPane.java

@@ -7,9 +7,11 @@ import com.fr.design.gui.ilist.JNameEdList;
 import com.fr.design.gui.ilist.ListModelElement;
 import com.fr.design.gui.ilist.UINameEdList;
 import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.os.impl.PopupDialogSaveAction;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.Nameable;
+import com.fr.stable.os.support.OSSupportCenter;
 
 import javax.swing.DefaultListModel;
 import javax.swing.JList;
@@ -216,6 +218,8 @@ public abstract class UIListControlPane extends UIControlPane implements ListCon
                 ((PopupEditDialog)popupEditDialog).setTitle(getSelectedName());
             }
             popupEditDialog.setVisible(true);
+            PopupDialogSaveAction osBasedAction = OSSupportCenter.getAction(PopupDialogSaveAction.class);
+            osBasedAction.register(this, popupEditDialog);
         }
     }
 

designer-base/src/main/java/com/fr/design/gui/icontainer/UIEastResizableContainer.java

@@ -18,6 +18,10 @@ import java.awt.event.MouseMotionListener;
  */
 public class UIEastResizableContainer extends JPanel {
     private static final long serialVersionUID = 1854340560790476907L;
+
+    public static final int MAX_CONTAINER_WIDTH = 500;
+    public static final int MIN_CONTAINER_WIDTH = 286;
+
     private int containerWidth = 240;
     private int preferredWidth = 240;
     private int topToolPaneHeight = 25;
@@ -262,7 +266,13 @@ public class UIEastResizableContainer extends JPanel {
 
                 @Override
                 public void mouseDragged(MouseEvent e) {
-                    // do nothing
+                    containerWidth = UIEastResizableContainer.this.getWidth() + (UIEastResizableContainer.this.getLocationOnScreen().x - e.getXOnScreen());
+                    containerWidth = Math.min(containerWidth, MAX_CONTAINER_WIDTH);
+                    containerWidth = Math.max(containerWidth, MIN_CONTAINER_WIDTH);
+                    refreshContainer();
+                    if ( DesignModeContext.isAuthorityEditing()) {
+                        DesignerContext.getDesignerFrame().doResize();
+                    }
                 }
             });
             addMouseListener(new MouseAdapter() {

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

@@ -1,6 +1,7 @@
 package com.fr.design.mainframe;
 
 import com.fr.base.BaseUtils;
+import com.fr.base.FRContext;
 import com.fr.base.vcs.DesignerMode;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.ExtraDesignClassManager;
@@ -66,7 +67,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
     private JPanel leftPane;
     private JPanel rightPane;
     private FixedPopupPane currentPopupPane;
-    private static final int CONTAINER_WIDTH = 286;
+    private static final int CONTAINER_WIDTH = containerWidth();
     private static final int TAB_WIDTH = 38;
     private static final int TAB_BUTTON_WIDTH = 32;
     private static final int TAB_BUTTON_HEIGHT = 28;
@@ -107,6 +108,13 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
     private PropertyMode currentMode;  // 当前模式（根据不同模式，显示不同的可用面板）
 
 
+    private static int containerWidth() {
+        if (FRContext.isChineseEnv()) {
+            return UIEastResizableContainer.MIN_CONTAINER_WIDTH;
+        }
+        return UIEastResizableContainer.MAX_CONTAINER_WIDTH;
+    }
+
     /**
      * 得到实例
      *
@@ -219,8 +227,10 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
                     itemBean.getEnableModes());
         UIButton button = propertyItem.getButton();
         List<ActionListener> buttonListeners = itemBean.getButtonListeners();
-        for (ActionListener buttonListener : buttonListeners) {
+        if (buttonListeners != null) {
-            button.addActionListener(buttonListener);
+            for (ActionListener buttonListener : buttonListeners) {
+                button.addActionListener(buttonListener);
+            }
         }
         propertyItemMap.put(key, propertyItem);
 

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

@@ -93,6 +93,7 @@ public class LogHandlerBar extends JPanel implements ItemSelectable {
 
     public void clearMessage() {
         INFONUM = ERRORNUM = SERVERNUM = 0;
+        LogMessageBar.getInstance().clear();
         changeLabel();
     }
 

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

@@ -2,6 +2,7 @@ package com.fr.design.mainframe.loghandler;
 
 import com.fr.design.constants.UIConstants;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.stable.StringUtils;
 
 
 import javax.swing.JFrame;
@@ -63,6 +64,11 @@ public class LogMessageBar extends JPanel {
 		repaint();
 	}
 
+	public void clear() {
+		messageLabel.setText(StringUtils.EMPTY);
+		repaint();
+	}
+
     public void setLoggerBarWidth(int width) {
         this.width = width;
     }

designer-base/src/main/java/com/fr/design/os/impl/PopupDialogSaveAction.java

@@ -0,0 +1,39 @@
+package com.fr.design.os.impl;
+
+import com.fr.design.gui.controlpane.UIListControlPane;
+import com.fr.stable.os.OperatingSystem;
+import com.fr.stable.os.support.OSBasedAction;
+
+import java.awt.*;
+
+/**
+ * linux下超链弹窗等保存问题
+ *
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2020/7/21
+ */
+public class PopupDialogSaveAction implements OSBasedAction {
+
+    private UIListControlPane currentControlPane;
+    private Window popupDialog;
+
+    @Override
+    public void execute(Object... objects) {
+        boolean canSave = OperatingSystem.isLinux() && popupDialog != null && popupDialog.isVisible() && currentControlPane != null;
+        if (canSave) {
+            currentControlPane.saveSettings();
+        }
+    }
+
+    public void register(UIListControlPane currentControlPane, Window popupDialog) {
+        this.currentControlPane = currentControlPane;
+        this.popupDialog = popupDialog;
+    }
+
+    public void unregister() {
+        this.currentControlPane = null;
+        this.popupDialog = null;
+    }
+
+}

designer-base/src/main/java/com/fr/design/os/impl/UpdateDialogAction.java

@@ -2,8 +2,6 @@ package com.fr.design.os.impl;
 
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.update.ui.dialog.UpdateMainDialog;
-import com.fr.design.utils.DesignUtils;
-import com.fr.stable.os.OperatingSystem;
 import com.fr.stable.os.support.OSBasedAction;
 
 /**
@@ -12,14 +10,10 @@ import com.fr.stable.os.support.OSBasedAction;
  * @date 2019/10/9
  */
 public class UpdateDialogAction implements OSBasedAction {
-    private static String UPDATE_ROUTE = "#management/backup";
+    
     @Override
     public void execute(Object... objects) {
-        if(!OperatingSystem.isLinux()) {
+        UpdateMainDialog dialog = new UpdateMainDialog(DesignerContext.getDesignerFrame());
-            UpdateMainDialog dialog = new UpdateMainDialog(DesignerContext.getDesignerFrame());
+        dialog.showDialog();
-            dialog.showDialog();
-        }else{
-            DesignUtils.visitEnvServerByParameters( UPDATE_ROUTE,null,null);
-        }
     }
 }

designer-base/src/main/java/com/fr/design/style/background/gradient/GradientBar.java

@@ -11,6 +11,7 @@ import com.fr.design.style.color.ColorSelectDialog;
 import com.fr.design.style.color.ColorSelectable;
 import com.fr.stable.AssistUtils;
 
+import com.fr.stable.os.OperatingSystem;
 import javax.swing.JComponent;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
@@ -124,14 +125,20 @@ public class GradientBar extends JComponent implements UIObserver, ColorSelectab
     protected void addMouseDragListener() {
         this.addMouseMotionListener(new MouseAdapter() {
             public void mouseDragged(MouseEvent e) {
-
+                int oldIndex = index;
                 for (int i = 0; i < list.size(); i++) {
                     if (list.get(i).contains(e.getX(), e.getY())) {
                         index = i;
                         break;
                     }
                 }
-
+                if(OperatingSystem.isLinux() && AssistUtils.equals(oldIndex,index)){
+                    if(Math.abs(p1.getX() - e.getX()) > Math.abs(p2.getX() - e.getX())){
+                        index = 1;
+                    }else{
+                        index = 0;
+                    }
+                }
                 boolean x = e.getX() <= max && e.getX() >= min;
                 if (x && e.getY() < MAX_VERTICAL) {
                     list.get(index).setX(e.getX());

designer-base/src/main/java/com/fr/design/utils/gui/GUICoreUtils.java

@@ -27,6 +27,7 @@ import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.style.color.ColorCell;
 import com.fr.design.style.color.ColorFactory;
 import com.fr.design.style.color.ColorSelectBox;
@@ -387,29 +388,35 @@ public final class GUICoreUtils {
 	 * @param y y坐标
 	 */
 	public static void showPopupMenu(JPopupMenu popup, Component parentComponent, int x, int y) {
-		if (popup == null) {// check null.
+        if (popup == null) {// check null.
-			return;
+            return;
-		}
+        }
-
+
-		Point point = new Point(x, y);
+        Point point = new Point(x, y);
-		SwingUtilities.convertPointToScreen(point, parentComponent);
+        SwingUtilities.convertPointToScreen(point, parentComponent);
-
+
-		Dimension size = popup.getPreferredSize();
+        Dimension size = popup.getPreferredSize();
-		Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
+        Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
-		screen.setSize(screen.getSize().width, screen.height - HEIGHT_GAP);
+        screen.setSize(screen.getSize().width, screen.height - HEIGHT_GAP);
-
+        //父元素右边界的坐标
-		// peter:调整X的高度.
+        int parentComponentRightBorderPosition = parentComponent.getLocationOnScreen().x + parentComponent.getWidth();
-		if (point.x + size.width > screen.width && size.width < screen.width) {
+        //设计器右边界的坐标
-			x += (screen.width - point.x - size.width);
+        Rectangle rectangle = DesignerContext.getDesignerFrame().getBounds();
-		}
+        int designerRightBorderPosition = rectangle.x + rectangle.width;
-
+        rectangle = SwingUtilities.getWindowAncestor(parentComponent).getBounds();
-		// peter:调整y高度.
+        designerRightBorderPosition = Math.max(designerRightBorderPosition, rectangle.x + rectangle.width);
-		if (point.y + size.height > screen.height && size.height < screen.height) {
+        // peter:调整X的高度.
-			y -= size.height;
+        if (point.x + size.width > designerRightBorderPosition && size.width < designerRightBorderPosition) {
-		}
+            x += (parentComponentRightBorderPosition - point.x - size.width);
-
+        }
-		popup.show(parentComponent, x, y);
+
-	}
+        // peter:调整y高度.
+        if (point.y + size.height > screen.height && size.height < screen.height) {
+            y -= size.height;
+        }
+
+        popup.show(parentComponent, x, y);
+    }
 
 	/**
 	 * Set enabled.<br>

designer-base/src/main/java/com/fr/file/FILEChooserPane.java

@@ -12,6 +12,7 @@ import com.fr.design.dialog.UIDialog;
 import com.fr.design.env.DesignerWorkspaceInfo;
 import com.fr.design.env.DesignerWorkspaceType;
 import com.fr.design.file.HistoryTemplateListPane;
+import com.fr.design.file.NodeAuthProcessor;
 import com.fr.design.fun.ReportSupportedFileUIProvider;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ibutton.UIButtonUI;
@@ -916,7 +917,8 @@ public class FILEChooserPane extends BasicPane {
         try {
             access = FRContext.getOrganizationOperator().canAccess(selectedFile.getPath());
             if (selectedFile.isEnvFile() && selectedFile instanceof FileNodeFILE) {
-                access = access && ((FileNodeFILE) selectedFile).hasFullAuth();
+                FileNodeFILE fileNodeFILE = ((FileNodeFILE) selectedFile);
+                access = access && fileNodeFILE.hasFullAuth() && NodeAuthProcessor.getInstance().checkFileNodeAuth(new FileNode(fileNodeFILE.getPath(), fileNodeFILE.isDirectory()));
             }
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);

designer-base/src/main/java/com/fr/start/server/FineEmbedServerActivator.java

@@ -73,6 +73,7 @@ public class FineEmbedServerActivator extends Activator {
         //覆盖tomcat的WebAppClassLoader
         context.setLoader(new FRTomcatLoader());
 
+
         //直接指定initializer，tomcat就不用再扫描一遍了
         SpringServletContainerInitializer initializer = new SpringServletContainerInitializer();
         Set<Class<?>> classes = new HashSet<Class<?>>();

designer-base/src/test/java/com/fr/design/data/BasicTableDataUtilsTest.java

@@ -1,6 +1,9 @@
 package com.fr.design.data;
 
+import com.fr.base.TableData;
+import com.fr.data.TableDataSource;
 import junit.framework.TestCase;
+import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -41,4 +44,26 @@ public class BasicTableDataUtilsTest extends TestCase {
         Assert.assertFalse(result12);
     }
 
-}
+
+    @Test
+    public void testGetTableDataName() {
+        TableDataSource source = EasyMock.mock(TableDataSource.class);
+        TableData tableData = EasyMock.mock(TableData.class);
+        EasyMock.expect(source.getTableData("ds1")).andReturn(tableData).anyTimes();
+        EasyMock.expect(source.getTableData("test-ds1")).andReturn(tableData).anyTimes();
+        EasyMock.expect(source.getTableData("test-ds11")).andReturn(null).anyTimes();
+        EasyMock.replay(source, tableData);
+        Assert.assertEquals("test-ds1", BasicTableDataUtils.getTableDataName(true, source, "ds1", "test", false));
+        Assert.assertEquals("test-ds11", BasicTableDataUtils.getTableDataName(false, source, "ds1", "test", false));
+
+        source = EasyMock.mock(TableDataSource.class);
+        EasyMock.expect(source.getTableData("ds1")).andReturn(null).anyTimes();
+        EasyMock.expect(source.getTableData("test-ds1")).andReturn(null).anyTimes();
+        EasyMock.replay(source);
+        Assert.assertEquals("test-ds1", BasicTableDataUtils.getTableDataName(true, source, "ds1", "test", false));
+        Assert.assertEquals("ds1", BasicTableDataUtils.getTableDataName(false, source, "ds1", "test", false));
+        Assert.assertEquals("test-ds1", BasicTableDataUtils.getTableDataName(false, source, "ds1", "test", true));
+
+    }
+
+}

designer-base/src/test/java/com/fr/design/env/RemoteDesignerWorkspaceInfoTest.java

@@ -0,0 +1,25 @@
+package com.fr.design.env;
+
+import com.fr.workspace.connect.WorkspaceConnectionInfo;
+import junit.framework.TestCase;
+import org.junit.Assert;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2020/7/15
+ */
+public class RemoteDesignerWorkspaceInfoTest extends TestCase {
+
+    public void testCheckValid() {
+        RemoteDesignerWorkspaceInfo workspaceInfo0 = RemoteDesignerWorkspaceInfo.create(new WorkspaceConnectionInfo("http://localhost:8075/webroot/decision", "admin", "123", "", "", true));
+        RemoteDesignerWorkspaceInfo workspaceInfo1 = RemoteDesignerWorkspaceInfo.create(new WorkspaceConnectionInfo("http://127.0.0.1:8075/webroot/decision", "admin", "123", "", "", true));
+        RemoteDesignerWorkspaceInfo workspaceInfo2 = RemoteDesignerWorkspaceInfo.create(new WorkspaceConnectionInfo("https://127.0.0.1:8075/webroot/decision", "admin", "123", "", "", true));
+        RemoteDesignerWorkspaceInfo workspaceInfo3 = RemoteDesignerWorkspaceInfo.create(new WorkspaceConnectionInfo("https://localhost:8075/webroot/decision", "admin", "123", "", "", true));
+        Assert.assertFalse(workspaceInfo0.checkValid());
+        Assert.assertFalse(workspaceInfo1.checkValid());
+        Assert.assertFalse(workspaceInfo2.checkValid());
+        Assert.assertFalse(workspaceInfo3.checkValid());
+    }
+
+}

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

@@ -49,6 +49,7 @@ import com.fr.locale.InterProviderFactory;
 import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.chart.PiePlot4VanChart;
 import com.fr.plugin.chart.area.VanChartAreaPlot;
+import com.fr.plugin.chart.box.VanChartBoxPlot;
 import com.fr.plugin.chart.bubble.VanChartBubblePlot;
 import com.fr.plugin.chart.column.VanChartColumnPlot;
 import com.fr.plugin.chart.custom.VanChartCustomPlot;
@@ -79,6 +80,7 @@ import com.fr.stable.StringUtils;
 import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;
 import com.fr.van.chart.area.AreaIndependentVanChartInterface;
 import com.fr.van.chart.bar.BarIndependentVanChartInterface;
+import com.fr.van.chart.box.BoxIndependentVanChartInterface;
 import com.fr.van.chart.bubble.BubbleIndependentVanChartInterface;
 import com.fr.van.chart.column.VanColumnChartTypeUI;
 import com.fr.van.chart.custom.CustomIndependentVanChartInterface;
@@ -202,6 +204,7 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
         addChartTypeInterface(VAN_CHART_PRIORITY, VanChartWordCloudPlot.WORD_CLOUD_PLOT_ID, new WordCloudIndependentVanChartInterface());
         addChartTypeInterface(VAN_CHART_PRIORITY, VanChartGanttPlot.VAN_CHART_GANTT_PLOT_ID, new GanttIndependentVanChartInterface());
         addChartTypeInterface(VAN_CHART_PRIORITY, VanChartStructurePlot.STRUCTURE_PLOT_ID, new VanStructureChartTypeUI());
+        addChartTypeInterface(VAN_CHART_PRIORITY, VanChartBoxPlot.VAN_CHART_BOX_PLOT_ID, new BoxIndependentVanChartInterface());
     }
 
 

designer-chart/src/main/java/com/fr/design/chartx/component/combobox/ColorSchemeComboBox.java

@@ -52,7 +52,7 @@ public class ColorSchemeComboBox extends UIComboBox {
         this.setRenderer(new ColorSchemeCellRenderer());
     }
 
-    private Map<String, ColorInfo> getColorSchemesFromConfig() {
+    protected Map<String, ColorInfo> getColorSchemesFromConfig() {
         Map<String, ColorInfo> colorSchemes = new LinkedHashMap<>();
         ChartPreStyleConfig config = ChartPreStyleConfig.getInstance();
 
@@ -92,7 +92,14 @@ public class ColorSchemeComboBox extends UIComboBox {
     }
 
     public void refresh() {
-        this.colorSchemes = getColorSchemesFromConfig();
+        refresh(null);
+    }
+
+    public void refresh(Map<String, ColorInfo> colorSchemes) {
+        if (colorSchemes == null) {
+            colorSchemes = getColorSchemesFromConfig();
+        }
+        this.colorSchemes = colorSchemes;
         this.setModel(new DefaultComboBoxModel(colorSchemes.keySet().toArray()));
     }
 
@@ -149,7 +156,7 @@ public class ColorSchemeComboBox extends UIComboBox {
         return colorSchemes.keySet();
     }
 
-    public class ColorInfo {
+    public static class ColorInfo {
 
         private List<Color> colors;
 

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

@@ -111,12 +111,15 @@ public class ChartTypePane extends AbstractChartAttrPane {
         autoButtonListener = new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
+                final String lastId = editingCollection.getSelectedChartProvider(ChartProvider.class).getID();
                 final MiddleChartDialog autoChartDialog = DesignModuleFactory.getAutoChartDialog(DesignerContext.getDesignerFrame());
                 autoChartDialog.populate(editingCollection);
                 autoChartDialog.addDialogActionListener(new DialogActionAdapter() {
                     @Override
                     public void doOk() {
                         populate(editingCollection);
+                        ChartProvider chart = editingCollection.getSelectedChartProvider(ChartProvider.class);
+                        reLayoutEditPane(chart, lastId);
                     }
                 });
                 autoChartDialog.setVisible(true);
@@ -124,6 +127,17 @@ public class ChartTypePane extends AbstractChartAttrPane {
         };
     }
 
+    private void reLayoutEditPane(ChartProvider chart, String lastChartId) {
+        String chartId = chart.getID();
+        //chartID改变的话图表类型就算改变了
+        if (StringUtils.isNotEmpty(chartId)) {
+            boolean isUseDefault = ChartTypeInterfaceManager.getInstance().isUseDefaultPane(chartId);
+            if (editPane.isDefaultPane() != isUseDefault || (!isUseDefault && !ComparatorUtils.equals(lastChartId, chartId))) {
+                editPane.reLayout(chart);
+            }
+        }
+    }
+
     class ComboBoxPane extends UIComboBoxPane<ChartProvider> {
         private Map<String, Map<String, FurtherBasicBeanPane<? extends ChartProvider>>> allChartTypePane;
 
@@ -167,17 +181,7 @@ public class ChartTypePane extends AbstractChartAttrPane {
             //这一步会替换plot
             ((AbstractChartTypePane) getSelectedPane()).updateBean(chart);
 
-            String chartID = chart.getID();
+            reLayoutEditPane(chart,lastPlotID);
-
-            //chartID改变的话图表类型就算改变了
-            if (StringUtils.isNotEmpty(chartID)) {
-
-                boolean isUseDefault = ChartTypeInterfaceManager.getInstance().isUseDefaultPane(chartID);
-
-                if (editPane.isDefaultPane() != isUseDefault || (!isUseDefault && !ComparatorUtils.equals(lastPlotID, chartID))) {
-                    editPane.reLayout(chart);
-                }
-            }
         }
 
         protected UIComboBox createComboBox() {

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

@@ -7,13 +7,13 @@ import com.fr.chart.chartattr.Plot;
 import com.fr.chart.chartdata.TopDefinition;
 import com.fr.design.gui.frpane.AbstractAttrNoScrollPane;
 import com.fr.design.gui.icheckbox.UICheckBox;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.style.AbstractChartTabPane;
 import com.fr.design.mainframe.chart.gui.style.ThirdTabPane;
-
 import com.fr.stable.StringUtils;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 
@@ -50,6 +50,11 @@ public class ChartDataFilterPane extends ThirdTabPane<ChartCollection> {
         this.isNeedPresent = true;
     }
 
+    public ChartDataFilterPane(Plot plot, ChartDataPane parent, boolean isNeedPresent) {
+        super(plot, parent);
+        this.isNeedPresent = isNeedPresent;
+    }
+
     protected void initTabPane() {
         super.initTabPane();
         tabPane.setPreferredSize(new Dimension(221, 25));
@@ -109,7 +114,7 @@ public class ChartDataFilterPane extends ThirdTabPane<ChartCollection> {
      * @return 返回标题.
      */
     public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter");
+        return Toolkit.i18nText("Fine-Design_Chart_Data_Filter");
     }
 
     /**
@@ -144,12 +149,17 @@ public class ChartDataFilterPane extends ThirdTabPane<ChartCollection> {
     }
 
     public void populateBean(ChartCollection collection, boolean isNeedPresent) {
-        relayoutPane(isNeedPresent);
+        TopDefinitionProvider topDefinition = collection.getSelectedChart().getFilterDefinition();
+        populateDefinition(topDefinition, isNeedPresent);
+    }
+
+    public void populateDefinition(TopDefinitionProvider topDefinition, boolean isNeedSummary) {
+        relayoutPane(isNeedSummary);
         if (categoryPane != null) {
-            categoryPane.populateBean(collection.getSelectedChart().getFilterDefinition());
+            categoryPane.populateBean(topDefinition);
         }
         if (seriesPane != null) {
-            seriesPane.populateBean(collection.getSelectedChart().getFilterDefinition());
+            seriesPane.populateBean(topDefinition);
         }
         checkBoxUse();
     }
@@ -165,11 +175,16 @@ public class ChartDataFilterPane extends ThirdTabPane<ChartCollection> {
      * 保存界面数据筛选.
      */
     public void updateBean(ChartCollection collection) {
+        TopDefinitionProvider topDefinition = collection.getSelectedChart().getFilterDefinition();
+        updateDefinition(topDefinition);
+    }
+
+    public void updateDefinition(TopDefinitionProvider topDefinition) {
         if (categoryPane != null) {
-            categoryPane.updateBean(collection.getSelectedChart().getFilterDefinition());
+            categoryPane.updateBean(topDefinition);
         }
         if (seriesPane != null) {
-            seriesPane.updateBean(collection.getSelectedChart().getFilterDefinition());
+            seriesPane.updateBean(topDefinition);
         }
     }
 
@@ -222,13 +237,13 @@ public class ChartDataFilterPane extends ThirdTabPane<ChartCollection> {
         }
 
         protected JPanel initOtherPane() {
-            onlyPreData = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Only_Use_Before_Records"));
+            onlyPreData = new UICheckBox(Toolkit.i18nText("Fine-Design_Chart_Only_Use_Before_Records"));
             JPanel panel1 = new JPanel(new BorderLayout());
             JPanel panel2 = new JPanel(new BorderLayout());
             panel1.add(onlyPreData, BorderLayout.NORTH);
             preDataNum = new UITextField();
-            UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Records_Num"));
+            UILabel label = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Records_Num"));
-            combineOther = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_CombineOther"));
+            combineOther = new UICheckBox(Toolkit.i18nText("Fine-Design_Chart_Data_CombineOther"));
             combineOther.setSelected(true);
             double p = TableLayout.PREFERRED;
             double f = TableLayout.FILL;
@@ -244,7 +259,7 @@ public class ChartDataFilterPane extends ThirdTabPane<ChartCollection> {
             //默认不显示
             preDataNumPane.setVisible(false);
             panel1.add(preDataNumPane, BorderLayout.CENTER);
-            notShowNull = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Not_Show_Cate"));
+            notShowNull = new UICheckBox(Toolkit.i18nText("Fine-Design_Chart_Data_Not_Show_Cate"));
             panel2.add(notShowNull, BorderLayout.NORTH);
 
             onlyPreData.addChangeListener(new ChangeListener() {
@@ -258,7 +273,7 @@ public class ChartDataFilterPane extends ThirdTabPane<ChartCollection> {
                     fire();
                 }
             };
-            presentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Present") ,present);
+            presentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Style_Present") ,present);
             panel2.add(presentPane, BorderLayout.SOUTH);
 
             double[] column = {f};
@@ -281,7 +296,7 @@ public class ChartDataFilterPane extends ThirdTabPane<ChartCollection> {
          * 界面标题 "分类"
          */
         public String title4PopupWindow() {
-            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Category");
+            return Toolkit.i18nText("Fine-Design_Chart_Style_Category");
         }
 
         /**
@@ -397,13 +412,13 @@ public class ChartDataFilterPane extends ThirdTabPane<ChartCollection> {
 
 
         protected JPanel initOtherPane() {
-            onlyPreData = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Only_Use_Before_Records"));
+            onlyPreData = new UICheckBox(Toolkit.i18nText("Fine-Design_Chart_Only_Use_Before_Records"));
             JPanel panel1 = new JPanel(new BorderLayout());
             JPanel panel2 = new JPanel(new BorderLayout());
             panel1.add(onlyPreData, BorderLayout.NORTH);
             preDataNum = new UITextField();
-            UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Records_Num"));
+            UILabel label = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Records_Num"));
-            combineOther = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_CombineOther"));
+            combineOther = new UICheckBox(Toolkit.i18nText("Fine-Design_Chart_Data_CombineOther"));
             combineOther.setSelected(true);
             double p = TableLayout.PREFERRED;
             double f = TableLayout.FILL;
@@ -419,7 +434,7 @@ public class ChartDataFilterPane extends ThirdTabPane<ChartCollection> {
             //默认不显示
             preDataNumPane.setVisible(false);
             panel1.add(preDataNumPane, BorderLayout.CENTER);
-            notShowNull = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Not_Show_Series"));
+            notShowNull = new UICheckBox(Toolkit.i18nText("Fine-Design_Chart_Data_Not_Show_Series"));
             panel2.add(notShowNull, BorderLayout.NORTH);
 
             onlyPreData.addChangeListener(new ChangeListener() {
@@ -433,7 +448,7 @@ public class ChartDataFilterPane extends ThirdTabPane<ChartCollection> {
                     fire();
                 }
             };
-            presentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Present") ,present);
+            presentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Style_Present") ,present);
             panel2.add(presentPane, BorderLayout.SOUTH);
 
             double[] column = {f};
@@ -457,7 +472,7 @@ public class ChartDataFilterPane extends ThirdTabPane<ChartCollection> {
          * 界面标题
          */
         public String title4PopupWindow() {
-            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series");
+            return Toolkit.i18nText("Fine-Design_Chart_Series");
         }
 
         /**

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotMoreCateReportDataContentPane.java

@@ -13,21 +13,20 @@ import com.fr.design.formula.TinyFormulaPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.data.ChartDataFilterPane;
-
 import com.fr.stable.StringUtils;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 
 import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
 import javax.swing.JPanel;
+import java.util.ArrayList;
+import java.util.List;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.util.ArrayList;
-import java.util.List;
 
 
 /**
@@ -72,14 +71,14 @@ public class CategoryPlotMoreCateReportDataContentPane extends CategoryPlotRepor
 
 		catePane.add(boxPane, BorderLayout.SOUTH);
 
-		catePane.setBorder(BorderFactory.createEmptyBorder(0,24,10,6));
+		catePane.setBorder(BorderFactory.createEmptyBorder(0,24,10,20));
 
 		this.add(catePane, "0,0,2,0");
 		filterPane = new ChartDataFilterPane(new Bar2DPlot(), parent);
 		JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter"),filterPane);
 		panel.setBorder(getSidesBorder());
 		filterPane.setBorder(getFilterPaneBorder());
-		this.add(panel, "0,6,2,4");
+		this.add(panel, "0,6,1,4");
 
 		addButton.addActionListener(new ActionListener() {
 			@Override

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java

@@ -10,7 +10,6 @@ import com.fr.design.formula.TinyFormulaPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.data.ChartDataFilterPane;
-
 import com.fr.stable.StringUtils;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 
@@ -18,9 +17,9 @@ import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
+import java.util.List;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
-import java.util.List;
 
 public class CategoryPlotReportDataContentPane extends AbstractReportDataContentPane {
 	protected static final int PRE_WIDTH = 210;
@@ -35,14 +34,14 @@ public class CategoryPlotReportDataContentPane extends AbstractReportDataContent
     public CategoryPlotReportDataContentPane(ChartDataPane parent) {
         initEveryPane();
         categoryName = initCategoryBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category_Name"));
-        categoryName.setPreferredSize(new Dimension(246,30));
+        categoryName.setPreferredSize(new Dimension(236,30));
-        categoryName.setBorder(BorderFactory.createEmptyBorder(0,24,0,7));
+        categoryName.setBorder(BorderFactory.createEmptyBorder(0,24,0,20));
-        this.add(categoryName, "0,0,2,0");
+        this.add(categoryName, "0,0,1,0");
         filterPane = new ChartDataFilterPane(new Bar2DPlot(), parent);
         JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter"),filterPane);
         panel.setBorder(getSidesBorder());
         filterPane.setBorder(getFilterPaneBorder());
-        this.add(panel, "0,6,2,4");    }
+        this.add(panel, "0,6,1,4");    }
     
 	protected TinyFormulaPane initCategoryBox(final String leftLabel) {
 		TinyFormulaPane categoryName = new TinyFormulaPane() {

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotTableDataContentPane.java

@@ -11,6 +11,7 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.ComparatorUtils;
+import com.fr.design.i18n.Toolkit;
 
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.StringUtils;
@@ -28,24 +29,24 @@ import java.util.List;
  */
 public class CategoryPlotTableDataContentPane extends AbstractTableDataContentPane{
 	private static final long serialVersionUID = 7284078589672079657L;
-	
+
 	protected UIComboBox categoryCombox;
 	protected SeriesTypeUseComboxPane seriesTypeComboxPane;
-	
+
 	public CategoryPlotTableDataContentPane() {
-		
+
 	}
-	
+
 	public CategoryPlotTableDataContentPane(ChartDataPane parent) {
-		
+
 		categoryCombox = new UIComboBox();
 		JPanel categoryPane = new JPanel(new BorderLayout(4,0));
 		categoryPane.setBorder(BorderFactory.createMatteBorder(0, 0, 6, 1, getBackground()));
-        UILabel label1 = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Category")) ;
+        UILabel label1 = new BoldFontTextLabel(Toolkit.i18nText("Fine-Design_Chart_Style_Category")) ;
         label1.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH,ChartDataPane.LABEL_HEIGHT));
         categoryCombox.setPreferredSize(new Dimension(100,20));
 
-        categoryCombox.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None"));
+        categoryCombox.addItem(Toolkit.i18nText("Fine-Design_Chart_Use_None"));
         categoryPane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{categoryCombox,null,null,label1,null}));
 		categoryPane.setPreferredSize(new Dimension(246,30));
 		categoryPane.setBorder(BorderFactory.createEmptyBorder(0,24,10,15));
@@ -56,7 +57,7 @@ public class CategoryPlotTableDataContentPane extends AbstractTableDataContentPa
 		this.add(getJSeparator());
 		seriesTypeComboxPane = new SeriesTypeUseComboxPane(parent, new Bar2DPlot());
 		this.add(seriesTypeComboxPane, BorderLayout.SOUTH);
-		
+
 		categoryCombox.addItemListener(new ItemListener() {
 			public void itemStateChanged(ItemEvent e) {
 				checkSeriseUse(categoryCombox.getSelectedItem() != null);
@@ -64,7 +65,7 @@ public class CategoryPlotTableDataContentPane extends AbstractTableDataContentPa
 			}
 		});
 	}
-	
+
 	protected void makeToolTipUse(UIComboBox comBox) {
 		if(comBox.getSelectedItem() != null) {
 			comBox.setToolTipText(comBox.getSelectedItem().toString());
@@ -72,7 +73,7 @@ public class CategoryPlotTableDataContentPane extends AbstractTableDataContentPa
 			comBox.setToolTipText(null);
 		}
 	}
-	
+
 	/**
 	 * 检查 某些Box是否可用
      * @param hasUse  是否使用.
@@ -81,16 +82,16 @@ public class CategoryPlotTableDataContentPane extends AbstractTableDataContentPa
 		categoryCombox.setEnabled(hasUse);
 		checkSeriseUse(hasUse);
 	}
-	
+
 	protected void checkSeriseUse(boolean hasUse) {
 		if(seriesTypeComboxPane != null) {
 			seriesTypeComboxPane.checkUseBox(hasUse && categoryCombox.getSelectedItem() != null);
 		}
 	}
-	
+
     protected void refreshBoxListWithSelectTableData(List list) {
     	refreshBoxItems(categoryCombox, list);
-        categoryCombox.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None"));
+        categoryCombox.addItem(Toolkit.i18nText("Fine-Design_Chart_Use_None"));
 
     	seriesTypeComboxPane.refreshBoxListWithSelectTableData(list);
     }
@@ -100,10 +101,10 @@ public class CategoryPlotTableDataContentPane extends AbstractTableDataContentPa
      */
     public void clearAllBoxList(){
         clearBoxItems(categoryCombox);
-        categoryCombox.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None"));
+        categoryCombox.addItem(Toolkit.i18nText("Fine-Design_Chart_Use_None"));
         seriesTypeComboxPane.clearAllBoxList();
     }
-	
+
 	/**
 	 * 保存界面内容到ChartCollection
 	 */
@@ -129,15 +130,15 @@ public class CategoryPlotTableDataContentPane extends AbstractTableDataContentPa
 	public void populateBean(ChartCollection collection) {
 		super.populateBean(collection);
 		TopDefinition top = (TopDefinition)collection.getSelectedChart().getFilterDefinition();
-		
+
 		if(!(top instanceof NormalTableDataDefinition)) {
 			return;
 		}
 		NormalTableDataDefinition data = (NormalTableDataDefinition)top;
 
-        if(data == null || ComparatorUtils.equals(data.getCategoryName(), StringUtils.EMPTY)) {
+        if(ComparatorUtils.equals(data.getCategoryName(), StringUtils.EMPTY)) {
-            categoryCombox.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None"));
+            categoryCombox.setSelectedItem(Toolkit.i18nText("Fine-Design_Chart_Use_None"));
-        } else if(data!= null && !this.boxItemsContainsObject(categoryCombox,data.getCategoryName())){
+        } else if(!DataPaneHelper.boxItemsContainsObject(categoryCombox,data.getCategoryName())){
 		     categoryCombox.setSelectedItem(null);
         }else {
 			combineCustomEditValue(categoryCombox, data.getCategoryName());
@@ -146,20 +147,6 @@ public class CategoryPlotTableDataContentPane extends AbstractTableDataContentPa
 		seriesTypeComboxPane.populateBean(collection,this.isNeedSummaryCaculateMethod());
 	}
 
-	private boolean boxItemsContainsObject(UIComboBox box,Object item){
-     if(box == null){
-         return false;
-     }
-
-     ComboBoxModel dataModel = box.getModel();
-     for (int i = 0; i < dataModel.getSize(); i++) {
-         if(ComparatorUtils.equals(dataModel.getElementAt(i),item)){
-             return true;
-         }
-     }
-     return false;
- }
-
     /**
      * 重新布局整个面板
      */

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/DataPaneHelper.java

@@ -7,6 +7,7 @@ import com.fr.design.mainframe.chart.gui.data.CalculateComboBox;
 import com.fr.general.ComparatorUtils;
 import com.fr.log.FineLoggerFactory;
 
+import javax.swing.ComboBoxModel;
 import java.util.List;
 
 /**
@@ -24,6 +25,30 @@ public class DataPaneHelper {
         box.refreshBoxItems(list);
     }
 
+    public static boolean boxItemsContainsObject(UIComboBox box, Object item) {
+        if (box == null) {
+            return false;
+        }
+
+        ComboBoxModel dataModel = box.getModel();
+
+        for (int i = 0; i < dataModel.getSize(); i++) {
+            if (ComparatorUtils.equals(dataModel.getElementAt(i), item)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public static void combineCustomEditValue(UIComboBox comBox, String value) {
+        if(comBox != null) {
+            comBox.setEditable(true);
+            comBox.setSelectedItem(value);
+            comBox.setEditable(false);
+        }
+    }
+
     /**
      * 清空box里所有东西
      *

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldNamePane.java

@@ -14,6 +14,7 @@ import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.itable.UITable;
 import com.fr.design.gui.itable.UITableEditor;
 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.chart.gui.data.CalculateComboBox;
@@ -40,8 +41,15 @@ import java.util.List;
  * @version 创建时间：2012-12-26 下午04:39:46
  */
 public class SeriesNameUseFieldNamePane extends FurtherBasicBeanPane<ChartCollection> {
-    private static final String[] HEADS = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Field_Name"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Summary_Method")};
+    private static final String[] HEADS = {
-    private static final String[] HEADS_NO_SUMMARY = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Field_Name"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name")};
+            Toolkit.i18nText("Fine-Design_Chart_Field_Name"),
+            Toolkit.i18nText("Fine-Design_Chart_Series_Name"),
+            Toolkit.i18nText("Fine-Design_Chart_Summary_Method")};
+
+    private static final String[] HEADS_NO_SUMMARY = {
+            Toolkit.i18nText("Fine-Design_Chart_Field_Name"),
+            Toolkit.i18nText("Fine-Design_Chart_Series_Name")};
+
     private UICorrelationPane seriesDataPane;
     private List<String> field = new ArrayList<String>();
     private JPanel centerPane;
@@ -62,7 +70,7 @@ public class SeriesNameUseFieldNamePane extends FurtherBasicBeanPane<ChartCollec
                 return new ActionListener() {
                     @Override
                     public void actionPerformed(ActionEvent e) {
-                        String[] blank =heads.length == 3?new String[]{StringUtils.EMPTY, StringUtils.EMPTY, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")}:
+                        String[] blank = heads.length == 3 ? new String[]{StringUtils.EMPTY, StringUtils.EMPTY, Toolkit.i18nText("Fine-Design_Chart_Use_None")} :
                                 new String[]{StringUtils.EMPTY, StringUtils.EMPTY};
                         tablePane.addLine(blank);
                         fireTargetChanged();
@@ -121,7 +129,7 @@ public class SeriesNameUseFieldNamePane extends FurtherBasicBeanPane<ChartCollec
      * @return 标题
      */
     public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Enable_Field_Name");
+        return Toolkit.i18nText("Fine-Design_Chart_Enable_Field_Name");
     }
 
     /**
@@ -186,9 +194,13 @@ public class SeriesNameUseFieldNamePane extends FurtherBasicBeanPane<ChartCollec
    		}
    	}
 
-    public void populateBean(ChartCollection collection,boolean isNeedSummary){
+    public void populateBean(ChartCollection collection, boolean isNeedSummary) {
-        relayoutPane(isNeedSummary);
         TopDefinitionProvider topDefinition = collection.getSelectedChart().getFilterDefinition();
+        populateDefinition(topDefinition, isNeedSummary);
+    }
+
+    public void populateDefinition(TopDefinitionProvider topDefinition, boolean isNeedSummary) {
+        relayoutPane(isNeedSummary);
         if (topDefinition instanceof MoreNameCDDefinition) {
             MoreNameCDDefinition moreDefinition = (MoreNameCDDefinition) topDefinition;
             ChartSummaryColumn[] chartSummaryColumnArray = moreDefinition.getChartSummaryColumn();
@@ -221,6 +233,11 @@ public class SeriesNameUseFieldNamePane extends FurtherBasicBeanPane<ChartCollec
      */
     public void updateBean(ChartCollection collection) {
         TopDefinitionProvider normalDefinition = collection.getSelectedChart().getFilterDefinition();
+        MoreNameCDDefinition moreDefinition = updateDefinition(normalDefinition);
+        collection.getSelectedChart().setFilterDefinition(moreDefinition);
+    }
+
+    public MoreNameCDDefinition updateDefinition(TopDefinitionProvider normalDefinition) {
         MoreNameCDDefinition moreDefinition = null;
         if (normalDefinition instanceof MoreNameCDDefinition) {
             moreDefinition = (MoreNameCDDefinition) normalDefinition;
@@ -242,7 +259,8 @@ public class SeriesNameUseFieldNamePane extends FurtherBasicBeanPane<ChartCollec
             }
         }
         moreDefinition.setChartSummaryColumn(dataArray);
-        collection.getSelectedChart().setFilterDefinition(moreDefinition);
+
+        return moreDefinition;
     }
 
     /**

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldValuePane.java

@@ -8,15 +8,14 @@ import com.fr.data.util.function.NoneFunction;
 import com.fr.design.beans.FurtherBasicBeanPane;
 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.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.data.CalculateComboBox;
 import com.fr.design.utils.gui.GUICoreUtils;
-import com.fr.general.ComparatorUtils;
 
 import javax.swing.BorderFactory;
-import javax.swing.ComboBoxModel;
 import javax.swing.JPanel;
 import java.awt.BorderLayout;
 import java.awt.Component;
@@ -79,11 +78,11 @@ public class SeriesNameUseFieldValuePane extends FurtherBasicBeanPane<ChartColle
         double f = TableLayout.FILL;
         double[] columnSize = {f};
         double[] rowSize = {p, p, p, p, p};
-        UILabel Label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name"));
+        UILabel Label1 = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Series_Name"));
         Label1.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH, ChartDataPane.LABEL_HEIGHT));
-        UILabel Label2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Value"));
+        UILabel Label2 = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Series_Value"));
         Label2.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH, ChartDataPane.LABEL_HEIGHT));
-        UILabel Label3 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Summary_Method"));
+        UILabel Label3 = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Summary_Method"));
         Label3.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH, ChartDataPane.LABEL_HEIGHT));
         Component[][] components = getUseComponent(Label1, Label2, Label3);
 
@@ -93,16 +92,16 @@ public class SeriesNameUseFieldValuePane extends FurtherBasicBeanPane<ChartColle
         this.add(centerPane, BorderLayout.CENTER);
     }
 
-    private void initCenterPaneWithOutCaculateSummary(){
+    private void initCenterPaneWithOutCaculateSummary() {
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
         double[] columnSize = {f};
         double[] rowSize = {p, p, p, p};
-        UILabel Label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name"));
+        UILabel Label1 = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Series_Name"));
         Label1.setPreferredSize(new Dimension(75, 20));
-        UILabel Label2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Value"));
+        UILabel Label2 = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Series_Value"));
         Label2.setPreferredSize(new Dimension(75, 20));
-        UILabel Label3 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Summary_Method"));
+        UILabel Label3 = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Summary_Method"));
         Label3.setPreferredSize(new Dimension(75, 20));
         Component[][] components = getUseComponentWithOutSummary(Label1, Label2, Label3);
 
@@ -170,20 +169,6 @@ public class SeriesNameUseFieldValuePane extends FurtherBasicBeanPane<ChartColle
         DataPaneHelper.clearBoxItems(seriesValue);
     }
 
-    private boolean boxItemsContainsObject(UIComboBox box,Object item){
-        if(box == null){
-            return false;
-        }
-
-        ComboBoxModel dataModel = box.getModel();
-        for (int i = 0; i < dataModel.getSize(); i++) {
-            if(ComparatorUtils.equals(dataModel.getElementAt(i),item)){
-                return true;
-            }
-        }
-        return false;
-    }
-
     /**
      * 判断界面是否接受
      * @param ob 接受的对象
@@ -199,7 +184,7 @@ public class SeriesNameUseFieldValuePane extends FurtherBasicBeanPane<ChartColle
      * @return 界面标题
      */
     public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Enable_Field_Value");
+        return Toolkit.i18nText("Fine-Design_Chart_Enable_Field_Value");
     }
 
     /**
@@ -226,17 +211,22 @@ public class SeriesNameUseFieldValuePane extends FurtherBasicBeanPane<ChartColle
         }
     }
 
-    public void populateBean(ChartCollection ob , boolean isNeedSummary){
+    public void populateBean(ChartCollection ob, boolean isNeedSummary) {
-        relayoutPane(isNeedSummary);
         TopDefinitionProvider topDefinition = ob.getSelectedChart().getFilterDefinition();
+        populateDefinition(topDefinition, isNeedSummary);
+    }
+
+    public void populateDefinition(TopDefinitionProvider topDefinition, boolean isNeedSummary) {
+        relayoutPane(isNeedSummary);
+
         if (topDefinition instanceof OneValueCDDefinition) {
             OneValueCDDefinition oneDefinition = (OneValueCDDefinition) topDefinition;
             seriesName.setEditable(true);
-            seriesName.setSelectedItem(this.boxItemsContainsObject(seriesName,oneDefinition.getSeriesColumnName())
+            seriesName.setSelectedItem(DataPaneHelper.boxItemsContainsObject(seriesName, oneDefinition.getSeriesColumnName())
                     ? oneDefinition.getSeriesColumnName() : null);
             seriesName.setEditable(false);
             seriesValue.setEditable(true);
-            seriesValue.setSelectedItem(this.boxItemsContainsObject(seriesValue,oneDefinition.getValueColumnName())
+            seriesValue.setSelectedItem(DataPaneHelper.boxItemsContainsObject(seriesValue,oneDefinition.getValueColumnName())
                                 ? oneDefinition.getValueColumnName() : null);
             seriesValue.setEditable(false);
             if(this.isNeedSummary){
@@ -256,6 +246,11 @@ public class SeriesNameUseFieldValuePane extends FurtherBasicBeanPane<ChartColle
      * 保存界面内容 字段值
      */
     public void updateBean(ChartCollection collection) {
+        OneValueCDDefinition oneDefinition = updateDefinition();
+        collection.getSelectedChart().setFilterDefinition(oneDefinition);
+    }
+
+    public OneValueCDDefinition updateDefinition() {
         OneValueCDDefinition oneDefinition = createOneValueCDDefinition();
 
         String seriesName = (String) this.seriesName.getSelectedItem();
@@ -267,7 +262,8 @@ public class SeriesNameUseFieldValuePane extends FurtherBasicBeanPane<ChartColle
         }else{
             oneDefinition.setDataFunction(new NoneFunction());
         }
-        collection.getSelectedChart().setFilterDefinition(oneDefinition);
+
+        return oneDefinition;
     }
 
     protected OneValueCDDefinition createOneValueCDDefinition(){

designer-chart/src/main/java/com/fr/design/module/ChartPreFillStylePane.java

@@ -2,14 +2,16 @@ package com.fr.design.module;
 
 import com.fr.base.ChartColorMatching;
 import com.fr.design.beans.BasicBeanPane;
-import com.fr.design.gui.ibutton.UIButton;
+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.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.gui.style.ChartColorAdjustPane;
 import com.fr.design.style.background.gradient.FixedGradientBar;
 
+import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -19,7 +21,6 @@ import java.awt.CardLayout;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Dimension;
-import java.awt.FlowLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -35,8 +36,7 @@ public class ChartPreFillStylePane extends BasicBeanPane<ChartColorMatching> {
     private JPanel changeColorSetPane;
     private CardLayout cardLayout;
 
-    private UIButton accButton;
+    private UIButtonGroup groupButton;
-    private UIButton gradientButton;
 
     private ChartColorAdjustPane colorAdjustPane;
     private FixedGradientBar colorGradient;
@@ -52,25 +52,22 @@ public class ChartPreFillStylePane extends BasicBeanPane<ChartColorMatching> {
 
         JPanel customPane = new JPanel(FRGUIPaneFactory.createBorderLayout());
 
-        JPanel buttonPane = new JPanel();
+        groupButton = new UIButtonGroup<>(new String[]{Toolkit.i18nText("Fine-Design_Chart_Custom_Color"), Toolkit.i18nText("Fine-Design_Chart_Gradient_Color")});
-        buttonPane.setLayout(new FlowLayout(FlowLayout.LEFT));
+        groupButton.setSelectedIndex(0);
-        buttonPane.add(accButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Color")));
+        customPane.add(groupButton, BorderLayout.NORTH);
-        buttonPane.add(gradientButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gradient_Color")));
-        customPane.add(buttonPane, BorderLayout.NORTH);
 
         changeColorSetPane = new JPanel(cardLayout = new CardLayout());
-        changeColorSetPane.add(colorGradient = new FixedGradientBar(4, 130), "gradient");
+        changeColorSetPane.setBorder(BorderFactory.createEmptyBorder(5, 0, 0, 0));
+        changeColorSetPane.add(colorGradient = new FixedGradientBar(4, 150), "gradient");
         changeColorSetPane.add(colorAdjustPane = new ChartColorAdjustPane(), "acc");
         cardLayout.show(changeColorSetPane, "acc");
         customPane.add(changeColorSetPane, BorderLayout.CENTER);
 
-        accButton.setSelected(true);
+        customPane.setPreferredSize(new Dimension(155, 300));
-
+        colorGradient.setPreferredSize(new Dimension(155, 30));
-        customPane.setPreferredSize(new Dimension(200, 200));
-        colorGradient.setPreferredSize(new Dimension(120, 30));
         colorGradient.getSelectColorPointBtnP1().setColorInner(Color.WHITE);
         colorGradient.getSelectColorPointBtnP2().setColorInner(FixedGradientBar.NEW_CHARACTER);
-
+        
         double p = TableLayout.PREFERRED;
         double[] columnSize = {p, p};
         double[] rowSize = {p, p, p};
@@ -84,24 +81,20 @@ public class ChartPreFillStylePane extends BasicBeanPane<ChartColorMatching> {
     }
 
     private void initListener() {
-
+        groupButton.addActionListener(new ActionListener() {
-        accButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                accButton.setSelected(true);
+                checkCardPane();
-                gradientButton.setSelected(false);
-                cardLayout.show(changeColorSetPane, "acc");
             }
         });
+    }
 
-        gradientButton.addActionListener(new ActionListener() {
+    private void checkCardPane() {
-            @Override
+        if (groupButton.getSelectedIndex() == 0) {
-            public void actionPerformed(ActionEvent e) {
+            cardLayout.show(changeColorSetPane, "acc");
-                gradientButton.setSelected(true);
+        } else {
-                accButton.setSelected(false);
+            cardLayout.show(changeColorSetPane, "gradient");
-                cardLayout.show(changeColorSetPane, "gradient");
+        }
-            }
-        });
     }
 
     @Override
@@ -117,8 +110,7 @@ public class ChartPreFillStylePane extends BasicBeanPane<ChartColorMatching> {
         boolean isGradient = condition.getGradient();
         List<Color> colorList = condition.getColorList();
         if (isGradient) {
-            gradientButton.setSelected(true);
+            groupButton.setSelectedIndex(1);
-            accButton.setSelected(false);
             cardLayout.show(changeColorSetPane, "gradient");
 
             if (colorList.size() == 2) {
@@ -127,8 +119,7 @@ public class ChartPreFillStylePane extends BasicBeanPane<ChartColorMatching> {
                 colorGradient.repaint();
             }
         } else {
-            accButton.setSelected(true);
+            groupButton.setSelectedIndex(0);
-            gradientButton.setSelected(false);
             cardLayout.show(changeColorSetPane, "acc");
 
             if (colorList.isEmpty()) {
@@ -148,7 +139,7 @@ public class ChartPreFillStylePane extends BasicBeanPane<ChartColorMatching> {
 
         List<Color> colorList = new ArrayList<Color>();
 
-        if (gradientButton.isSelected()) {
+        if (groupButton.getSelectedIndex() == 1) {
             chartColorMatching.setGradient(true);
 
             Color start = colorGradient.getSelectColorPointBtnP1().getColorInner();

designer-chart/src/main/java/com/fr/design/module/ChartPreStyleListPane.java

@@ -0,0 +1,142 @@
+package com.fr.design.module;
+
+import com.fr.base.ChartColorMatching;
+import com.fr.base.ChartPreStyleConfig;
+import com.fr.base.Utils;
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.gui.controlpane.JListControlPane;
+import com.fr.design.gui.controlpane.NameObjectCreator;
+import com.fr.design.gui.controlpane.NameableCreator;
+import com.fr.design.gui.controlpane.ShortCut4JControlPane;
+import com.fr.design.gui.ilist.ModNameActionListener;
+import com.fr.design.menu.ShortCut;
+import com.fr.general.NameObject;
+import com.fr.stable.Nameable;
+
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.util.ArrayList;
+import java.util.Iterator;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2020-07-08
+ */
+public class ChartPreStyleListPane extends JListControlPane {
+
+    ChartPreStyleManagerPane chartPreStyleManagerPane;
+
+    public ChartPreStyleListPane(ChartPreStyleManagerPane chartPreStyleManagerPane) {
+        super();
+        this.chartPreStyleManagerPane = chartPreStyleManagerPane;
+        initListener();
+    }
+
+    /**
+     * 创建有名字的creator
+     *
+     * @return 有名字的creator数组
+     */
+    @Override
+    public NameableCreator[] createNameableCreators() {
+        return new NameableCreator[]{
+                new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_PreStyle_Duplicate"),
+                        ChartColorMatching.class, ChartPreStylePane.class)
+        };
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_PreStyle");
+    }
+
+    @Override
+    public BasicBeanPane createPaneByCreators(NameableCreator creator) {
+        return new ChartPreStylePane() {
+            @Override
+            protected void refreshWhenStyleChange(ChartColorMatching preStyle) {
+                super.refreshWhenStyleChange(preStyle);
+                chartPreStyleManagerPane.refreshDefaultColorBox();
+            }
+        };
+    }
+
+
+    protected ShortCut4JControlPane[] createShortcuts() {
+        return new ShortCut4JControlPane[]{
+                shortCutFactory.addItemShortCut(),
+                createRemoveItemShortCut(),
+                shortCutFactory.copyItemShortCut(),
+                shortCutFactory.moveUpItemShortCut(),
+                shortCutFactory.moveDownItemShortCut(),
+                shortCutFactory.sortItemShortCut()
+        };
+    }
+
+    private ShortCut4JControlPane createRemoveItemShortCut() {
+        ShortCut4JControlPane shortCut4JControlPane = shortCutFactory.removeItemShortCut();
+        //替换删除按钮的check事件。
+        ShortCut shortCut = shortCut4JControlPane.getShortCut();
+        shortCut4JControlPane = new MoreThanOneShortCut(shortCut);
+        return shortCut4JControlPane;
+    }
+
+    public void initListener() {
+        nameableList.addListSelectionListener(new ListSelectionListener() {
+            @Override
+            public void valueChanged(ListSelectionEvent e) {
+                chartPreStyleManagerPane.refreshDefaultColorBox();
+            }
+        });
+        nameableList.addModNameActionListener(new ModNameActionListener() {
+            @Override
+            public void nameModed(int index, String oldName, String newName) {
+                chartPreStyleManagerPane.refreshDefaultColorBox(oldName, newName);
+            }
+        });
+    }
+
+    public void populateBean() {
+        ChartPreStyleConfig config = ChartPreStyleConfig.getInstance().mirror();
+        ArrayList list = new ArrayList();
+
+        Iterator keys = config.names();
+        while (keys.hasNext()) {
+            Object key = keys.next();
+            ChartColorMatching value = (ChartColorMatching) config.getPreStyle(key);
+
+            list.add(new NameObject(Utils.objectToString(key), value));
+        }
+
+        Nameable[] values = (Nameable[]) list.toArray(new Nameable[list.size()]);
+        populate(values);
+
+        if (config.containsName(config.getCurrentStyle())) {
+            this.setSelectedName(config.getCurrentStyle());
+        }
+    }
+
+    public void updateBean() {
+        ChartPreStyleConfig config = ChartPreStyleConfig.getInstance();
+
+        Nameable[] values = update();
+        config.clearAllPreStyle();
+
+        for (Nameable value : values) {
+            config.putPreStyle(value.getName(), ((NameObject) value).getObject());
+        }
+    }
+
+    private class MoreThanOneShortCut extends ShortCut4JControlPane {
+        public MoreThanOneShortCut(ShortCut shortCut) {
+            this.shortCut = shortCut;
+        }
+
+
+        @Override
+        public void checkEnable() {
+            this.shortCut.setEnabled(nameableList.getModel().getSize() > 1);
+        }
+    }
+}

designer-chart/src/main/java/com/fr/design/module/ChartPreStyleManagerPane.java

@@ -2,72 +2,114 @@ package com.fr.design.module;
 
 import com.fr.base.ChartColorMatching;
 import com.fr.base.ChartPreStyleConfig;
-import com.fr.base.Utils;
+import com.fr.design.chartx.component.combobox.ColorSchemeComboBox;
-import com.fr.design.gui.controlpane.JListControlPane;
+import com.fr.design.dialog.BasicPane;
-import com.fr.design.gui.controlpane.NameObjectCreator;
+import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.gui.controlpane.NameableCreator;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.general.ComparatorUtils;
+import com.fr.general.GeneralUtils;
 import com.fr.general.NameObject;
 import com.fr.stable.Nameable;
+import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 
-import java.util.ArrayList;
+import javax.swing.JPanel;
 import java.util.Iterator;
-
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
 
 /**
  * 图表预定义管理 界面, 在工具栏-服务器管理中.
+ *
  * @author kunsnat E-mail:kunsnat@gmail.com
  * @version 创建时间：2013-8-21 下午02:33:48
  */
-public class ChartPreStyleManagerPane extends JListControlPane {
+public class ChartPreStyleManagerPane extends BasicPane {
-
+
-	@Override
+    private ColorSchemeComboBox defaultColorBox;
-    /**
+
-     * 创建有名字的creator
+    private ChartPreStyleListPane chartPreStyleListPane;
-     * @return 有名字的creator数组
+
-     */
+    public ChartPreStyleManagerPane() {
-	public NameableCreator[] createNameableCreators() {
+        initComponent();
-		return new NameableCreator[]{
+    }
-				new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_PreStyle_Duplicate"),
+
-						ChartColorMatching.class, ChartPreStylePane.class)
+    private void initComponent() {
-		};
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
-	}
+        JPanel colorBoxPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
-
+
-	@Override
+        chartPreStyleListPane = new ChartPreStyleListPane(this);
-	protected String title4PopupWindow() {
+
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_PreStyle");
+        initDefaultColorBox();
-	}
+        colorBoxPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Chart_Match_Default_Color_Scheme") + "："));
-	
+        colorBoxPane.add(defaultColorBox);
-	public void populateBean() {
+
-		ChartPreStyleConfig config = ChartPreStyleConfig.getInstance().mirror();
+        this.add(colorBoxPane, BorderLayout.NORTH);
-		ArrayList list = new ArrayList();
+        this.add(chartPreStyleListPane, BorderLayout.CENTER);
-		
+    }
-		Iterator keys = config.names();
+
-		while(keys.hasNext()) {
+    private void initDefaultColorBox() {
-			Object key = keys.next();
+        Map<String, ColorSchemeComboBox.ColorInfo> colorSchemes = new LinkedHashMap<>();
-			ChartColorMatching value = (ChartColorMatching) config.getPreStyle(key);
+        ChartPreStyleConfig config = ChartPreStyleConfig.getInstance();
-
+        Iterator names = config.names();
-			list.add(new NameObject(Utils.objectToString(key), value));
+        while (names.hasNext()) {
-		}
+            Object key = names.next();
-		
+            ColorSchemeComboBox.ColorInfo colorInfo = new ColorSchemeComboBox.ColorInfo();
-		Nameable[] values = (Nameable[])list.toArray(new Nameable[list.size()]);
+            ChartColorMatching colorMatching = (ChartColorMatching) config.getPreStyle(key);
-		populate(values);
+            colorInfo.setGradient(colorMatching.getGradient());
-		
+            colorInfo.setColors(colorMatching.getColorList());
-		if(config.containsName(config.getCurrentStyle())) {
+            colorSchemes.put(colorMatching.getId(), colorInfo);
-			this.setSelectedName(config.getCurrentStyle());
+        }
-		}
+        defaultColorBox = new ColorSchemeComboBox(colorSchemes);
-	}
+        defaultColorBox.setPreferredSize(new Dimension(TableLayout4VanChartHelper.EDIT_AREA_WIDTH, 20));
-	
+    }
-	public void updateBean() {
+
-		ChartPreStyleConfig config = ChartPreStyleConfig.getInstance();
+    private void refreshColorSchemes() {
-
+        Nameable[] nameables = chartPreStyleListPane.update();
-		config.setCurrentStyle(getSelectedName());
+        Map<String, ColorSchemeComboBox.ColorInfo> colorSchemes = new LinkedHashMap<>();
-
+        for (Nameable value : nameables) {
-		Nameable[] values = update();
+            String name = value.getName();
-		config.clearAllPreStyle();
+            ChartColorMatching colorMatching = (ChartColorMatching) ((NameObject) value).getObject();
-
+            ColorSchemeComboBox.ColorInfo colorInfo = new ColorSchemeComboBox.ColorInfo();
-		for (Nameable value : values) {
+            colorInfo.setGradient(colorMatching.getGradient());
-			config.putPreStyle(value.getName(), ((NameObject) value).getObject());
+            colorInfo.setColors(colorMatching.getColorList());
-		}
+            colorSchemes.put(name, colorInfo);
-	}
+        }
+        defaultColorBox.refresh(colorSchemes);
+    }
+
+    public void refreshDefaultColorBox() {
+        Object selectedItem = defaultColorBox.getSelectedItem();
+        refreshColorSchemes();
+        defaultColorBox.setSelectedItem(selectedItem);
+    }
+
+    public void refreshDefaultColorBox(String oldName, String newName) {
+        Object selectedItem = defaultColorBox.getSelectedItem();
+        if (ComparatorUtils.equals(selectedItem, oldName)) {
+            selectedItem = newName;
+        }
+        refreshColorSchemes();
+        defaultColorBox.setSelectedItem(selectedItem);
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return Toolkit.i18nText("Fine-Design_Report_ServerM_Predefined_Styles");
+    }
+
+    public void populateBean() {
+        ChartPreStyleConfig config = ChartPreStyleConfig.getInstance();
+        String currentStyle = config.getCurrentStyle();
+        defaultColorBox.setSelectedItem(currentStyle);
+        chartPreStyleListPane.populateBean();
+    }
 
+    public void updateBean() {
+        ChartPreStyleConfig config = ChartPreStyleConfig.getInstance();
+        config.setCurrentStyle(GeneralUtils.objectToString(defaultColorBox.getSelectedItem()));
+        chartPreStyleListPane.updateBean();
+    }
 }

designer-chart/src/main/java/com/fr/design/module/ChartPreStylePane.java

@@ -80,7 +80,7 @@ public class ChartPreStylePane extends BasicBeanPane<ChartColorMatching> {
 		}
 	}
 
-	private void refreshWhenStyleChange(ChartColorMatching preStyle) {
+	protected void refreshWhenStyleChange(ChartColorMatching preStyle) {
 		if(chartComponent != null) {
 			demoPlot.setPlotFillStyle(ChartUtils.chartColorMatching2AttrFillStyle(preStyle));
 			chartComponent.reset();

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

@@ -0,0 +1,97 @@
+package com.fr.van.chart.box;
+
+import com.fr.chart.chartattr.Chart;
+import com.fr.chart.chartattr.Plot;
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.condition.ConditionAttributesPane;
+import com.fr.design.gui.frpane.AttributeChangeListener;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.mainframe.chart.AbstractChartAttrPane;
+import com.fr.design.mainframe.chart.gui.ChartDataPane;
+import com.fr.design.mainframe.chart.gui.ChartStylePane;
+import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
+import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
+import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.van.chart.box.data.BoxPlotReportDataContentPane;
+import com.fr.van.chart.box.data.table.BoxPlotTableDataContentPane;
+import com.fr.van.chart.designer.other.VanChartInteractivePane;
+import com.fr.van.chart.designer.other.VanChartOtherPane;
+import com.fr.van.chart.designer.other.zoom.ZoomPane;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+import com.fr.van.chart.vanchart.AbstractIndependentVanChartUI;
+
+import java.awt.Component;
+
+public class BoxIndependentVanChartInterface extends AbstractIndependentVanChartUI {
+
+    public String getName() {
+        return Toolkit.i18nText("Fine-Design_Chart_New_Box");
+    }
+
+    public String[] getSubName() {
+        return new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_New_Box")
+        };
+    }
+
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/box.png"
+        };
+    }
+
+    public String getIconPath() {
+        return "com/fr/design/images/form/toolbar/box.png";
+    }
+
+    public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) {
+        return new BoxPlotTableDataContentPane(plot, parent);
+    }
+
+    public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) {
+        return new BoxPlotReportDataContentPane(parent);
+    }
+
+    public AbstractChartTypePane getPlotTypePane() {
+        return new VanChartBoxPlotPane();
+    }
+
+    public ConditionAttributesPane getPlotConditionPane(Plot plot) {
+        return new VanChartBoxConditionPane(plot);
+    }
+
+    public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot) {
+        return new VanChartBoxSeriesPane(parent, plot);
+    }
+
+    public AbstractChartAttrPane[] getAttrPaneArray(AttributeChangeListener listener) {
+        VanChartStylePane stylePane = new VanChartBoxStylePane(listener);
+        VanChartOtherPane otherPane = new VanChartOtherPane() {
+
+            protected BasicBeanPane<Chart> createInteractivePane() {
+                return new VanChartInteractivePane() {
+
+                    protected Component[][] createToolBarComponents() {
+                        return new Component[][]{
+                                new Component[]{null, exportImages},
+                                new Component[]{null, fullScreenDisplay}
+                        };
+                    }
+
+                    protected double[] getToolBarRowSize() {
+                        double p = TableLayout.PREFERRED;
+                        return new double[]{p, p};
+                    }
+
+                    protected ZoomPane createZoomPane() {
+                        return new ZoomPane();
+                    }
+                };
+            }
+        };
+
+        return new AbstractChartAttrPane[]{stylePane, otherPane};
+    }
+
+}

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

@@ -0,0 +1,53 @@
+package com.fr.van.chart.box;
+
+import com.fr.chart.base.AttrAlpha;
+import com.fr.chart.base.AttrBackground;
+import com.fr.chart.base.AttrBorder;
+import com.fr.chart.chartattr.Plot;
+import com.fr.design.chart.series.SeriesCondition.ChartConditionPane;
+import com.fr.design.chart.series.SeriesCondition.DataSeriesConditionPane;
+import com.fr.design.chart.series.SeriesCondition.LabelAlphaPane;
+import com.fr.plugin.chart.box.VanChartBoxPlot;
+import com.fr.plugin.chart.type.ConditionKeyType;
+import com.fr.van.chart.column.VanChartColumnLabelBorderPane;
+import com.fr.van.chart.designer.other.condition.item.VanChartColumnSeriesColorConditionPane;
+
+import java.awt.Dimension;
+
+public class VanChartBoxConditionPane extends DataSeriesConditionPane {
+
+    public VanChartBoxConditionPane(Plot plot) {
+        super(plot);
+    }
+
+    protected void initComponents() {
+        super.initComponents();
+
+        liteConditionPane.setPreferredSize(new Dimension(300, 400));
+    }
+
+    protected void addBasicAction() {
+        classPaneMap.put(AttrBackground.class, new VanChartColumnSeriesColorConditionPane(this));
+        classPaneMap.put(AttrAlpha.class, new LabelAlphaPane(this));
+        classPaneMap.put(AttrBorder.class, new VanChartColumnLabelBorderPane(this));
+    }
+
+    protected void addStyleAction() {
+    }
+
+    protected ChartConditionPane createListConditionPane() {
+
+        return new ChartConditionPane() {
+
+            @Override
+            protected ConditionKeyType[] conditionKeyTypes() {
+                return ConditionKeyType.BOX_CONDITION_KEY_TYPES;
+            }
+        };
+    }
+
+
+    public Class<? extends Plot> class4Correspond() {
+        return VanChartBoxPlot.class;
+    }
+}

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

@@ -0,0 +1,45 @@
+package com.fr.van.chart.box;
+
+import com.fr.chart.chartattr.Chart;
+import com.fr.chart.chartattr.Plot;
+import com.fr.log.FineLoggerFactory;
+import com.fr.plugin.chart.box.BoxIndependentVanChart;
+import com.fr.plugin.chart.box.VanChartBoxPlot;
+import com.fr.van.chart.designer.type.AbstractVanChartTypePane;
+
+public class VanChartBoxPlotPane extends AbstractVanChartTypePane {
+
+    protected String[] getTypeIconPath() {
+        return new String[]{"/com/fr/van/chart/box.images/box.png"
+        };
+    }
+
+    protected Plot getSelectedClonedPlot() {
+        VanChartBoxPlot newPlot = null;
+
+        Chart[] boxChartGroup = BoxIndependentVanChart.BoxVanChartTypes;
+
+        for (int i = 0, len = boxChartGroup.length; i < len; i++) {
+            if (typeDemo.get(i).isPressing) {
+                newPlot = boxChartGroup[i].getPlot();
+            }
+        }
+
+        Plot cloned = null;
+
+        try {
+            if (newPlot != null) {
+                cloned = (Plot) newPlot.clone();
+            }
+        } catch (CloneNotSupportedException e) {
+            FineLoggerFactory.getLogger().error("Error In ColumnChart");
+        }
+
+        return cloned;
+    }
+
+    public Chart getDefaultChart() {
+        return BoxIndependentVanChart.BoxVanChartTypes[0];
+    }
+
+}

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

@@ -0,0 +1,26 @@
+package com.fr.van.chart.box;
+
+import com.fr.chart.chartattr.Plot;
+import com.fr.plugin.chart.base.AttrTooltip;
+import com.fr.plugin.chart.box.attr.AttrBoxTooltip;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+import com.fr.van.chart.designer.style.tooltip.VanChartPlotTooltipPane;
+
+public class VanChartBoxPlotTooltipPane extends VanChartPlotTooltipPane {
+
+    public VanChartBoxPlotTooltipPane(Plot plot, VanChartStylePane parent) {
+        super(plot, parent);
+    }
+
+    protected void initTooltipContentPane(Plot plot) {
+        tooltipContentPane = new VanChartBoxTooltipContentPane(parent, VanChartBoxPlotTooltipPane.this);
+    }
+
+    protected AttrTooltip getAttrTooltip() {
+        return new AttrBoxTooltip();
+    }
+
+    protected boolean hasTooltipSeriesType() {
+        return false;
+    }
+}

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

@@ -0,0 +1,107 @@
+package com.fr.van.chart.box;
+
+import com.fr.chart.chartattr.Plot;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.mainframe.chart.gui.ChartStylePane;
+import com.fr.plugin.chart.box.VanChartBoxPlot;
+import com.fr.van.chart.designer.TableLayout4VanChartHelper;
+import com.fr.van.chart.designer.component.VanChartBeautyPane;
+import com.fr.van.chart.designer.component.VanChartMarkerPane;
+import com.fr.van.chart.designer.component.border.VanChartBorderPane;
+import com.fr.van.chart.designer.style.series.VanChartAbstractPlotSeriesPane;
+
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Component;
+
+public class VanChartBoxSeriesPane extends VanChartAbstractPlotSeriesPane {
+
+    private JPanel normalMarker;
+    private JPanel outlierMarker;
+
+    private VanChartMarkerPane normalValuePane;
+    private VanChartMarkerPane outlierValuePane;
+
+    public VanChartBoxSeriesPane(ChartStylePane parent, Plot plot) {
+        super(parent, plot);
+    }
+
+    protected JPanel getContentInPlotType() {
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+
+        double[] columnSize = {f};
+        double[] rowSize = {p, p, p};
+
+        Component[][] components = new Component[][]{
+                new Component[]{createBorderPane()},
+                new Component[]{createNormalValuePane()},
+                new Component[]{createOutlierValuePane()}
+        };
+
+        contentPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
+
+        return contentPane;
+    }
+
+    protected VanChartBorderPane createDiffBorderPane() {
+        return new VanChartBorderPane();
+    }
+
+    private JPanel createNormalValuePane() {
+        normalValuePane = new VanChartMarkerPane();
+        normalMarker = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Engine_Chart_Normal_Value"), normalValuePane);
+
+        return normalMarker;
+    }
+
+    private JPanel createOutlierValuePane() {
+        outlierValuePane = new VanChartMarkerPane();
+        outlierMarker = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Engine_Chart_Outlier_Value"), outlierValuePane);
+
+        return outlierMarker;
+    }
+
+    private void checkMarkerPane(boolean isDetailed) {
+        normalMarker.setVisible(isDetailed);
+        outlierMarker.setVisible(isDetailed);
+    }
+
+    protected void setColorPaneContent(JPanel panel) {
+        panel.add(createAlphaPane(), BorderLayout.SOUTH);
+    }
+
+    protected VanChartBeautyPane createStylePane() {
+        return null;
+    }
+
+    public void populateBean(Plot plot) {
+        if (plot == null) {
+            return;
+        }
+
+        super.populateBean(plot);
+
+        if (plot instanceof VanChartBoxPlot) {
+            normalValuePane.populate(((VanChartBoxPlot) plot).getNormalValue());
+            outlierValuePane.populate(((VanChartBoxPlot) plot).getOutlierValue());
+
+            checkMarkerPane(((VanChartBoxPlot) plot).isDetailed());
+        }
+    }
+
+    public void updateBean(Plot plot) {
+        if (plot == null) {
+            return;
+        }
+
+        if (plot instanceof VanChartBoxPlot) {
+            ((VanChartBoxPlot) plot).setNormalValue(normalValuePane.update());
+            ((VanChartBoxPlot) plot).setOutlierValue(outlierValuePane.update());
+        }
+
+        super.updateBean(plot);
+    }
+}

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

@@ -0,0 +1,21 @@
+package com.fr.van.chart.box;
+
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.gui.frpane.AttributeChangeListener;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import java.util.List;
+
+public class VanChartBoxStylePane extends VanChartStylePane {
+
+    public VanChartBoxStylePane(AttributeChangeListener listener) {
+        super(listener);
+    }
+
+    protected void createVanChartLabelPane(List<BasicPane> paneList) {
+    }
+
+    protected void addVanChartTooltipPane(List<BasicPane> paneList) {
+        paneList.add(new VanChartBoxTooltipPane(VanChartBoxStylePane.this));
+    }
+}

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

@@ -0,0 +1,149 @@
+package com.fr.van.chart.box;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.plugin.chart.base.AttrTooltipContent;
+import com.fr.plugin.chart.box.attr.AttrBoxTooltipContent;
+import com.fr.van.chart.designer.component.VanChartTooltipContentPane;
+import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.VanChartFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import javax.swing.JPanel;
+import java.awt.Component;
+
+public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
+
+    private VanChartFormatPaneWithCheckBox number;
+    private VanChartFormatPaneWithCheckBox max;
+    private VanChartFormatPaneWithCheckBox q3;
+    private VanChartFormatPaneWithCheckBox median;
+    private VanChartFormatPaneWithCheckBox q1;
+    private VanChartFormatPaneWithCheckBox min;
+    private VanChartFormatPaneWithCheckBox outlier;
+
+    public VanChartBoxTooltipContentPane(VanChartStylePane parent, JPanel showOnPane) {
+        super(parent, showOnPane);
+    }
+
+    protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+        categoryNameFormatPane = new CategoryNameFormatPaneWithCheckBox(parent, showOnPane);
+        seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane);
+
+        number = new VanChartFormatPaneWithCheckBox(parent, showOnPane) {
+            protected String getCheckBoxText() {
+                return Toolkit.i18nText("Fine-Design_Chart_Data_Number");
+            }
+        };
+        max = new VanChartFormatPaneWithCheckBox(parent, showOnPane) {
+            protected String getCheckBoxText() {
+                return Toolkit.i18nText("Fine-Design_Chart_Max_Value");
+            }
+        };
+        q3 = new VanChartFormatPaneWithCheckBox(parent, showOnPane) {
+            protected String getCheckBoxText() {
+                return Toolkit.i18nText("Fine-Design_Chart_Data_Q3");
+            }
+        };
+        median = new VanChartFormatPaneWithCheckBox(parent, showOnPane) {
+            protected String getCheckBoxText() {
+                return Toolkit.i18nText("Fine-Design_Chart_Data_Median");
+            }
+        };
+        q1 = new VanChartFormatPaneWithCheckBox(parent, showOnPane) {
+            protected String getCheckBoxText() {
+                return Toolkit.i18nText("Fine-Design_Chart_Data_Q1");
+            }
+        };
+        min = new VanChartFormatPaneWithCheckBox(parent, showOnPane) {
+            protected String getCheckBoxText() {
+                return Toolkit.i18nText("Fine-Design_Chart_Min_Value");
+            }
+        };
+        outlier = new VanChartFormatPaneWithCheckBox(parent, showOnPane) {
+            protected String getCheckBoxText() {
+                return Toolkit.i18nText("Fine-Engine_Chart_Outlier_Value");
+            }
+        };
+    }
+
+    protected double[] getRowSize(double p) {
+        return new double[]{p, p, p, p, p, p, p, p, p};
+    }
+
+    protected Component[][] getPaneComponents() {
+        return new Component[][]{
+                new Component[]{categoryNameFormatPane, null},
+                new Component[]{seriesNameFormatPane, null},
+                new Component[]{number, null},
+                new Component[]{max, null},
+                new Component[]{q3, null},
+                new Component[]{median, null},
+                new Component[]{q1, null},
+                new Component[]{min, null},
+                new Component[]{outlier, null}
+        };
+    }
+
+    public boolean isDirty() {
+        return categoryNameFormatPane.isDirty()
+                || seriesNameFormatPane.isDirty()
+                || number.isDirty()
+                || max.isDirty()
+                || q3.isDirty()
+                || median.isDirty()
+                || q1.isDirty()
+                || min.isDirty()
+                || outlier.isDirty();
+    }
+
+    public void setDirty(boolean isDirty) {
+        categoryNameFormatPane.setDirty(isDirty);
+        seriesNameFormatPane.setDirty(isDirty);
+        number.setDirty(isDirty);
+        max.setDirty(isDirty);
+        q3.setDirty(isDirty);
+        median.setDirty(isDirty);
+        q1.setDirty(isDirty);
+        min.setDirty(isDirty);
+        outlier.setDirty(isDirty);
+    }
+
+    protected AttrTooltipContent createAttrTooltip() {
+        return new AttrBoxTooltipContent();
+    }
+
+    protected void populateFormatPane(AttrTooltipContent attrTooltipContent) {
+        categoryNameFormatPane.populate(attrTooltipContent.getCategoryFormat());
+        seriesNameFormatPane.populate(attrTooltipContent.getSeriesFormat());
+
+        if (attrTooltipContent instanceof AttrBoxTooltipContent) {
+            AttrBoxTooltipContent boxTooltipContent = (AttrBoxTooltipContent) attrTooltipContent;
+
+            number.populate(boxTooltipContent.getNumber());
+            max.populate(boxTooltipContent.getMax());
+            q3.populate(boxTooltipContent.getQ3());
+            median.populate(boxTooltipContent.getMedian());
+            q1.populate(boxTooltipContent.getQ1());
+            min.populate(boxTooltipContent.getMin());
+            outlier.populate(boxTooltipContent.getOutlier());
+        }
+    }
+
+    protected void updateFormatPane(AttrTooltipContent attrTooltipContent) {
+        categoryNameFormatPane.update(attrTooltipContent.getCategoryFormat());
+        seriesNameFormatPane.update(attrTooltipContent.getSeriesFormat());
+
+        if (attrTooltipContent instanceof AttrBoxTooltipContent) {
+            AttrBoxTooltipContent boxTooltipContent = (AttrBoxTooltipContent) attrTooltipContent;
+
+            number.update(boxTooltipContent.getNumber());
+            max.update(boxTooltipContent.getMax());
+            q3.update(boxTooltipContent.getQ3());
+            median.update(boxTooltipContent.getMedian());
+            q1.update(boxTooltipContent.getQ1());
+            min.update(boxTooltipContent.getMin());
+            outlier.update(boxTooltipContent.getOutlier());
+        }
+    }
+}

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

@@ -0,0 +1,17 @@
+package com.fr.van.chart.box;
+
+import com.fr.chart.chartattr.Plot;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+import com.fr.van.chart.designer.style.tooltip.VanChartPlotTooltipPane;
+import com.fr.van.chart.designer.style.tooltip.VanChartTooltipPane;
+
+public class VanChartBoxTooltipPane extends VanChartTooltipPane {
+
+    public VanChartBoxTooltipPane(VanChartStylePane parent) {
+        super(parent);
+    }
+
+    protected VanChartPlotTooltipPane getTooltipPane(Plot plot) {
+        return new VanChartBoxPlotTooltipPane(plot, parent);
+    }
+}

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

@@ -0,0 +1,11 @@
+package com.fr.van.chart.box.data;
+
+import com.fr.design.mainframe.chart.gui.ChartDataPane;
+import com.fr.design.mainframe.chart.gui.data.report.CategoryPlotReportDataContentPane;
+
+public class BoxPlotReportDataContentPane extends CategoryPlotReportDataContentPane {
+
+    public BoxPlotReportDataContentPane(ChartDataPane parent) {
+        super(parent);
+    }
+}

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

@@ -0,0 +1,4 @@
+package com.fr.van.chart.box.data;
+
+public class BoxPlotReportResultDataSeriesPane {
+}

designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableDataContentPane.java

@@ -0,0 +1,212 @@
+package com.fr.van.chart.box.data.table;
+
+import com.fr.chart.chartattr.ChartCollection;
+import com.fr.chart.chartattr.Plot;
+import com.fr.chart.chartdata.NormalTableDataDefinition;
+import com.fr.design.foldablepane.UIExpandablePane;
+import com.fr.design.gui.ibutton.UIButtonGroup;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.chart.gui.ChartDataPane;
+import com.fr.design.mainframe.chart.gui.data.ChartDataFilterPane;
+import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
+import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.plugin.chart.box.VanChartBoxPlot;
+import com.fr.plugin.chart.box.data.VanBoxTableDefinition;
+
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.List;
+
+public class BoxPlotTableDataContentPane extends AbstractTableDataContentPane {
+
+    private UIButtonGroup dataType;
+
+    private BoxPlotTableSeriesTypeUsePane seriesTypeComboxPane;
+    private BoxPlotTableResultDataSeriesPane resultDataSeriesPane;
+
+    private JPanel filterPane;
+    private ChartDataFilterPane dataScreeningPane;
+
+    private ChartDataPane parent;
+    private Plot initplot;
+
+    public BoxPlotTableDataContentPane(Plot plot, ChartDataPane parent) {
+        this.initplot = plot;
+        this.parent = parent;
+
+        this.setLayout(new BorderLayout());
+
+        this.add(createDataTypePane(), BorderLayout.NORTH);
+        this.add(createSeriesPane(), BorderLayout.CENTER);
+        this.add(createFilterPane(), BorderLayout.SOUTH);
+
+        initDataTypeListener();
+        checkDataPaneVisible();
+    }
+
+    private JPanel createDataTypePane() {
+        JPanel pane = new JPanel(new BorderLayout(4, 0));
+        pane.setBorder(BorderFactory.createMatteBorder(0, 0, 6, 1, getBackground()));
+
+        UILabel label = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Data_Type"));
+        label.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH, ChartDataPane.LABEL_HEIGHT));
+
+        String[] names = new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Detailed_Data"),
+                Toolkit.i18nText("Fine-Design_Chart_Result_Data")
+        };
+
+        dataType = new UIButtonGroup(names);
+        dataType.setPreferredSize(new Dimension(100, 20));
+
+        pane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{dataType, null, null, label, null}));
+        pane.setPreferredSize(new Dimension(246, 30));
+        pane.setBorder(BorderFactory.createEmptyBorder(0, 24, 10, 15));
+
+        return pane;
+    }
+
+    private JPanel createSeriesPane() {
+        seriesTypeComboxPane = new BoxPlotTableSeriesTypeUsePane();
+        resultDataSeriesPane = new BoxPlotTableResultDataSeriesPane();
+
+        JPanel pane = new JPanel(new BorderLayout(4, 0));
+
+        pane.add(seriesTypeComboxPane, BorderLayout.CENTER);
+        pane.add(resultDataSeriesPane, BorderLayout.SOUTH);
+
+        return pane;
+    }
+
+    private JPanel createFilterPane() {
+        dataScreeningPane = new ChartDataFilterPane(initplot, parent, false);
+        dataScreeningPane.setBorder(BorderFactory.createEmptyBorder(10, 24, 10, 15));
+
+        filterPane = new UIExpandablePane(Toolkit.i18nText("Fine-Design_Chart_Data_Filter"), 290, 24, dataScreeningPane);
+        filterPane.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 5));
+
+        return filterPane;
+    }
+
+    private void initDataTypeListener() {
+        dataType.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                checkDataPaneVisible();
+            }
+        });
+    }
+
+    private void checkDataPaneVisible() {
+        if (seriesTypeComboxPane != null) {
+            seriesTypeComboxPane.setVisible(dataType.getSelectedIndex() == 0);
+        }
+        if (resultDataSeriesPane != null) {
+            resultDataSeriesPane.setVisible(dataType.getSelectedIndex() == 1);
+        }
+
+        if (filterPane != null) {
+            filterPane.setVisible(dataType.getSelectedIndex() == 0);
+        }
+    }
+
+    public void checkBoxUse(boolean hasUse) {
+        if (dataType.getSelectedIndex() == 0 && seriesTypeComboxPane != null) {
+            seriesTypeComboxPane.checkBoxUse(hasUse);
+        }
+
+        if (dataType.getSelectedIndex() == 1 && resultDataSeriesPane != null) {
+            resultDataSeriesPane.checkBoxUse(hasUse);
+        }
+
+        dataScreeningPane.checkBoxUse();
+    }
+
+    protected void refreshBoxListWithSelectTableData(List list) {
+        if (seriesTypeComboxPane != null) {
+            seriesTypeComboxPane.refreshBoxListWithSelectTableData(list);
+        }
+        if (resultDataSeriesPane != null) {
+            resultDataSeriesPane.refreshBoxListWithSelectTableData(list);
+        }
+    }
+
+    public void clearAllBoxList() {
+        if (seriesTypeComboxPane != null) {
+            seriesTypeComboxPane.clearAllBoxList();
+        }
+        if (resultDataSeriesPane != null) {
+            resultDataSeriesPane.clearAllBoxList();
+        }
+    }
+
+    public void updateBean(ChartCollection collection) {
+        checkChartCollection(collection);
+
+        VanBoxTableDefinition table = BoxTableDefinitionHelper.getBoxTableDefinition(collection);
+
+        if (table != null) {
+            boolean isDetailed = dataType.getSelectedIndex() == 0;
+
+            table.setDetailed(isDetailed);
+            ((VanChartBoxPlot) initplot).setDetailed(isDetailed);
+        }
+        if (seriesTypeComboxPane != null) {
+            seriesTypeComboxPane.updateBean(collection);
+        }
+        if (resultDataSeriesPane != null) {
+            resultDataSeriesPane.updateBean(collection);
+        }
+        if (dataScreeningPane != null) {
+            updateDataScreeningPane(dataScreeningPane, collection);
+        }
+    }
+
+    public void populateBean(ChartCollection collection) {
+        checkChartCollection(collection);
+
+        if (dataType != null) {
+            dataType.setSelectedIndex(BoxTableDefinitionHelper.isDetailedTableDataType(collection) ? 0 : 1);
+        }
+        if (seriesTypeComboxPane != null) {
+            seriesTypeComboxPane.populateBean(collection);
+        }
+        if (resultDataSeriesPane != null) {
+            resultDataSeriesPane.populateBean(collection);
+        }
+        if (dataScreeningPane != null) {
+            populateDataScreeningPane(dataScreeningPane, collection);
+        }
+
+        checkDataPaneVisible();
+    }
+
+    private void checkChartCollection(ChartCollection collection) {
+        VanBoxTableDefinition table = BoxTableDefinitionHelper.getBoxTableDefinition(collection);
+
+        if (table == null) {
+            collection.getSelectedChart().setFilterDefinition(new VanBoxTableDefinition());
+        }
+    }
+
+    private void populateDataScreeningPane(ChartDataFilterPane dataScreeningPane, ChartCollection collection) {
+        NormalTableDataDefinition detailedDefinition = BoxTableDefinitionHelper.getBoxTableDetailedDefinition(collection);
+
+        if (detailedDefinition != null) {
+            dataScreeningPane.populateDefinition(detailedDefinition, false);
+        }
+    }
+
+    private void updateDataScreeningPane(ChartDataFilterPane dataScreeningPane, ChartCollection collection) {
+        NormalTableDataDefinition detailedDefinition = BoxTableDefinitionHelper.getBoxTableDetailedDefinition(collection);
+
+        if (detailedDefinition != null) {
+            dataScreeningPane.updateDefinition(detailedDefinition);
+        }
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableResultDataSeriesPane.java

@@ -0,0 +1,178 @@
+package com.fr.van.chart.box.data.table;
+
+import com.fr.chart.base.ChartConstants;
+import com.fr.chart.chartattr.ChartCollection;
+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.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
+import com.fr.plugin.chart.box.data.VanBoxTableDefinition;
+import com.fr.plugin.chart.box.data.VanBoxTableResultDefinition;
+import com.fr.stable.ArrayUtils;
+import com.fr.stable.StringUtils;
+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;
+import java.util.List;
+
+public class BoxPlotTableResultDataSeriesPane extends AbstractTableDataContentPane {
+
+    private UIComboBox category;
+    private UIComboBox seriesName;
+    private UIComboBox max;
+    private UIComboBox q3;
+    private UIComboBox median;
+    private UIComboBox q1;
+    private UIComboBox min;
+
+    public BoxPlotTableResultDataSeriesPane() {
+
+        initComboxSize();
+
+        this.setLayout(new BorderLayout());
+        this.add(createDataSeriesPane(), BorderLayout.CENTER);
+
+        addItemListener();
+    }
+
+    private void initComboxSize() {
+        Dimension preferredSize = new Dimension(100, 20);
+
+        category = new UIComboBox();
+        seriesName = new UIComboBox();
+        max = new UIComboBox();
+        q3 = new UIComboBox();
+        median = new UIComboBox();
+        q1 = new UIComboBox();
+        min = new UIComboBox();
+
+        category.setPreferredSize(preferredSize);
+        seriesName.setPreferredSize(preferredSize);
+        max.setPreferredSize(preferredSize);
+        q3.setPreferredSize(preferredSize);
+        median.setPreferredSize(preferredSize);
+        q1.setPreferredSize(preferredSize);
+        min.setPreferredSize(preferredSize);
+    }
+
+    private void addItemListener() {
+        category.addItemListener(tooltipListener);
+        seriesName.addItemListener(tooltipListener);
+        max.addItemListener(tooltipListener);
+        q3.addItemListener(tooltipListener);
+        median.addItemListener(tooltipListener);
+        q1.addItemListener(tooltipListener);
+        min.addItemListener(tooltipListener);
+    }
+
+    private JPanel createDataSeriesPane() {
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+
+        double[] column = {f, COMPONENT_WIDTH};
+        double[] row = {p, p, p, p, p, p, p};
+
+        Component[][] components_north = new Component[][]{
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Category")), category},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Series_Name")), seriesName},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Data_Max")), max},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Data_Q3")), q3},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Data_Median")), median},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Data_Q1")), q1},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Data_Min")), min},
+        };
+
+        JPanel center = TableLayout4VanChartHelper.createGapTableLayoutPane(components_north, row, column);
+        center.setBorder(BorderFactory.createEmptyBorder(10, 24, 10, 15));
+
+        return center;
+    }
+
+    public void checkBoxUse(boolean hasUse) {
+    }
+
+    protected void refreshBoxListWithSelectTableData(List list) {
+        refreshBoxItems(category, list);
+        refreshBoxItems(seriesName, list);
+        refreshBoxItems(max, list);
+        refreshBoxItems(q3, list);
+        refreshBoxItems(median, list);
+        refreshBoxItems(q1, list);
+        refreshBoxItems(min, list);
+    }
+
+    public void clearAllBoxList() {
+        clearBoxItems(category);
+        clearBoxItems(seriesName);
+        clearBoxItems(max);
+        clearBoxItems(q3);
+        clearBoxItems(median);
+        clearBoxItems(q1);
+        clearBoxItems(min);
+    }
+
+    public void populateBean(ChartCollection collection) {
+        super.populateBean(collection);
+
+        VanBoxTableResultDefinition definition = BoxTableDefinitionHelper.getBoxTableResultDefinition(collection);
+
+        if (definition == null) {
+            return;
+        }
+
+        combineCustomEditValue(category, definition.getCategoryName());
+        combineCustomEditValue(seriesName, definition.getSeriesName());
+        combineCustomEditValue(max, definition.getMax());
+        combineCustomEditValue(q3, definition.getQ3());
+        combineCustomEditValue(median, definition.getMedian());
+        combineCustomEditValue(q1, definition.getQ1());
+        combineCustomEditValue(min, definition.getMin());
+    }
+
+    public void updateBean(ChartCollection collection) {
+        VanBoxTableDefinition table = BoxTableDefinitionHelper.getBoxTableDefinition(collection);
+
+        VanBoxTableResultDefinition definition = new VanBoxTableResultDefinition();
+
+        Object resultCategory = category.getSelectedItem();
+        Object resultSeries = seriesName.getSelectedItem();
+        Object resultMax = max.getSelectedItem();
+        Object resultQ3 = q3.getSelectedItem();
+        Object resultMedian = median.getSelectedItem();
+        Object resultQ1 = q1.getSelectedItem();
+        Object resultMin = min.getSelectedItem();
+
+        if (resultCategory == null || ArrayUtils.contains(ChartConstants.getNoneKeys(), resultCategory)) {
+            definition.setCategoryName(StringUtils.EMPTY);
+        } else {
+            definition.setCategoryName(resultCategory.toString());
+        }
+        if (resultSeries == null || ArrayUtils.contains(ChartConstants.getNoneKeys(), resultSeries)) {
+            definition.setSeriesName(StringUtils.EMPTY);
+        } else {
+            definition.setSeriesName(resultSeries.toString());
+        }
+        if (resultMax != null) {
+            definition.setMax(resultMax.toString());
+        }
+        if (resultQ3 != null) {
+            definition.setQ3(resultQ3.toString());
+        }
+        if (resultMedian != null) {
+            definition.setMedian(resultMedian.toString());
+        }
+        if (resultQ1 != null) {
+            definition.setQ1(resultQ1.toString());
+        }
+        if (resultMin != null) {
+            definition.setMin(resultMin.toString());
+        }
+
+        table.setResultDefinition(definition);
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableSeriesNameUseFieldNamePane.java

@@ -0,0 +1,12 @@
+package com.fr.van.chart.box.data.table;
+
+import com.fr.chart.chartdata.MoreNameCDDefinition;
+import com.fr.design.mainframe.chart.gui.data.table.SeriesNameUseFieldNamePane;
+import com.fr.plugin.chart.box.data.VanBoxMoreNameCDDefinition;
+
+public class BoxPlotTableSeriesNameUseFieldNamePane extends SeriesNameUseFieldNamePane {
+
+    protected MoreNameCDDefinition createMoreNameCDDefinition() {
+        return new VanBoxMoreNameCDDefinition();
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableSeriesNameUseFieldValuePane.java

@@ -0,0 +1,12 @@
+package com.fr.van.chart.box.data.table;
+
+import com.fr.chart.chartdata.OneValueCDDefinition;
+import com.fr.design.mainframe.chart.gui.data.table.SeriesNameUseFieldValuePane;
+import com.fr.plugin.chart.box.data.VanBoxOneValueCDDefinition;
+
+public class BoxPlotTableSeriesNameUseFieldValuePane extends SeriesNameUseFieldValuePane {
+
+    protected OneValueCDDefinition createOneValueCDDefinition() {
+        return new VanBoxOneValueCDDefinition();
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableSeriesTypeUsePane.java

@@ -0,0 +1,224 @@
+package com.fr.van.chart.box.data.table;
+
+import com.fr.chart.base.ChartConstants;
+import com.fr.chart.chartattr.ChartCollection;
+import com.fr.chart.chartdata.MoreNameCDDefinition;
+import com.fr.chart.chartdata.NormalTableDataDefinition;
+import com.fr.chart.chartdata.OneValueCDDefinition;
+import com.fr.design.beans.FurtherBasicBeanPane;
+import com.fr.design.constants.LayoutConstants;
+import com.fr.design.gui.frpane.UIComboBoxPane;
+import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.gui.ilable.BoldFontTextLabel;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.chart.gui.ChartDataPane;
+import com.fr.design.mainframe.chart.gui.data.table.DataPaneHelper;
+import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.design.utils.gui.UIComponentUtils;
+import com.fr.general.ComparatorUtils;
+import com.fr.plugin.chart.box.data.VanBoxTableDefinition;
+import com.fr.stable.ArrayUtils;
+import com.fr.stable.StringUtils;
+
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.util.ArrayList;
+import java.util.List;
+
+public class BoxPlotTableSeriesTypeUsePane extends UIComboBoxPane<ChartCollection> {
+
+    private static boolean NEED_SUMMERY = false;
+
+    private UIComboBox categoryCombox;
+
+    private BoxPlotTableSeriesNameUseFieldValuePane nameFieldValuePane;
+    private BoxPlotTableSeriesNameUseFieldNamePane nameFieldNamePane;
+
+    public BoxPlotTableSeriesTypeUsePane() {
+        cards = initPaneList();
+        initComponents();
+        initListener();
+    }
+
+    protected void initLayout() {
+        this.setLayout(new BorderLayout(4, LayoutConstants.VGAP_MEDIUM));
+
+        cardPane.setBorder(BorderFactory.createEmptyBorder(0, 24, 0, 15));
+
+        this.add(createNorthPane(), BorderLayout.NORTH);
+        this.add(createCenterPane(), BorderLayout.CENTER);
+        this.add(cardPane, BorderLayout.SOUTH);
+    }
+
+    protected UIComboBox createComboBox() {
+        UIComboBox uiComboBox = new UIComboBox();
+        UIComponentUtils.setPreferedWidth(uiComboBox, 100);
+        return uiComboBox;
+    }
+
+    private JPanel createNorthPane() {
+        JPanel north = new JPanel(new BorderLayout(4, 0));
+        north.setBorder(BorderFactory.createMatteBorder(0, 0, 6, 1, getBackground()));
+        UILabel label = new BoldFontTextLabel(Toolkit.i18nText("Fine-Design_Chart_Style_Category"));
+        label.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH, ChartDataPane.LABEL_HEIGHT));
+
+        categoryCombox = new UIComboBox();
+        categoryCombox.setPreferredSize(new Dimension(100, 20));
+        categoryCombox.addItem(Toolkit.i18nText("Fine-Design_Chart_Use_None"));
+
+        north.add(GUICoreUtils.createBorderLayoutPane(new Component[]{categoryCombox, null, null, label, null}));
+        north.setPreferredSize(new Dimension(246, 30));
+        north.setBorder(BorderFactory.createEmptyBorder(0, 24, 10, 15));
+
+        return north;
+    }
+
+    private JPanel createCenterPane() {
+        JPanel center = new JPanel(new BorderLayout(4, 0));
+
+        UILabel label = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Series_Name_From"));
+        label.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH, ChartDataPane.LABEL_HEIGHT));
+        center.add(GUICoreUtils.createBorderLayoutPane(new Component[]{jcb, null, null, label, null}));
+        center.setBorder(BorderFactory.createEmptyBorder(0, 24, 0, 15));
+
+        return center;
+    }
+
+    private void initListener() {
+        categoryCombox.addItemListener(new ItemListener() {
+            public void itemStateChanged(ItemEvent e) {
+                checkBoxUse(categoryCombox.getSelectedItem() != null);
+                makeToolTipUse(categoryCombox);
+            }
+        });
+    }
+
+    public void checkBoxUse(boolean hasUse) {
+        categoryCombox.setEnabled(hasUse);
+        jcb.setEnabled(hasUse);
+        nameFieldValuePane.checkUse(hasUse);
+    }
+
+    private void makeToolTipUse(UIComboBox comBox) {
+        if (comBox.getSelectedItem() != null) {
+            comBox.setToolTipText(comBox.getSelectedItem().toString());
+        } else {
+            comBox.setToolTipText(null);
+        }
+    }
+
+    public void refreshBoxListWithSelectTableData(List list) {
+        DataPaneHelper.refreshBoxItems(categoryCombox, list);
+
+        categoryCombox.addItem(Toolkit.i18nText("Fine-Design_Chart_Use_None"));
+
+        nameFieldValuePane.refreshBoxListWithSelectTableData(list);
+        nameFieldNamePane.refreshBoxListWithSelectTableData(list);
+    }
+
+    public void clearAllBoxList() {
+        DataPaneHelper.clearBoxItems(categoryCombox);
+
+        categoryCombox.addItem(Toolkit.i18nText("Fine-Design_Chart_Use_None"));
+
+        nameFieldValuePane.clearAllBoxList();
+        nameFieldNamePane.clearAllBoxList();
+    }
+
+    protected String title4PopupWindow() {
+        return Toolkit.i18nText("Fine-Design_Chart_Series_Name_From");
+    }
+
+    protected List<FurtherBasicBeanPane<? extends ChartCollection>> initPaneList() {
+        nameFieldValuePane = new BoxPlotTableSeriesNameUseFieldValuePane();
+        nameFieldNamePane = new BoxPlotTableSeriesNameUseFieldNamePane();
+
+        nameFieldValuePane.relayoutPane(NEED_SUMMERY);
+        nameFieldNamePane.relayoutPane(NEED_SUMMERY);
+
+        List<FurtherBasicBeanPane<? extends ChartCollection>> paneList = new ArrayList<FurtherBasicBeanPane<? extends ChartCollection>>();
+
+        paneList.add(nameFieldValuePane);
+        paneList.add(nameFieldNamePane);
+
+        return paneList;
+    }
+
+    public void relayoutPane() {
+        if (jcb.getSelectedIndex() == 0) {
+            nameFieldValuePane.relayoutPane(NEED_SUMMERY);
+        } else {
+            nameFieldNamePane.relayoutPane(NEED_SUMMERY);
+        }
+    }
+
+    protected void comboBoxItemStateChanged() {
+        if (jcb.getSelectedIndex() == 0) {
+            nameFieldValuePane.relayoutPane(NEED_SUMMERY);
+        } else {
+            nameFieldNamePane.relayoutPane(NEED_SUMMERY);
+        }
+    }
+
+    public void populateBean(ChartCollection collection) {
+        NormalTableDataDefinition definition = BoxTableDefinitionHelper.getBoxTableDetailedDefinition(collection);
+
+        if (definition == null) {
+            categoryCombox.setSelectedItem(Toolkit.i18nText("Fine-Design_Chart_Use_None"));
+            return;
+        }
+
+        if (definition instanceof OneValueCDDefinition) {
+            this.setSelectedIndex(0);
+            nameFieldValuePane.populateDefinition(definition, NEED_SUMMERY);
+        } else if (definition instanceof MoreNameCDDefinition) {
+            this.setSelectedIndex(1);
+            nameFieldNamePane.populateDefinition(definition, NEED_SUMMERY);
+        }
+
+        populateCategoryItem(categoryCombox, definition.getCategoryName());
+    }
+
+    public void updateBean(ChartCollection collection) {
+        VanBoxTableDefinition table = BoxTableDefinitionHelper.getBoxTableDefinition(collection);
+
+        if (table == null) {
+            return;
+        }
+
+        NormalTableDataDefinition definition;
+
+        if (this.getSelectedIndex() == 0) {
+            definition = nameFieldValuePane.updateDefinition();
+        } else {
+            definition = nameFieldNamePane.updateDefinition(table.getDetailedDefinition());
+        }
+
+        Object categoryName = categoryCombox.getSelectedItem();
+
+        if (ArrayUtils.contains(ChartConstants.getNoneKeys(), categoryName)) {
+            definition.setCategoryName(StringUtils.EMPTY);
+        } else {
+            definition.setCategoryName(categoryName == null ? null : categoryName.toString());
+        }
+
+        table.setDetailedDefinition(definition);
+    }
+
+    private void populateCategoryItem(UIComboBox categoryCombox, String item) {
+        if (ComparatorUtils.equals(item, StringUtils.EMPTY)) {
+            categoryCombox.setSelectedItem(Toolkit.i18nText("Fine-Design_Chart_Use_None"));
+        } else if (!DataPaneHelper.boxItemsContainsObject(categoryCombox, item)) {
+            categoryCombox.setSelectedItem(null);
+        } else {
+            DataPaneHelper.combineCustomEditValue(categoryCombox, item);
+        }
+    }
+
+}

designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxTableDefinitionHelper.java

@@ -0,0 +1,59 @@
+package com.fr.van.chart.box.data.table;
+
+import com.fr.base.chart.chartdata.TopDefinitionProvider;
+import com.fr.chart.chartattr.Chart;
+import com.fr.chart.chartattr.ChartCollection;
+import com.fr.chart.chartdata.NormalTableDataDefinition;
+import com.fr.plugin.chart.box.data.VanBoxTableDefinition;
+import com.fr.plugin.chart.box.data.VanBoxTableResultDefinition;
+
+public class BoxTableDefinitionHelper {
+
+    public static VanBoxTableDefinition getBoxTableDefinition(ChartCollection collection) {
+        if (collection != null) {
+
+            Chart chart = collection.getSelectedChart();
+
+            if (chart != null) {
+                TopDefinitionProvider definitionProvider = chart.getFilterDefinition();
+
+                if (definitionProvider instanceof VanBoxTableDefinition) {
+                    return (VanBoxTableDefinition) definitionProvider;
+                }
+            }
+        }
+
+        return null;
+    }
+
+    public static VanBoxTableResultDefinition getBoxTableResultDefinition(ChartCollection collection) {
+        VanBoxTableDefinition table = getBoxTableDefinition(collection);
+
+        if (table != null) {
+            return table.getResultDefinition();
+        }
+
+        return null;
+    }
+
+    public static NormalTableDataDefinition getBoxTableDetailedDefinition(ChartCollection collection) {
+        VanBoxTableDefinition table = getBoxTableDefinition(collection);
+
+        if (table != null) {
+            return table.getDetailedDefinition();
+        }
+
+        return null;
+    }
+
+    public static boolean isDetailedTableDataType(ChartCollection collection) {
+        VanBoxTableDefinition table = getBoxTableDefinition(collection);
+
+        if (table != null) {
+            return table.isDetailed();
+        }
+
+        return true;
+    }
+}
+

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

@@ -27,6 +27,7 @@ public class VanChartCustomDataPane extends ChartDataPane {
         }
 
         contentsTabPane = new VanChartCustomPlotDataContentsTabPane((VanChartCustomPlot)chart.getPlot(), VanChartCustomDataPane.this, listener);
+        contentsTabPane.setSupportCellData(isSupportCellData());
 
         content.add(contentsTabPane, BorderLayout.CENTER);
         return content;

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

@@ -22,14 +22,25 @@ import java.util.Map;
  * Created by Fangjie on 2016/4/29.
  */
 public class VanChartCustomPlotDataContentsTabPane extends VanChartCustomPlotTabPane<VanChartCustomPlot, ChartCollection> {
+
+    private boolean supportCellData;
+
     public VanChartCustomPlotDataContentsTabPane(VanChartCustomPlot plot, VanChartCustomDataPane parent, AttributeChangeListener listener) {
         super(plot, parent, listener);
     }
 
+    public boolean isSupportCellData() {
+        return supportCellData;
+    }
+
+    public void setSupportCellData(boolean supportCellData) {
+        this.supportCellData = supportCellData;
+    }
+
     @Override
     protected void initTabTitle() {
 
-        if (plot == null){
+        if (plot == null) {
             return;
         }
 
@@ -49,7 +60,7 @@ public class VanChartCustomPlotDataContentsTabPane extends VanChartCustomPlotTab
     @Override
     protected List<JPanel> initPaneList() {
 
-        if (plot == null){
+        if (plot == null) {
             return null;
         }
 
@@ -57,9 +68,10 @@ public class VanChartCustomPlotDataContentsTabPane extends VanChartCustomPlotTab
 
         List<VanChartPlot> customPlotList = plot.getCustomPlotList();
 
-        for (int i = 0; i < customPlotList.size(); i++){
+        for (int i = 0; i < customPlotList.size(); i++) {
             //根据不同的plot创建不同的数据配置界面
             ChartDataPane contentPane = new VanChartDataPane(listener);
+            contentPane.setSupportCellData(supportCellData);
             paneList.add(contentPane);
         }
 
@@ -67,42 +79,38 @@ public class VanChartCustomPlotDataContentsTabPane extends VanChartCustomPlotTab
     }
 
     @Override
-    public void populateBean(ChartCollection chartCollection){
+    public void populateBean(ChartCollection chartCollection) {
 
         plot = (VanChartCustomPlot) chartCollection.getSelectedChart().getPlot();
 
-        if (paneList == null){
+        paneList = initPaneList();
-            paneList = initPaneList();
-        }
-
-        if (paneList != null){
-
-            try {
 
-                List<VanChartPlot> customPlotList = plot.getCustomPlotList();
+        relayoutWhenListChange();
+        try {
 
+            List<VanChartPlot> customPlotList = plot.getCustomPlotList();
 
-                for (int i = 0; i < paneList.size() && i < customPlotList.size(); i++) {
-                    //將plot包裝起来，主要是为了获取dataDefinition
-                    ChartCollection cloneCollection = (ChartCollection) chartCollection.clone();
 
-                    //设置collection的plot
+            for (int i = 0; i < paneList.size() && i < customPlotList.size(); i++) {
-                    cloneCollection.getSelectedChart().setPlot(customPlotList.get(i));
+                //將plot包裝起来，主要是为了获取dataDefinition
+                ChartCollection cloneCollection = (ChartCollection) chartCollection.clone();
 
-                    //获取definitionMap中的dataDefinition
+                //设置collection的plot
-                    TopDefinitionProvider definition = chartCollection.getSelectedChart().getFilterDefinition();
+                cloneCollection.getSelectedChart().setPlot(customPlotList.get(i));
-                    TopDefinitionProvider dataDefinition = null;
-                    if (definition != null && definition instanceof CustomDefinition) {
-                        Map<CustomPlotType, TopDefinitionProvider> definitionProviderMap = ((CustomDefinition)definition).getDefinitionProviderMap();
-                        dataDefinition = definitionProviderMap.get(CustomPlotFactory.getCustomType(customPlotList.get(i)));
-                    }
-                    cloneCollection.getSelectedChart().setFilterDefinition(dataDefinition);
 
-                    ((ChartDataPane) paneList.get(i)).populate(cloneCollection);
+                //获取definitionMap中的dataDefinition
+                TopDefinitionProvider definition = chartCollection.getSelectedChart().getFilterDefinition();
+                TopDefinitionProvider dataDefinition = null;
+                if (definition != null && definition instanceof CustomDefinition) {
+                    Map<CustomPlotType, TopDefinitionProvider> definitionProviderMap = ((CustomDefinition) definition).getDefinitionProviderMap();
+                    dataDefinition = definitionProviderMap.get(CustomPlotFactory.getCustomType(customPlotList.get(i)));
                 }
-            }catch (Exception e){
+                cloneCollection.getSelectedChart().setFilterDefinition(dataDefinition);
-                return;
+
+                ((ChartDataPane) paneList.get(i)).populate(cloneCollection);
             }
+        } catch (Exception e) {
+            return;
         }
     }
 
@@ -112,8 +120,8 @@ public class VanChartCustomPlotDataContentsTabPane extends VanChartCustomPlotTab
     }
 
     @Override
-    public void updateBean(ChartCollection collection){
+    public void updateBean(ChartCollection collection) {
-        if (paneList == null || plot == null){
+        if (paneList == null || plot == null) {
             return;
         }
         try {
@@ -146,7 +154,7 @@ public class VanChartCustomPlotDataContentsTabPane extends VanChartCustomPlotTab
             customDefinition.setDefinitionProviderMap(definitionMap);
             collection.getSelectedChart().setFilterDefinition(customDefinition);
 
-        }catch (Exception e){
+        } catch (Exception e) {
             return;
         }
     }
@@ -168,10 +176,11 @@ public class VanChartCustomPlotDataContentsTabPane extends VanChartCustomPlotTab
 
     /**
      * 返回绑定的属性事件.
-     * @param listener  增加监听
+     *
+     * @param listener 增加监听
      */
     public void addAttributeChangeListener(AttributeChangeListener listener) {
-        for (int i = 0; i < paneList.size(); i++){
+        for (int i = 0; i < paneList.size(); i++) {
             ((ChartDataPane) paneList.get(i)).addAttributeChangeListener(listener);
         }
     }

designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartAreaFillColorConditionPane.java

@@ -1,11 +1,11 @@
 package com.fr.van.chart.designer.other.condition.item;
 
-import com.fr.chart.base.ChartConstants;
 import com.fr.chart.base.DataSeriesCondition;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.condition.ConditionAttributesPane;
-
+import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.plugin.chart.base.AttrAreaSeriesFillColorBackground;
+import com.fr.plugin.chart.type.GradientType;
 import com.fr.van.chart.designer.component.VanChartAreaSeriesFillColorPane;
 
 import javax.swing.JPanel;
@@ -13,7 +13,7 @@ import javax.swing.JPanel;
 /**
  * 面积图，填充色
  */
-public class VanChartAreaFillColorConditionPane  extends AbstractNormalMultiLineConditionPane {
+public class VanChartAreaFillColorConditionPane extends AbstractNormalMultiLineConditionPane {
     private Plot plot;
     private static final long serialVersionUID = -4148284851967140012L;
     private VanChartAreaSeriesFillColorPane fillColorBackground;
@@ -40,6 +40,7 @@ public class VanChartAreaFillColorConditionPane  extends AbstractNormalMultiLine
 
     /**
      * 条件属性item的名称
+     *
      * @return item的名称
      */
     public String nameForPopupMenuItem() {
@@ -54,13 +55,13 @@ public class VanChartAreaFillColorConditionPane  extends AbstractNormalMultiLine
     public void setDefault() {
         //下面这句话是给各组件一个默认值
         fillColorBackground.populate(new AttrAreaSeriesFillColorBackground());
-        fillColorBackground.checkoutAlpha(!(plot != null && plot.getPlotStyle() == ChartConstants.STYLE_SHADE));
+        fillColorBackground.checkoutAlpha(plot != null && ((VanChartPlot) plot).getGradientStyle().getGradientType() == GradientType.NONE);
     }
 
     public void populate(DataSeriesCondition condition) {
         if (condition instanceof AttrAreaSeriesFillColorBackground) {
             fillColorBackground.populate((AttrAreaSeriesFillColorBackground) condition);
-            fillColorBackground.checkoutAlpha(!(plot != null &&  plot.getPlotStyle() == ChartConstants.STYLE_SHADE));
+            fillColorBackground.checkoutAlpha(plot != null && ((VanChartPlot) plot).getGradientStyle().getGradientType() == GradientType.NONE);
         }
     }
 

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

@@ -54,11 +54,13 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
 
     private static final long serialVersionUID = -5717246802333308973L;
     private static final double ROTATION_MAX = 90.0;
+    protected UIButtonGroup showTitle;
     protected TinyFormulaPane titleContent;
     protected UIButtonGroup<Integer> titleAlignPane;
     protected UIToggleButton titleUseHtml;
     protected ChartTextAttrPane titleTextAttrPane;
     protected UINumberDragPane titleTextRotation;
+    protected JPanel titlePane;
 
     protected UIButtonGroup showLabel;
     protected ChartTextAttrPane labelTextAttrPane;
@@ -96,11 +98,11 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
     protected JPanel centerPane;
     private VanChartHtmlLabelPane htmlLabelPane;
 
-    public VanChartBaseAxisPane(){
+    public VanChartBaseAxisPane() {
         this(true);
     }
 
-    public VanChartBaseAxisPane(boolean isXAxis){
+    public VanChartBaseAxisPane(boolean isXAxis) {
         this.setLayout(new BorderLayout());
         this.add(createContentPane(isXAxis), BorderLayout.CENTER);
     }
@@ -108,12 +110,13 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
     public void setParentPane(VanChartStylePane parent) {
         htmlLabelPane.setParent(parent);
     }
-    protected void reLayoutPane(boolean isXAxis){
+
+    protected void reLayoutPane(boolean isXAxis) {
         this.removeAll();
         this.add(createContentPane(isXAxis), BorderLayout.CENTER);
     }
 
-    protected JPanel createContentPane(boolean isXAxis){
+    protected JPanel createContentPane(boolean isXAxis) {
 
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
@@ -121,9 +124,9 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
         double s = TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH;
         double[] columnSize = {f, e};
         double[] column = {f, s};
-        double[] rowSize = {p, p, p, p, p, p, p,p};
+        double[] rowSize = {p, p, p, p, p, p, p, p};
         Component[][] components = new Component[][]{
-                new Component[]{createTitlePane(new double[]{p, p, p, p, p, p}, columnSize, isXAxis), null},
+                new Component[]{createTitlePane(new double[]{p, p, p, p, p, p}, column, isXAxis), null},
                 new Component[]{createLabelPane(new double[]{p, p}, column), null},
                 new Component[]{createLineStylePane(new double[]{p, p, p, p, p}, columnSize), null},
                 new Component[]{createAxisPositionPane(new double[]{p, p, p}, columnSize, isXAxis), null},
@@ -131,39 +134,53 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
                 new Component[]{createValueStylePane(), null},
         };
 
-        return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize);
+        return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
     }
 
-    protected JPanel createTitlePane(double[] row, double[] col, boolean isXAxis){
+    protected JPanel createTitlePane(double[] row, double[] col, boolean isXAxis) {
+        showTitle = new UIButtonGroup(new String[]{Toolkit.i18nText("Fine-Design_Chart_Use_Show"), Toolkit.i18nText("Fine-Design_Chart_Hidden")});
         titleAlignPane = isXAxis ? getXAxisTitleAlignPane() : getYAxisTitleAlignPane();
         titleAlignPane.setSelectedItem(Constants.CENTER);
         titleContent = new TinyFormulaPane();
         titleUseHtml = new UIToggleButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Html"));
         UIComponentUtils.setLineWrap(titleUseHtml);
-        titleTextAttrPane = new ChartTextAttrPane();
+        titleTextAttrPane = getChartTextAttrPane();
-        titleTextRotation = new UINumberDragPane(-ROTATION_MAX,ROTATION_MAX);
+        titleTextRotation = new UINumberDragPane(-ROTATION_MAX, ROTATION_MAX);
-        if(isXAxis){
+        if (isXAxis) {
             titleTextRotation.populateBean(0.0);
         } else {
             titleTextRotation.populateBean(-ROTATION_MAX);
         }
         Component[][] components = new Component[][]{
-                new Component[]{null,null},
+                new Component[]{null, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content")),titleContent},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content")), titleContent},
-                new Component[]{null,titleUseHtml},
+                new Component[]{null, titleUseHtml},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout_Position")),titleAlignPane},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout_Position")), titleAlignPane},
-                new Component[]{titleTextAttrPane,null},
+                new Component[]{titleTextAttrPane, null},
                 new Component[]{
                         FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TextRotation")),
                         UIComponentUtils.wrapWithBorderLayoutPane(titleTextRotation)
                 },
         };
+        titlePane = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col);
+        titlePane.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 0));
 
-        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col);
+        JPanel showTitlePane = TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Axis_Title"), showTitle);
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(PaneTitleConstants.CHART_STYLE_TITLE_TITLE, panel);
+        showTitle.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                checkTitlePane();
+            }
+        });
+
+        JPanel jPanel = new JPanel(new BorderLayout());
+        jPanel.add(showTitlePane, BorderLayout.NORTH);
+        jPanel.add(titlePane, BorderLayout.CENTER);
+
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(PaneTitleConstants.CHART_STYLE_TITLE_TITLE, jPanel);
     }
 
-    private UIButtonGroup<Integer> getXAxisTitleAlignPane(){
+    private UIButtonGroup<Integer> getXAxisTitleAlignPane() {
         Icon[] alignmentIconArray = {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_left_normal.png"),
                 BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_center_normal.png"),
                 BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal.png")};
@@ -171,7 +188,8 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
 
         return new UIButtonGroup<Integer>(alignmentIconArray, alignment);
     }
-    private UIButtonGroup<Integer> getYAxisTitleAlignPane(){
+
+    private UIButtonGroup<Integer> getYAxisTitleAlignPane() {
         Icon[] alignmentIconArray = {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_top_normal.png"),
                 BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_center_normal.png"),
                 BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_down_normal.png")};
@@ -180,7 +198,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
         return new UIButtonGroup<Integer>(alignmentIconArray, alignment);
     }
 
-    protected JPanel createLabelPane(double[] row, double[] col){
+    protected JPanel createLabelPane(double[] row, double[] col) {
         showLabel = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Show"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Hidden")});
         labelTextAttrPane = getChartTextAttrPane();
 
@@ -205,9 +223,9 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
                 new Component[]{gapPanel, null},
         };
 
-        JPanel showLabelPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Label"),showLabel);
+        JPanel showLabelPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Label"), showLabel);
         labelPanel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col);
-        labelPanel.setBorder(BorderFactory.createEmptyBorder(0,10,0,0));
+        labelPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 0));
         showLabel.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
@@ -308,11 +326,11 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
 
     }
 
-    protected ChartTextAttrPane getChartTextAttrPane(){
+    protected ChartTextAttrPane getChartTextAttrPane() {
-        return new ChartTextAttrPane(){
+        return new ChartTextAttrPane() {
 
             @Override
-            protected JPanel getContentPane (JPanel buttonPane) {
+            protected JPanel getContentPane(JPanel buttonPane) {
                 double p = TableLayout.PREFERRED;
                 double f = TableLayout.FILL;
                 double e = TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH;
@@ -324,10 +342,10 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
         };
     }
 
-    protected JPanel createLineStylePane(double[] row, double[] col){
+    protected JPanel createLineStylePane(double[] row, double[] col) {
         axisLineStyle = createLineComboBox();
         axisLineColor = new ColorSelectBox(100);
-        String[] strings = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Close")};
+        String[] strings = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Close")};
         AxisTickLineType[] values = new AxisTickLineType[]{AxisTickLineType.TICK_LINE_OUTSIDE, AxisTickLineType.TICK_LINE_NONE};
         mainTick = new UIButtonGroup<AxisTickLineType>(strings, values);
         secondTick = new UIButtonGroup<AxisTickLineType>(strings, values);
@@ -342,15 +360,15 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
 
     protected Component[][] getLineStylePaneComponents() {
         return new Component[][]{
-                new Component[]{null,null} ,
+                new Component[]{null, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Type")),axisLineStyle} ,
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Type")), axisLineStyle},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color")),axisLineColor},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color")), axisLineColor},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Graduation_Line")),mainTick},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Graduation_Line")), mainTick},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Second_Graduation_Line")),secondTick},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Second_Graduation_Line")), secondTick},
         };
     }
 
-    protected JPanel createAxisPositionPane(double[] row, double[] col, boolean isXAxis){
+    protected JPanel createAxisPositionPane(double[] row, double[] col, boolean isXAxis) {
         position = new UIButtonGroup<Integer>(getAxisPositionNameArray(isXAxis), getAxisPositionValueArray(isXAxis));
         reversed = new UIButtonGroup<Boolean>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_On"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Off")}, new Boolean[]{true, false});
         Component[][] components = new Component[][]{
@@ -359,30 +377,30 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
                         FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Label_Position")),
                         UIComponentUtils.wrapWithBorderLayoutPane(position)
                 },
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_AxisReversed")),reversed},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_AxisReversed")), reversed},
-        } ;
+        };
 
         JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col);
         return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout_Position"), panel);
     }
 
-    private String[] getAxisPositionNameArray(boolean isXAxis){
+    private String[] getAxisPositionNameArray(boolean isXAxis) {
-        if(isXAxis){
+        if (isXAxis) {
             return new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Top"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Bottom"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Vertical_Zero")};
         } else {
             return new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout_Left"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout_Right"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Vertical_Zero")};
         }
     }
 
-    private Integer[] getAxisPositionValueArray(boolean isXAxis){
+    private Integer[] getAxisPositionValueArray(boolean isXAxis) {
-        if(isXAxis){
+        if (isXAxis) {
             return new Integer[]{VanChartConstants.AXIS_TOP, VanChartConstants.AXIS_BOTTOM, VanChartConstants.AXIS_VERTICAL_ZERO};
         } else {
             return new Integer[]{VanChartConstants.AXIS_LEFT, VanChartConstants.AXIS_RIGHT, VanChartConstants.AXIS_VERTICAL_ZERO};
         }
     }
 
-    protected JPanel createDisplayStrategy(){
+    protected JPanel createDisplayStrategy() {
         //区域显示策略 恢复用注释。删除到return，即除了注释的代码都删除。
         maxProportion = new UISpinner(0, 100, 1, 30);
         axisLimitSize = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Limit"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Not_Limit")});
@@ -408,7 +426,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
 //        return limitPane;
     }
 
-    protected JPanel createValueStylePane(){
+    protected JPanel createValueStylePane() {
         valueFormatStyle = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Common"),
                 com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom")});
 
@@ -418,19 +436,19 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
         htmlLabelPane = new VanChartHtmlLabelPane();
 
         centerPane = new JPanel(new CardLayout());
-        centerPane.add(valueFormat,com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Common"));
+        centerPane.add(valueFormat, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Common"));
         centerPane.add(htmlLabelPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom"));
 
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
-        double[] columnSize = {p,f};
+        double[] columnSize = {p, f};
-        double[] rowSize = {p,p,p};
+        double[] rowSize = {p, p, p};
         Component[][] components = new Component[][]{
-                new Component[]{null,null},
+                new Component[]{null, null},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Label_Format"), SwingConstants.LEFT), valueFormatStyle},
                 new Component[]{null, centerPane},
         };
-        JPanel contentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components,rowSize,columnSize);
+        JPanel contentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize);
 
 
         valueFormatStyle.addActionListener(new ActionListener() {
@@ -443,12 +461,12 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
         return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Format"), contentPane);
     }
 
-    protected FormatPane createFormatPane(){
+    protected FormatPane createFormatPane() {
-        return new FormatPane(){
+        return new FormatPane() {
-            protected Component[][] getComponent (JPanel fontPane, JPanel centerPane, JPanel typePane) {
+            protected Component[][] getComponent(JPanel fontPane, JPanel centerPane, JPanel typePane) {
                 typePane.setBorder(BorderFactory.createEmptyBorder());
                 return new Component[][]{
-                        new Component[]{typePane,null},
+                        new Component[]{typePane, null},
                         new Component[]{centerPane, null},
                 };
             }
@@ -462,6 +480,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
     protected void checkAllUse() {
         checkCardPane();
         checkLabelPane();
+        checkTitlePane();
         //区域显示策略 恢复用注释。删除下面一行。
         checkMaxProPortionUse();
 
@@ -480,10 +499,10 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
     }
 
     protected void checkCardPane() {
-        if(centerPane != null && valueFormatStyle != null){
+        if (centerPane != null && valueFormatStyle != null) {
             CardLayout cardLayout = (CardLayout) centerPane.getLayout();
             if (valueFormatStyle.getSelectedIndex() == 1) {
-                cardLayout.show(centerPane,com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom"));
+                cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom"));
             } else {
                 cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Common"));
             }
@@ -491,12 +510,12 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
     }
 
     protected void checkLabelPane() {
-        if(showLabel != null){
+        if (showLabel != null) {
             boolean enabled = showLabel.getSelectedIndex() == 0;
-            if(labelPanel != null){
+            if (labelPanel != null) {
                 labelPanel.setVisible(enabled);
             }
-            if(enabled){
+            if (enabled) {
                 //轴标签缩略间隔显示 恢复用注释。下面1行删除。
                 checkLabelGapValuePane();
                 //轴标签缩略间隔显示 恢复用注释。取消注释。
@@ -505,6 +524,12 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
         }
     }
 
+    protected void checkTitlePane() {
+        if (showTitle != null && titlePane != null) {
+            titlePane.setVisible(showTitle.getSelectedIndex() == 0);
+        }
+    }
+
     private void checkLabelGapAndStylePane() {
         if (overlapHandleTypeGroup != null && labelGapStylePane != null) {
             boolean visible = overlapHandleTypeGroup.getSelectedItem() == OverlapHandleType.INTERVAL;
@@ -528,28 +553,31 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
 
     /**
      * 是否是指定类型
+     *
      * @param ob 对象
      * @return 是否是指定类型
      */
-    public boolean accept(Object ob){
+    public boolean accept(Object ob) {
         return false;
     }
 
     /**
      * title应该是一个属性，不只是对话框的标题时用到，与其他组件结合时，也会用得到
+     *
      * @return 绥化狂标题
      */
     @Override
-    public String title4PopupWindow(){
+    public String title4PopupWindow() {
         return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category_Axis");
     }
 
     /**
      * 重置
      */
-    public void reset(){
+    public void reset() {
 
     }
+
     @Override
     public void populateBean(VanChartAxis axis) {
         populateTitle(axis);
@@ -568,50 +596,53 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
     }
 
     //标题
-    private void populateTitle(VanChartAxis axis){
+    private void populateTitle(VanChartAxis axis) {
+        if (showTitle != null) {
+            showTitle.setSelectedIndex(axis.isShowAxisTitle() ? 0 : 1);
+        }
         Title axisTitle = axis.getTitle();
-        if(axisTitle != null){
+        if (axisTitle != null) {
             if (axisTitle.getTextObject() instanceof BaseFormula && titleContent != null) {
                 titleContent.populateBean(((BaseFormula) axisTitle.getTextObject()).getContent());
-            } else if(titleContent != null){
+            } else if (titleContent != null) {
                 titleContent.populateBean(Utils.objectToString(axisTitle.getTextObject()));
             }
 
-            if(titleAlignPane != null){
+            if (titleAlignPane != null) {
                 titleAlignPane.setSelectedItem(axisTitle.getPosition());
             }
-            if(titleTextAttrPane != null){
+            if (titleTextAttrPane != null) {
                 titleTextAttrPane.populate(axisTitle.getTextAttr());
             }
-            if(titleUseHtml != null){
+            if (titleUseHtml != null) {
                 titleUseHtml.setSelected(axis.isTitleUseHtml());
             }
-            if(titleTextRotation != null){
+            if (titleTextRotation != null) {
-                titleTextRotation.populateBean((double)axisTitle.getTextAttr().getRotation());
+                titleTextRotation.populateBean((double) axisTitle.getTextAttr().getRotation());
             }
         }
     }
 
     //标签
-    private void populateLabel(VanChartAxis axis){
+    private void populateLabel(VanChartAxis axis) {
-        if(showLabel != null){
+        if (showLabel != null) {
             showLabel.setSelectedIndex(axis.isShowAxisLabel() ? 0 : 1);
         }
         TextAttr labelTextAttr = axis.getTextAttr();
-        if(labelTextAttrPane != null){
+        if (labelTextAttrPane != null) {
             labelTextAttrPane.populate(labelTextAttr);
         }
-        if(labelTextRotation != null){
+        if (labelTextRotation != null) {
-            labelTextRotation.populateBean((double)labelTextAttr.getRotation());
+            labelTextRotation.populateBean((double) labelTextAttr.getRotation());
         }
         //轴标签缩略间隔显示 恢复用注释。取消注释。
 //        if (overlapHandleTypeGroup != null) {
 //            overlapHandleTypeGroup.setSelectedItem(axis.getOverlapHandleType());
 //        }
-        if(labelGapStyle != null){
+        if (labelGapStyle != null) {
             labelGapStyle.setSelectedIndex(axis.isAutoLabelGap() ? 0 : 1);
         }
-        if(labelGapValue != null){
+        if (labelGapValue != null) {
             //轴标签缩略间隔显示 恢复用注释。下面1行删除。
             labelGapValue.setText(axis.getLabelNumber().getContent());
             //轴标签缩略间隔显示 恢复用注释。取消注释。
@@ -620,30 +651,30 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
     }
 
     //轴线样式
-    private void populateLineStyle(VanChartAxis axis){
+    private void populateLineStyle(VanChartAxis axis) {
-        if(axisLineStyle != null){
+        if (axisLineStyle != null) {
             axisLineStyle.setSelectedLineStyle(axis.getAxisStyle());
         }
-        if(axisLineColor != null){
+        if (axisLineColor != null) {
             axisLineColor.setSelectObject(axis.getAxisColor());
         }
-        if(mainTick != null){
+        if (mainTick != null) {
             mainTick.setSelectedItem(axis.getMainTickLine());
         }
-        if(secondTick != null){
+        if (secondTick != null) {
             secondTick.setSelectedItem(axis.getSecTickLine());
         }
     }
 
     //位置
-    private void populatePosition(VanChartAxis axis){
+    private void populatePosition(VanChartAxis axis) {
-        if(position != null){
+        if (position != null) {
             position.setSelectedItem(axis.getPosition());
-            if(position.getSelectedItem() == null){
+            if (position.getSelectedItem() == null) {
                 position.setSelectedIndex(1);
             }
         }
-        if(reversed != null){
+        if (reversed != null) {
             reversed.setSelectedIndex(axis.hasAxisReversed() == true ? 0 : 1);
         }
     }
@@ -666,13 +697,13 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
 
     //格式
     protected void populateFormat(VanChartAxis axis) {
-        if(valueFormatStyle != null){
+        if (valueFormatStyle != null) {
             valueFormatStyle.setSelectedIndex(axis.isCommonValueFormat() ? 0 : 1);
         }
-        if(valueFormat != null){
+        if (valueFormat != null) {
             valueFormat.populateBean(axis.getFormat());
         }
-        if(htmlLabelPane != null){
+        if (htmlLabelPane != null) {
             htmlLabelPane.populate(axis.getHtmlLabel());
         }
     }
@@ -690,15 +721,19 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
 
         updateFormat(axis);
     }
+
     //标题
-    private void updateTitle(VanChartAxis axis){
+    private void updateTitle(VanChartAxis axis) {
+        if (showTitle != null) {
+            axis.setShowAxisTitle(showTitle.getSelectedIndex() == 0);
+        }
         Title axisTitle = axis.getTitle();
-        if(axisTitle == null){
+        if (axisTitle == null) {
             axisTitle = new Title();
             axis.setTitle(axisTitle);
         }
 
-        if(titleContent != null){
+        if (titleContent != null) {
             String titleString = titleContent.updateBean();
             Object titleObj;
             if (StableUtils.maybeFormula(titleString)) {
@@ -708,42 +743,42 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
             }
             axisTitle.setTextObject(titleObj);
         }
-        if(titleAlignPane != null){
+        if (titleAlignPane != null) {
             axisTitle.setPosition(titleAlignPane.getSelectedItem());
         }
 
         TextAttr textAttr = axisTitle.getTextAttr();
-        if(titleTextAttrPane != null){
+        if (titleTextAttrPane != null) {
             titleTextAttrPane.update(textAttr);
         }
-        if(titleUseHtml != null){
+        if (titleUseHtml != null) {
             axis.setTitleUseHtml(titleUseHtml.isSelected());
         }
-        if(titleTextRotation != null){
+        if (titleTextRotation != null) {
             textAttr.setRotation(titleTextRotation.updateBean().intValue());
         }
     }
 
     //标签
-    private void updateLabel(VanChartAxis axis){
+    private void updateLabel(VanChartAxis axis) {
-        if(showLabel != null){
+        if (showLabel != null) {
             axis.setShowAxisLabel(showLabel.getSelectedIndex() == 0);
         }
         TextAttr labelTextAttr = axis.getTextAttr();
-        if(labelTextAttrPane != null){
+        if (labelTextAttrPane != null) {
             labelTextAttrPane.update(labelTextAttr);
         }
-        if(labelTextRotation != null){
+        if (labelTextRotation != null) {
             labelTextAttr.setRotation(labelTextRotation.updateBean().intValue());
         }
         //轴标签缩略间隔显示 恢复用注释。取消注释。
 //        if (overlapHandleTypeGroup != null) {
 //            axis.setOverlapHandleType(overlapHandleTypeGroup.getSelectedItem());
 //        }
-        if(labelGapStyle != null){
+        if (labelGapStyle != null) {
             axis.setAutoLabelGap(labelGapStyle.getSelectedIndex() == 0);
         }
-        if(labelGapValue != null){
+        if (labelGapValue != null) {
             //轴标签缩略间隔显示 恢复用注释。下面5行删除。
             if (axis.isAutoLabelGap()) {
                 axis.setLabelIntervalNumber(BaseFormula.createFormulaBuilder().build("1"));
@@ -756,33 +791,33 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
     }
 
     //轴线样式
-    private void updateLineStyle(VanChartAxis axis){
+    private void updateLineStyle(VanChartAxis axis) {
-        if(axisLineStyle != null){
+        if (axisLineStyle != null) {
             axis.setAxisStyle(axisLineStyle.getSelectedLineStyle());
         }
-        if(axisLineColor != null){
+        if (axisLineColor != null) {
             axis.setAxisColor(axisLineColor.getSelectObject());
         }
-        if(mainTick != null){
+        if (mainTick != null) {
             axis.setMainTickLine(mainTick.getSelectedItem());
         }
-        if(secondTick != null){
+        if (secondTick != null) {
             axis.setSecTickLine(secondTick.getSelectedItem());
         }
     }
 
     //位置
-    private void updatePosition(VanChartAxis axis){
+    private void updatePosition(VanChartAxis axis) {
-        if(position != null){
+        if (position != null) {
             axis.setPosition(position.getSelectedItem());
         }
-        if(reversed != null){
+        if (reversed != null) {
             axis.setAxisReversed(reversed.getSelectedItem());
         }
     }
 
     //显示策略
-    private void updateDisplayStrategy(VanChartAxis axis){
+    private void updateDisplayStrategy(VanChartAxis axis) {
         //区域显示策略 恢复用注释。下面6行删除。
         if (axisLimitSize != null) {
             axis.setLimitSize(axisLimitSize.getSelectedIndex() == 0);
@@ -797,29 +832,30 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
     }
 
     protected void updateFormat(VanChartAxis axis) {
-        if(valueFormatStyle != null){
+        if (valueFormatStyle != null) {
             axis.setCommonValueFormat(valueFormatStyle.getSelectedIndex() == 0);
         }
-        if(valueFormat != null){
+        if (valueFormat != null) {
             axis.setFormat(valueFormat.update());
         }
-        if(htmlLabelPane != null){
+        if (htmlLabelPane != null) {
             htmlLabelPane.update(axis.getHtmlLabel());
         }
     }
 
     /**
      * X坐标轴不同类型切换,new一个新的
+     *
      * @param axisName 坐标轴名称
      * @return 新的axis
      */
-    public VanChartAxis updateBean(String axisName, int position){
+    public VanChartAxis updateBean(String axisName, int position) {
         VanChartAxis axis = new VanChartAxis(axisName, position);
         this.updateBean(axis);
         return axis;
     }
 
-    public VanChartAxis updateBean(){
+    public VanChartAxis updateBean() {
         return null;
     }
 }

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

@@ -27,15 +27,15 @@ import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
+import java.text.ParseException;
+import java.util.Date;
+import java.util.regex.Pattern;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.text.ParseException;
-import java.util.Date;
-import java.util.regex.Pattern;
 
 /**
  * 时间坐标轴
@@ -68,7 +68,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
         double[] column = {f, s};
         double[] rowSize = {p,p,p,p,p,p,p,p,p,p,p,p,p,p};
         Component[][] components = new Component[][]{
-                new Component[]{createTitlePane(new double[]{p, p, p, p, p,p}, columnSize, isXAxis),null},
+                new Component[]{createTitlePane(new double[]{p, p, p, p, p,p}, column, isXAxis),null},
                 new Component[]{createLabelPane(new double[]{p, p}, column),null},
                 new Component[]{createValueDefinition(),null},
                 new Component[]{createLineStylePane(new double[]{p, p,p,p,p}, columnSize),null},

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

@@ -49,7 +49,7 @@ public class VanChartValueAxisPane extends VanChartBaseAxisPane {
         double[] column = {f, s};
         double[] rowSize = {p,p,p,p,p,p,p,p,p,p,p,p,p,p};
         Component[][] components = new Component[][]{
-                new Component[]{createTitlePane(new double[]{p, p, p, p, p, p}, columnSize, isXAxis), null},
+                new Component[]{createTitlePane(new double[]{p, p, p, p, p, p}, column, isXAxis), null},
                 new Component[]{createLabelPane(new double[]{p, p}, column), null},
                 new Component[]{createMinMaxValuePane(new double[]{p, p}, columnSize), null},
                 new Component[]{createLineStylePane(new double[]{p, p, p, p, p}, columnSize), null},

designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAlertValuePane.java

@@ -50,10 +50,10 @@ public class VanChartAlertValuePane extends BasicBeanPane<VanChartAlertValue> {
     private static final double LINE_WIDTH_DEFAULT_VALUE = 1;
 
     private UIButtonGroup alertAxis;
-    protected TinyFormulaPane alertValue;
+    private TinyFormulaPane alertValue;
-    protected LineTypeComboBox alertLineStyle;//线型
+    private LineTypeComboBox alertLineStyle;//线型
     private UISpinner lineWidthSpinner;//线宽
-    protected ColorSelectBox alertLineColor;
+    private ColorSelectBox alertLineColor;
 
     private UIButtonGroup alertTextPosition;
     private TinyFormulaPane alertText;
@@ -67,6 +67,22 @@ public class VanChartAlertValuePane extends BasicBeanPane<VanChartAlertValue> {
         initComponents();
     }
 
+    public TinyFormulaPane getAlertValue() {
+        return alertValue;
+    }
+
+    public LineTypeComboBox getAlertLineStyle() {
+        return alertLineStyle;
+    }
+
+    public UISpinner getLineWidthSpinner() {
+        return lineWidthSpinner;
+    }
+
+    public ColorSelectBox getAlertLineColor() {
+        return alertLineColor;
+    }
+
     private void initComponents() {
         alertValue = new TinyFormulaPane();
 

designer-chart/src/main/java/com/fr/van/chart/designer/style/background/radar/VanChartRadarAlertValuePane.java

@@ -1,7 +1,7 @@
 package com.fr.van.chart.designer.style.background.radar;
 
 import com.fr.design.gui.ilable.UILabel;
-
+import com.fr.design.i18n.Toolkit;
 import com.fr.van.chart.designer.style.background.VanChartAlertValuePane;
 
 import java.awt.Component;
@@ -14,9 +14,10 @@ public class VanChartRadarAlertValuePane extends VanChartAlertValuePane {
 
     protected Component[][] getTopPaneComponents() {
         return new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Value")),alertValue},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Use_Value")), getAlertValue()},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),alertLineStyle},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Line_Style")), getAlertLineStyle()},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color")),alertLineColor},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Line_Width")), getLineWidthSpinner()},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Color")), getAlertLineColor()},
         };
     }
 

designer-chart/src/main/java/com/fr/van/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java

@@ -5,7 +5,6 @@ import com.fr.base.chart.chartdata.model.LargeDataModel;
 import com.fr.base.chart.chartdata.model.NormalDataModel;
 import com.fr.chart.base.AttrAlpha;
 import com.fr.chart.base.AttrBorder;
-import com.fr.chart.base.ChartConstants;
 import com.fr.chart.base.GradientStyle;
 import com.fr.chart.chartattr.Plot;
 import com.fr.chart.chartglyph.ConditionAttr;
@@ -90,7 +89,7 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
         }
         JPanel panel = new JPanel(new BorderLayout());
         JPanel colorPane = getColorPane();
-        if(colorPane != null) {
+        if (colorPane != null) {
             panel.add(colorPane, BorderLayout.NORTH);
         }
         panel.add(getContentInPlotType(), BorderLayout.CENTER);
@@ -279,7 +278,7 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
 
         checkoutMapType(plot);
 
-        if(vanChartFillStylePane != null) { //配色
+        if (vanChartFillStylePane != null) { //配色
             vanChartFillStylePane.populateBean(plot.getPlotFillStyle());
         }
 
@@ -310,7 +309,7 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
 
         populateCondition(plot.getConditionCollection().getDefaultAttr());
 
-        checkAreaSeriesFillColorPane(plot.getPlotStyle());
+        checkAreaSeriesFillColorPane(((VanChartPlot) plot).getGradientStyle());
 
         checkCompsEnabledWithLarge(plot);
     }
@@ -340,7 +339,7 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
         //更新之前先更新界面的map类型属性
         checkoutMapType(plot);
 
-        if(vanChartFillStylePane != null) {//配色
+        if (vanChartFillStylePane != null) {//配色
             plot.setPlotFillStyle(vanChartFillStylePane.updateBean());
         }
 
@@ -369,16 +368,16 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
 
         updateCondition(plot.getConditionCollection().getDefaultAttr());
 
-        checkAreaSeriesFillColorPane(plot.getPlotStyle());
+        checkAreaSeriesFillColorPane(((VanChartPlot) plot).getGradientStyle());
     }
 
     protected void checkoutMapType(Plot plot) {
 
     }
 
-    protected void checkAreaSeriesFillColorPane(int plotStyle) {
+    protected void checkAreaSeriesFillColorPane(GradientStyle gradientStyle) {
         if (areaSeriesFillColorPane != null) {
-            areaSeriesFillColorPane.checkoutAlpha(plotStyle == ChartConstants.STYLE_NONE);
+            areaSeriesFillColorPane.checkoutAlpha(gradientStyle.getGradientType() == GradientType.NONE);
         }
     }
 

designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/table/VanPointMapPlotTableDataContentPane.java

@@ -4,9 +4,11 @@ import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.ilable.BoldFontTextLabel;
 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.design.mainframe.chart.gui.ChartDataPane;
+import com.fr.design.widget.FRWidgetFactory;
 import com.fr.plugin.chart.map.data.VanMapTableDefinitionProvider;
 import com.fr.van.chart.map.designer.data.component.table.AbstractLongLatAreaPane;
 import com.fr.van.chart.map.designer.data.component.table.AreaPane;
@@ -91,6 +93,7 @@ public class VanPointMapPlotTableDataContentPane extends VanAreaMapPlotTableData
 
             double p = TableLayout.PREFERRED;
             double f = TableLayout.FILL;
+            double labelWidth = 65;
 
             this.setLayout(new BorderLayout(0, 5));
             centerPane = new JPanel(new CardLayout()) {
@@ -122,13 +125,14 @@ public class VanPointMapPlotTableDataContentPane extends VanAreaMapPlotTableData
 
             locationType.setSelectedIndex(0);
 
-            double[] columnSize = {p, f};
+            double[] columnSize = {labelWidth, f};
             double[] rowSize = {p};
+            UILabel label = FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Chart_Geographic"));
             Component[][] components = new Component[][]{
-                    new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Geographic")), locationType},
+                    new Component[]{label, locationType},
             };
 
-            JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 30, 6);
+            JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 5, 6);
 
             this.add(panel, BorderLayout.NORTH);
             this.add(centerPane, BorderLayout.CENTER);
@@ -219,7 +223,7 @@ public class VanPointMapPlotTableDataContentPane extends VanAreaMapPlotTableData
         return new PointMapAreaPane(longLatAreaTableComboPane) {
             protected void initAreaPane(VanPointMapPlotTableDataContentPane.LongLatAreaTableComboPane parentPane) {
                 areaPane = new AreaPane(parentPane) {
-                    protected Component[][] getComponent () {
+                    protected Component[][] getComponent() {
                         return new Component[][]{
                                 new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name")), VanPointMapPlotTableDataContentPane.this.createAreaPanel(areaNameCom)}
                         };

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

@@ -14,16 +14,16 @@ import com.fr.design.layout.TableLayout;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.data.CalculateComboBox;
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
+import com.fr.design.mainframe.chart.gui.data.table.DataPaneHelper;
 import com.fr.general.ComparatorUtils;
-
 import com.fr.plugin.chart.multilayer.data.MultiPieValueDefinition;
+import com.fr.design.i18n.Toolkit;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.AssistUtils;
 import com.fr.stable.StringUtils;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 
 import javax.swing.BorderFactory;
-import javax.swing.ComboBoxModel;
 import javax.swing.JPanel;
 import javax.swing.JSeparator;
 import java.awt.BorderLayout;
@@ -72,7 +72,7 @@ public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPa
         for (int i = 0; i < levelNum; i++){
             levelNameList.add(new UIComboBox());
             levelNameList.get(i).setPreferredSize(new Dimension(WD, HT));
-            levelNameList.get(i).addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None"));
+            levelNameList.get(i).addItem(Toolkit.i18nText("Fine-Design_Chart_Use_None"));
         }
     }
 
@@ -103,7 +103,7 @@ public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPa
         Component[][] components_center = new Component[levelNum + 3][];
 
         for (int i = 0; i < levelNum; i++){
-            components_center[i] = new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Level") + String.valueOf(i+1)), levelNameList.get(i)};
+            components_center[i] = new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Level") + String.valueOf(i+1)), levelNameList.get(i)};
         }
 
         value = new UIComboBox();
@@ -113,8 +113,8 @@ public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPa
         calculateCombox.setPreferredSize(new Dimension(WD, HT));
 
         components_center[levelNum] = new Component[]{getJSeparator(), null};
-        components_center[levelNum+1] = new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Value")), value};
+        components_center[levelNum+1] = new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Use_Value")), value};
-        components_center[levelNum+2] = new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Summary_Method")), calculateCombox};
+        components_center[levelNum+2] = new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Summary_Method")), calculateCombox};
 
 
         initCenterItemListener();
@@ -181,9 +181,9 @@ public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPa
         nameField = new UITextField();
 
         Component[][] components_north = new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name")), nameField},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name")), nameField},
                 new Component[]{getJSeparator(),null },
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Level_Number")), levelNumEdit},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Level_Number")), levelNumEdit},
         };
 
         JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components_north, rowSize_north, columnSize_north);
@@ -243,7 +243,7 @@ public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPa
         columnNameList = list;
         for (int i = 0; i < levelNum; i++) {
             refreshBoxItems(levelNameList.get(i), list);
-            levelNameList.get(i).addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None"));
+            levelNameList.get(i).addItem(Toolkit.i18nText("Fine-Design_Chart_Use_None"));
         }
         refreshBoxItems(value, list);
     }
@@ -282,7 +282,7 @@ public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPa
 
         //值
         value.setEditable(true);
-        value.setSelectedItem(this.boxItemsContainsObject(value,data.getValueColumnName())
+        value.setSelectedItem(DataPaneHelper.boxItemsContainsObject(value,data.getValueColumnName())
                 ? data.getValueColumnName() : null);
         value.setEditable(false);
         //汇总方式
@@ -327,8 +327,8 @@ public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPa
 
         for (int i = 0; i < levelNameList.size(); i++){
             if(!definition.hasLevelIndex(i) || ComparatorUtils.equals(levelColumnNameList.get(i), StringUtils.EMPTY)) {
-                levelNameList.get(i).setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None"));
+                levelNameList.get(i).setSelectedItem(Toolkit.i18nText("Fine-Design_Chart_Use_None"));
-            } else if(definition.hasLevelIndex(i) && !this.boxItemsContainsObject(levelNameList.get(i),levelColumnNameList.get(i))){
+            } else if(definition.hasLevelIndex(i) && !DataPaneHelper.boxItemsContainsObject(levelNameList.get(i),levelColumnNameList.get(i))){
                 levelNameList.get(i).setSelectedItem(null);
             }else {
                 combineCustomEditValue(levelNameList.get(i), definition.hasLevelIndex(i) ? levelColumnNameList.get(i) : null);
@@ -353,20 +353,6 @@ public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPa
         }
     }
 
-    private boolean boxItemsContainsObject(UIComboBox box,Object item){
-        if(box == null){
-            return false;
-        }
-
-        ComboBoxModel dataModel = box.getModel();
-        for (int i = 0; i < dataModel.getSize(); i++) {
-            if(ComparatorUtils.equals(dataModel.getElementAt(i),item)){
-                return true;
-            }
-        }
-        return false;
-    }
-
     protected JSeparator getJSeparator() {
         JSeparator jSeparator = new JSeparator();
         jSeparator.setPreferredSize(new Dimension(220, 2));

designer-form/src/main/java/com/fr/design/designer/beans/models/SelectionModel.java

@@ -262,7 +262,7 @@ public class SelectionModel {
             Rectangle rec = selection.getSelctionBounds();
             FormSelectionUtils.paste2Container(designer, container, clipboard, rec.x + DELTA_X_Y, rec.y + DELTA_X_Y);
         } else if (isExtraContainer(container)) {
-            provider.paste2Container(selection);
+            provider.paste2Container(clipboard);
         }
     }
 
@@ -306,12 +306,12 @@ public class SelectionModel {
                 // 清除被选中的组件
                 selection.reset();
             }
+            designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_DELETED);
 
+            setSelectedCreator(isInPara ? designer.getParaComponent() : designer.getRootComponent());
 
 
-            setSelectedCreator(isInPara ? designer.getParaComponent() : designer.getRootComponent());
             // 触发事件
-            designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_DELETED);
             designer.repaint();
         }
     }

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

@@ -298,7 +298,7 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 	@Override
 	public JComponent createToolPane(BaseJForm jform, FormDesigner formEditor) {
 		if (!DesignerMode.isAuthorityEditing()) {
-			if (isDedicateContainer()) {
+			if (isDedicateContainer() && this.getComponentCount() > 0) {
 				// 图表块和报表块由于控件树处不显示，但对应的属性表要显示，此处处理下
 				XCreator child = ((XLayoutContainer) this).getXCreator(0);
 				return child.createToolPane(jform, formEditor);
@@ -408,7 +408,7 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 	public Component getParentShow(){
 		return this.getParent();
 	}
-	
+
 	/**
 	 * 重置组件的名称
 	 *
@@ -418,18 +418,18 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 	public void resetCreatorName(String name) {
 		toData().setWidgetName(name);
 	}
-	
+
 	/**
 	 * 遍历所有命名相关的组件到集合中
 	 *
 	 * @param xCreators 集合
 	 */
 	public void traversalNameRelatedXCreators(Set<XCreator> xCreators) {
-		
+
 		xCreators.add(this);
 		int componentCount = getComponentCount();
 		for (int i = 0; i < componentCount; i++) {
-			
+
 			Component component = getComponent(i);
 			if (component instanceof XCreator) {
 				XCreator xCreator = (XCreator) component;
@@ -439,7 +439,7 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 			}
 		}
 	}
-	
+
 	/**
 	 * 重置组件的可见性
 	 *
@@ -448,7 +448,7 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 	public void resetVisible(boolean visible) {
 		toData().setVisible(visible);
 	}
-	
+
 	/**
 	 * 返回编辑的子组件，scale为其内部组件
 	 * @return 组件
@@ -804,4 +804,4 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 		return false;
 	}
 
-}
+}

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

@@ -11,6 +11,7 @@ import com.fr.design.designer.creator.cardlayout.XWCardMainBorderLayout;
 import com.fr.design.designer.creator.cardlayout.XWCardTagLayout;
 import com.fr.design.designer.creator.cardlayout.XWCardTitleLayout;
 import com.fr.design.designer.creator.cardlayout.XWTabFitLayout;
+import com.fr.design.fun.ChartWidgetOptionProvider;
 import com.fr.design.fun.FormWidgetOptionProvider;
 import com.fr.design.fun.ParameterWidgetOptionProvider;
 import com.fr.design.module.DesignModuleFactory;
@@ -102,7 +103,8 @@ public class XCreatorUtils {
             public boolean accept(PluginContext context) {
 
                 return context.contain(PluginModule.ExtraDesign, ParameterWidgetOptionProvider.XML_TAG)
-                        || context.contain(PluginModule.ExtraDesign, FormWidgetOptionProvider.XML_TAG);
+                        || context.contain(PluginModule.ExtraDesign, FormWidgetOptionProvider.XML_TAG)
+                        || context.contain(PluginModule.ExtraDesign, ChartWidgetOptionProvider.XML_TAG);
             }
         });
     }

designer-form/src/main/java/com/fr/design/form/parameter/FormParaDesigner.java

@@ -83,6 +83,7 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP
     private static final int SUBMIT_BUTTON_H_LOCATION = 270;
     private static final int PARA_IMAGE_SHIFT_X = -4;
     private static final int FORM_AREA_PADDING_LEFT = 13;
+    private int addableRegionY;
 
     private static Image paraImage = BaseUtils.readImage("/com/fr/design/images/form/parameter.png");
 
@@ -412,10 +413,30 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP
         if (layoutContainer == null) {
             layoutContainer = new XWParameterLayout();
         }
+        refreshAddableRegion(layoutContainer);
         layoutContainer.setSize(LARGE_PREFERRED_SIZE);
         setRootComponent(layoutContainer);
     }
 
+    /**
+     * @param layoutContainer
+     * @Description: 为了不覆盖以前的组件，所以要计算可以添加组件的区域
+     * @return:
+     * @Author: Henry.Wang
+     * @date: 2020/7/15 15:12
+     */
+    public void refreshAddableRegion(XLayoutContainer layoutContainer) {
+        addableRegionY = 0;
+        for (int i = 0; i < layoutContainer.getComponentCount(); i++) {
+            Rectangle rectangle = layoutContainer.getComponent(i).getBounds();
+            if (addableRegionY < rectangle.y + rectangle.height) {
+                addableRegionY = rectangle.y + rectangle.height;
+            }
+        }
+        int vGap = V_COMPONENT_GAP - (int) XCreator.SMALL_PREFERRED_SIZE.getHeight();
+        addableRegionY = Math.max(0, addableRegionY - FIRST_V_LOCATION + (int) (XCreator.SMALL_PREFERRED_SIZE.getHeight() / 2) + vGap);
+    }
+
     /**
      * 是否是报表的参数面板
      *
@@ -583,14 +604,15 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP
         label.setWidgetName("Label" + name);
         label.setWidgetValue(new WidgetValue(name + ":"));
         XCreator xCreator = XCreatorUtils.createXCreator(label);
-        if (!(this.autoAddComponent(xCreator, H_COMPONENT_GAP * (currentIndex % NUM_IN_A_LINE)
+        int x = H_COMPONENT_GAP * (currentIndex % NUM_IN_A_LINE) + FIRST_H_LOCATION;
-                + FIRST_H_LOCATION, FIRST_V_LOCATION + V_COMPONENT_GAP * (currentIndex / NUM_IN_A_LINE)))) {
+        int y = addableRegionY + FIRST_V_LOCATION + V_COMPONENT_GAP * (currentIndex / NUM_IN_A_LINE);
+        if (!(this.autoAddComponent(xCreator, x, y))) {
             return false;
         }
         EditorHolder editor = new EditorHolder(parameter);
         xCreator = XCreatorUtils.createXCreator(editor);
-        if (!(this.autoAddComponent(xCreator, H_COMPONENT_GAP * (currentIndex % NUM_IN_A_LINE)
+        x = H_COMPONENT_GAP * (currentIndex % NUM_IN_A_LINE) + SECOND_H_LOCATION;
-                + SECOND_H_LOCATION, FIRST_V_LOCATION + V_COMPONENT_GAP * (currentIndex / NUM_IN_A_LINE)))) {
+        if (!(this.autoAddComponent(xCreator, x, y))) {
             return false;
         }
         return true;
@@ -646,16 +668,17 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP
             label.setWidgetValue(new WidgetValue(parameterArray[i].getName() + ":"));
             XCreator xCreator = XCreatorUtils.createXCreator(label);
 
-            if (!(this.autoAddComponent(xCreator, H_COMPONENT_GAP * (currentIndex % NUM_IN_A_LINE)
+            int x = H_COMPONENT_GAP * (currentIndex % NUM_IN_A_LINE) + FIRST_H_LOCATION;
-                    + FIRST_H_LOCATION, FIRST_V_LOCATION + V_COMPONENT_GAP * (currentIndex / NUM_IN_A_LINE)))) {
+            int y = addableRegionY + FIRST_V_LOCATION + V_COMPONENT_GAP * (currentIndex / NUM_IN_A_LINE);
+            if (!(this.autoAddComponent(xCreator, x, y))) {
                 break;
             }
             // 每行显示5组
             EditorHolder editor = new EditorHolder(parameterArray[i]);
             editor.setWidgetName(parameterArray[i].getName());
             xCreator = XCreatorUtils.createXCreator(editor);
-            if (!(this.autoAddComponent(xCreator, H_COMPONENT_GAP * (currentIndex % NUM_IN_A_LINE)
+            x = H_COMPONENT_GAP * (currentIndex % NUM_IN_A_LINE) + SECOND_H_LOCATION;
-                    + SECOND_H_LOCATION, FIRST_V_LOCATION + V_COMPONENT_GAP * (currentIndex / NUM_IN_A_LINE)))) {
+            if (!(this.autoAddComponent(xCreator, x, y))) {
                 break;
             }
             currentIndex++;

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

@@ -105,7 +105,7 @@ public class FormCreatorDropTarget extends DropTarget {
                 SharableEditorProvider sharableEditor = ShareLoader.getLoader().getSharedElCaseEditorById(shareId);
                 SharableWidgetProvider bindInfo = ShareLoader.getLoader().getElCaseBindInfoById(shareId);
                 if (sharableEditor != null && bindInfo != null) {
-                    Map<String, String> tdNameMap = TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter()).addTableData(bindInfo.getName(), sharableEditor.getTableDataSource());
+                    Map<String, String> tdNameMap = TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter()).addTableData(bindInfo.getName(), sharableEditor.getTableDataSource(), true);
                     //合并数据集之后,可能会有数据集名称变化，做一下联动
                     //共享的组件拿的时候都是克隆的,这边改拖拽中克隆的对象而非新克隆对象,上面这个新克隆的对象只是为了拿数据集
                     for (Map.Entry<String, String> entry : tdNameMap.entrySet()) {

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

@@ -14,6 +14,7 @@ import com.fr.general.ComparatorUtils;
 import com.fr.general.IOUtils;
 import com.fr.share.ShareConstants;
 import com.fr.stable.StringUtils;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
@@ -52,12 +53,12 @@ import java.io.Serializable;
  */
 public class ShareWidgetButton extends JPanel implements MouseListener, MouseMotionListener, Serializable {
     
-    private static final Dimension TAB_DEFAULT_SIZE = new Dimension(500, 300);
+    protected SharableWidgetProvider bindInfo;
-    private SharableWidgetProvider bindInfo;
+    protected MouseEvent lastPressEvent;
-    private MouseEvent lastPressEvent;
+    protected JPanel reportPane;
-    private JPanel reportPane;
+    protected boolean isEdit;
-    private boolean isEdit;
+    protected boolean isMarked;
-    private boolean isMarked;
+    private ShareWidgetUI ui;
     private Icon markedMode = IOUtils.readIcon("/com/fr/design/form/images/marked.png");
     private Icon unMarkedMode = IOUtils.readIcon("/com/fr/design/form/images/unmarked.png");
     private AlphaComposite composite = AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 60 / 100.0F);
@@ -71,9 +72,11 @@ public class ShareWidgetButton extends JPanel implements MouseListener, MouseMot
             unMarkedMode.paintIcon(this, g, 0, 0);
         }
     };
-
+    
-    public ShareWidgetButton(SharableWidgetProvider bindInfo) {
+    public ShareWidgetButton(SharableWidgetProvider bindInfo, ShareWidgetUI ui) {
+        
         this.bindInfo = bindInfo;
+        this.ui = ui;
         this.setPreferredSize(new Dimension(108, 68));
         initUI();
         this.setLayout(getCoverLayout());
@@ -81,7 +84,12 @@ public class ShareWidgetButton extends JPanel implements MouseListener, MouseMot
         this.addMouseMotionListener(this);
         new DragAndDropDragGestureListener(this, DnDConstants.ACTION_COPY_OR_MOVE);
     }
-
+    
+    public ShareWidgetButton(SharableWidgetProvider bindInfo) {
+        
+        this(bindInfo, new ShareWidgetUI());
+    }
+    
     public void paint(Graphics g) {
         Graphics2D g2d = (Graphics2D) g;
         Composite oldComposite = g2d.getComposite();
@@ -219,21 +227,14 @@ public class ShareWidgetButton extends JPanel implements MouseListener, MouseMot
             if (creatorSource != null) {
                 ((AbstractBorderStyleWidget)creatorSource).addWidgetAttrMark(new SharableAttrMark(true));
                 //tab布局WCardMainBorderLayout通过反射出来的大小是960*480
-                XCreator xCreator = null;
+                XCreator xCreator = ui.createXCreator(creatorSource, shareId, no.getBindInfo());
-                if (creatorSource instanceof WCardMainBorderLayout) {
-                    xCreator = XCreatorUtils.createXCreator(creatorSource, TAB_DEFAULT_SIZE);
-                } else {
-                    xCreator = XCreatorUtils.createXCreator(creatorSource);
-                }
-                xCreator.setBackupBound(new Rectangle(no.getBindInfo().getWidth(), no.getBindInfo().getHeight()));
-                xCreator.setShareId(shareId);
                 WidgetToolBarPane.getTarget().startDraggingBean(xCreator);
                 lastPressEvent = null;
                 this.setBorder(null);
             }
         }
     }
-
+    
     @Override
     public void mouseMoved(MouseEvent e) {
 
@@ -283,9 +284,31 @@ public class ShareWidgetButton extends JPanel implements MouseListener, MouseMot
             }
             return false;
         }
-
+    
         public Object getTransferData(DataFlavor df) throws UnsupportedFlavorException, IOException {
             return widget;
         }
     }
+    
+    /**
+     * 抽出来，专门为了创建 ui 来搞
+     */
+    public static class ShareWidgetUI {
+        
+        private static final Dimension TAB_DEFAULT_SIZE = new Dimension(500, 300);
+        
+        @NotNull
+        public XCreator createXCreator(Widget creatorSource, String shareId, SharableWidgetProvider provider) {
+            
+            XCreator xCreator = null;
+            if (creatorSource instanceof WCardMainBorderLayout) {
+                xCreator = XCreatorUtils.createXCreator(creatorSource, TAB_DEFAULT_SIZE);
+            } else {
+                xCreator = XCreatorUtils.createXCreator(creatorSource, new Dimension(provider.getWidth(), provider.getHeight()));
+            }
+            xCreator.setBackupBound(new Rectangle(provider.getWidth(), provider.getHeight()));
+            xCreator.setShareId(shareId);
+            return xCreator;
+        }
+    }
 }

designer-form/src/test/java/com/fr/design/mainframe/ShareWidgetButtonTest.java

@@ -0,0 +1,38 @@
+package com.fr.design.mainframe;
+
+import com.fr.chart.chartattr.ChartCollection;
+import com.fr.design.designer.creator.XCreator;
+import com.fr.form.share.SharableWidgetProvider;
+import com.fr.form.ui.ChartEditor;
+import com.fr.general.ImageWithSuffix;
+import com.fr.invoke.Reflect;
+import org.easymock.EasyMock;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+@RunWith(PowerMockRunner.class)
+@PowerMockIgnore({"com.fr.jvm.assist.*", "javax.swing.*"})
+public class ShareWidgetButtonTest {
+    
+    @Test
+    public void testCreateXCreator() throws Exception {
+        
+        SharableWidgetProvider provider = EasyMock.mock(SharableWidgetProvider.class);
+        EasyMock.expect(provider.getWidth()).andReturn(300).anyTimes();
+        EasyMock.expect(provider.getHeight()).andReturn(400).anyTimes();
+        EasyMock.expect(provider.getName()).andReturn("test-drag").anyTimes();
+        EasyMock.expect(provider.getCover()).andReturn(new ImageWithSuffix("utf-8")).anyTimes();
+        EasyMock.replay(provider);
+        
+        ShareWidgetButton.ShareWidgetUI ui = new ShareWidgetButton.ShareWidgetUI();
+        
+        ChartEditor editor = new ChartEditor();
+        Reflect.on(editor).set("chartCollection", new ChartCollection());
+        XCreator xCreator = ui.createXCreator(editor, "333", provider);
+        Assert.assertEquals(300, xCreator.getWidth());
+        Assert.assertEquals(400, xCreator.getHeight());
+    }
+}

designer-realize/src/main/java/com/fr/design/actions/columnrow/ColumnRowSizingAction.java

@@ -13,6 +13,7 @@ import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.fun.ReportLengthUNITProvider;
 import com.fr.design.unit.UnitConvertUtil;
+import com.fr.general.ComparatorUtils;
 import com.fr.grid.selection.CellSelection;
 import com.fr.report.elementcase.ElementCase;
 import com.fr.stable.ArrayUtils;
@@ -39,8 +40,8 @@ public abstract class ColumnRowSizingAction extends AbstractColumnRowIndexAction
         		return ColumnRowSizingAction.this.title4UnitInputPane();
         	}
         };
-        UNIT len = getShowLen(report, cs);
+        final UNIT oldLen = getShowLen(report, cs);
-        populateNumberDialog(uPane, len);
+        populateNumberDialog(uPane, oldLen);
 
         final CellSelection finalCS = cs;
         uPane.showSmallWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
@@ -51,8 +52,10 @@ public abstract class ColumnRowSizingAction extends AbstractColumnRowIndexAction
 					float newHeight = (float) uPane.update();
 					int unitType = DesignerEnvManager.getEnvManager().getReportLengthUnit();
                     ReportLengthUNITProvider lengthUNIT = UnitConvertUtil.parseLengthUNIT(unitType);
-					UNIT len = lengthUNIT.float2UNIT(newHeight);
+                    UNIT newLen = lengthUNIT.float2UNIT(newHeight);
-					updateAction(report, len, finalCS);
+                    if (!ComparatorUtils.equals(oldLen, newLen)) {
+                        updateAction(report, newLen, finalCS);
+                    }
 				} catch (ValueNotChangeException e) {
 					// nothing
 				}

designer-realize/src/main/java/com/fr/design/actions/report/ReportWriteAttrAction.java

@@ -3,6 +3,7 @@ package com.fr.design.actions.report;
 import com.fr.design.actions.ReportComponentAction;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.dialog.DialogActionListener;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.design.mainframe.WorkSheetDesigner;
@@ -11,10 +12,15 @@ import com.fr.design.webattr.ReportWriteAttrPane;
 import com.fr.general.IOUtils;
 import com.fr.report.worksheet.WorkSheet;
 
+import java.awt.Dimension;
+
+
 /**
  * ReportWriteAttrAction
  */
 public class ReportWriteAttrAction extends ReportComponentAction<WorkSheetDesigner> {
+    public static final Dimension WINDOW_CUSTOM_SIZE = new Dimension(720, 600);
+
     public ReportWriteAttrAction(WorkSheetDesigner t) {
         super(t);
         this.setMenuKeySet(KeySetUtils.REPORT_WRITE);
@@ -49,7 +55,7 @@ public class ReportWriteAttrAction extends ReportComponentAction<WorkSheetDesign
             }
         };
 
-        BasicDialog dialog = reportWritePane.showWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
+        DialogActionListener dialogActionListener = new DialogActionAdapter() {
             @Override
             public void doOk() {
                 isChange = true;
@@ -67,7 +73,9 @@ public class ReportWriteAttrAction extends ReportComponentAction<WorkSheetDesign
             public void doCancel() {
                 isChange = false;
             }
-        });
+        };
+
+        BasicDialog dialog = reportWritePane.showWindowWithCustomSize(DesignerContext.getDesignerFrame(), dialogActionListener, WINDOW_CUSTOM_SIZE);
 
         DesignerContext.setReportWritePane(dialog);
         dialog.setVisible(true);

designer-realize/src/main/java/com/fr/design/actions/server/StyleListAction.java

@@ -17,6 +17,7 @@ import com.fr.transaction.WorkerCallBack;
 import com.fr.transaction.WorkerFacade;
 
 import javax.swing.*;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 
 
@@ -24,6 +25,8 @@ import java.awt.event.ActionEvent;
  * StyleList Action
  */
 public class StyleListAction extends UpdateAction {
+    public static final Dimension WINDOW_CUSTOM_SIZE = new Dimension(710, 600);
+
     public StyleListAction() {
         this.setMenuKeySet(PREDEFINED_STYLES);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
@@ -37,23 +40,23 @@ public class StyleListAction extends UpdateAction {
      *
      * @param evt 事件
      */
-	public void actionPerformed(ActionEvent evt) {
+    public void actionPerformed(ActionEvent evt) {
-		DesignerFrame designerFrame = DesignerContext.getDesignerFrame();
+        DesignerFrame designerFrame = DesignerContext.getDesignerFrame();
-		final StyleManagerPane styleListPane = new StyleManagerPane();
+        final StyleManagerPane styleListPane = new StyleManagerPane();
-		final BasicDialog styleListDialog = styleListPane.showWindow(designerFrame);
+        final BasicDialog styleListDialog = styleListPane.showWindowWithCustomSize(designerFrame, null, WINDOW_CUSTOM_SIZE);
-		styleListDialog.addDialogActionListener(new DialogActionAdapter() {
+        styleListDialog.addDialogActionListener(new DialogActionAdapter() {
-			@Override
+            @Override
-			public void doOk() {
+            public void doOk() {
-			    if (!styleListPane.isNamePermitted()) {
+                if (!styleListPane.isNamePermitted()) {
-			        styleListDialog.setDoOKSucceed(false);
+                    styleListDialog.setDoOKSucceed(false);
                 }
-				Configurations.modify(new WorkerFacade(ServerPreferenceConfig.class) {
+                Configurations.modify(new WorkerFacade(ServerPreferenceConfig.class) {
-					@Override
+                    @Override
-					public void run() {
+                    public void run() {
-						styleListPane.update(ServerPreferenceConfig.getInstance());
+                        styleListPane.update(ServerPreferenceConfig.getInstance());
-					}
+                    }
-				}.addCallBack(new CallBackAdaptor(){
+                }.addCallBack(new CallBackAdaptor() {
-				    @Override
+                    @Override
                     public void afterCommit() {
                         DesignerContext.getDesignerBean("predefinedStyle").refreshBeanElement();
                     }

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

@@ -256,8 +256,12 @@ public class RichTextToolBar extends BasicPane{
 		@Override
 		public void actionPerformed(ActionEvent e) {
 			boolean isSub = RichTextToolBar.this.subPane.isSelected();
-			// 调用setCharacterAttributes函数设置文本区选择文本的字体
 			MutableAttributeSet attr = new SimpleAttributeSet();
+			if (!isSub && RichTextToolBar.this.superPane.isSelected()) {
+				RichTextToolBar.this.superPane.setSelected(false);
+				StyleConstants.setSuperscript(attr, false);
+			}
+			// 调用setCharacterAttributes函数设置文本区选择文本的字体
 			StyleConstants.setSubscript(attr, !isSub);
 			setCharacterAttributes(RichTextToolBar.this.textPane, attr, false);
 		}
@@ -269,6 +273,10 @@ public class RichTextToolBar extends BasicPane{
 			boolean isSuper = RichTextToolBar.this.superPane.isSelected();
 			// 调用setCharacterAttributes函数设置文本区选择文本的字体
 			MutableAttributeSet attr = new SimpleAttributeSet();
+			if (!isSuper && RichTextToolBar.this.subPane.isSelected()) {
+				RichTextToolBar.this.subPane.setSelected(false);
+				StyleConstants.setSubscript(attr, false);
+			}
 			StyleConstants.setSuperscript(attr, !isSuper);
 			setCharacterAttributes(RichTextToolBar.this.textPane, attr, false);
 		}
@@ -402,7 +410,7 @@ public class RichTextToolBar extends BasicPane{
 			bold.setSelected(isBold);
 			italic.setSelected(isItalic);
 			underline.setSelected(isUnderline);
-			subPane.setSelected(isSubscript);
+			subPane.setSelected(isSuperscript ? false : isSubscript);
 			superPane.setSelected(isSuperscript);
 			//为什么字体名称, 大小, 颜色, 不需要去判断是否全相同呢
 			//因为如果全相同, 则设置为第一个字符的样式, 如果不全相同, 那么默认也设置成第一个字符的样式.

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

@@ -4,9 +4,13 @@
 package com.fr.design.mainframe;
 
 import com.fr.base.BaseUtils;
+import com.fr.design.ExtraDesignClassManager;
+import com.fr.design.cell.CellElementPropertyComponent;
 import com.fr.design.fun.BackgroundQuickUIProvider;
 import com.fr.design.fun.CellAttributeProvider;
+import com.fr.design.fun.CellPropertyPaneProvider;
 import com.fr.design.fun.PresentKindProvider;
+import com.fr.design.fun.PropertyItemPaneProvider;
 import com.fr.design.gui.frpane.UITitlePanel;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itabpane.TitleChangeListener;
@@ -31,6 +35,7 @@ import javax.swing.JPanel;
 import javax.swing.SwingConstants;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
+import java.util.Set;
 
 
 /**
@@ -156,6 +161,7 @@ public class CellElementPropertyPane extends DockingView {
              return;
          }
          ePane.getSelection().populatePropertyPane(ePane);
+         populateExtraCellProperties(ePane);
     }
 
     @Override
@@ -188,5 +194,29 @@ public class CellElementPropertyPane extends DockingView {
         EastRegionContainerPane.getInstance().switchTabTo(EastRegionContainerPane.KEY_CELL_ATTR);
         EastRegionContainerPane.getInstance().setWindow2PreferWidth();
     }
+    private void populateExtraCellProperties(ElementCasePane ePane) {
+        if (ePane == null) {
+            return;
+        }
+        Selection selection = ePane.getSelection();
+        if (selection instanceof CellSelection) {
+            //单元格属性,限定下是选中单个单元格
+            TemplateElementCase elementCase = ePane.getEditingElementCase();
+            if (elementCase != null) {
+                Set<PropertyItemPaneProvider> itemPaneProviders = ExtraDesignClassManager.getInstance().getArray(PropertyItemPaneProvider.XML_TAG);
+                if (itemPaneProviders != null) {
+                    for (PropertyItemPaneProvider itemPaneProvider : itemPaneProviders) {
+                        if(itemPaneProvider instanceof CellPropertyPaneProvider){
+                            CellPropertyPaneProvider cellPropertyPaneProvider = (CellPropertyPaneProvider) itemPaneProvider;
+                            CellElementPropertyComponent cellElementPropertyPane = cellPropertyPaneProvider.getSingletonCelPropertyPane();
+                            if (cellElementPropertyPane != null && cellElementPropertyPane.accept(ePane)) {
+                                cellElementPropertyPane.populate(ePane);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
 
 }

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

@@ -28,7 +28,6 @@ import com.fr.design.present.ConditionAttributesGroupPane;
 import com.fr.design.roleAuthority.RolesAlreadyEditedPane;
 import com.fr.design.selection.SelectionEvent;
 import com.fr.design.selection.SelectionListener;
-
 import com.fr.grid.selection.FloatSelection;
 import com.fr.grid.selection.Selection;
 import com.fr.page.ReportSettingsProvider;
@@ -82,6 +81,7 @@ public class ElementCasePaneDelegate extends ElementCasePane<WorkSheet> {
         }
         CellWidgetPropertyPane.getInstance().populate(ElementCasePaneDelegate.this);
         CellElementPropertyPane.getInstance().populate(ElementCasePaneDelegate.this);
+
         QuickEditorRegion.getInstance().populate(getCurrentEditor());
         JTemplate editingTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
         // 模板初始化完成后，才能初始化超级链接面板

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

@@ -945,7 +945,7 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
                 // marks：判断是否重名
                 boolean isExisted = false;
                 for (int i = 0; i < reportComposite.getEditingWorkBook().getReportCount(); i++) {
-                    if (newName.equalsIgnoreCase(reportComposite.getEditingWorkBook().getReportName(i))) {
+                    if (newName.equalsIgnoreCase(reportComposite.getEditingWorkBook().getReportName(i)) && i != selectedIndex) {
                         isExisted = true;
                         break;
                     }

designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java

@@ -19,25 +19,20 @@ import java.awt.event.FocusEvent;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 
-import javax.swing.BorderFactory;
+import javax.swing.*;
-import javax.swing.Box;
-import javax.swing.ButtonGroup;
-import javax.swing.Icon;
 
+import com.fr.design.gui.ispinner.ColumnRowSpinner;
 import com.fr.page.PaperSettingProvider;
 import com.fr.page.ReportSettingsProvider;
 import com.fr.design.gui.frpane.UITabbedPane;
 import com.fr.design.gui.ibutton.UIRadioButton;
 import com.fr.design.gui.ilable.UILabel;
 
-import javax.swing.JList;
-import javax.swing.JPanel;
-import javax.swing.JSpinner;
-import javax.swing.SpinnerNumberModel;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
+import javax.swing.text.NumberFormatter;
 
 import com.fr.base.BaseUtils;
 import com.fr.base.Margin;
@@ -72,6 +67,7 @@ public class PageSetupPane extends BasicPane {
     private PagePane pagePane;
     private OtherPane otherPane;
     private UILabel zeroMarginWarn;
+    private static final String E = "E";
 
     public PageSetupPane() {
         this.initComponents();
@@ -212,6 +208,13 @@ public class PageSetupPane extends BasicPane {
             ((JSpinner.DefaultEditor) paperWidthSpinner.getEditor()).getTextField().setColumns(7);
             paperHeightSpinner = new UIBasicSpinner(new SpinnerNumberModel(0.0, 0.0, Double.MAX_VALUE, 1.0));
             ((JSpinner.DefaultEditor) paperHeightSpinner.getEditor()).getTextField().setColumns(7);
+
+            JFormattedTextField txt = ((JSpinner.NumberEditor) paperWidthSpinner.getEditor()).getTextField();
+            ((NumberFormatter) txt.getFormatter()).setAllowsInvalid(false);
+            txt = ((JSpinner.NumberEditor) paperHeightSpinner.getEditor()).getTextField();
+            ((NumberFormatter) txt.getFormatter()).setAllowsInvalid(false);
+
+
             unitLabel = new UnitFieldPane.UnitLabel(Constants.UNIT_MM, paperHeightSpinner.getPreferredSize().height);
 
             String[] inch = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_MM"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_INCH")};
@@ -738,8 +741,8 @@ public class PageSetupPane extends BasicPane {
                     return;
                 }
                 // 最大2000，以免画的时候超边
-                this.paper_width = Math.min(paper_width, 2000);
+                this.paper_width = Math.min(paper_width, Double.MAX_VALUE);
-                this.paper_height = Math.min(paper_height, 2000);
+                this.paper_height = Math.min(paper_height, Double.MAX_VALUE);
                 this.paper_orientation = paper_orientation;
                 length_scale = !useLocale ? NUM_3 : NUM_POINT_3;
             }
@@ -766,22 +769,28 @@ public class PageSetupPane extends BasicPane {
                     FontMetrics fm = g2d.getFontMetrics();
                     // 横向的长度
                     String w_str = "" + paper_width;
-                    if (w_str.indexOf(CoreConstants.DOT) > 0) {
+                    if (!w_str.contains(E) && w_str.indexOf(CoreConstants.DOT) > 0) {
                         w_str = w_str.substring(0, w_str.indexOf(CoreConstants.DOT) + 2);
                     }
                     int w_length = fm.stringWidth(w_str);
                     paint_width = Math.max(paint_width, w_length + 26);
                     // 纵向的长度
                     String h_str = "" + paper_height;
-                    if (h_str.indexOf(".") > 0) {
+                    //使用科学计数法显示长度的时候，限制纵向显示长度为9位
-                        h_str = h_str.substring(0, h_str.indexOf(".") + 2);
+                    if (h_str.contains(E)) {
+                        String str1 = h_str.substring(h_str.indexOf(E));
+                        String str2 = h_str.substring(0, 9 - str1.length());
+                        h_str = str2 + str1;
+                    } else if (h_str.indexOf(CoreConstants.DOT) > 0) {
+                        h_str = h_str.substring(0, h_str.indexOf(CoreConstants.DOT) + 2);
                     }
                     int h_length = fm.stringWidth(h_str);
                     paint_height = Math.max(paint_height, h_length + 26);
+                    paint_height = Math.min(paint_height, 74);
                     double startX = (pane_width - paint_width) / 2;
                     double startY = (pane_height - paint_height) / 2;
                     g2d.translate(startX, startY);
-                    g2d = getG2d(paint_width, paint_height,g2d,w_str,h_str,w_length,h_length);
+                    g2d = getG2d(paint_width, paint_height, g2d, w_str, h_str, w_length, h_length);
                     if (paper_orientation == ReportConstants.PORTRAIT) {
                         g2d.drawImage(img, (int) ((paint_width - img.getWidth(null)) / 2),
                                 (int) ((paint_height - img.getHeight(null)) / 2), null);

designer-realize/src/main/java/com/fr/design/report/UnitFieldPane.java

@@ -8,6 +8,7 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UIBasicSpinner;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.stable.Constants;
+import com.fr.stable.GraphDrawHelper;
 import com.fr.stable.OperatingSystem;
 import com.fr.stable.unit.CM;
 import com.fr.stable.unit.INCH;
@@ -52,9 +53,9 @@ public class UnitFieldPane extends JPanel {
                 this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_MM"));
             }
 
-            //ajust the heigt of unitLabel.
+            //自适应label宽度
-            Dimension unitDimension = new Dimension(this.getPreferredSize().width,
+            int width = GraphDrawHelper.getWidth(this.getText(), this.getFont());
-                    preferredHeight);
+            Dimension unitDimension = new Dimension(width, preferredHeight);
             this.setMinimumSize(unitDimension);
             this.setMinimumSize(unitDimension);
             this.setSize(unitDimension);

designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java

@@ -238,6 +238,7 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
 
         dlg.setModal(false);
         dlg.setVisible(true);
+        dlg.setAlwaysOnTop(true);
     }
 
     private void showDialogAfterAddCellAction() {

designer-realize/src/main/java/com/fr/grid/GridMouseAdapter.java

@@ -10,7 +10,7 @@ import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.EastRegionContainerPane;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.mainframe.JSliderPane;
-import com.fr.design.present.CellWriteAttrPane;
+import com.fr.design.os.impl.PopupDialogSaveAction;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.grid.selection.CellSelection;
 import com.fr.grid.selection.FloatSelection;
@@ -26,6 +26,7 @@ import com.fr.report.elementcase.TemplateElementCase;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.ColumnRow;
 import com.fr.stable.StringUtils;
+import com.fr.stable.os.support.OSSupportCenter;
 import com.fr.stable.unit.FU;
 
 import javax.swing.*;
@@ -93,7 +94,9 @@ public class GridMouseAdapter implements MouseListener, MouseWheelListener, Mous
         if (!grid.hasFocus() && grid.isRequestFocusEnabled()) {
             grid.requestFocus();
         }
-
+        // linux下 点击单元格时 失焦之前立即触发保存
+        PopupDialogSaveAction saveAction = OSSupportCenter.getAction(PopupDialogSaveAction.class);
+        saveAction.execute();
         if (SwingUtilities.isRightMouseButton(evt)) {
             doWithRightButtonPressed();
         } else {

designer-realize/src/main/java/com/fr/grid/GridUI.java

@@ -300,6 +300,8 @@ public class GridUI extends ComponentUI {
 
         private int resolution;
 
+        private static  final double THRESHOLD = 1.0E-4D;
+
         DrawLineHelper(int startIndex, int endIndex, boolean showGridLine,
                        boolean showPaginateLine, DynamicUnitList sizeList, double paperPaintSize,
                        List paginateLineList, int resolution) {
@@ -342,7 +344,7 @@ public class GridUI extends ComponentUI {
                 }
 
                 // paint paper margin line.
-                if (showPaginateLine && paperSumSize >= paperPaintSize) {
+                if (showPaginateLine && paperSumSize - paperPaintSize > THRESHOLD) {
                     paginateLineList.add(getPaginateLine2D((int) sumSize));
                     paperSumSize = tmpSize;
                 }
@@ -497,8 +499,8 @@ public class GridUI extends ComponentUI {
             paintCellElementRectangleList.add(this.tmpRectangle.clone());
 
 
-            double cellWidth =  this.tmpRectangle.getWidth();
+            double cellWidth = this.tmpRectangle.getWidth();
-            double cellHeight =  this.tmpRectangle.getHeight();
+            double cellHeight = this.tmpRectangle.getHeight();
             // denny_Grid: 画Grid中单元格的内容(包括单元格的背景Content + Background), 不包括边框
 
             painter.paintBackground(g2d, report, tmpCellElement, cellWidth - 1, cellHeight - 1);
@@ -625,10 +627,10 @@ public class GridUI extends ComponentUI {
                 tmpLine2D = (Line2D) paginateLineList.get(j);// 直接强制转换，因为List中肯定都是Line2D型的
                 for (int k = j + 1; k < paginateLineList.size(); k++) {
                     tmpLine2D2 = (Line2D) paginateLineList.get(k);
-                    if (AssistUtils.equals(tmpLine2D2.getX1() ,tmpLine2D.getX1())
+                    if (AssistUtils.equals(tmpLine2D2.getX1(), tmpLine2D.getX1())
-                            && AssistUtils.equals(tmpLine2D2.getX2() , tmpLine2D.getX2())
+                            && AssistUtils.equals(tmpLine2D2.getX2(), tmpLine2D.getX2())
-                            && AssistUtils.equals(tmpLine2D2.getY1() , tmpLine2D.getY1())
+                            && AssistUtils.equals(tmpLine2D2.getY1(), tmpLine2D.getY1())
-                            && AssistUtils.equals(tmpLine2D2.getY2() , tmpLine2D.getY2())) {
+                            && AssistUtils.equals(tmpLine2D2.getY2(), tmpLine2D.getY2())) {
                         paginateLineList.remove(k);
                     }
                 }

designer-realize/src/main/java/com/fr/grid/IntelliElements.java

@@ -194,8 +194,12 @@ public class IntelliElements {
                     TemplateCellElement newCellElement = new DefaultTemplateCellElement(colIndex, rowIndex);
                     applyStyle(newCellElement, sourceCellElement);//style
                     if (sourceCellElement.getValue() instanceof DSColumn) {
-                        DSColumn dsColumn = (DSColumn) sourceCellElement.getValue();
+                        try{
-                        newCellElement.setValue(dsColumn);
+                            DSColumn dsColumn = (DSColumn)((DSColumn) sourceCellElement.getValue()).clone();
+                            newCellElement.setValue(dsColumn);
+                        }catch (CloneNotSupportedException e){
+                            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+                        }
                         newCellElement.setCellExpandAttr(sourceCellElement.getCellExpandAttr());
                     } else if (sourceCellElement.getValue() instanceof Number) {
                         newCellElement.setValue(processNumber((Number) sourceCellElement.getValue()));

designer-realize/src/main/java/com/fr/quickeditor/CellQuickEditor.java

@@ -1,5 +1,6 @@
 package com.fr.quickeditor;
 
+import com.fr.base.GraphHelper;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.file.HistoryTemplateListPane;
@@ -49,7 +50,6 @@ public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> {
 
     protected static final Dimension LABEL_DIMENSION = new Dimension(60, 20);
     protected static final int VGAP = 10, HGAP = 8, VGAP_INNER = 3;
-    private static final int INSERT_CONTENT_LABEL_WIDTH = 60;
 
     /**
      * 滚动条相关配置
@@ -208,7 +208,7 @@ public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> {
     private JPanel initTopContent() {
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
-        double[] columnSize = {INSERT_CONTENT_LABEL_WIDTH, f};
+        double[] columnSize = {GraphHelper.getWidth(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Insert_Cell_Element")), f};
         double[] rowSize = {p, p};
         UILabel cellLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell"));
         UILabel insertContentLabel = FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Insert_Cell_Element"));