Merge pull request #1414 in DESIGN/design from ~JEO/report-design:persist/10.0 to persist/10.0

* commit '7017fe854243aafac1974103084d3a0b6d760af9': (55 commits)
  MOBILE-24587 同步到final
  fix
  REPORT-26085 同步到final
  REPORT-26263 切换远程目录到tomcat，放置一段时间切回本地，出现切换失败的弹窗，实际切换成功 修复 npe 。
  MOBILE-24962 && MOBILE-24940 合到final
  REPORT-26147 @harrison：新的release的jar和旧版本的性能插件，性能插件需要自动禁用 改 apilevel 满足不了全部禁用的需求。 改回原来的名字，不然旧版本的性能插件没法正常用。
  REPORT-26091 && REPORT-26181
  REPORT-26160 && REPORT-26204 && && REPORT-25532
  MOBILE-23781 单选按钮组的弹出配置框,有时候点击Tab不会切换
  MOBILE-24787 设计器上第一次打开已有弹窗设置模板，发现弹窗设置界面为空
  REPORT-24314 10.0.4启动画面 非中文版提供
  REPORT-25645 mac设计器取色器异常
  REPORT-25447 10.0.4设计器表单设计奇怪的bug
  MOBILE-24213 单选按钮 选项值前面会出现虚线 && 默认值
  判断条件有误
  REPORT-25730 最新的release设计器启动后一直报模板不存在 还需要判断是否存在
  REPORT-25730 最新的release设计器启动后一直报模板不存在 这里执行的时候需要判空。
  无jira任务, 冲突
  调整
  无JIRA任务，1.8编译单元测试代码失败
  ...

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

@@ -3,6 +3,7 @@ package com.fr.design;
 import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.env.DesignerWorkspaceGenerator;
 import com.fr.design.env.DesignerWorkspaceInfo;
 import com.fr.design.env.DesignerWorkspaceType;
@@ -91,8 +92,8 @@ public class EnvChangeEntrance {
                 strategy.showTip(new PopTip() {
                     @Override
                     public void show() {
-                        JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"),
+                        FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"),
-                                UIManager.getString("OptionPane.messageDialogTitle"), ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
+                                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error"), ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
                     }
                 });
                 return false;
@@ -127,8 +128,8 @@ public class EnvChangeEntrance {
             strategy.showTip(new PopTip() {
                 @Override
                 public void show() {
-                    JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"),
+                    FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"),
-                            UIManager.getString("OptionPane.messageDialogTitle"), ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
+                            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error"), ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
                 }
             });
             return false;
@@ -137,8 +138,8 @@ public class EnvChangeEntrance {
             strategy.showTip(new PopTip() {
                 @Override
                 public void show() {
-                    JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"),
+                    FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"),
-                            UIManager.getString("OptionPane.messageDialogTitle"), ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
+                            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error"), ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
                 }
             });
 

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

@@ -2,6 +2,7 @@ package com.fr.design.actions.community;
 
 import com.fr.base.BaseUtils;
 import com.fr.design.actions.UpdateAction;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.menu.MenuKeySet;
 import com.fr.general.CloudCenter;
 import com.fr.log.FineLoggerFactory;
@@ -38,7 +39,7 @@ public class UpAction extends UpdateAction
 	        try {
 	            Desktop.getDesktop().browse(new URI(url));
 	        } catch (IOException exp) {
-	            JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Default_Browser"));
+	            FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Default_Browser"));
 	            FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
 	        } catch (URISyntaxException exp) {
 	            FineLoggerFactory.getLogger().error(exp.getMessage(), exp);

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

@@ -21,7 +21,7 @@ import java.util.Map;
 import static javax.swing.JOptionPane.OK_CANCEL_OPTION;
 import static javax.swing.JOptionPane.OK_OPTION;
 import static javax.swing.JOptionPane.WARNING_MESSAGE;
-import static javax.swing.JOptionPane.showConfirmDialog;
+import static com.fr.design.dialog.FineJOptionPane.showConfirmDialog;
 
 public final class WebPreviewUtils {
 

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

@@ -2,6 +2,7 @@ package com.fr.design.actions.file.export;
 
 import com.fr.design.actions.JTemplateAction;
 import com.fr.design.base.mode.DesignModeContext;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.iprogressbar.FRProgressBar;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.DesignerContext;
@@ -132,10 +133,10 @@ public abstract class AbstractExportAction<E extends JTemplate<?, ?>> extends JT
         E e = getEditingComponent();
         if (!e.isALLSaved() && !DesignModeContext.isVcsMode()) {
             e.stopEditing();
-            int returnVal = JOptionPane.showConfirmDialog(
+            int returnVal = FineJOptionPane.showConfirmDialog(
                     DesignerContext.getDesignerFrame(),
                     Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Save") + " \"" + e.getEditingFILE() + "\" ?",
-                    ProductConstants.PRODUCT_NAME,
+                    Toolkit.i18nText("Fine-Design_Basic_Confirm"),
                     JOptionPane.YES_NO_CANCEL_OPTION,
                     JOptionPane.QUESTION_MESSAGE
             );
@@ -171,7 +172,7 @@ public abstract class AbstractExportAction<E extends JTemplate<?, ?>> extends JT
                     this.setProgress(100);
 
                     FineLoggerFactory.getLogger().info("\"" + name + "\"" + Toolkit.i18nText("Fine-Design_Report_Finish_Export") + "!");
-                    JOptionPane.showMessageDialog(
+                    FineJOptionPane.showMessageDialog(
                             DesignerContext.getDesignerFrame(),
                             Toolkit.i18nText("Fine-Design_Report_Exported_Successfully") + "\n" + name);
 
@@ -180,10 +181,10 @@ public abstract class AbstractExportAction<E extends JTemplate<?, ?>> extends JT
                     this.setProgress(100);
                     target.closeTemplate();
                     FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
-                    JOptionPane.showMessageDialog(
+                    FineJOptionPane.showMessageDialog(
                             DesignerContext.getDesignerFrame(),
                             Toolkit.i18nText("Fine-Engine_Remote_Design_Permission_Denied"),
-                            UIManager.getString("OptionPane.messageDialogTitle"),
+                            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error"),
                             JOptionPane.ERROR_MESSAGE,
                             UIManager.getIcon("OptionPane.errorIcon")
                     );
@@ -191,10 +192,10 @@ public abstract class AbstractExportAction<E extends JTemplate<?, ?>> extends JT
                     this.setProgress(100);
                     target.closeTemplate();
                     FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
-                    JOptionPane.showMessageDialog(
+                    FineJOptionPane.showMessageDialog(
                             DesignerContext.getDesignerFrame(),
                             Toolkit.i18nText("Fine-Design_Report_Export_Failed") + "\n" + path,
-                            UIManager.getString("OptionPane.messageDialogTitle"),
+                            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error"),
                             JOptionPane.ERROR_MESSAGE,
                             UIManager.getIcon("OptionPane.errorIcon")
                     );

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

@@ -6,6 +6,7 @@ package com.fr.design.actions.help;
 
 import com.fr.base.BaseUtils;
 import com.fr.design.actions.UpdateAction;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.menu.MenuKeySet;
 import com.fr.general.CloudCenter;
 import com.fr.log.FineLoggerFactory;
@@ -47,7 +48,7 @@ public class ForumAction extends UpdateAction {
         try {
             Desktop.getDesktop().browse(new URI(url));
         } catch (IOException exp) {
-            JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Default_Browser"));
+            FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Default_Browser"));
             FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
         } catch (URISyntaxException exp) {
             FineLoggerFactory.getLogger().error(exp.getMessage(), exp);

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

@@ -6,6 +6,7 @@ package com.fr.design.actions.help;
 
 import com.fr.base.BaseUtils;
 import com.fr.design.actions.UpdateAction;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.menu.MenuKeySet;
 
 import com.fr.log.FineLoggerFactory;
@@ -37,7 +38,7 @@ public class SupportQQAction extends UpdateAction {
         try {
             Desktop.getDesktop().browse(new URI(ProductConstants.SUPPORT_QQ));
         } catch (IOException exp) {
-            JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Default_Browser"));
+            FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Default_Browser"));
             FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
         } catch (URISyntaxException exp) {
             FineLoggerFactory.getLogger().error(exp.getMessage(), exp);

designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java

@@ -10,6 +10,7 @@ import com.fr.data.condition.ListCondition;
 import com.fr.data.condition.ObjectCondition;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.formula.FormulaFactory;
 import com.fr.design.formula.UIFormula;
 import com.fr.design.formula.VariableResolver;
@@ -123,7 +124,7 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
             ExpandMutableTreeNode parentTreeNode = getParentTreeNode();
             boolean result = isExistedInParentTreeNode(parentTreeNode, liteCondition, false);
             if (result) {
-                JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(LiteConditionPane.this),
+                FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(LiteConditionPane.this),
                         com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BindColumn_This_Condition_Has_Been_Existed"));
                 return;
             }
@@ -222,7 +223,7 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
                 return;
             }
 
-            int returnVal = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(LiteConditionPane.this),
+            int returnVal = FineJOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(LiteConditionPane.this),
                     com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"),
                     JOptionPane.OK_CANCEL_OPTION);
             if (returnVal == JOptionPane.OK_OPTION) {
@@ -610,7 +611,7 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
                 //修改的时候加入判断条件重复 REPORT-13441
                 boolean result = isExistedInParentTreeNode(parentTreeNode, liteCondition, true);
                 if (result) {
-                    JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(LiteConditionPane.this),
+                    FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(LiteConditionPane.this),
                             com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BindColumn_This_Condition_Has_Been_Existed"));
                     return;
                 }

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

@@ -83,6 +83,7 @@ public abstract class DesignTableDataManager {
     //用于记录是否要弹出参数框
     private static ThreadLocal<String> threadLocal = new ThreadLocal<String>();
 
+    private static Map<TableDataSource, Map<String, String[]>> columnCache = new HashMap<>();
 
     /**
      * 清除全局 数据集缓存.
@@ -113,11 +114,13 @@ public abstract class DesignTableDataManager {
 
     public static void closeTemplate(JTemplate<?, ?> template) {
         if (template != null) {
+            columnCache.remove(getEditingTableDataSource());
             dsListenersMap.remove(template.getPath());
         }
     }
 
     public static void envChange() {
+        columnCache.clear();
         dsListenersMap.clear();
         dsNameChangedMap.clear();
         clearGlobalDs();
@@ -197,7 +200,51 @@ public abstract class DesignTableDataManager {
         java.util.Map<String, TableDataWrapper> resMap = getAllEditingDataSet(source);
         java.util.Map<String, TableDataWrapper> dsMap = getAllDataSetIncludingProcedure(resMap);
         TableDataWrapper tabledataWrapper = dsMap.get(dsName);
-        return tabledataWrapper == null ? new String[0] : tabledataWrapper.calculateColumnNameList().toArray(new String[0]);
+        if (tabledataWrapper == null) {
+            return new String[0];
+        } else {
+            return getSelectedColumnNamesFromCache(source, dsName, tabledataWrapper);
+        }
+    }
+
+    private static String[] getSelectedColumnNamesFromCache(TableDataSource dataSource, String dsName, TableDataWrapper tableDataWrapper) {
+        Map<String, String[]> map = columnCache.get(dataSource);
+        if (map == null) {
+            map = new HashMap<>();
+            String[] columnNames = tableDataWrapper.calculateColumnNameList().toArray(new String[0]);
+            map.put(dsName, columnNames);
+            columnCache.put(dataSource, map);
+            return columnNames;
+        } else {
+            String[] columnNames = map.get(dsName);
+            if (columnNames == null) {
+                columnNames = tableDataWrapper.calculateColumnNameList().toArray(new String[0]);
+                map.put(dsName, columnNames);
+                return columnNames;
+            } else {
+                return columnNames;
+            }
+        }
+    }
+
+    public static void removeSelectedColumnNames(String dsName) {
+        Map<String, String[]> map = columnCache.get(getEditingTableDataSource());
+        if (map == null) {
+            return;
+        }
+        map.remove(dsName);
+    }
+
+    public static void addDsColumnNames(String dsName, String[] columnNames) {
+        TableDataSource dataSource = getEditingTableDataSource();
+        Map<String, String[]> map = columnCache.get(dataSource);
+        if (map == null) {
+            map = new HashMap<>();
+            map.put(dsName, columnNames);
+            columnCache.put(dataSource, map);
+        } else {
+            map.put(dsName, columnNames);
+        }
     }
 
     /**

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

@@ -17,6 +17,7 @@ import com.fr.design.data.datapane.preview.PreviewLabel;
 import com.fr.design.data.datapane.preview.PreviewLabel.Previewable;
 import com.fr.design.data.datapane.preview.PreviewTablePane;
 import com.fr.design.data.tabledata.Prepare4DataSourceChange;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.icombobox.FRTreeComboBox;
 import com.fr.design.gui.icombobox.FilterableComboBoxModel;
 import com.fr.design.gui.icombobox.UIComboBox;
@@ -332,7 +333,7 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
         DBUtils.refreshDatabase();
         String schema = StringUtils.isEmpty(schemaBox.getSelectedItem()) ? null : schemaBox.getSelectedItem();
         DataCoreUtils.refreshTables(getConnection(), TableProcedure.TABLE, schema);
-        JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Refresh_Successfully") + "!", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Refresh_Database"),
+        FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Refresh_Successfully") + "!", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Refresh_Database"),
                 JOptionPane.INFORMATION_MESSAGE);
     }
 
@@ -438,7 +439,7 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
             }
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
-            JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"),
+            FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"),
                     com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Failed"), JOptionPane.ERROR_MESSAGE);
         }
     }
@@ -462,7 +463,7 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
         }
         if (!connect) {
             DesignerFrame designerFrame = DesignerContext.getDesignerFrame();
-            JOptionPane.showMessageDialog(designerFrame, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"),
+            FineJOptionPane.showMessageDialog(designerFrame, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"),
                     com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Failed"), JOptionPane.ERROR_MESSAGE);
             failedToFindTable();
             return null;

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

@@ -5,6 +5,7 @@ import com.fr.data.TableDataSource;
 import com.fr.data.api.StoreProcedureAssist;
 import com.fr.data.impl.storeproc.StoreProcedure;
 import com.fr.design.data.DesignTableDataManager;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.controlpane.JListControlPane;
 import com.fr.design.gui.controlpane.NameableCreator;
 import com.fr.design.gui.ilist.ListModelElement;
@@ -49,7 +50,7 @@ public class TableDataPaneListPane extends JListControlPane implements TableData
                 if (StringUtils.isEmpty(tempName)) {
                     isNamePermitted = false;
                     nameableList.stopEditing();
-                    JOptionPane.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"));
                     setIllegalIndex(editingIndex);
                     return;
                 }
@@ -58,12 +59,12 @@ public class TableDataPaneListPane extends JListControlPane implements TableData
                         && isNameRepeated(new List[]{Arrays.asList(allDSNames), Arrays.asList(allListNames)}, tempName)) {
                     isNamePermitted = false;
                     nameableList.stopEditing();
-                    JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), Toolkit.i18nText("Fine-Design_Basic_Table_Data_Duplicate_Name_Tips", tempName));
+                    FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), Toolkit.i18nText("Fine-Design_Basic_Table_Data_Duplicate_Name_Tips", tempName));
                     setIllegalIndex(editingIndex);
                 } else if (editingType instanceof StoreProcedure && isIncludeUnderline(tempName)) {
                     isNamePermitted = false;
                     nameableList.stopEditing();
-                    JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), Toolkit.i18nText("Fine-Design_Basic_Stored_Procedure_Name_Tips"));
+                    FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), Toolkit.i18nText("Fine-Design_Basic_Stored_Procedure_Name_Tips"));
                     setIllegalIndex(editingIndex);
                 }
                 if (nameableList.getSelectedValue() instanceof ListModelElement) {

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

@@ -16,6 +16,9 @@ import com.fr.design.data.tabledata.wrapper.AbstractTableDataWrapper;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.file.HistoryTemplateListCache;
+import com.fr.design.fun.TableDataDefineProvider;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.fun.TableDataPaneProcessor;
 import com.fr.design.gui.ibutton.UIHeadGroup;
 import com.fr.design.gui.icontainer.UIScrollPane;
@@ -24,12 +27,12 @@ import com.fr.design.gui.itoolbar.UIToolbar;
 import com.fr.design.icon.IconPathConstants;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.JTemplate;
 import com.fr.design.menu.MenuDef;
 import com.fr.design.menu.SeparatorDef;
 import com.fr.design.menu.ToolBarDef;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.GeneralContext;
-
 import com.fr.general.NameObject;
 import com.fr.plugin.context.PluginContext;
 import com.fr.plugin.injectable.PluginModule;
@@ -38,8 +41,13 @@ import com.fr.plugin.observer.PluginEvent;
 import com.fr.plugin.observer.PluginEventListener;
 import com.fr.stable.core.PropertyChangeAdapter;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
-import java.awt.*;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+import javax.swing.ToolTipManager;
+import java.awt.BorderLayout;
+import java.awt.GridLayout;
 import java.awt.dnd.DnDConstants;
 import java.awt.event.ActionEvent;
 import java.awt.event.MouseAdapter;
@@ -89,22 +97,8 @@ public class TableDataTreePane extends BasicTableDataTreePane {
 
         createAddMenuDef();
     
-        GeneralContext.listenPluginRunningChanged(new PluginEventListener(PLUGIN_LISTENER_PRIORITY) {
+        // 创建插件监听
-        
+        createPluginListener();
-            @Override
-            public void on(PluginEvent event) {
-            
-                addMenuDef.clearShortCuts();
-                createAddMenuDef();
-            }
-        }, new PluginFilter() {
-        
-            @Override
-            public boolean accept(PluginContext context) {
-    
-                return context.contain(PluginModule.ExtraDesign);
-            }
-        });
     
         editAction = new EditAction();
         removeAction = new RemoveAction();
@@ -146,6 +140,56 @@ public class TableDataTreePane extends BasicTableDataTreePane {
         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
+            public void on(PluginEvent event) {
+                //REPORT-25577
+                //如果数据集插件禁用或启用。需要清空当前模板中的缓存
+                reloadCurrTemplate();
+            }
+    
+            private void reloadCurrTemplate() {
+                JTemplate<?, ?> jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+                if (accept(jt)) {
+                    HistoryTemplateListCache.getInstance().closeSelectedReport(jt);
+                    DesignerContext.getDesignerFrame().openTemplate(jt.getEditingFILE());
+                }
+            }
+    
+            private boolean accept(JTemplate<?, ?> jt) {
+                
+                return jt != null && jt.getEditingFILE() != null && jt.getEditingFILE().exists();
+            }
+        }, new PluginFilter() {
+            @Override
+            public boolean accept(PluginContext pluginContext) {
+                
+                return pluginContext.contain(TableDataDefineProvider.XML_TAG);
+            }
+        });
+    }
+    
     
     protected void checkButtonEnabled() {
         super.checkButtonEnabled(editAction, previewTableDataAction, removeAction, op, dataTree);
@@ -243,6 +287,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
             if (selectedNO == null) {
                 return;
             }
+            DesignTableDataManager.removeSelectedColumnNames(selectedNO.getName());
             dgEdit(((AbstractTableDataWrapper) selectedNO.getObject()).creatTableDataPane(), selectedNO.getName(), false);
         }
     }
@@ -263,7 +308,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
                 return;
             }
 
-            int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + ":" + selectedNO.getName() + "?",
+            int returnVal = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + ":" + selectedNO.getName() + "?",
                     com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
             if (returnVal == JOptionPane.OK_OPTION) {
                 // richer:这个地方为什么要在DataSourceTree里面去remove呢？多此一举吧
@@ -274,6 +319,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
                 dataTree.setSelectionRow(dataTree.getRowCount() - 1);
                 fireDSChanged();
                 checkButtonEnabled();
+                DesignTableDataManager.removeSelectedColumnNames(selectedNO.getName());
             }
         }
     }

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

@@ -4,6 +4,7 @@ import com.fr.data.impl.Connection;
 import com.fr.data.impl.JDBCDatabaseConnection;
 import com.fr.data.impl.JNDIDatabaseConnection;
 import com.fr.design.ExtraDesignClassManager;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.fun.ConnectionProvider;
 import com.fr.design.gui.controlpane.JListControlPane;
 import com.fr.design.gui.controlpane.NameObjectCreator;
@@ -43,7 +44,7 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
                 String tempName = getEditingName();
                 if (StringUtils.isEmpty(tempName)) {
                     nameableList.stopEditing();
-                    JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ConnectionListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connection_Empty_Name"));
+                    FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ConnectionListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connection_Empty_Name"));
                     setIllegalIndex(editingIndex);
                     isNamePermitted = false;
                     return;
@@ -53,7 +54,7 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
                     isNamePermitted = false;
                     nameableList.stopEditing();
                     String message = Toolkit.i18nText("Fine-Design_Basic_Connection_Duplicate_Name", tempName);
-                    JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ConnectionListPane.this), message);
+                    FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ConnectionListPane.this), message);
                     setIllegalIndex(editingIndex);
                 }
                 if (isNamePermitted && !ComparatorUtils.equals(tempName, selectedName)) {

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

@@ -14,6 +14,7 @@ import com.fr.design.DesignerEnvManager;
 import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.BasicPane;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.gui.frpane.UITabbedPane;
 import com.fr.design.gui.ilable.UILabel;
@@ -303,7 +304,7 @@ public class PreviewTablePane extends BasicPane {
             return;
         }
         FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
-        JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), columnErrMessage, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error"), JOptionPane.ERROR_MESSAGE);
+        FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), columnErrMessage, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error"), JOptionPane.ERROR_MESSAGE);
     }
 
     private void populate(TableData tableData) throws Exception {
@@ -394,8 +395,8 @@ public class PreviewTablePane extends BasicPane {
                 } catch (Exception e) {
                     if (!(e instanceof CancellationException)) {
                         FineLoggerFactory.getLogger().error(e.getMessage(), e);
-                        JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), e.getMessage(),
+                        FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), e.getMessage(),
-                                null, 0, UIManager.getIcon("OptionPane.errorIcon"));
+                                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error"), JOptionPane.ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
                     }
                     dialog.setVisible(false);
                 } finally {

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

@@ -14,6 +14,7 @@ import com.fr.data.impl.XMLTableData;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.data.datapane.preview.PreviewTablePane;
 import com.fr.design.dialog.BasicPane;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ibutton.UIRadioButton;
 import com.fr.design.gui.icheckbox.UICheckBox;
@@ -222,7 +223,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         public void actionPerformed(ActionEvent arg0) {
             String uri = ParameterHelper.analyze4Templatee(urlText.getText(), params);
             if (!checkURL(uri)) {
-                JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(FileTableDataPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add_JS_warning"));
+                FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(FileTableDataPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add_JS_warning"));
                 return;
             }
             params = getEditorPaneParameter();
@@ -234,10 +235,10 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
                 FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
             if (in == null) {
-                JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"),
+                FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"),
-                        null, 0, UIManager.getIcon("OptionPane.errorIcon"));
+                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error"), JOptionPane.ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
             } else {
-                JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Connection_Successfully"));
+                FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Connection_Successfully"));
                 try {
                     in.close();
                 } catch (IOException e) {

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

@@ -17,6 +17,7 @@ import com.fr.design.data.datapane.sqlpane.SQLEditPane;
 import com.fr.design.data.tabledata.ResponseDataSourceChange;
 import com.fr.design.data.tabledata.StoreProcedureWorkerListener;
 import com.fr.design.data.tabledata.wrapper.StoreProcedureDataWrapper;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.ilable.UILabel;
@@ -239,7 +240,7 @@ public class ProcedureDataPane extends AbstractTableDataPane<StoreProcedure> imp
             try {
                 throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connect_SQL_Cannot_Null") + ".");
             } catch (Exception e) {
-                JOptionPane.showMessageDialog(ProcedureDataPane.this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connect_SQL_Cannot_Null") + ".");
+                FineJOptionPane.showMessageDialog(ProcedureDataPane.this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connect_SQL_Cannot_Null") + ".");
             }
         }
 

designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/AbstractTableDataWrapper.java

@@ -65,6 +65,7 @@ public abstract class AbstractTableDataWrapper implements TableDataWrapper {
             }
 		}
 		columnNameList = DesignTableDataManager.getColumnNamesByTableData(embeddedTableData);
+        DesignTableDataManager.addDsColumnNames(name, columnNameList.toArray(new String[0]));
 		return columnNameList;
 	}
 

designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java

@@ -9,6 +9,7 @@ import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.data.datapane.preview.PreviewTablePane;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.iprogressbar.AutoProgressBar;
 import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
 import com.fr.design.mainframe.DesignerContext;
@@ -102,7 +103,7 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper {
             return columnNameList;
         }
         if (!createStore(false)) {
-            JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Engine_No_TableData"));
+            FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Engine_No_TableData"));
             return new ArrayList<String>();
         }
         columnNameList = Arrays.asList(procedureDataModel.getColumnName());
@@ -219,7 +220,7 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper {
                 } catch (Exception e) {
                     if (!(e instanceof CancellationException)) {
                         FineLoggerFactory.getLogger().error(e.getMessage(), e);
-                        JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), e.getMessage());
+                        FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), e.getMessage());
                     }
                     loadingBar.close();
                 }

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

@@ -0,0 +1,290 @@
+package com.fr.design.dialog;
+
+import com.fr.invoke.Reflect;
+
+import javax.swing.Icon;
+import javax.swing.JDialog;
+import javax.swing.JOptionPane;
+import java.awt.Component;
+import java.awt.HeadlessException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author Joe
+ * @version 10.0
+ * Created by Joe on 12/5/2019
+ */
+public class FineJOptionPane extends JOptionPane {
+
+    public final static String[] OPTION_DEFAULT = { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_OK") };
+    public final static String[] OPTION_YES_NO = { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Yes"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_No") };
+    public final static String[] OPTION_YES_NO_CANCEL = { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Yes"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_No"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Cancel") };
+    public final static String[] OPTION_OK_CANCEL = { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_OK"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Cancel") };
+
+    //选项类型optionType 和 选项字符串数组 一一对应
+    private final static Map<Integer, String[]> OPTION_MAP = new HashMap<>();
+
+    static {
+        OPTION_MAP.put(DEFAULT_OPTION, OPTION_DEFAULT);
+        OPTION_MAP.put(YES_NO_OPTION, OPTION_YES_NO);
+        OPTION_MAP.put(YES_NO_CANCEL_OPTION, OPTION_YES_NO_CANCEL);
+        OPTION_MAP.put(OK_CANCEL_OPTION, OPTION_OK_CANCEL);
+    }
+
+    private final static String MESSAGE_DIALOG_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Message");
+    private final static String CONFIRM_DIALOG_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm");
+    private final static String INPUT_DIALOG_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips");
+
+    /**
+     * 使用默认 标题 和 消息类型 的消息提示弹出框
+     * @param parentComponent 父容器
+     * @param message 具体的提示消息
+     * @throws HeadlessException
+     */
+    public static void showMessageDialog(Component parentComponent, Object message)
+            throws HeadlessException {
+        showMessageDialog(parentComponent, message, MESSAGE_DIALOG_TITLE,
+                INFORMATION_MESSAGE);
+    }
+
+    /**
+     * 使用默认 Icon 的消息提示弹出框
+     * @param parentComponent 父容器
+     * @param message 具体的提示消息
+     * @param title 标题
+     * @param messageType 消息类型
+     * @throws HeadlessException
+     */
+    public static void showMessageDialog(Component parentComponent, Object message,
+                                         String title, int messageType)
+            throws HeadlessException {
+        showMessageDialog(parentComponent, message, title, messageType, null);
+    }
+
+    /**
+     * 使用默认 选项类型、选项 和 初始选项 的消息提示弹出框
+     * @param parentComponent 父容器
+     * @param message 具体的提示消息
+     * @param title 标题
+     * @param messageType 消息类型
+     * @param icon 图标
+     * @throws HeadlessException
+     */
+    public static void showMessageDialog(Component parentComponent, Object message,
+                                         String title, int messageType, Icon icon)
+            throws HeadlessException {
+        showMessageDialog(parentComponent, message, title, DEFAULT_OPTION,
+                messageType, icon, OPTION_DEFAULT, null);
+    }
+
+    /**
+     * 自定义的消息提示弹出框
+     * @param parentComponent 父容器
+     * @param message 具体的提示消息
+     * @param title 标题
+     * @param optionType 选项类型
+     * @param messageType 消息类型
+     * @param icon 图标
+     * @param options 选项
+     * @param initialValue 初始选项
+     * @throws HeadlessException
+     */
+    public static void showMessageDialog(Component parentComponent, Object message,
+                                         String title, int optionType, int messageType,
+                                         Icon icon, Object[] options, Object initialValue)
+            throws HeadlessException {
+        showOptionDialog(parentComponent, message, title, optionType,
+                messageType, icon, options, initialValue);
+    }
+
+    /**
+     * 使用默认 标题 和 选项类型 的确认弹出框
+     * @param parentComponent 父容器
+     * @param message 具体的提示消息
+     * @throws HeadlessException
+     */
+    public static int showConfirmDialog(Component parentComponent, Object message)
+            throws HeadlessException {
+        return showConfirmDialog(parentComponent, message,
+                CONFIRM_DIALOG_TITLE,
+                YES_NO_CANCEL_OPTION);
+    }
+
+    /**
+     * 使用默认 消息类型 的确认弹出框
+     * @param parentComponent 父容器
+     * @param message 具体的提示消息
+     * @param title 标题
+     * @param optionType 选项类型
+     * @throws HeadlessException
+     */
+    public static int showConfirmDialog(Component parentComponent, Object message,
+                                        String title, int optionType) throws HeadlessException {
+        return showConfirmDialog(parentComponent, message, title, optionType,
+                QUESTION_MESSAGE);
+    }
+
+    /**
+     * 使用默认 Icon 的确认弹出框
+     * @param parentComponent 父容器
+     * @param message 具体的提示消息
+     * @param title 标题
+     * @param optionType 选项类型
+     * @param messageType 消息类型
+     * @throws HeadlessException
+     */
+    public static int showConfirmDialog(Component parentComponent, Object message,
+                                        String title, int optionType, int messageType)
+            throws HeadlessException {
+        return showConfirmDialog(parentComponent, message, title, optionType,
+                messageType, null);
+    }
+
+    /**
+     * 根据 选项类型 获取对应 选项 ，且使用默认 初始选项 的确认弹出框
+     * @param parentComponent 父容器
+     * @param message 具体的提示消息
+     * @param title 标题
+     * @param optionType 选项类型
+     * @param messageType 消息类型
+     * @param icon 图标
+     * @throws HeadlessException
+     */
+    public static int showConfirmDialog(Component parentComponent, Object message,
+                                        String title, int optionType, int messageType, Icon icon)
+            throws HeadlessException {
+        String[] options = OPTION_MAP.get(optionType);
+        return showConfirmDialog(parentComponent, message, title, optionType,
+                messageType, icon, options, options[0]);
+    }
+
+    /**
+     * 自定义的确认弹出框
+     * @param parentComponent 父容器
+     * @param message 具体的提示消息
+     * @param title 标题
+     * @param optionType 选项类型
+     * @param messageType 消息类型
+     * @param icon 图标
+     * @param options 选项
+     * @param initialValue 初始选项
+     * @throws HeadlessException
+     */
+    public static int showConfirmDialog(Component parentComponent, Object message,
+                                        String title, int optionType, int messageType, Icon icon,
+                                        Object[] options, Object initialValue)
+            throws HeadlessException {
+        return showOptionDialog(parentComponent, message, title, optionType,
+                messageType, icon, options, initialValue);
+    }
+
+    /**
+     * 指定消息内容的输入弹出框
+     * @param message 消息内容
+     * @return
+     * @throws HeadlessException
+     */
+    public static String showInputDialog(Object message)
+            throws HeadlessException {
+        return showInputDialog(null, message);
+    }
+
+    /**
+     * 使用默认 标题 和 消息类型 的输入弹出框
+     * @param parentComponent 父容器
+     * @param message 消息内容
+     * @return
+     * @throws HeadlessException
+     */
+    public static String showInputDialog(Component parentComponent,
+                                         Object message) throws HeadlessException {
+        return showInputDialog(parentComponent, message, INPUT_DIALOG_TITLE, QUESTION_MESSAGE);
+    }
+
+    /**
+     * 使用默认 标题、消息类型、Icon 和 选项 的输入弹出框
+     * @param parentComponent 父容器
+     * @param message 消息类型
+     * @param initialSelectionValue 初始选项
+     * @return
+     */
+    public static String showInputDialog(Component parentComponent, Object message,
+                                         Object initialSelectionValue) {
+        return (String)showInputDialog(parentComponent, message,
+                INPUT_DIALOG_TITLE, QUESTION_MESSAGE, null, null,
+                initialSelectionValue);
+    }
+
+    /**
+     * 使用默认 父容器、消息内容 和 初始选项 的输入弹出框
+     * @param message 消息内容
+     * @param initialSelectionValue 初始选项
+     * @return
+     */
+    public static String showInputDialog(Object message, Object initialSelectionValue) {
+        return showInputDialog(null, message, initialSelectionValue);
+    }
+
+    /**
+     * 使用默认 Icon、选项 和 初始选项 的输入弹出框
+     * @param parentComponent 父容器
+     * @param message 消息内容
+     * @param title 标题
+     * @param messageType 消息类型
+     * @return
+     * @throws HeadlessException
+     */
+    public static String showInputDialog(Component parentComponent,
+                                         Object message, String title, int messageType)
+            throws HeadlessException {
+        return (String)showInputDialog(parentComponent, message, title,
+                messageType, null, null, null);
+    }
+
+    /**
+     * 自定义的输入弹出框
+     * @param parentComponent 父容器
+     * @param message 消息内容
+     * @param title 标题
+     * @param messageType 消息类型
+     * @param icon 图标
+     * @param selectionValues 选项
+     * @param initialSelectionValue 初始选项
+     * @return
+     * @throws HeadlessException
+     */
+    public static Object showInputDialog(Component parentComponent,
+                                         Object message, String title, int messageType, Icon icon,
+                                         Object[] selectionValues, Object initialSelectionValue)
+            throws HeadlessException {
+        JOptionPane    pane = new JOptionPane(message, messageType,
+                OK_CANCEL_OPTION, icon,
+                OPTION_OK_CANCEL, null);
+
+        pane.setWantsInput(true);
+        pane.setSelectionValues(selectionValues);
+        pane.setInitialSelectionValue(initialSelectionValue);
+        pane.setComponentOrientation(((parentComponent == null) ?
+                getRootFrame() : parentComponent).getComponentOrientation());
+
+        int style = Reflect.on(JOptionPane.class).call("styleFromMessageType", messageType).get();
+        JDialog dialog = Reflect.on(pane).call("createDialog", parentComponent, title, style).get();
+
+        pane.selectInitialValue();
+        dialog.show();
+        dialog.dispose();
+
+        Object value = pane.getInputValue();
+
+        if (value == UNINITIALIZED_VALUE) {
+            return null;
+        }
+        return value;
+    }
+
+}

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

@@ -167,7 +167,7 @@ public abstract class UIDialog extends JDialog {
         try {
             checkValid();
         } catch (Exception exp) {
-            JOptionPane.showMessageDialog(this, exp.getMessage());
+            FineJOptionPane.showMessageDialog(this, exp.getMessage());
             return;
         }
 

designer-base/src/main/java/com/fr/design/editor/DoubleDeckValueEditorPane.java

@@ -3,6 +3,7 @@ package com.fr.design.editor;
 import com.fr.base.BaseFormula;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.dialog.BasicPane;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.editor.editor.ColumnIndexEditor;
 import com.fr.design.editor.editor.ColumnNameEditor;
 import com.fr.design.editor.editor.Editor;
@@ -302,8 +303,8 @@ public class DoubleDeckValueEditorPane extends BasicPane implements UIObserver,
             DesignerEnvManager designerEnvManager = DesignerEnvManager.getEnvManager();
             if (designerEnvManager.isSupportStringToFormula()) {
                 if (!designerEnvManager.isDefaultStringToFormula()) {
-                    int returnValue = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit_String_To_Formula")
+                    int returnValue = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit_String_To_Formula")
-                            + "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), JOptionPane.YES_NO_OPTION);
+                            + "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION);
                     if (returnValue == JOptionPane.OK_OPTION) {
 
                         setCurrentEditor(j);

designer-base/src/main/java/com/fr/design/editor/ValueEditorPane.java

@@ -3,6 +3,7 @@ package com.fr.design.editor;
 import com.fr.base.BaseFormula;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.dialog.BasicPane;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.editor.editor.ColumnNameEditor;
 import com.fr.design.editor.editor.Editor;
 import com.fr.design.editor.editor.FormulaEditor;
@@ -283,8 +284,8 @@ public class ValueEditorPane extends BasicPane implements UIObserver, GlobalName
             DesignerEnvManager designerEnvManager = DesignerEnvManager.getEnvManager();
             if (designerEnvManager.isSupportStringToFormula()) {
                 if (!designerEnvManager.isDefaultStringToFormula()) {
-                    int returnValue = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit_String_To_Formula")
+                    int returnValue = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit_String_To_Formula")
-                            + "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), JOptionPane.YES_NO_OPTION);
+                            + "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION);
                     if (returnValue == JOptionPane.OK_OPTION) {
 
                         setCurrentEditor(j);

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

@@ -1,5 +1,6 @@
 package com.fr.design.extra;
 
+import com.fr.design.dialog.FineJOptionPane;
 import javafx.application.Platform;
 import javafx.embed.swing.JFXPanel;
 import javafx.event.EventHandler;
@@ -46,7 +47,7 @@ public class LoginWebPane extends JFXPanel {
         SwingUtilities.invokeLater(new Runnable() {
             @Override
             public void run() {
-                JOptionPane.showMessageDialog(LoginWebPane.this, message);
+                FineJOptionPane.showMessageDialog(LoginWebPane.this, message);
             }
         });
     }

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

@@ -1,6 +1,7 @@
 package com.fr.design.extra;
 
 import com.fr.config.MarketConfig;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.extra.tradition.callback.UpdateOnlineCallback;
 import com.fr.design.gui.frpane.UITabbedPane;
 import com.fr.design.gui.ilable.UILabel;
@@ -181,14 +182,14 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane<List<Plug
                 public void done(PluginTaskResult result) {
                     if (result.isSuccess()) {
                         FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Install_Success"));
-                        JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Successful"));
+                        FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Successful"));
                     } else {
-                        JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+                        FineJOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
                     }
                 }
             });
         } catch (Exception e1) {
-            JOptionPane.showMessageDialog(PluginFromStorePane.this, e1.getMessage(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+            FineJOptionPane.showMessageDialog(PluginFromStorePane.this, e1.getMessage(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
         }
     }
 

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

@@ -1,6 +1,7 @@
 package com.fr.design.extra;
 
 import com.fr.design.RestartHelper;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.ibutton.UIButton;
 
 import com.fr.plugin.context.PluginContext;
@@ -67,9 +68,9 @@ public class PluginInstalledPane extends PluginAbstractViewPane {
                             @Override
                             public void done(PluginTaskResult result) {
                                 if (result.isSuccess()) {
-                                    JOptionPane.showMessageDialog(null, modifyMessage);
+                                    FineJOptionPane.showMessageDialog(null, modifyMessage);
                                 } else {
-                                    JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+                                    FineJOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
                                 }
                             }
                         });
@@ -78,9 +79,9 @@ public class PluginInstalledPane extends PluginAbstractViewPane {
                             @Override
                             public void done(PluginTaskResult result) {
                                 if (result.isSuccess()) {
-                                    JOptionPane.showMessageDialog(null, modifyMessage);
+                                    FineJOptionPane.showMessageDialog(null, modifyMessage);
                                 } else {
-                                    JOptionPane.showMessageDialog(null,PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+                                    FineJOptionPane.showMessageDialog(null,PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
                                 }
                             }
                         });
@@ -135,7 +136,7 @@ public class PluginInstalledPane extends PluginAbstractViewPane {
         try {
             controlPane.deletePlugin(plugin);
         } catch (Exception e) {
-            JOptionPane.showMessageDialog(PluginInstalledPane.this, e.getMessage(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+            FineJOptionPane.showMessageDialog(PluginInstalledPane.this, e.getMessage(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
         }
 
         if (rv == JOptionPane.OK_OPTION) {

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

@@ -1,6 +1,7 @@
 package com.fr.design.extra;
 
 import com.fr.config.MarketConfig;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.extra.exe.callback.InstallFromDiskCallback;
 import com.fr.design.extra.exe.callback.InstallOnlineCallback;
 import com.fr.design.bridge.exec.JSCallback;
@@ -91,7 +92,7 @@ public class PluginOperateUtils {
 
             @Override
             public void run() {
-                int rv = JOptionPane.showConfirmDialog(
+                int rv = FineJOptionPane.showConfirmDialog(
                         null,
                         com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Delete_Confirmed"),
                         com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),

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

@@ -1,6 +1,7 @@
 package com.fr.design.extra;
 
 import com.fr.config.MarketConfig;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.extra.tradition.callback.UpdateOnlineCallback;
 import com.fr.design.gui.frpane.UITabbedPane;
 import com.fr.design.gui.ilable.UILabel;
@@ -199,9 +200,9 @@ public class PluginUpdatePane extends PluginAbstractLoadingViewPane<List<PluginV
             public void done(PluginTaskResult result) {
                 if (result.isSuccess()) {
                     FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Update_Success"));
-                    JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Successful"));
+                    FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Successful"));
                 } else {
-                    JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+                    FineJOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
                 }
             }
         });

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

@@ -1,6 +1,7 @@
 package com.fr.design.extra;
 
 import com.fr.base.TemplateUtils;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.general.CloudCenter;
 import com.fr.general.http.HttpClient;
 import com.fr.json.JSONArray;
@@ -12,6 +13,7 @@ import com.fr.plugin.basic.version.VersionIntervalFactory;
 import com.fr.plugin.context.PluginContext;
 import com.fr.plugin.context.PluginMarker;
 import com.fr.plugin.error.PluginErrorCode;
+import com.fr.plugin.error.PluginBaseErrorCode;
 import com.fr.plugin.manage.PluginManager;
 import com.fr.plugin.view.PluginView;
 import com.fr.stable.EncodeConstants;
@@ -109,7 +111,7 @@ public class PluginUtils {
                 throw new com.fr.plugin.PluginVerifyException(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Connect_Server_Error"));
             }
         } catch (PluginVerifyException e) {
-            JOptionPane.showMessageDialog(null, e.getMessage(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+            FineJOptionPane.showMessageDialog(null, e.getMessage(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
             return false;
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
@@ -193,7 +195,7 @@ public class PluginUtils {
         }
     }
     
-    public static String getMessageByErrorCode(PluginErrorCode errorCode) {
+    public static String getMessageByErrorCode(PluginBaseErrorCode errorCode) {
         if(errorCode == PluginErrorCode.None){
             return "";
         }
@@ -201,7 +203,7 @@ public class PluginUtils {
         return com.fr.design.i18n.Toolkit.i18nCompatibleServerText(getInterKeyByErrorCode(errorCode));
     }
     
-    private static String getInterKeyByErrorCode(PluginErrorCode errorCode) {
+    private static String getInterKeyByErrorCode(PluginBaseErrorCode errorCode) {
         
         return  errorCode.getDescription();
     }

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

@@ -1,6 +1,7 @@
 package com.fr.design.extra;
 
 import com.fr.base.TemplateUtils;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.general.GeneralContext;
 import com.fr.general.IOUtils;
 import com.fr.log.FineLoggerFactory;
@@ -104,7 +105,7 @@ public class PluginWebPane extends JFXPanel {
         SwingUtilities.invokeLater(new Runnable() {
             @Override
             public void run() {
-                JOptionPane.showMessageDialog(PluginWebPane.this, message);
+                FineJOptionPane.showMessageDialog(PluginWebPane.this, message);
             }
         });
     }

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

@@ -1,5 +1,6 @@
 package com.fr.design.extra;
 
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.general.CloudCenter;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.IOUtils;
@@ -138,7 +139,7 @@ public class QQLoginWebPane extends JFXPanel {
         SwingUtilities.invokeLater(new Runnable() {
             @Override
             public void run() {
-                JOptionPane.showMessageDialog(QQLoginWebPane.this, message);
+                FineJOptionPane.showMessageDialog(QQLoginWebPane.this, message);
             }
         });
     }

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

@@ -2,6 +2,7 @@ package com.fr.design.extra;
 
 import com.fr.base.FRContext;
 import com.fr.design.dialog.BasicPane;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.dialog.UIDialog;
 import com.fr.design.gui.frpane.UITabbedPane;
 import com.fr.design.mainframe.DesignerContext;
@@ -62,7 +63,7 @@ public class WebViewDlgHelper {
             String mainJsPath = StableUtils.pathJoin(installHome, MAIN_JS_PATH);
             File file = new File(mainJsPath);
             if (!file.exists()) {
-                int rv = JOptionPane.showConfirmDialog(
+                int rv = FineJOptionPane.showConfirmDialog(
                         null,
                         com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Need_Install"),
                         com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
@@ -79,7 +80,7 @@ public class WebViewDlgHelper {
                 updateShopScripts(SHOP_SCRIPTS);
                 showPluginDlg();
             } else {
-                int rv = JOptionPane.showConfirmDialog(
+                int rv = FineJOptionPane.showConfirmDialog(
                         null,
                         com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Need_Install_Version"),
                         com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
@@ -199,7 +200,7 @@ public class WebViewDlgHelper {
 
 
     private static void confirmDownLoadShopJS() {
-        int rv = JOptionPane.showConfirmDialog(
+        int rv = FineJOptionPane.showConfirmDialog(
                 null,
                 com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Need_Install"),
                 com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
@@ -277,7 +278,7 @@ public class WebViewDlgHelper {
                             CommonUtils.deleteFile(scriptZip);
                         }
                         PluginStoreConstants.refreshProps();    // 下载完刷新一下版本号等
-                        JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Installed"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), JOptionPane.INFORMATION_MESSAGE);
+                        FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Installed"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), JOptionPane.INFORMATION_MESSAGE);
                     }
                 } catch (InterruptedException e) {
                     FineLoggerFactory.getLogger().error(e.getMessage(), e);
@@ -300,7 +301,7 @@ public class WebViewDlgHelper {
                     JSONObject resultJSONObject = new JSONObject(text);
                     String isLatest = resultJSONObject.optString("result");
                     if (!ComparatorUtils.equals(isLatest, LATEST)) {
-                        int rv = JOptionPane.showConfirmDialog(
+                        int rv = FineJOptionPane.showConfirmDialog(
                                 null,
                                 com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Need_Update"),
                                 com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),

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

@@ -1,6 +1,7 @@
 package com.fr.design.extra.exe.callback;
 
 import com.fr.design.bridge.exec.JSCallback;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.extra.PluginOperateUtils;
 import com.fr.design.extra.PluginUtils;
 
@@ -41,7 +42,7 @@ public class InstallFromDiskCallback extends AbstractPluginTaskCallback {
             String switchedInfo = PluginOperateUtils.getSwitchedInfo(result);
             jsCallback.execute("success");
             FineLoggerFactory.getLogger().info(pluginInfo + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Success") + switchedInfo);
-            JOptionPane.showMessageDialog(null, pluginInfo + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Success") + switchedInfo);
+            FineJOptionPane.showMessageDialog(null, pluginInfo + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Success") + switchedInfo);
         } else if (result.errorCode() == PluginErrorCode.NeedDealWithPluginDependency) {
             int rv = JOptionPane.showOptionDialog(
                     null,
@@ -50,7 +51,7 @@ public class InstallFromDiskCallback extends AbstractPluginTaskCallback {
                     JOptionPane.YES_NO_CANCEL_OPTION,
                     JOptionPane.INFORMATION_MESSAGE,
                     null,
-                    null,
+                    FineJOptionPane.OPTION_YES_NO_CANCEL,
                     null
             );
             if (rv == JOptionPane.NO_OPTION || rv == JOptionPane.CANCEL_OPTION || rv == JOptionPane.CLOSED_OPTION) {
@@ -70,7 +71,7 @@ public class InstallFromDiskCallback extends AbstractPluginTaskCallback {
                     JOptionPane.YES_NO_CANCEL_OPTION,
                     JOptionPane.INFORMATION_MESSAGE,
                     null,
-                    null,
+                    FineJOptionPane.OPTION_YES_NO_CANCEL,
                     null
             );
             if (rv == JOptionPane.NO_OPTION || rv == JOptionPane.CANCEL_OPTION || rv == JOptionPane.CLOSED_OPTION) {
@@ -80,7 +81,7 @@ public class InstallFromDiskCallback extends AbstractPluginTaskCallback {
         }else {
             jsCallback.execute("failed");
             FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Failed"));
-            JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Failed"), JOptionPane.ERROR_MESSAGE);
+            FineJOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Failed"), JOptionPane.ERROR_MESSAGE);
         }
     }
 }

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

@@ -1,6 +1,7 @@
 package com.fr.design.extra.exe.callback;
 
 import com.fr.design.bridge.exec.JSCallback;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.extra.PluginOperateUtils;
 
 import com.fr.log.FineLoggerFactory;
@@ -38,7 +39,7 @@ public class InstallOnlineCallback extends AbstractDealPreTaskCallback {
             String switchedInfo = PluginOperateUtils.getSwitchedInfo(result);
             jsCallback.execute("success");
             FineLoggerFactory.getLogger().info(pluginInfo + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Success") + switchedInfo);
-            JOptionPane.showMessageDialog(null, pluginInfo + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Success") + switchedInfo);
+            FineJOptionPane.showMessageDialog(null, pluginInfo + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Success") + switchedInfo);
         } else if(result.errorCode() == PluginErrorCode.HasLowerPluginWhenInstall){
             int rv = JOptionPane.showOptionDialog(
                     null,
@@ -47,7 +48,7 @@ public class InstallOnlineCallback extends AbstractDealPreTaskCallback {
                     JOptionPane.YES_NO_CANCEL_OPTION,
                     JOptionPane.INFORMATION_MESSAGE,
                     null,
-                    null,
+                    FineJOptionPane.OPTION_YES_NO_CANCEL,
                     null
             );
             if (rv == JOptionPane.CANCEL_OPTION || rv == JOptionPane.CLOSED_OPTION) {
@@ -58,7 +59,7 @@ public class InstallOnlineCallback extends AbstractDealPreTaskCallback {
         }else {
             jsCallback.execute("failed");
             FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Failed"));
-            JOptionPane.showMessageDialog(null, pluginInfo, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+            FineJOptionPane.showMessageDialog(null, pluginInfo, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
         }
     }
 

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

@@ -1,6 +1,7 @@
 package com.fr.design.extra.exe.callback;
 
 import com.fr.design.bridge.exec.JSCallback;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.extra.PluginUtils;
 
 import com.fr.plugin.manage.control.PluginTaskCallback;
@@ -24,9 +25,9 @@ public class ModifyStatusCallback implements PluginTaskCallback{
         if (result.isSuccess()) {
             jsCallback.execute("success");
             String modifyMessage = isActive ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Has_Been_Disabled_Duplicate") : com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Plugin_Has_Been_Actived_Duplicate");
-            JOptionPane.showMessageDialog(null, modifyMessage);
+            FineJOptionPane.showMessageDialog(null, modifyMessage);
         } else {
-            JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+            FineJOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
         }
     }
 

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

@@ -1,6 +1,7 @@
 package com.fr.design.extra.exe.callback;
 
 import com.fr.design.bridge.exec.JSCallback;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.extra.PluginUtils;
 
 import com.fr.log.FineLoggerFactory;
@@ -27,7 +28,7 @@ public class UninstallPluginCallback extends AbstractPluginTaskCallback {
         if (result.isSuccess()) {
             jsCallback.execute("success");
             FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Delete_Success"));
-            JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Delete_Success"));
+            FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Delete_Success"));
         }else if (result.errorCode() == PluginErrorCode.NeedUninstallDependingPluginFirst) {
             int rv = JOptionPane.showOptionDialog(
                     null,
@@ -36,7 +37,7 @@ public class UninstallPluginCallback extends AbstractPluginTaskCallback {
                     JOptionPane.YES_NO_CANCEL_OPTION,
                     JOptionPane.INFORMATION_MESSAGE,
                     null,
-                    null,
+                    FineJOptionPane.OPTION_YES_NO_CANCEL,
                     null
             );
             if (rv == JOptionPane.CANCEL_OPTION || rv == JOptionPane.CLOSED_OPTION) {
@@ -46,7 +47,7 @@ public class UninstallPluginCallback extends AbstractPluginTaskCallback {
         } else {
             jsCallback.execute("failed");
             FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Delete_Failed"));
-            JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+            FineJOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
         }
     }
 }

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

@@ -1,6 +1,7 @@
 package com.fr.design.extra.exe.callback;
 
 import com.fr.design.bridge.exec.JSCallback;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.extra.PluginOperateUtils;
 import com.fr.design.extra.PluginUtils;
 
@@ -39,7 +40,7 @@ public class UpdateFromDiskCallback extends AbstractPluginTaskCallback {
         if (result.isSuccess()) {
             jsCallback.execute("success");
             FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Success"));
-            JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Success"));
+            FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Success"));
         } else if (result.errorCode() == PluginErrorCode.NeedDealWithPluginDependency) {
             int rv = JOptionPane.showOptionDialog(
                     null,
@@ -48,7 +49,7 @@ public class UpdateFromDiskCallback extends AbstractPluginTaskCallback {
                     JOptionPane.YES_NO_CANCEL_OPTION,
                     JOptionPane.INFORMATION_MESSAGE,
                     null,
-                    null,
+                    FineJOptionPane.OPTION_YES_NO_CANCEL,
                     null
             );
             if (rv == JOptionPane.NO_OPTION || rv == JOptionPane.CANCEL_OPTION || rv == JOptionPane.CLOSED_OPTION) {
@@ -68,7 +69,7 @@ public class UpdateFromDiskCallback extends AbstractPluginTaskCallback {
                     JOptionPane.YES_NO_CANCEL_OPTION,
                     JOptionPane.INFORMATION_MESSAGE,
                     null,
-                    null,
+                    FineJOptionPane.OPTION_YES_NO_CANCEL,
                     null
             );
             if (rv == JOptionPane.NO_OPTION || rv == JOptionPane.CANCEL_OPTION || rv == JOptionPane.CLOSED_OPTION) {
@@ -78,7 +79,7 @@ public class UpdateFromDiskCallback extends AbstractPluginTaskCallback {
         }else {
             jsCallback.execute("failed");
             FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Failed"));
-            JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+            FineJOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
         }
     }
 }

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

@@ -1,6 +1,7 @@
 package com.fr.design.extra.exe.callback;
 
 import com.fr.design.bridge.exec.JSCallback;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.extra.PluginOperateUtils;
 
 import com.fr.log.FineLoggerFactory;
@@ -33,11 +34,11 @@ public class UpdateOnlineCallback extends AbstractDealPreTaskCallback {
         if (result.isSuccess()) {
             jsCallback.execute("success");
             FineLoggerFactory.getLogger().info(pluginInfo + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Success"));
-            JOptionPane.showMessageDialog(null,pluginInfo + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Success"));
+            FineJOptionPane.showMessageDialog(null,pluginInfo + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Success"));
         } else {
             jsCallback.execute("failed");
             FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Failed"));
-            JOptionPane.showMessageDialog(null, pluginInfo, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+            FineJOptionPane.showMessageDialog(null, pluginInfo, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
         }
     }
 }

designer-base/src/main/java/com/fr/design/extra/tradition/callback/UpdateOnlineCallback.java

@@ -1,5 +1,6 @@
 package com.fr.design.extra.tradition.callback;
 
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.extra.PluginStatusCheckCompletePane;
 import com.fr.design.extra.PluginUtils;
 
@@ -32,7 +33,7 @@ public class UpdateOnlineCallback implements ProgressCallback {
     public void done(PluginTaskResult result){
         if (result.isSuccess()) {
             FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Update_Success"));
-            JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Successful"));
+            FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Successful"));
         } else if (result.errorCode() == PluginErrorCode.OperationNotSupport) {
             int rv = JOptionPane.showOptionDialog(
                     null,
@@ -41,7 +42,7 @@ public class UpdateOnlineCallback implements ProgressCallback {
                     JOptionPane.YES_NO_CANCEL_OPTION,
                     JOptionPane.INFORMATION_MESSAGE,
                     null,
-                    null,
+                    FineJOptionPane.OPTION_YES_NO_CANCEL,
                     null
             );
             if (rv == JOptionPane.CANCEL_OPTION || rv == JOptionPane.CLOSED_OPTION) {
@@ -50,7 +51,7 @@ public class UpdateOnlineCallback implements ProgressCallback {
             PluginManager.getController().update(pluginMarker, toPluginMarker, new UpdateOnlineCallback(pluginMarker, toPluginMarker, pane));
         } else {
             FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Delete_Failed"));
-            JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+            FineJOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
         }
     }
 }

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

@@ -386,4 +386,17 @@ public class HistoryTemplateListCache implements CallbackEvent {
         }
         FineLoggerFactory.getLogger().info("Env Change Template Loaded.");
     }
+
+    /**
+     * 重新载入当前模板，刷新数据/对象
+     */
+    public void reloadCurrentTemplate() {
+        JTemplate<?, ?> jt = getCurrentEditingTemplate();
+        boolean access = jt != null && jt.getEditingFILE() != null && jt.getEditingFILE().exists();
+        if (access) {
+            closeSelectedReport(jt);
+            DesignerContext.getDesignerFrame().openTemplate(jt.getEditingFILE());
+        }
+    }
+
 }

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

@@ -5,6 +5,7 @@ import com.fr.base.BaseUtils;
 import com.fr.base.GraphHelper;
 import com.fr.base.vcs.DesignerMode;
 import com.fr.design.constants.UIConstants;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.imenu.UIMenuItem;
 import com.fr.design.gui.imenu.UIScrollPopUpMenu;
 import com.fr.design.i18n.Toolkit;
@@ -678,8 +679,8 @@ public class MutilTempalteTabPane extends JComponent {
 
         if (!specifiedTemplate.isALLSaved() && !DesignerMode.isVcsMode()) {
             specifiedTemplate.stopEditing();
-            int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Save") + " \"" + specifiedTemplate.getEditingFILE() + "\" ?",
+            int returnVal = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Save") + " \"" + specifiedTemplate.getEditingFILE() + "\" ?",
-                    ProductConstants.PRODUCT_NAME, JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
+                    Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
             if (returnVal == JOptionPane.YES_OPTION) {
                 specifiedTemplate.saveTemplate();
                 FineLoggerFactory.getLogger().info(Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName()));
@@ -931,7 +932,7 @@ public class MutilTempalteTabPane extends JComponent {
                     //如果在权限编辑情况下，不允许切换到表单类型的工作簿
                     if (DesignerMode.isAuthorityEditing() && !openedTemplate.get(selectedIndex).isJWorkBook()) {
                         DesignerContext.getDesignerFrame().addAndActivateJTemplate(openedTemplate.get(tempSelectedIndex));
-                        JOptionPane.showMessageDialog(MutilTempalteTabPane.this, Toolkit.i18nText("Fine-Design_Basic_Form_Authority_Edited_Cannot_Be_Supported")
+                        FineJOptionPane.showMessageDialog(MutilTempalteTabPane.this, Toolkit.i18nText("Fine-Design_Basic_Form_Authority_Edited_Cannot_Be_Supported")
                                 + "!", Toolkit.i18nText("Fine-Design_Basic_Alert"), JOptionPane.WARNING_MESSAGE);
                         MutilTempalteTabPane.this.repaint();
                         return;

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

@@ -4,6 +4,7 @@
 package com.fr.design.file;
 
 import com.fr.base.FRContext;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.itree.filetree.TemplateFileTree;
 import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
@@ -254,16 +255,16 @@ public class TemplateTreePane extends JPanel implements FileOperations {
                             ? Toolkit.i18nText("Fine-Design_Basic_Confirm_Delete_Folder")
                             : Toolkit.i18nText("Fine-Design_Basic_Confirm_Delete_File");
 
-            if (JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(),
+            if (FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(),
                     tipContent,
-                    UIManager.getString("OptionPane.messageDialogTitle"),
+                    Toolkit.i18nText("Fine-Design_Basic_Confirm"),
                     YES_NO_OPTION)
                     == JOptionPane.YES_OPTION) {
                 // 删除所有选中的即可
                 if (!deleteNodes(Arrays.asList(treeNodes))) {
-                    JOptionPane.showConfirmDialog(null,
+                    FineJOptionPane.showConfirmDialog(null,
                             Toolkit.i18nText("Fine-Design_Basic_Delete_Failure"),
-                            UIManager.getString("OptionPane.messageDialogTitle"),
+                            Toolkit.i18nText("Fine-Design_Basic_Error"),
                             JOptionPane.DEFAULT_OPTION,
                             JOptionPane.ERROR_MESSAGE);
                 }
@@ -277,24 +278,24 @@ public class TemplateTreePane extends JPanel implements FileOperations {
 
             if (deletableNodes.isEmpty()) {
                 // 提醒被锁定模板无法删除
-                JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
+                FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
                         Toolkit.i18nText("Fine-Design_Basic_Unable_Delete_Locked_File"),
-                        Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
+                        Toolkit.i18nText("Fine-Design_Basic_Alert"),
                         WARNING_MESSAGE);
                 return;
             }
 
 
-            if (JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(),
+            if (FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(),
                     tipContent,
-                    UIManager.getString("OptionPane.messageDialogTitle"),
+                    Toolkit.i18nText("Fine-Design_Basic_Confirm"),
                     YES_NO_OPTION)
                     == JOptionPane.YES_OPTION) {
                 // 删除其他
                 if (!deleteNodes(deletableNodes)) {
-                    JOptionPane.showConfirmDialog(null,
+                    FineJOptionPane.showConfirmDialog(null,
                             Toolkit.i18nText("Fine-Design_Basic_Delete_Failure"),
-                            UIManager.getString("OptionPane.messageDialogTitle"),
+                            Toolkit.i18nText("Fine-Design_Basic_Error"),
                             JOptionPane.DEFAULT_OPTION,
                             JOptionPane.ERROR_MESSAGE);
                 }
@@ -415,9 +416,9 @@ public class TemplateTreePane extends JPanel implements FileOperations {
         }
 
         if (!lockedNodes.isEmpty()) {
-            JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(),
+            FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(),
                     Toolkit.i18nText("Fine-Design_Basic_Warn_Rename_Lock_File"),
-                    UIManager.getString("OptionPane.messageDialogTitle"),
+                    Toolkit.i18nText("Fine-Design_Basic_Alert"),
                     JOptionPane.DEFAULT_OPTION, JOptionPane.WARNING_MESSAGE);
             return true;
         }

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

@@ -8,6 +8,7 @@ import com.fr.design.border.UIRoundedBorder;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.BasicPane;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.ilable.UILabel;
@@ -583,14 +584,15 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
                     // alex:继续往下面走,expression为null时告知不合法公式
                 }
 
-                JOptionPane.showMessageDialog(
+                FineJOptionPane.showMessageDialog(
                         FormulaPane.this,
                         /*
                         * alex:仅仅只需要根据expression是否为null作合法性判断
                         * 不需要eval
                         * TODO 但有个问题,有些函数的参数个数是有规定的,何以判别之
                         */
-                        (expression != null ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Valid_Formula") : com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Invalid_Formula")) + ".", ProductConstants.PRODUCT_NAME,
+                        (expression != null ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Valid_Formula") : com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Invalid_Formula")) + ".",
+                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
                         JOptionPane.INFORMATION_MESSAGE);
             }
         }

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

@@ -2,6 +2,7 @@ package com.fr.design.formula;
 
 import com.fr.base.FRContext;
 import com.fr.design.dialog.BasicPane;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.ilable.UILabel;
@@ -161,11 +162,11 @@ public class JavaEditorPane extends BasicPane {
         }
         try {
             WorkContext.getWorkResource().write(StableUtils.pathJoin(ProjectConstants.CLASSES_NAME, getJavaPath()), text.getBytes(EncodeConstants.ENCODING_UTF_8));
-            JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Common_Save_Successfully") + "！");
+            FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Common_Save_Successfully") + "！");
             fireSaveActionListener();
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
-            JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Common_Save_Failed") + "！");
+            FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Common_Save_Failed") + "！");
         }
 
     }
@@ -191,7 +192,7 @@ public class JavaEditorPane extends BasicPane {
                         if (StringUtils.isEmpty(message)) {
                             message = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Compile_Success") + "!";
                         }
-                        JOptionPane.showMessageDialog(null, message);
+                        FineJOptionPane.showMessageDialog(null, message);
                     } catch (InterruptedException e1) {
                         FineLoggerFactory.getLogger().error(e1.getMessage(), e1);
                         Thread.currentThread().interrupt();

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

@@ -0,0 +1,34 @@
+package com.fr.design.fun;
+
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.form.ui.mobile.MobileBookMarkStyle;
+import com.fr.stable.fun.mark.Mutable;
+
+/**
+ * 移动端书签样式扩展接口
+ *
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2019/12/23
+ */
+public interface MobileBookMarkStyleProvider extends Mutable {
+
+    String XML_TAG = "MobileBookMarkStyleProvider";
+
+    int CURRENT_LEVEL = 1;
+
+    /**
+     * 书签样式
+     * @return
+     */
+    Class<? extends MobileBookMarkStyle> classForMobileBookMarkStyle();
+
+    /**
+     * 书签样式面板
+     * @return
+     */
+    Class<? extends BasicBeanPane<MobileBookMarkStyle>> classForMobileBookMarkStyleAppearance();
+
+    String displayName();
+
+}

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

@@ -0,0 +1,24 @@
+package com.fr.design.fun.impl;
+
+import com.fr.design.fun.MobileBookMarkStyleProvider;
+import com.fr.stable.fun.impl.AbstractProvider;
+import com.fr.stable.fun.mark.API;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2019/12/24
+ */
+@API(level = MobileBookMarkStyleProvider.CURRENT_LEVEL)
+public abstract class AbstractMobileBookMarkStyleProvider extends AbstractProvider implements MobileBookMarkStyleProvider {
+
+    @Override
+    public int currentAPILevel() {
+        return CURRENT_LEVEL;
+    }
+
+    @Override
+    public String mark4Provider() {
+        return getClass().getName();
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.fr.design.gui.controlpane;
 
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.ilist.JNameEdList;
 import com.fr.design.gui.ilist.ListModelElement;
 import com.fr.stable.Nameable;
@@ -32,7 +33,7 @@ class ListControlPaneHelper {
             try {
                 listControlPane.checkValid();
             } catch (Exception exp) {
-                JOptionPane.showMessageDialog((Component) listControlPane, exp.getMessage());
+                FineJOptionPane.showMessageDialog((Component) listControlPane, exp.getMessage());
                 listControlPane.setSelectedIndex(idx);
                 return true;
             }

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

@@ -1,6 +1,7 @@
 package com.fr.design.gui.controlpane;
 
 import com.fr.design.constants.UIConstants;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.controlpane.shortcutfactory.ShortCutFactory;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itoolbar.UIToolBarUI;
@@ -250,7 +251,7 @@ abstract class UIControlPane extends JControlPane {
             } catch (Exception exp) {
                 // 存在非法输入 拒绝隐藏
                 this.setAlwaysOnTop(true);
-                JOptionPane.showMessageDialog(this, exp.getMessage());
+                FineJOptionPane.showMessageDialog(this, exp.getMessage());
                 this.requestFocus();
                 return;
             }

designer-base/src/main/java/com/fr/design/gui/frpane/CommitTabbedPane.java

@@ -3,6 +3,7 @@ package com.fr.design.gui.frpane;
 
 import com.fr.base.BaseUtils;
 import com.fr.design.constants.UIConstants;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.write.submit.DBManipulationPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.javascript.Commit2DBJavaScriptPane;
@@ -408,7 +409,7 @@ public  class CommitTabbedPane extends JComponent implements MouseListener, Mous
             selectedIndex = dbManipulationPaneList.size()-1;
             commit2DBJavaScriptPane.updateCardPane();
         } else if (isOverCloseIcon(x)){
-            int re = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_CommitTab_Sure_To_Delete")+ "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_CommitTab_Remove")
+            int re = FineJOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_CommitTab_Sure_To_Delete")+ "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_CommitTab_Remove")
                     , JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
             if (re == JOptionPane.OK_OPTION) {
                 dbManipulationPaneList.remove(getTabIndex(x));

designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java

@@ -1,6 +1,7 @@
 package com.fr.design.gui.frpane;
 
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.utils.gui.GUICoreUtils;
@@ -127,7 +128,7 @@ public abstract class EditingStringListPane extends BasicBeanPane<List<String>>
 						setAddEnabled(false);
 					}
 				} else {
-					JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(EditingStringListPane.this), newvalue + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Already_Exists_Not_Add_Repeat")+"!");
+					FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(EditingStringListPane.this), newvalue + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Already_Exists_Not_Add_Repeat")+"!");
 				}
 			}
 		});
@@ -149,7 +150,7 @@ public abstract class EditingStringListPane extends BasicBeanPane<List<String>>
 			public void actionPerformed(ActionEvent e) {
 				Object selected = jlist.getSelectedValue();
 				if (selected != null) {
-					int re = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(EditingStringListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Sure_To_Delete") + selected.toString() + "?");
+					int re = FineJOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(EditingStringListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Sure_To_Delete") + selected.toString() + "?");
 					if (re == JOptionPane.OK_OPTION) {
 						JListUtils.removeSelectedListItems(jlist);
 					}

designer-base/src/main/java/com/fr/design/gui/frpane/HyperlinkGroupPane.java

@@ -2,6 +2,7 @@ package com.fr.design.gui.frpane;
 
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.designer.TargetComponent;
+import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.fun.HyperlinkProvider;
 import com.fr.design.gui.controlpane.NameableCreator;
 import com.fr.design.gui.controlpane.UIListControlPane;
@@ -45,6 +46,7 @@ public abstract class HyperlinkGroupPane extends UIListControlPane {
             @Override
             public void on(PluginEvent event) {
                 refreshNameableCreator(createNameableCreators());
+                HistoryTemplateListCache.getInstance().reloadCurrentTemplate();
             }
         }, new PluginFilter() {
 

designer-base/src/main/java/com/fr/design/gui/frpane/JTreeControlPane.java

@@ -5,6 +5,7 @@ import com.fr.data.impl.TreeNodeAttr;
 import com.fr.data.impl.TreeNodeWrapper;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.controlpane.ControlPane;
 import com.fr.design.gui.controlpane.NameableCreator;
 import com.fr.design.gui.controlpane.UnrepeatedNameHelper;
@@ -231,7 +232,7 @@ public class JTreeControlPane extends ControlPane {
 
         public void actionPerformed(ActionEvent e) {
             // TODO remove tree node
-            int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?",
+            int val = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?",
                     com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
             if (val != JOptionPane.OK_OPTION) {
                 return;

designer-base/src/main/java/com/fr/design/gui/frpane/UITabbedPane.java

@@ -1,5 +1,6 @@
 package com.fr.design.gui.frpane;
 
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.general.ComparatorUtils;
 
 
@@ -113,7 +114,7 @@ public class UITabbedPane extends JTabbedPane{
      * @param i tab索引
      */
     public void doRemoveTab(int i){
-        int re = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(UITabbedPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Sure_To_Delete")+ "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove")
+        int re = FineJOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(UITabbedPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Sure_To_Delete")+ "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove")
                 , JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
         if (re == JOptionPane.OK_OPTION) {
             super.removeTabAt(i);

designer-base/src/main/java/com/fr/design/gui/frpane/tree/layer/config/LayerDataControlPane.java

@@ -2,6 +2,7 @@ package com.fr.design.gui.frpane.tree.layer.config;
 
 import com.fr.base.BaseUtils;
 import com.fr.design.actions.UpdateAction;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.controlpane.ControlPane;
 import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.itoolbar.UIToolbar;
@@ -177,7 +178,7 @@ public class LayerDataControlPane extends ControlPane {
 
         public void actionPerformed(ActionEvent e) {
             // TODO remove tree node
-            int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?",
+            int val = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?",
                 com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
             if (val != JOptionPane.OK_OPTION) {
                 return;

designer-base/src/main/java/com/fr/design/gui/ibutton/UIColorButton.java

@@ -1,19 +1,5 @@
 package com.fr.design.gui.ibutton;
 
-import java.awt.*;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-
-import javax.swing.AbstractButton;
-import javax.swing.ButtonModel;
-import javax.swing.Icon;
-import javax.swing.JComponent;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import javax.swing.event.EventListenerList;
-
 import com.fr.base.Utils;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.event.GlobalNameListener;
@@ -21,9 +7,21 @@ import com.fr.design.event.GlobalNameObserver;
 import com.fr.design.event.UIObserver;
 import com.fr.design.event.UIObserverListener;
 import com.fr.design.gui.ipoppane.PopupHider;
-import com.fr.general.ComparatorUtils;
 import com.fr.design.style.color.ColorControlWindow;
 import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.general.ComparatorUtils;
+
+import javax.swing.AbstractButton;
+import javax.swing.ButtonModel;
+import javax.swing.Icon;
+import javax.swing.JComponent;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.swing.event.EventListenerList;
+import java.awt.Color;
+import java.awt.Graphics;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 
 public class UIColorButton extends UIButton implements PopupHider, UIObserver, GlobalNameObserver {
     private static final int SIZE = 16;
@@ -136,10 +134,9 @@ public class UIColorButton extends UIButton implements PopupHider, UIObserver, G
     public void hidePopupMenu() {
         if (popupWin != null) {
             popupWin.setVisible(false);
-			repaint();
         }
-
         popupWin = null;
+        repaint();
     }
 
     private ColorControlWindow getColorControlWindow() {
@@ -169,6 +166,7 @@ public class UIColorButton extends UIButton implements PopupHider, UIObserver, G
     /**
      * 移除监听
      * Removes an old ColorChangeListener.
+     *
      * @param changeListener 监听列表
      */
     public void removeColorChangeListener(ChangeListener changeListener) {
@@ -228,24 +226,4 @@ public class UIColorButton extends UIButton implements PopupHider, UIObserver, G
     public boolean shouldResponseNameListener() {
         return true;
     }
-
-	/**
-	 * 主函数
-	 * 
-	 * @param args 参数
-	 */
-	public static void main(String... args) {
-		LayoutManager layoutManager = null;
-		JFrame jf = new JFrame("test");
-		jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-		JPanel content = (JPanel) jf.getContentPane();
-		content.setLayout(layoutManager);
-
-		UIColorButton bb = new UIColorButton(UIConstants.FONT_ICON);
-		bb.setBounds(20, 20, bb.getPreferredSize().width, bb.getPreferredSize().height);
-		content.add(bb);
-		GUICoreUtils.centerWindow(jf);
-		jf.setSize(400, 400);
-		jf.setVisible(true);
-	}
 }

designer-base/src/main/java/com/fr/design/gui/ibutton/UIRadioButton.java

@@ -25,36 +25,43 @@ public class UIRadioButton extends JRadioButton implements UIObserver, GlobalNam
     public UIRadioButton() {
         super();
         initListener();
+        initComponent();
     }
 
     public UIRadioButton(Icon icon) {
         super(icon);
         initListener();
+        initComponent();
     }
 
     public UIRadioButton(Action a) {
         super(a);
         initListener();
+        initComponent();
     }
 
     public UIRadioButton(Icon icon, boolean selected) {
         super(icon, selected);
         initListener();
+        initComponent();
     }
 
     public UIRadioButton(String text) {
         super(text);
         initListener();
+        initComponent();
     }
 
     public UIRadioButton(String text, boolean selected) {
         super(text, selected);
         initListener();
+        initComponent();
     }
 
     public UIRadioButton(String text, Icon icon) {
         super(text, icon);
         initListener();
+        initComponent();
     }
 
 
@@ -81,6 +88,10 @@ public class UIRadioButton extends JRadioButton implements UIObserver, GlobalNam
         }
     }
 
+    private void initComponent() {
+        this.setFocusPainted(false);
+    }
+
     /**
      * 给组件登记一个观察者监听事件
      *

designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTableUI.java

@@ -10,6 +10,7 @@ import javax.swing.event.MouseInputListener;
 
 import com.fr.base.GraphHelper;
 import com.fr.design.constants.UIConstants;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.itable.UITableUI;
 import com.fr.design.mainframe.DesignerContext;
 
@@ -74,7 +75,7 @@ public class UIMenuTableUI extends UITableUI{
 			@Override
 			public void mousePressed(MouseEvent e) {
 				if (e.getX() >= table.getWidth() - 20) {
-					int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?",
+					int val = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?",
 							com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
 					if (val == JOptionPane.OK_OPTION) {
 						uiTable.removeLine(table.rowAtPoint(e.getPoint()));

designer-base/src/main/java/com/fr/design/gui/itable/UITableUI.java

@@ -19,6 +19,7 @@ import javax.swing.table.TableModel;
 
 import com.fr.base.BaseUtils;
 import com.fr.design.constants.UIConstants;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.mainframe.DesignerContext;
 
 import com.fr.stable.Constants;
@@ -132,7 +133,7 @@ public class UITableUI extends BasicTableUI {
                     return;
                 }
                 if (!table.isEditing()) {
-                    int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?",
+                    int val = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?",
                             com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
                     if (val == JOptionPane.OK_OPTION) {
                         ((UITable) table).removeLine(table.rowAtPoint(e.getPoint()));

designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java

@@ -1,6 +1,7 @@
 package com.fr.design.gui.itableeditorpane;
 
 import com.fr.base.BaseUtils;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.log.FineLoggerFactory;
 
@@ -207,7 +208,7 @@ public abstract class UITableModelAdapter<T extends Object> extends AbstractTabl
 		public void actionPerformed(ActionEvent e) {
 			final int selectedRow = table.getSelectedRow();
 			if (selectedRow > table.getRowCount() - 1 || selectedRow < 0) {
-				JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_No-Alternatives"));
+				FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_No-Alternatives"));
 				return;
 			}
 			stopCellEditing();
@@ -251,7 +252,7 @@ public abstract class UITableModelAdapter<T extends Object> extends AbstractTabl
 			if(component == null){
 				component = DesignerContext.getDesignerFrame();
 			}
-			int val = JOptionPane.showConfirmDialog(component,
+			int val = FineJOptionPane.showConfirmDialog(component,
 					com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"),
 					JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
 			if (val != JOptionPane.OK_OPTION) {

designer-base/src/main/java/com/fr/design/gui/style/BackgroundPane.java

@@ -32,7 +32,7 @@ public class BackgroundPane extends AbstractBasicStylePane {
     protected BackgroundQuickPane[] paneList;
 
     //获取当前面板
-    protected JPanel currentPane = null;
+    protected BackgroundQuickPane currentPane = null;
 
 
     public BackgroundPane() {
@@ -43,7 +43,6 @@ public class BackgroundPane extends AbstractBasicStylePane {
         this.setLayout(new BorderLayout(0, 6));
         typeComboBox = new UIComboBox();
         final CardLayout cardlayout = new CardLayout();
-//        this.add(typeComboBox, BorderLayout.NORTH);
 
         paneList = supportKindsOfBackgroundUI();
 
@@ -58,12 +57,12 @@ public class BackgroundPane extends AbstractBasicStylePane {
             typeComboBox.addItem(pane.title4PopupWindow());
             centerPane.add(pane, pane.title4PopupWindow());
         }
-//        this.add(centerPane, BorderLayout.CENTER);
         typeComboBox.addItemListener(new ItemListener() {
 
             @Override
             public void itemStateChanged(ItemEvent e) {
                 cardlayout.show(centerPane, (String) typeComboBox.getSelectedItem());
+                currentPane = paneList[typeComboBox.getSelectedIndex()];
                 fireStateChanged();
             }
         });

designer-base/src/main/java/com/fr/design/gui/style/BorderPane.java

@@ -16,7 +16,6 @@ import com.fr.design.gui.icombobox.LineComboBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
-import com.fr.design.mainframe.backgroundpane.ColorBackgroundQuickPane;
 import com.fr.design.style.color.NewColorSelectBox;
 
 import com.fr.stable.Constants;
@@ -28,6 +27,7 @@ import javax.swing.event.ChangeListener;
 import java.awt.*;
 import java.util.Arrays;
 import java.util.HashSet;
+import java.util.Set;
 
 /**
  * @author zhou
@@ -37,6 +37,7 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse
 
     private static final String[] BORDERARRAY = {"currentLineCombo", "currentLineColorPane", "outerToggleButton", "topToggleButton",
             "leftToggleButton", "bottomToggleButton", "rightToggleButton", "innerToggleButton", "horizontalToggleButton", "verticalToggleButton"};
+    private static final Set<String> BORDER_SET = new HashSet<>(Arrays.asList(BORDERARRAY));
     private boolean insideMode = false;
 
     private UIToggleButton topToggleButton;
@@ -193,26 +194,21 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse
         this.verticalToggleButton.setEnabled(this.insideMode);
     }
 
+    @Override
     public Style update(Style style) {
 
         if (style == null) {
             style = Style.DEFAULT_STYLE;
         }
 
-        CellBorderStyle cellBorderStyle = this.update();
+        if (backgroundPane.currentPane.isBackgroundChange()) {
-        HashSet<String> borderSet = new HashSet<String>(Arrays.asList(BORDERARRAY));
             style = style.deriveBackground(backgroundPane.update());
-        if (backgroundPane.currentPane != backgroundPane.paneList[1]){
-            if (borderSet.contains(globalNameListener.getGlobalName())) {
-                style = style.deriveBorder(cellBorderStyle.getTopStyle(), cellBorderStyle.getTopColor(), cellBorderStyle.getBottomStyle(), cellBorderStyle.getBottomColor(),
-                        cellBorderStyle.getLeftStyle(), cellBorderStyle.getLeftColor(), cellBorderStyle.getRightStyle(), cellBorderStyle.getRightColor());
         }
-        }else {
+        if (BORDER_SET.contains(globalNameListener.getGlobalName())) {
-            if (borderSet.contains(globalNameListener.getGlobalName()) && !((ColorBackgroundQuickPane) backgroundPane.currentPane).isBackGroundColor()){
+            CellBorderStyle cellBorderStyle = this.update();
             style = style.deriveBorder(cellBorderStyle.getTopStyle(), cellBorderStyle.getTopColor(), cellBorderStyle.getBottomStyle(), cellBorderStyle.getBottomColor(),
                                        cellBorderStyle.getLeftStyle(), cellBorderStyle.getLeftColor(), cellBorderStyle.getRightStyle(), cellBorderStyle.getRightColor());
         }
-        }
 
         return style;
     }

designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperlinkPane.java

@@ -2,6 +2,7 @@ package com.fr.design.hyperlink;
 
 import com.fr.base.BaseUtils;
 import com.fr.base.Parameter;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.frpane.ReportletParameterViewPane;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.itableeditorpane.ParameterTableModel;
@@ -122,7 +123,7 @@ public class ReportletHyperlinkPane extends AbstractHyperLinkPane<ReportletHyper
         public void actionPerformed(ActionEvent e) {
             String tpl = northPane.getReportletName();
             if (StringUtils.isBlank(tpl)) {
-                JOptionPane.showMessageDialog(ReportletHyperlinkPane.this, Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Please_Select_Reportlet") + ".", Toolkit.i18nText("Fine-Design_Basic_Message"), JOptionPane.WARNING_MESSAGE);
+                FineJOptionPane.showMessageDialog(ReportletHyperlinkPane.this, Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Please_Select_Reportlet") + ".", Toolkit.i18nText("Fine-Design_Basic_Alert"), JOptionPane.WARNING_MESSAGE);
                 northPane.requestButtonFocus();
                 return;
             }

designer-base/src/main/java/com/fr/design/javascript/JavaScriptActionPane.java

@@ -144,7 +144,8 @@ public abstract class JavaScriptActionPane extends UIComboBoxPane<JavaScript> {
         return contentDBManiPane;
     }
 
-    public static JavaScriptActionPane defaultJavaScriptActionPane = new JavaScriptActionPane() {
+    public static JavaScriptActionPane createDefaultJavaScriptActionPane() {
+        return new JavaScriptActionPane() {
 
             private static final long serialVersionUID = 1L;
 
@@ -164,10 +165,12 @@ public abstract class JavaScriptActionPane extends UIComboBoxPane<JavaScript> {
                 return false;
             }
 
+            @Override
             public String[] getDefaultArgs() {
                 return new String[0];
             }
         };
+    }
 
     /**
      * 生成界面默认的组建

designer-base/src/main/java/com/fr/design/locale/impl/SplashMark.java

@@ -15,14 +15,13 @@ import java.util.Map;
 public class SplashMark implements LocaleMark<String> {
 
     private Map<Locale, String> map = new HashMap<Locale, String>();
-    private static final String SPLASH_PATH = "/com/fr/design/images/splash_10.gif";
+    private static final String SPLASH_PATH = "/com/fr/design/images/splash_10.png";
-    private static final String SPLASH_EN_PATH = "/com/fr/design/images/splash_10_en.gif";
+    private static final String SPLASH_EN_PATH = "/com/fr/design/images/splash_10_en.png";
-    private static final String SPLASH_JP_PATH = "/com/fr/design/images/splash_10_jp.gif";
 
     public SplashMark() {
         map.put(Locale.CHINA, SPLASH_PATH);
         map.put(Locale.KOREA, SPLASH_EN_PATH);
-        map.put(Locale.JAPAN, SPLASH_JP_PATH);
+        map.put(Locale.JAPAN, SPLASH_EN_PATH);
         map.put(Locale.US, SPLASH_EN_PATH);
         map.put(Locale.TAIWAN, SPLASH_EN_PATH);
     }

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

@@ -13,6 +13,7 @@ import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.data.datapane.TableDataTreePane;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.env.DesignerWorkspaceInfo;
 import com.fr.design.event.DesignerOpenedListener;
 import com.fr.design.event.TargetModifiedEvent;
@@ -180,7 +181,8 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
 
         @Override
         public void windowClosing(WindowEvent e) {
-
+            //关闭前当前模板 停止编辑
+            HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().stopEditing();
             SaveSomeTemplatePane saveSomeTempaltePane = new SaveSomeTemplatePane(true);
             // 只有一个文件未保存时
             if (HistoryTemplateListCache.getInstance().getHistoryCount() == 1) {
@@ -919,9 +921,9 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
         } else {
             editingTemplate.stopEditing();
             if (!editingTemplate.getEditingFILE().exists()) {
-                int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(),
+                int returnVal = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(),
                         Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Save") + " \"" + editingTemplate.getEditingFILE()
-                                + "\" ?", ProductConstants.PRODUCT_NAME, JOptionPane.YES_NO_OPTION,
+                                + "\" ?", Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION,
                         JOptionPane.QUESTION_MESSAGE);
                 if (returnVal == JOptionPane.YES_OPTION && editingTemplate.saveTemplate()) {
                     editingTemplate.saveTemplate();
@@ -1033,10 +1035,10 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
 
         // p:判断一下，如何文件为空或者文件不存在，直接返回.
         if (tplFile == null || !tplFile.exists()) {
-            JOptionPane.showMessageDialog(
+            FineJOptionPane.showMessageDialog(
                     this,
                     Toolkit.i18nText("Fine-Design_Basic_Warning_Template_Do_Not_Exsit"),
-                    ProductConstants.PRODUCT_NAME,
+                    Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
                     JOptionPane.INFORMATION_MESSAGE
             );
             DesignerFrameFileDealerPane.getInstance().refresh();
@@ -1046,10 +1048,10 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
         try {
             openFile(tplFile);
         } catch (DecryptTemplateException e) {
-            JOptionPane.showMessageDialog(
+            FineJOptionPane.showMessageDialog(
                     this,
                     Toolkit.i18nText("Fine-Design_Encrypt_Decrypt_Exception"),
-                    UIManager.getString("OptionPane.messageDialogTitle"),
+                    Toolkit.i18nText("Fine-Design_Basic_Alert"),
                     JOptionPane.WARNING_MESSAGE,
                     UIManager.getIcon("OptionPane.errorIcon")
             );

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

@@ -11,6 +11,7 @@ import com.fr.design.constants.UIConstants;
 import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.data.datapane.TableDataTreePane;
 import com.fr.design.data.tabledata.ResponseDataSourceChange;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.file.FileOperations;
 import com.fr.design.file.FileToolbarStateChangeListener;
 import com.fr.design.file.HistoryTemplateListCache;
@@ -324,9 +325,9 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         public void actionPerformed(ActionEvent evt) {
 
             if (!selectedOperation.access()) {
-                JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
+                FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
                         Toolkit.i18nText("Fine-Design_Basic_Template_Permission_Denied"),
-                        Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
+                        Toolkit.i18nText("Fine-Design_Basic_Alert"),
                         WARNING_MESSAGE);
                 return;
             }
@@ -466,9 +467,9 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         @Override
         public void actionPerformed(ActionEvent evt) {
             if (!selectedOperation.access()) {
-                JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
+                FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
                         Toolkit.i18nText("Fine-Design_Basic_Template_Permission_Denied"),
-                        Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
+                        Toolkit.i18nText("Fine-Design_Basic_Alert"),
                         WARNING_MESSAGE);
                 return;
             }
@@ -477,9 +478,9 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
             String lock = node.getLock();
             if (lock != null && !lock.equals(node.getUserID())) {
                 // 提醒被锁定模板无法重命名
-                JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
+                FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
                         Toolkit.i18nText("Fine-Design_Basic_Unable_Rename_Locked_File"),
-                        Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
+                        Toolkit.i18nText("Fine-Design_Basic_Alert"),
                         WARNING_MESSAGE);
                 return;
             }
@@ -506,9 +507,9 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         public void actionPerformed(ActionEvent evt) {
 
             if (!selectedOperation.access()) {
-                JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
+                FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
                         Toolkit.i18nText("Fine-Design_Basic_Template_Permission_Denied"),
-                        Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
+                        Toolkit.i18nText("Fine-Design_Basic_Alert"),
                         WARNING_MESSAGE);
                 return;
             }
@@ -705,9 +706,9 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
                 selectedOperation.refresh();
                 DesignerContext.getDesignerFrame().setTitle();
             } else {
-                JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(),
+                FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(),
                         Toolkit.i18nText("Fine-Design_Basic_Rename_Failure"),
-                        UIManager.getString("OptionPane.messageDialogTitle"),
+                        Toolkit.i18nText("Fine-Design_Basic_Error"),
                         JOptionPane.DEFAULT_OPTION,
                         JOptionPane.ERROR_MESSAGE);
             }
@@ -896,9 +897,9 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
             selectedOperation.refresh();
             this.dispose();
             if (!success) {
-                JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(),
+                FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(),
                         Toolkit.i18nText("Fine-Design_Basic_Make_Failure"),
-                        UIManager.getString("OptionPane.messageDialogTitle"),
+                        Toolkit.i18nText("Fine-Design_Basic_Error"),
                         JOptionPane.DEFAULT_OPTION,
                         JOptionPane.ERROR_MESSAGE);
             }

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

@@ -458,10 +458,15 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
     }
 
     private void refreshContainer() {
+        SwingUtilities.invokeLater(new Runnable() {
+            @Override
+            public void run() {
                 validate();
                 repaint();
                 revalidate();
             }
+        });
+    }
 
     public int getToolPaneY() {
         return 0;

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

@@ -21,6 +21,7 @@ import com.fr.design.actions.file.WebPreviewUtils;
 import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.designer.DesignerProxy;
 import com.fr.design.designer.TargetComponent;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.dialog.InformationWarnPane;
 import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.file.TemplateTreePane;
@@ -540,7 +541,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
         if (!access) {
-            JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Permission_Denied") + "!", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Message"), JOptionPane.WARNING_MESSAGE);
+            FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Permission_Denied") + "!", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Alert"), JOptionPane.WARNING_MESSAGE);
             return false;
         }
         collectInfo();
@@ -594,10 +595,10 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
                 FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
             if (!access) {
-                JOptionPane.showMessageDialog(
+                FineJOptionPane.showMessageDialog(
                         DesignerContext.getDesignerFrame(),
                         Toolkit.i18nText("Fine-Design_Basic_Template_Permission_Denied") + "!",
-                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Message"),
+                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Alert"),
                         JOptionPane.WARNING_MESSAGE);
                 return false;
             }
@@ -618,10 +619,10 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
             }
             return saved;
         } else {
-            JOptionPane.showMessageDialog(
+            FineJOptionPane.showMessageDialog(
                     DesignerContext.getDesignerFrame(),
                     Toolkit.i18nText("Fine-Design-Basic_Save_Failure"),
-                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Message"),
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Alert"),
                     JOptionPane.WARNING_MESSAGE);
             return false;
         }

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

@@ -2,6 +2,7 @@ package com.fr.design.mainframe;
 
 
 import com.fr.base.vcs.DesignerMode;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.roleAuthority.RolesAlreadyEditedPane;
 
 
@@ -43,7 +44,7 @@ public class UndoStateEdit extends AbstractUndoableEdit {
     public void undo() throws CannotUndoException {
         super.undo();
         if (cur.getAuthorityType() == BaseUndoState.AUTHORITY_STATE) {
-            int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Undo_All_Authority_Operations") + "?",
+            int returnVal = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Undo_All_Authority_Operations") + "?",
                     com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Undo"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
             if (returnVal == JOptionPane.NO_OPTION) {
                 return;

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

@@ -2,14 +2,20 @@ package com.fr.design.mainframe.backgroundpane;
 
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.event.UIObserver;
+import com.fr.design.event.UIObserverListener;
 import com.fr.general.Background;
 
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
 /**
  * @author zhou
  * @since 2012-5-29下午1:12:28
  */
 public abstract class BackgroundQuickPane extends BasicBeanPane<Background> implements UIObserver {
 
+	private boolean backgroundChange;
+
 	public abstract boolean accept(Background background);
 
 	@Override
@@ -23,6 +29,10 @@ public abstract class BackgroundQuickPane extends BasicBeanPane<Background> impl
 
 	public abstract void reset();
 
+	public boolean isBackgroundChange() {
+		return backgroundChange;
+	}
+
 	/**
 	 * 组件是否需要响应添加的观察者事件
 	 *
@@ -32,4 +42,20 @@ public abstract class BackgroundQuickPane extends BasicBeanPane<Background> impl
 
 		return true;
 	}
+
+	class ChangeListenerImpl implements ChangeListener {
+
+		private UIObserverListener listener;
+
+		public ChangeListenerImpl(UIObserverListener listener) {
+			this.listener = listener;
+		}
+
+		@Override
+		public void stateChanged(ChangeEvent e) {
+			backgroundChange = true;
+			this.listener.doChange();
+			backgroundChange = false;
+		}
+	}
 }

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

@@ -19,7 +19,6 @@ import java.awt.Color;
 public class ColorBackgroundQuickPane extends BackgroundQuickPane {
 
     private NewColorSelectPane detailColorSelectPane;
-    private boolean isBackGroundColor;
 
     public ColorBackgroundQuickPane() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
@@ -39,7 +38,6 @@ public class ColorBackgroundQuickPane extends BackgroundQuickPane {
 
     public void populateColor(Color color) {
         this.detailColorSelectPane.setColor(color);
-        isBackGroundColor = false;
     }
 
     public Color updateColor() {
@@ -47,23 +45,14 @@ public class ColorBackgroundQuickPane extends BackgroundQuickPane {
         return this.detailColorSelectPane.getNotNoneColor();
     }
 
-    public boolean isBackGroundColor() {
-        return isBackGroundColor;
-    }
-
     /**
      * 给组件登记一个观察者监听事件
      *
      * @param listener 观察者监听事件
      */
+    @Override
     public void registerChangeListener(final UIObserverListener listener) {
-        detailColorSelectPane.addChangeListener(new ChangeListener() {
+        detailColorSelectPane.addChangeListener(new ChangeListenerImpl(listener));
-            public void stateChanged(ChangeEvent e) {
-                isBackGroundColor = true;
-                listener.doChange();
-                isBackGroundColor = false;
-            }
-        });
     }
 
     @Override

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

@@ -96,17 +96,10 @@ public class GradientBackgroundQuickPane extends BackgroundQuickPane {
 	 *
 	 * @param listener 观察者监听事件
 	 */
+	@Override
 	public void registerChangeListener(final UIObserverListener listener) {
-	   gradientBar.addChangeListener(new ChangeListener() {
+	   gradientBar.addChangeListener(new ChangeListenerImpl(listener));
-		   public void stateChanged(ChangeEvent e) {
+	   directionPane.addChangeListener(new ChangeListenerImpl(listener));
-			   listener.doChange();
-		   }
-	   });
-	   directionPane.addChangeListener(new ChangeListener() {
-		   public void stateChanged(ChangeEvent e) {
-			   listener.doChange();
-		   }
-	   });
 	}
 
 	@Override

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

@@ -127,12 +127,7 @@ public class ImageBackgroundQuickPane extends BackgroundQuickPane {
      */
     @Override
     public void registerChangeListener(final UIObserverListener listener) {
-        changeListener = new ChangeListener() {
+        changeListener = new ChangeListenerImpl(listener);
-            @Override
-            public void stateChanged(ChangeEvent e) {
-                listener.doChange();
-            }
-        };
         imageLayoutPane.addChangeListener(changeListener);
     }
 

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

@@ -33,6 +33,10 @@ public class NullBackgroundQuickPane extends BackgroundQuickPane {
 
 	}
 
+	@Override
+	public boolean isBackgroundChange() {
+		return true;
+	}
 
     /**
      * 是否接受

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

@@ -112,23 +112,12 @@ public class PatternBackgroundQuickPane extends BackgroundQuickPane {
      *
      * @param listener 观察者监听事件
      */
+    @Override
     public void registerChangeListener(final UIObserverListener listener) {
-        foregroundColorPane.addSelectChangeListener(new ChangeListener() {
+        foregroundColorPane.addSelectChangeListener(new ChangeListenerImpl(listener));
-            public void stateChanged(ChangeEvent e) {
+        backgroundColorPane.addSelectChangeListener(new ChangeListenerImpl(listener));
-                listener.doChange();
-            }
-        });
-        backgroundColorPane.addSelectChangeListener(new ChangeListener() {
-            public void stateChanged(ChangeEvent e) {
-                listener.doChange();
-            }
-        });
         for (int i = 0, count = patternButtonArray.length; i < count; i++) {
-            patternButtonArray[i].addChangeListener(new ChangeListener() {
+            patternButtonArray[i].addChangeListener(new ChangeListenerImpl(listener));
-                public void stateChanged(ChangeEvent e) {
-                    listener.doChange();
-                }
-            });
         }
     }
 

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

@@ -68,13 +68,10 @@ public class TextureBackgroundQuickPane extends BackgroundQuickPane {
 	 *
 	 * @param listener 观察者监听事件
 	 */
+	@Override
 	public void registerChangeListener(final UIObserverListener listener) {
 		for (int i = 0, count = textureButtonArray.length; i < count; i++) {
-			textureButtonArray[i].addChangeListener(new ChangeListener() {
+			textureButtonArray[i].addChangeListener(new ChangeListenerImpl(listener));
-				public void stateChanged(ChangeEvent e) {
-					listener.doChange();
-				}
-			});
 		}
 	}
 

designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/DefaultMobileBookMarkStyleCustomDefinePane.java

@@ -0,0 +1,27 @@
+package com.fr.design.mainframe.mobile.ui;
+
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.form.ui.mobile.MobileBookMarkStyle;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2019/12/24
+ */
+public class DefaultMobileBookMarkStyleCustomDefinePane extends BasicBeanPane<MobileBookMarkStyle> {
+
+    @Override
+    public void populateBean(MobileBookMarkStyle ob) {
+
+    }
+
+    @Override
+    public MobileBookMarkStyle updateBean() {
+        return null;
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return null;
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/DefaultMobileBookMarkStyleProvider.java

@@ -0,0 +1,29 @@
+package com.fr.design.mainframe.mobile.ui;
+
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.fun.impl.AbstractMobileBookMarkStyleProvider;
+import com.fr.form.ui.mobile.impl.DefaultMobileBookMarkStyle;
+import com.fr.form.ui.mobile.MobileBookMarkStyle;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2019/12/24
+ */
+public class DefaultMobileBookMarkStyleProvider extends AbstractMobileBookMarkStyleProvider {
+
+    @Override
+    public Class<? extends MobileBookMarkStyle> classForMobileBookMarkStyle() {
+        return DefaultMobileBookMarkStyle.class;
+    }
+
+    @Override
+    public Class<? extends BasicBeanPane<MobileBookMarkStyle>> classForMobileBookMarkStyleAppearance() {
+        return DefaultMobileBookMarkStyleCustomDefinePane.class;
+    }
+
+    @Override
+    public String displayName() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_None_BookMark_Style");
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileBookMarkStyleDefinePane.java

@@ -0,0 +1,57 @@
+package com.fr.design.mainframe.mobile.ui;
+
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.fun.MobileBookMarkStyleProvider;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.form.ui.mobile.MobileBookMarkStyle;
+import com.fr.general.ComparatorUtils;
+import com.fr.invoke.Reflect;
+
+import javax.swing.*;
+import java.awt.*;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2019/12/23
+ */
+public class MobileBookMarkStyleDefinePane extends BasicBeanPane<MobileBookMarkStyle> {
+
+    private BasicBeanPane<MobileBookMarkStyle> customDefinePane;
+    private String displayName;
+
+    MobileBookMarkStyleDefinePane(MobileBookMarkStyleProvider bookMarkStyleProvider) {
+        this.customDefinePane = Reflect.on(
+                bookMarkStyleProvider.classForMobileBookMarkStyleAppearance()).create().get();
+        this.displayName = bookMarkStyleProvider.displayName();
+        initComponent();
+    }
+
+    private void initComponent() {
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        JPanel settingPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        if (!ComparatorUtils.equals(displayName, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_None_BookMark_Style"))) {
+            UILabel hintLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_BookMark_Style_Hint"));
+            hintLabel.setForeground(Color.GRAY);
+            settingPane.add(hintLabel, BorderLayout.NORTH);
+        }
+        settingPane.add(this.customDefinePane, BorderLayout.CENTER);
+        this.add(settingPane, BorderLayout.CENTER);
+    }
+
+    @Override
+    public void populateBean(MobileBookMarkStyle ob) {
+        this.customDefinePane.populateBean(ob);
+    }
+
+    @Override
+    public MobileBookMarkStyle updateBean() {
+        return this.customDefinePane.updateBean();
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return "MobileBookMarkStyleDefinePane";
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileBookMarkStylePane.java

@@ -0,0 +1,136 @@
+package com.fr.design.mainframe.mobile.ui;
+
+import com.fr.design.ExtraDesignClassManager;
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.fun.MobileBookMarkStyleProvider;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.form.ui.mobile.MobileBookMarkStyle;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2019/12/23
+ */
+public class MobileBookMarkStylePane extends BasicBeanPane<MobileBookMarkStyle> {
+
+    public static ListCellRenderer renderer = new DefaultListCellRenderer() {
+        @Override
+        public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected,
+                                                      boolean cellHasFocus) {
+            super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+            if (value instanceof MobileBookMarkStyle) {
+                this.setText((value.toString()));
+            }
+            return this;
+        }
+    };
+
+    private DefaultListModel<String> listModel;
+    private JList bookMarkList;
+    private JPanel rightPane;
+    private CardLayout card;
+    private Map<String, BasicBeanPane<MobileBookMarkStyle>> map = new HashMap<>();
+
+    public MobileBookMarkStylePane() {
+        initComponent();
+    }
+
+    private void initComponent() {
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        this.listModel = new DefaultListModel<>();
+        this.card = new CardLayout();
+        this.rightPane = FRGUIPaneFactory.createCardLayout_S_Pane();
+        this.rightPane.setLayout(card);
+        initDefaultAndExtraPanel();
+        initLeftListPanel();
+        initRightPanel();
+    }
+
+    private void initDefaultAndExtraPanel() {
+        List<MobileBookMarkStyleProvider> list = getMobileBookMarkStyleProvider();
+        for (MobileBookMarkStyleProvider bookMarkStyleProvider : list) {
+            String displayName = bookMarkStyleProvider.displayName();
+            MobileBookMarkStyleDefinePane mobileBookMarkStyleDefinePane = new MobileBookMarkStyleDefinePane(
+                    bookMarkStyleProvider);
+            listModel.addElement(displayName);
+            rightPane.add(displayName, mobileBookMarkStyleDefinePane);
+            map.put(displayName, mobileBookMarkStyleDefinePane);
+        }
+    }
+
+    private void initLeftListPanel() {
+        bookMarkList = new JList<>(listModel);
+        bookMarkList.setCellRenderer(renderer);
+        bookMarkList.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                card.show(rightPane, (String) bookMarkList.getSelectedValue());
+            }
+        });
+        JPanel leftPanel = FRGUIPaneFactory.createBorderLayout_L_Pane();
+        leftPanel.add(bookMarkList, BorderLayout.CENTER);
+        leftPanel.setPreferredSize(new Dimension(100, 500));
+        this.add(leftPanel, BorderLayout.WEST);
+    }
+
+    private void initRightPanel() {
+        JPanel centerPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
+        centerPane.setPreferredSize(new Dimension(500, 500));
+        centerPane.add(rightPane, BorderLayout.CENTER);
+        this.add(centerPane, BorderLayout.CENTER);
+    }
+
+
+    private List<MobileBookMarkStyleProvider> getMobileBookMarkStyleProvider() {
+        DefaultMobileBookMarkStyleProvider defaultMobileBookMarkStyleProvider = new DefaultMobileBookMarkStyleProvider();
+        Set<MobileBookMarkStyleProvider> mobileBookMarkStyleProviders = ExtraDesignClassManager.getInstance().getArray(
+                MobileBookMarkStyleProvider.XML_TAG);
+        List<MobileBookMarkStyleProvider> list = new ArrayList<>();
+        list.add(defaultMobileBookMarkStyleProvider);
+        list.addAll(mobileBookMarkStyleProviders);
+        return Collections.unmodifiableList(list);
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return null;
+    }
+
+
+    @Override
+    public void populateBean(MobileBookMarkStyle mobileBookMarkStyle) {
+        if (mobileBookMarkStyle != null) {
+            List<MobileBookMarkStyleProvider> bookMarkStyleProviders = getMobileBookMarkStyleProvider();
+            int i = 0;
+            for (MobileBookMarkStyleProvider bookMarkStyleProvider : bookMarkStyleProviders) {
+                if (mobileBookMarkStyle.getClass() == bookMarkStyleProvider.classForMobileBookMarkStyle()) {
+                    String displayName = bookMarkStyleProvider.displayName();
+                    bookMarkList.setSelectedIndex(i);
+                    map.get(displayName).populateBean(mobileBookMarkStyle);
+                    card.show(rightPane, displayName);
+                    return;
+                }
+                i++;
+            }
+        }
+        bookMarkList.setSelectedIndex(0);
+    }
+
+    @Override
+    public MobileBookMarkStyle updateBean() {
+        return map.get(bookMarkList.getSelectedValue()).updateBean();
+    }
+
+
+}

designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileStylePane.java

@@ -13,9 +13,9 @@ import com.fr.log.FineLoggerFactory;
 import com.fr.stable.ArrayUtils;
 
 import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
 import java.awt.*;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -79,8 +79,8 @@ public class MobileStylePane extends BasicPane {
     private void addWestList() {
         styleList = new JList<>(listModel);
         styleList.setCellRenderer(render);
-        styleList.addMouseListener(new MouseAdapter() {
+        styleList.addListSelectionListener(new ListSelectionListener() {
-            public void mouseClicked(MouseEvent e) {
+            public void valueChanged(ListSelectionEvent e) {
                 String selectedValue = (String)styleList.getSelectedValue();
                 card.show(right, selectedValue);
             }

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

@@ -528,14 +528,14 @@ public abstract class ToolBarMenuDock {
      */
     public ShortCut[] createHelpShortCuts() {
         final java.util.List<ShortCut> shortCuts = new ArrayList<ShortCut>();
-        shortCuts.add(new WebDemoAction());
         // 英文，把 video 和帮助文档放到 Help 下面
         if (GeneralContext.getLocale().equals(Locale.US)) {
             shortCuts.add(new VideoAction());
             shortCuts.add(new TutorialAction());
         }
-        //远程不使用更新升级
+        //远程不使用更新升级，产品演示
         if (WorkContext.getCurrent().isLocal()) {
+            shortCuts.add(new WebDemoAction());
             shortCuts.add(new SoftwareUpdateAction());
         }
         if (AlphaFineConfigManager.isALPHALicAvailable()) {

designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/FileVersionRowPanel.java

@@ -1,5 +1,6 @@
 package com.fr.design.mainframe.vcs.ui;
 
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.frpane.UITextPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ilable.UILabel;
@@ -61,7 +62,7 @@ public class FileVersionRowPanel extends JPanel {
         confirmBtn.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent evt) {
-                if (JOptionPane.showConfirmDialog(null, Toolkit.i18nText("Fine-Design_Vcs_Version_Revert_Confirm"), Toolkit.i18nText("Fine-Design_Vcs_Version_Revert_Title"),
+                if (FineJOptionPane.showConfirmDialog(null, Toolkit.i18nText("Fine-Design_Vcs_Version_Revert_Confirm"), Toolkit.i18nText("Fine-Design_Vcs_Version_Revert_Title"),
                         JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) {
                     vcsEntity.setUsername(VcsHelper.getInstance().getCurrentUsername());
                     WorkContext.getCurrent().get(VcsOperator.class).rollbackTo(vcsEntity);
@@ -75,7 +76,7 @@ public class FileVersionRowPanel extends JPanel {
         deleteBtn.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent evt) {
-                if (JOptionPane.showConfirmDialog(null, Toolkit.i18nText("Fine-Design_Vcs_Delete-Confirm"), Toolkit.i18nText("Fine-Design_Vcs_Remove"),
+                if (FineJOptionPane.showConfirmDialog(null, Toolkit.i18nText("Fine-Design_Vcs_Delete-Confirm"), Toolkit.i18nText("Fine-Design_Vcs_Remove"),
                         JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) {
                     try {
                         WorkContext.getCurrent().get(VcsOperator.class).deleteVersion(vcsEntity.getFilename(), vcsEntity.getVersion());

designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/MobileBookMarkStyleWrapper.java

@@ -0,0 +1,30 @@
+package com.fr.design.mainframe.widget.wrappers;
+
+import com.fr.design.Exception.ValidationException;
+import com.fr.design.designer.properties.Decoder;
+import com.fr.design.designer.properties.Encoder;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2019/12/24
+ */
+public class MobileBookMarkStyleWrapper implements Encoder, Decoder {
+    @Override
+    public Object decode(String txt) {
+        return null;
+    }
+
+    @Override
+    public void validate(String txt) throws ValidationException {
+
+    }
+
+    @Override
+    public String encode(Object v) {
+        if (v == null) {
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_None_BookMark_Style");
+        }
+        return v.toString();
+    }
+}

designer-base/src/main/java/com/fr/design/remote/ui/AbstractListControlPane.java

@@ -6,6 +6,7 @@ import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.controlpane.ShortCut4JControlPane;
 import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.ilable.UILabel;
@@ -367,7 +368,7 @@ public abstract class AbstractListControlPane extends BasicPane {
                 checkValid();
             } catch (Exception exp) {
                 FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
-                JOptionPane.showMessageDialog(AbstractListControlPane.this, exp.getMessage());
+                FineJOptionPane.showMessageDialog(AbstractListControlPane.this, exp.getMessage());
                 authorityList.setSelectedIndex(idx);
                 return true;
             }

designer-base/src/main/java/com/fr/design/remote/ui/list/AddedMemberList.java

@@ -1,5 +1,6 @@
 package com.fr.design.remote.ui.list;
 
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.report.constant.RoleType;
@@ -35,7 +36,7 @@ public class AddedMemberList extends MemberList {
                     "Fine-Design_Basic_Utils_Are_You_Sure_To_Delete_The_Role_And_Its_Design_Authorities" :
                     "Fine-Design_Basic_Utils_Are_You_Sure_To_Delete_The_User_And_Its_Design_Authorities";
             if (member.isSelected() && member.hasAuthority()){
-                int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText(keyTitle),
+                int val = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText(keyTitle),
                         Toolkit.i18nText("Fine-Design_Basic_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
                 if (val == JOptionPane.OK_OPTION) {
                     member.setSelected(!member.isSelected());

designer-base/src/main/java/com/fr/design/remote/ui/list/AddingMemberList.java

@@ -1,5 +1,6 @@
 package com.fr.design.remote.ui.list;
 
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.report.constant.RoleType;
@@ -37,7 +38,7 @@ public class AddingMemberList extends MemberList {
                     "Fine-Design_Basic_Utils_Are_You_Sure_To_Delete_The_Role_And_Its_Design_Authorities" :
                     "Fine-Design_Basic_Utils_Are_You_Sure_To_Delete_The_User_And_Its_Design_Authorities";
             if (member.isSelected() && member.hasAuthority()){
-                int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText(keyTitle),
+                int val = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText(keyTitle),
                         Toolkit.i18nText("Fine-Design_Basic_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
                 if (val == JOptionPane.OK_OPTION) {
                     member.setSelected(!member.isSelected());

designer-base/src/main/java/com/fr/design/roleAuthority/ReportAndFSManagePane.java

@@ -6,6 +6,7 @@ import com.fr.design.actions.UpdateAction;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.data.tabledata.Prepare4DataSourceChange;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.ibutton.UIHeadGroup;
 import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.itoolbar.UIToolbar;
@@ -159,7 +160,7 @@ public class ReportAndFSManagePane extends DockingView implements Prepare4DataSo
      */
     private void checkChanges() {
         //如若有变化，则弹出下面的对话框
-        int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Role_changed_Is_Refresh") + "?",
+        int returnVal = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Role_changed_Is_Refresh") + "?",
                 com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Refresh"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE);
         if (returnVal == JOptionPane.OK_OPTION) {
             roleTree.refreshTreeNode();

designer-base/src/main/java/com/fr/design/style/color/ColorControlWindow.java

@@ -1,27 +1,28 @@
 package com.fr.design.style.color;
 
-import java.awt.BorderLayout;
+import com.fr.design.gui.ipoppane.PopupHider;
-import java.awt.Color;
+import com.fr.design.layout.FRGUIPaneFactory;
 
 import javax.swing.JPopupMenu;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-
+import java.awt.BorderLayout;
-import com.fr.design.gui.ipoppane.PopupHider;
+import java.awt.Color;
-import com.fr.design.layout.FRGUIPaneFactory;
 
 public abstract class ColorControlWindow extends JPopupMenu {
     private static final long serialVersionUID = 4317136753151221742L;
     private PopupHider popupHider;
     private ColorSelectionPopupPane selectionPopupPane;
+
     protected abstract void colorChanged();
 
     /**
      * Constructor.
      */
     public ColorControlWindow(PopupHider popupHider) {
-    	this(false,popupHider);
+        this(false, popupHider);
     }
+
     /**
      * Constructor.
      */
@@ -31,7 +32,7 @@ public abstract class ColorControlWindow extends JPopupMenu {
     }
 
     public Color getColor() {
-    	if(selectionPopupPane == null) {
+        if (selectionPopupPane == null) {
             return null;
         }
         return selectionPopupPane.getColor();
@@ -55,6 +56,7 @@ public abstract class ColorControlWindow extends JPopupMenu {
 
     class ColorSelectionPopupPane extends NewColorSelectPane {
         private static final long serialVersionUID = 7822856562329146354L;
+
         public ColorSelectionPopupPane(boolean isSupportTransparent) {
             super(isSupportTransparent);
             this.addChangeListener(new ChangeListener() {
@@ -65,11 +67,13 @@ public abstract class ColorControlWindow extends JPopupMenu {
                 }
             });
         }
+
         @Override
         protected void doTransparent() {
             popupHider.hidePopupMenu();
             super.doTransparent();
         }
+
         @Override
         public void customButtonPressed() {
             popupHider.hidePopupMenu();

designer-base/src/main/java/com/fr/design/style/color/ColorSelectDetailPane.java

@@ -11,6 +11,8 @@ import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import java.awt.*;
 
+import static com.fr.design.i18n.Toolkit.i18nText;
+
 /**
  * 颜色选择器更多颜色面板
  *
@@ -56,7 +58,7 @@ public class ColorSelectDetailPane extends BasicPane {
 
     @Override
     protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select_Color");
+        return i18nText("Fine-Design_Basic_Select_Color");
     }
 
     protected void initComponents() {
@@ -65,20 +67,15 @@ public class ColorSelectDetailPane extends BasicPane {
         // 颜色选择器面板
         selectedPanel = new JColorChooser(this.color);
         selectedPanel.setPreferredSize(new Dimension(selectedPanel.getWidth(), SELECT_PANEL_HEIGHT));
-        AbstractColorChooserPanel[] choosers = selectedPanel.getChooserPanels();
-        for (int i = 0; i < choosers.length; i++) {
-            selectedPanel.removeChooserPanel(choosers[i]);
-        }
         selectedPanel.setPreviewPanel(new JPanel());
 
         AbstractColorChooserPanel swatchChooserPanel = new SwatchChooserPanel();
         AbstractColorChooserPanel customChooserPanel = new CustomChooserPanel();
-        selectedPanel.addChooserPanel(swatchChooserPanel);
+        selectedPanel.setChooserPanels(new AbstractColorChooserPanel[]{swatchChooserPanel, customChooserPanel});
-        selectedPanel.addChooserPanel(customChooserPanel);
         this.add(selectedPanel, BorderLayout.NORTH);
 
         // 最近使用面板
-        recentUsePanel = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Used"));
+        recentUsePanel = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Used"));
         RecentUseColorPane recent = new RecentUseColorPane(selectedPanel);
         recentUsePanel.add(recent);
 
@@ -87,7 +84,7 @@ public class ColorSelectDetailPane extends BasicPane {
         selectedPanel.setPreviewPanel(new JPanel());
 
         // 预览
-        previewPanel = FRGUIPaneFactory.createTitledBorderPaneCenter(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"));
+        previewPanel = FRGUIPaneFactory.createTitledBorderPaneCenter(i18nText("Fine-Design_Basic_Preview"));
         final ColorChooserPreview colorChooserPreview = new ColorChooserPreview();
         ColorSelectionModel model = selectedPanel.getSelectionModel();
         model.addChangeListener(new ChangeListener() {

designer-base/src/main/java/com/fr/design/style/color/UIToolbarColorButton.java

@@ -3,15 +3,6 @@
  */
 package com.fr.design.style.color;
 
-import java.awt.Color;
-import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
-
-import javax.swing.Icon;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import javax.swing.event.EventListenerList;
-
 import com.fr.base.BaseUtils;
 import com.fr.design.event.UIObserver;
 import com.fr.design.event.UIObserverListener;
@@ -20,6 +11,15 @@ import com.fr.design.gui.ibutton.UIColorButton;
 import com.fr.design.gui.ibutton.UICombinationButton;
 import com.fr.design.gui.ipoppane.PopupHider;
 import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.stable.os.OperatingSystem;
+
+import javax.swing.Icon;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.swing.event.EventListenerList;
+import java.awt.Color;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
 
 /**
  * Color select pane2.
@@ -33,7 +33,6 @@ public class UIToolbarColorButton extends UICombinationButton implements PopupHi
     private EventListenerList colorChangeListenerList = new EventListenerList();
     private UIObserverListener uiObserverListener;
 
-
     public UIToolbarColorButton(Icon icon) {
         super(new UIColorButton(icon), new UIButton(BaseUtils.readIcon("/com/fr/design/images/gui/popup.gif")));
         getLeftButton().setEventBanned(true);
@@ -66,24 +65,17 @@ public class UIToolbarColorButton extends UICombinationButton implements PopupHi
     }
 
     @Override
-	/**
-	 *
-	 */
     public UIColorButton getLeftButton() {
         // TODO Auto-generated method stub
         return (UIColorButton) super.getLeftButton();
     }
 
-	/**
+    @Override
-	 * @return
-	 */
     public Color getColor() {
         return this.color;
     }
 
-	/**
+    @Override
-	 * @param color
-	 */
     public void setColor(Color color) {
         setColorWithoutchanged(color);
         fireColorStateChanged();
@@ -91,6 +83,7 @@ public class UIToolbarColorButton extends UICombinationButton implements PopupHi
 
     /**
      * 设置颜色
+     *
      * @param color 颜色
      */
     public void setColorWithoutchanged(Color color) {
@@ -100,6 +93,7 @@ public class UIToolbarColorButton extends UICombinationButton implements PopupHi
 
     /**
      * 是否可为NULL值
+     *
      * @return 同上
      */
     public boolean isCanBeNull() {
@@ -114,9 +108,6 @@ public class UIToolbarColorButton extends UICombinationButton implements PopupHi
     }
 
     @Override
-	/**
-	 *
-	 */
     public void setEnabled(boolean enabled) {
         super.setEnabled(enabled);
 
@@ -129,9 +120,6 @@ public class UIToolbarColorButton extends UICombinationButton implements PopupHi
     }
 
     @Override
-	/**
-	 *
-	 */
     public void setToolTipText(String tooltipText) {
         getLeftButton().setToolTipText(tooltipText);
         getLeftButton().setToolTipText(tooltipText);
@@ -155,8 +143,9 @@ public class UIToolbarColorButton extends UICombinationButton implements PopupHi
     /**
      * 隐藏弹出框
      */
+    @Override
     public void hidePopupMenu() {
-		if (popupWin != null) {
+        if (popupWin != null && !OperatingSystem.isMacos()) {
             popupWin.setVisible(false);
         }
 
@@ -181,6 +170,7 @@ public class UIToolbarColorButton extends UICombinationButton implements PopupHi
     /**
      * Adds a new ColorChangeListener
      * 注册监听
+     *
      * @param changeListener 监听
      */
     public void addColorChangeListener(ChangeListener changeListener) {
@@ -190,6 +180,7 @@ public class UIToolbarColorButton extends UICombinationButton implements PopupHi
     /**
      * Removes an old ColorChangeListener.
      * 移除监听
+     *
      * @param changeListener 监听
      */
     public void removeColorChangeListener(ChangeListener changeListener) {
@@ -198,7 +189,6 @@ public class UIToolbarColorButton extends UICombinationButton implements PopupHi
 
     /**
      * 触发颜色改变事件
-	 * 
      */
     public void fireColorStateChanged() {
         Object[] listeners = colorChangeListenerList.getListenerList();
@@ -214,6 +204,7 @@ public class UIToolbarColorButton extends UICombinationButton implements PopupHi
         }
     }
 
+    @Override
     protected void leftButtonClickEvent() {
         color = getLeftButton().getColor();
         fireColorStateChanged();
@@ -224,29 +215,32 @@ public class UIToolbarColorButton extends UICombinationButton implements PopupHi
         showPopupMenu();
     }
 
-	@Override
     /**
      * 选中颜色
+     *
      * @param colorCell 颜色单元格
      */
+    @Override
     public void colorSetted(ColorCell colorCell) {
         hidePopupMenu();
     }
 
-	@Override
     /**
      * 注册监听
+     *
      * @param listener 监听
      */
+    @Override
     public void registerChangeListener(UIObserverListener listener) {
         uiObserverListener = listener;
     }
 
-	@Override
     /**
      * 是否响应监听
+     *
      * @return 同上
      */
+    @Override
     public boolean shouldResponseChangeListener() {
         return true;
     }

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

@@ -30,6 +30,7 @@ public class RecoverForDesigner implements Recover {
             CommonIOUtils.copyFilesInDirByPath(StableUtils.pathJoin(installHome, ProjectConstants.LOGS_NAME,
                     UpdateConstants.INSTALL_LIB, UpdateConstants.DESIGNERBACKUPPATH),
                     StableUtils.pathJoin(StableUtils.getInstallHome(), ProjectConstants.LIB_NAME));
+            FineLoggerFactory.getLogger().error("Recover down for designer");
             return true;
         } catch (IOException e) {
             FineLoggerFactory.getLogger().error("Recover error for designer", e);
@@ -54,6 +55,7 @@ public class RecoverForDesigner implements Recover {
             CommonIOUtils.copyFilesInDirByPath(StableUtils.pathJoin(installHome,ProjectConstants.LIB_NAME),
                     StableUtils.pathJoin(installBackup,UpdateConstants.DESIGNERBACKUPPATH));
             DesignerContext.getDesignerFrame().prepareForExit();
+            FineLoggerFactory.getLogger().error("Backup down for designer");
             return true;
         } catch (IOException e) {
             UpdateException exception = new UpdateException("Backup Exception for designer" + e.getMessage());

designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateManager.java

@@ -7,16 +7,11 @@ import com.fr.design.mainframe.DesignerFrame;
 import com.fr.design.os.impl.SupportOSImpl;
 import com.fr.design.update.ui.dialog.UpdateMainDialog;
 import com.fr.general.CloudCenter;
-import com.fr.general.GeneralContext;
 import com.fr.general.GeneralUtils;
 import com.fr.general.http.HttpToolbox;
 import com.fr.json.JSONObject;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
-import com.fr.stable.os.OperatingSystem;
-import com.fr.stable.os.support.OSBasedAction;
-import com.fr.stable.os.support.OSSupportCenter;
-import com.fr.workspace.WorkContext;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -32,17 +27,6 @@ public class DesignerPushUpdateManager {
 
     private DesignerUpdateInfo updateInfo;
 
-    static {
-        if (DesignerPushUpdateConfigManager.getInstance().isAutoPushUpdateEnabled()) {
-            DesignerContext.getDesignerFrame().addDesignerOpenedListener(new DesignerOpenedListener() {
-                @Override
-                public void designerOpened() {
-                    getInstance().checkAndPop();
-                }
-            });
-        }
-    }
-
     private DesignerPushUpdateManager() {
     }
 
@@ -53,6 +37,17 @@ public class DesignerPushUpdateManager {
         return singleton;
     }
 
+    public void preparePushUpdate() {
+        if (DesignerPushUpdateConfigManager.getInstance().isAutoPushUpdateEnabled()) {
+            DesignerContext.getDesignerFrame().addDesignerOpenedListener(new DesignerOpenedListener() {
+                @Override
+                public void designerOpened() {
+                    getInstance().checkAndPop();
+                }
+            });
+        }
+    }
+
     private void initUpdateInfo(String currentVersion, String latestVersion) {
         String lastIgnoredVersion = DesignerPushUpdateConfigManager.getInstance().getLastIgnoredVersion();
         String updatePushInfo = CloudCenter.getInstance().acquireUrlByKind("update.push");

designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java

@@ -5,6 +5,7 @@ import com.fr.decision.update.info.UpdateCallBack;
 import com.fr.decision.update.info.UpdateProgressCallBack;
 import com.fr.design.RestartHelper;
 import com.fr.design.constants.LayoutConstants;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.dialog.UIDialog;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icontainer.UIScrollPane;
@@ -608,7 +609,7 @@ public class UpdateMainDialog extends UIDialog {
                         public void onDownloadFailed() {
                             progressBar.setVisible(false);
                             deleteForDesignerUpdate(installLib);
-                            JOptionPane.showMessageDialog(getParent(), Toolkit.i18nText("Fine-Design_Update_Info_Failed_Message"));
+                            FineJOptionPane.showMessageDialog(getParent(), Toolkit.i18nText("Fine-Design_Update_Info_Failed_Message"));
                             helper.restartForUpdate(frame);
                         }
                     }.execute();

designer-base/src/main/java/com/fr/design/upm/UpmFinder.java

@@ -2,6 +2,7 @@ package com.fr.design.upm;
 
 import com.fr.base.FRContext;
 import com.fr.decision.webservice.v10.plugin.helper.category.impl.UpmResourceLoader;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.dialog.UIDialog;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.DesignerContext;
@@ -64,18 +65,18 @@ public class UpmFinder {
         if (flag) {
             if (!checkUPMResourcesExist()){
                 // upm下载
-                int val = JOptionPane.showConfirmDialog(null, Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Need_Install"),
+                int val = FineJOptionPane.showConfirmDialog(null, Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Need_Install"),
-                        Toolkit.i18nText("Fine-Design_Basic_Alert"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE);
+                        Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE);
                 if (val == JOptionPane.OK_OPTION){
                     try {
                         UpmResourceLoader.INSTANCE.download();
                         UpmResourceLoader.INSTANCE.install();
-                        JOptionPane.showMessageDialog(null, Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Installed"),
+                        FineJOptionPane.showMessageDialog(null, Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Installed"),
-                                Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), JOptionPane.INFORMATION_MESSAGE);
+                                Toolkit.i18nText("Fine-Design_Basic_Message"), JOptionPane.INFORMATION_MESSAGE);
                     } catch (Exception e){
                         FineLoggerFactory.getLogger().error(e.getMessage(), e);
-                        JOptionPane.showMessageDialog(null, Toolkit.i18nText("Fine-Design_Updater_Download_Failed"),
+                        FineJOptionPane.showMessageDialog(null, Toolkit.i18nText("Fine-Design_Updater_Download_Failed"),
-                                Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), JOptionPane.INFORMATION_MESSAGE);
+                                Toolkit.i18nText("Fine-Design_Basic_Message"), JOptionPane.INFORMATION_MESSAGE);
                     }
                 }
             }

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

@@ -1,5 +1,6 @@
 package com.fr.design.utils;
 
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.OperatingSystem;
 import com.fr.stable.StringUtils;
@@ -27,7 +28,7 @@ public class BrowseUtils {
                 // win10 内存用到到80%左右的时候, Desktop.browser经常提示"存储空间不足, 无法处理改命令", 用rundll32可以打开.
                 Runtime.getRuntime().exec("rundll32 url.dll,FileProtocolHandler " + uri);
             } catch (IOException ee) {
-                JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Default_Browser_Duplicate"));
+                FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Default_Browser_Duplicate"));
                 FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
         } else {

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

@@ -5,6 +5,7 @@ import com.fr.base.ServerConfig;
 import com.fr.concurrent.NamedThreadFactory;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.ExtraDesignClassManager;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.fun.DesignerEnvProcessor;
 import com.fr.design.gui.UILookAndFeel;
 import com.fr.design.mainframe.DesignerContext;
@@ -176,7 +177,7 @@ public class DesignUtils {
 
             @Override
             public void run() {
-                JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), final_msg);
+                FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), final_msg);
             }
         });
     }

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

@@ -16,6 +16,7 @@ import com.fr.data.util.function.SumFunction;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.border.UITitledBorder;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ibutton.UIToggleButton;
 import com.fr.design.gui.icheckbox.UICheckBox;
@@ -324,7 +325,7 @@ public final class GUICoreUtils {
 
 	/**
 	 * Gets window/frame to screen center.
-	 * @param 窗口
+	 * @param win 窗口
 	 */
 	public static void setWindowFullScreen(Window win) {
 		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
@@ -341,7 +342,7 @@ public final class GUICoreUtils {
 	 * Shows down component.
 	 * 显示弹出关闭菜单
 	 * @param popup 弹出菜单
-	 * @param 父组件
+	 * @param parentComponent 父组件
 	 */
 	public static void showPopupCloseMenu(JPopupMenu popup, Component parentComponent) {
 		if (popup == null) {// check null.
@@ -537,7 +538,7 @@ public final class GUICoreUtils {
 	/**
 	 * 产生一个Flow Pane, flowAligment是FlowLayout.LEFT, CENTER, RIGHT.
 	 * @param comps 组件
-	 * @param flowAlignement 对齐方式
+	 * @param flowAlignment 对齐方式
 	 * @param hSpace 水平间隔
 	 * @return 面板
 	 */
@@ -660,7 +661,7 @@ public final class GUICoreUtils {
 
 	/**
 	 * it's a very good method, user can get treePath from treeNode.
-	 * @param 节点
+	 * @param treeNode 节点
 	 * @return 路径
 	 */
 	public static TreePath getTreePath(TreeNode treeNode) {
@@ -740,7 +741,7 @@ public final class GUICoreUtils {
 			return false;
 		}
 
-		int returnVal = JOptionPane.showConfirmDialog(ancestorWindow, com.fr.design.i18n.Toolkit.i18nText(key), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"),
+		int returnVal = FineJOptionPane.showConfirmDialog(ancestorWindow, com.fr.design.i18n.Toolkit.i18nText(key), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"),
 				JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
 		if (returnVal == JOptionPane.OK_OPTION) {
 			int minSelectedIndex = nodeList.getMinSelectionIndex();

designer-base/src/main/java/com/fr/design/web/CustomIconPane.java

@@ -6,6 +6,7 @@ import com.fr.base.Icon;
 import com.fr.base.IconManager;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.ilable.UILabel;
@@ -150,7 +151,7 @@ public class CustomIconPane extends BasicPane {
 
                         } else {
                             // add failed
-                            JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_Message2"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), JOptionPane.WARNING_MESSAGE);
+                            FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_Message2"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Alert"), JOptionPane.WARNING_MESSAGE);
                         }
                     }
                 }).setVisible(true);
@@ -179,9 +180,9 @@ public class CustomIconPane extends BasicPane {
                     CustomIconPane.this.repaint();
                 } else {
                     // remove failed
-                    JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
+                    FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
                             com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_Message2"),
-                            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
+                            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Alert"),
                             JOptionPane.WARNING_MESSAGE);
                 }
             }
@@ -204,9 +205,9 @@ public class CustomIconPane extends BasicPane {
                     // do nothing
                 }
                 if (oldIcon == null) {
-                    JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
+                    FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
-                            "Error",
+                            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error"),
-                            "Error",
+                            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error"),
                             JOptionPane.ERROR_MESSAGE);
                 }
 
@@ -228,7 +229,7 @@ public class CustomIconPane extends BasicPane {
                             // 失败了再弄回去
                             iconManager.addIcon(oldIcon, true);
                             // edit failed
-                            JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_Message2"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), JOptionPane.WARNING_MESSAGE);
+                            FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_Message2"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Alert"), JOptionPane.WARNING_MESSAGE);
                         }
                     }
                 }).setVisible(true);
@@ -425,9 +426,9 @@ public class CustomIconPane extends BasicPane {
                         return;
                     }
                     if (WidgetInfoConfig.getInstance().getIconManager().contains(nameTextField.getText())) {
-                        JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
+                        FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
                                 com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_Message3"),
-                                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
+                                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Alert"),
                                 JOptionPane.WARNING_MESSAGE);
                     }
                 }

designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java

@@ -17,6 +17,7 @@ import com.fr.design.data.tabledata.tabledatapane.FormatExplanationPane;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.editor.ValueEditorPane;
 import com.fr.design.editor.ValueEditorPaneFactory;
 import com.fr.design.editor.editor.Editor;
@@ -584,7 +585,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
 				return;
 			}
 
-			int returnVal = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(DBManipulationPane.this),
+			int returnVal = FineJOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(DBManipulationPane.this),
 					com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_sure_remove_item") + "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Remove"), JOptionPane.OK_CANCEL_OPTION,
 					JOptionPane.QUESTION_MESSAGE);
 			if (returnVal == JOptionPane.OK_OPTION) {

designer-base/src/main/java/com/fr/env/EnvListPane.java

@@ -1,6 +1,7 @@
 package com.fr.env;
 
 import com.fr.design.DesignerEnvManager;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.env.DesignerWorkspaceInfo;
 import com.fr.design.env.LocalDesignerWorkspaceInfo;
 import com.fr.design.env.RemoteDesignerWorkspaceInfo;
@@ -33,13 +34,13 @@ public class EnvListPane extends JListControlPane {
                 allListNames[nameableList.getSelectedIndex()] = StringUtils.EMPTY;
                 if (StringUtils.isEmpty(tempName)) {
                     nameableList.stopEditing();
-                    JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(EnvListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Workspace_Empty_Name_Warn_Text"));
+                    FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(EnvListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Workspace_Empty_Name_Warn_Text"));
                     setIllegalIndex(editingIndex);
                     return;
                 }
                 if (!ComparatorUtils.equals(tempName, selectedName) && isNameRepeated(new List[]{Arrays.asList(allListNames)}, tempName)) {
                     nameableList.stopEditing();
-                    JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(EnvListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Workspace_Duplicate_Name_Warn_Text", tempName));
+                    FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(EnvListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Workspace_Duplicate_Name_Warn_Text", tempName));
                     setIllegalIndex(editingIndex);
                 }
             }