Merge branch 'feature/x' of https://code.fineres.com/scm/~fly.li/design into feature/x

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

@@ -133,7 +133,7 @@ public class ESDStrategyConfigPane extends BasicBeanPane<StrategyConfig> {
             ob = StrategyConfigHelper.createStrategyConfig(true, false, true);
         }
         this.strategyConfig = ob;
-        this.updateInterval.setText(ob.getUpdateInterval() <= 0 ? "0" : String.format("%.0f", ob.getUpdateInterval() / (double) CacheConstants.MILLIS_OF_MINUTE));
+        this.updateInterval.setText(ob.getUpdateInterval() <= 0 ? "0" : String.valueOf(ob.getUpdateInterval() / (double) CacheConstants.MILLIS_OF_MINUTE));
         this.schemaTime.setText(StringUtils.join(",", ob.getUpdateSchema().toArray(new String[0])));
         this.shouldEvolve.setSelected(ob.shouldEvolve());
         this.selectBySchema.setSelected(ob.isScheduleBySchema());
@@ -185,7 +185,6 @@ public class ESDStrategyConfigPane extends BasicBeanPane<StrategyConfig> {
                                 this.schemaTimeCheckTips.setVisible(true);
                                 throw new IllegalArgumentException("[ESD]Update schema time interval is to short.");
                             }
-
                         } else {
                             Collections.addAll(schemaTimes, text.split(","));
                         }
@@ -200,8 +199,15 @@ public class ESDStrategyConfigPane extends BasicBeanPane<StrategyConfig> {
                     String interval = this.updateInterval.getText();
                     if (checkUpdateInterval(interval)) {
                         long intervalMillis = StringUtils.isEmpty(interval) ? 0 : (long) (Double.parseDouble(interval) * CacheConstants.MILLIS_OF_MINUTE);
+                        if (intervalMillis >= CacheConstants.MILLIS_OF_MINUTE) {
                             config.setUpdateInterval(intervalMillis);
                         } else {
+                            this.updateIntervalCheckTips.setText(InterProviderFactory.getDesignI18nProvider().i18nText("Fine-Design_ESD_Error_Time_Interval_Too_Short"));
+                            this.updateIntervalCheckTips.setVisible(true);
+                            throw new IllegalArgumentException("[ESD]Update schema time interval is to short.");
+                        }
+                    } else {
+                        this.updateIntervalCheckTips.setText(InterProviderFactory.getDesignI18nProvider().i18nText("Fine-Design_ESD_Error_Time_Format"));
                         this.updateIntervalCheckTips.setVisible(true);
                         throw new IllegalArgumentException("[ESD]Error update interval format.");
                     }
@@ -220,7 +226,7 @@ public class ESDStrategyConfigPane extends BasicBeanPane<StrategyConfig> {
 
     private boolean checkUpdateInterval(String intervalValue) {
         try {
-            return !StringUtils.isEmpty(intervalValue) && !(Integer.parseInt(intervalValue) <= 0);
+            return !StringUtils.isEmpty(intervalValue) && !(Double.parseDouble(intervalValue) <= 0);
         } catch (NumberFormatException e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
@@ -228,6 +234,7 @@ public class ESDStrategyConfigPane extends BasicBeanPane<StrategyConfig> {
         return false;
     }
 
+
     private boolean checkCornTimeInterval (String cronText) {
         // 判断后两次更新时间间隔，如果小于1分钟就返回false
         try {

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

@@ -13,6 +13,7 @@ import com.fr.design.data.BasicTableDataTreePane;
 import com.fr.design.data.BasicTableDataUtils;
 import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.data.StrategyConfigAttrUtils;
+import com.fr.design.data.datapane.auth.TableDataAuthHelper;
 import com.fr.design.data.datapane.management.clip.TableDataTreeClipboard;
 import com.fr.design.data.datapane.management.search.pane.TableDataSearchRemindPane;
 import com.fr.design.data.datapane.management.search.pane.TreeSearchToolbarPane;
@@ -22,6 +23,7 @@ import com.fr.design.data.tabledata.StoreProcedureWorkerListener;
 import com.fr.design.data.tabledata.paste.TableDataFollowingPasteUtils;
 import com.fr.design.data.tabledata.tabledatapane.AbstractTableDataPane;
 import com.fr.design.data.tabledata.tabledatapane.DBTableDataPane;
+import com.fr.design.data.tabledata.tabledatapane.loading.TableDataLoadingPane;
 import com.fr.design.data.tabledata.wrapper.AbstractTableDataWrapper;
 import com.fr.design.data.tabledata.wrapper.TableDataWrapper;
 import com.fr.design.data.tabledata.wrapper.TemplateTableDataWrapper;
@@ -39,7 +41,6 @@ import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.gui.itoolbar.UIToolbar;
 import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
 import com.fr.design.i18n.Toolkit;
-import com.fr.design.icon.IconPathConstants;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.menu.LineSeparator;
@@ -87,6 +88,7 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -1017,10 +1019,48 @@ public class TableDataTreePane extends BasicTableDataTreePane {
 
             AbstractTableDataPane<?> tableDataPane = wrapper.creatTableDataPane();
 
+            if (TableDataAuthHelper.needCheckAuthWhenEdit(wrapper.getTableData())) {
+                // 先打开一个Loading面板
+                TableDataLoadingPane loadingPane = new TableDataLoadingPane();
+                BasicDialog loadingDialog = loadingPane.showLargeWindow(SwingUtilities.getWindowAncestor(TableDataTreePane.this), null);
+                // 查询权限
+                new SwingWorker<Boolean, Void>() {
+                    @Override
+                    protected Boolean doInBackground() throws Exception {
+                        // 获取无权限连接名称集合
+                        Collection<String> noAuthConnections = TableDataAuthHelper.getNoAuthConnections();
+                        // 获取当前数据集对应的数据连接名称
+                        String connectionName = TableDataAuthHelper.getConnectionNameByDBTableData((DBTableData) wrapper.getTableData());
+                        return !noAuthConnections.contains(connectionName);
+                    }
+
+                    @Override
+                    protected void done() {
+                        try {
+                            Boolean hasAuth = get();
+                            if (hasAuth) {
+                                // 有权限时，关闭Loading面板，打开编辑面板
+                                loadingDialog.setVisible(false);
+                                dgEdit(tableDataPane, dsName, false);
+                            } else {
+                                // 无权限时，给出无权限提示
+                                loadingPane.switchTo(TableDataLoadingPane.NO_AUTH_PANE_NAME);
+                            }
+                        } catch (Exception e) {
+                            FineLoggerFactory.getLogger().error("loading connection error in remote design", e.getMessage());
+                            // 查询权限失败时，给出报错提示
+                            loadingPane.switchTo(TableDataLoadingPane.ERROR_NAME);
+                        }
+                    }
+                }.execute();
+                loadingDialog.setVisible(true);
+            } else {
+                // 无需检查权限时，直接打开数据库查询编辑面板
                 //下面创建creatTableDataPane后会直接populate，所以populate时不能用后设置的一些参数，比如name
                 dgEdit(tableDataPane, dsName, false);
             }
         }
+    }
 
     private class RemoveAction extends UpdateAction {
 

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

@@ -0,0 +1,57 @@
+package com.fr.design.data.datapane.auth;
+
+import com.fr.base.TableData;
+import com.fr.data.impl.Connection;
+import com.fr.data.impl.DBTableData;
+import com.fr.data.impl.NameDatabaseConnection;
+import com.fr.stable.StringUtils;
+import com.fr.workspace.WorkContext;
+import com.fr.workspace.server.connection.DBConnectAuth;
+
+import java.util.Collection;
+import java.util.Collections;
+
+/**
+ * 数据连接权限相关的工具类
+ * @author Yvan
+ */
+public class TableDataAuthHelper {
+
+    /**
+     * 编辑数据集时是否需要检查权限
+     * @param tableData
+     * @return
+     */
+    public static boolean needCheckAuthWhenEdit(TableData tableData) {
+        // 远程设计下，编辑DBTableData时需要判断权限
+        return !WorkContext.getCurrent().isLocal() && tableData instanceof DBTableData;
+    }
+
+    /**
+     * 获取无权限数据连接集合
+     * 远程下需要调用RPC，为耗时操作，谨慎使用
+     * @return
+     */
+    public static Collection<String> getNoAuthConnections() {
+        // 获取无权限连接集合
+        Collection<String> noAuthConnections = WorkContext.getCurrent().get(DBConnectAuth.class).getNoAuthConnections();
+        return noAuthConnections == null ? Collections.emptyList() : noAuthConnections;
+    }
+
+    /**
+     * 通过数据集获取其数据连接的名称
+     *
+     * 注意：
+     * 1. Connection接口本身是不提供名称的，只有我们内部为了使用方便，将其包装成了NameDataBaseConnection
+     *      如果不是NameDataBaseConnection类型，则无名称，因此这里只能用判断类型的方式获取名称
+     * 2. 仅支持DBTableData获取连接名
+     * @return
+     */
+    public static String getConnectionNameByDBTableData(DBTableData tableData) {
+        Connection database = tableData.getDatabase();
+        if (database instanceof NameDatabaseConnection) {
+            return ((NameDatabaseConnection) database).getName();
+        }
+        return StringUtils.EMPTY;
+    }
+}

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

@@ -138,6 +138,14 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
         if (connection instanceof NameDatabaseConnection) {
             this.setSelectedItem(((NameDatabaseConnection) connection).getName());
         } else {
+            setRecentConnection();
+        }
+    }
+
+    /**
+     * 下拉框选项设置成最近选择的connection，如果最近选择不存在，则选择列表中的第一个
+     */
+    protected void setRecentConnection() {
         String s = DesignerEnvManager.getEnvManager().getRecentSelectedConnection();
         if (StringUtils.isNotBlank(s)) {
             // 之前的写法有多线程问题，nameList异步尚未初始化完成的时候，这里可能无法匹配设置数据连接名称，导致DBTableDataPane打开后连接面板空白
@@ -151,5 +159,13 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
             this.setSelectedItem(this.getConnection(0));
         }
     }
+
+    /**
+     * 是否无选中状态（空白item也视为无选中）
+     * @return
+     */
+    protected boolean isSelectedItemEmpty() {
+        String selectedItem = this.getSelectedItem();
+        return selectedItem == null || StringUtils.equals(selectedItem, EMPTY.toString());
     }
 }

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

@@ -1,26 +1,32 @@
 package com.fr.design.data.datapane.connect;
 
 import com.fr.base.BaseUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.data.core.db.TableProcedure;
 import com.fr.data.impl.AbstractDatabaseConnection;
 import com.fr.data.impl.Connection;
 import com.fr.design.border.UIRoundedBorder;
 import com.fr.design.constants.UIConstants;
+import com.fr.design.data.tabledata.tabledatapane.DBTableDataPane;
+import com.fr.design.data.tabledata.tabledatapane.loading.SwitchableTableDataPane;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ilist.TableViewList;
 import com.fr.design.gui.itextfield.UITextField;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.general.GeneralContext;
 import com.fr.stable.ArrayUtils;
 
+import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.ToolTipManager;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 import java.awt.BorderLayout;
+import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -45,7 +51,39 @@ public class ConnectionTableProcedurePane extends BasicPane {
 	private java.util.List<DoubleClickSelectedNodeOnTreeListener> listeners = new java.util.ArrayList<DoubleClickSelectedNodeOnTreeListener>();
 
 	public ConnectionTableProcedurePane() {
+		init(null);
+	}
+
+	/**
+	 * 传入父容器
+	 * @param parent
+	 */
+	public ConnectionTableProcedurePane(SwitchableTableDataPane parent) {
+		init(parent);
+	}
+
+	private void init(SwitchableTableDataPane parent) {
 		this.setLayout(new BorderLayout(4, 4));
+		// 初始化数据连接下拉框
+		initConnectionComboBox(parent);
+		// 初始化中间的面板
+		JPanel centerPane = initCenterPane();
+		this.add(connectionComboBox, BorderLayout.NORTH);
+		this.add(centerPane, BorderLayout.CENTER);
+		this.setPreferredSize(new Dimension(WIDTH, getPreferredSize().height));
+		addKeyMonitor();
+	}
+
+	private JPanel initCenterPane() {
+		JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+		// 搜索面板
+		centerPane.add(createSearchPane(), BorderLayout.NORTH);
+		// 数据库表视图面板
+		centerPane.add(createTableViewBorderPane(), BorderLayout.CENTER);
+		return centerPane;
+	}
+
+	private void initConnectionComboBox(SwitchableTableDataPane parent) {
 		connectionComboBox = new ConnectionComboBoxPanel(com.fr.data.impl.Connection.class) {
 
 			@Override
@@ -60,10 +98,34 @@ public class ConnectionTableProcedurePane extends BasicPane {
 					search(true);
 				}
 			}
+
+			@Override
+			protected void afterRefreshItems() {
+				// 刷新完成后，如果未选中（在nameList初始化完成之前可能会出现），则尝试再次设置
+				if (isSelectedItemEmpty()) {
+					setRecentConnection();
+				}
+				// 获取数据连接之后，让父容器切换面板
+				if (parent != null) {
+					parent.switchTo(SwitchableTableDataPane.CONTENT_PANE_NAME);
+				}
+			}
+
+			@Override
+			protected void refreshItemsError() {
+				// 获取数据连接出现错误时，也让父容器从Loading面板切换至内容面板
+				if (parent != null) {
+					parent.switchTo(SwitchableTableDataPane.CONTENT_PANE_NAME);
+				}
+			}
 		};
+		connectionComboBox.addComboBoxActionListener(filter);
+	}
+
+	private JPanel createTableViewBorderPane() {
 		tableViewList = new TableViewList();
 		ToolTipManager.sharedInstance().registerComponent(tableViewList);
-		connectionComboBox.addComboBoxActionListener(filter);
+
 		tableViewList.addMouseListener(new MouseAdapter() {
 			public void mouseClicked(MouseEvent evt) {
 				if (evt.getClickCount() >= 2) {
@@ -80,23 +142,50 @@ public class ConnectionTableProcedurePane extends BasicPane {
 				}
 			}
 		});
-		JPanel filterPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+		UIScrollPane tableViewListPane = new UIScrollPane(tableViewList);
+		tableViewListPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC));
+		JPanel tableViewBorderPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+		tableViewBorderPane.add(tableViewListPane, BorderLayout.CENTER);
 		JPanel checkBoxgroupPane = createCheckBoxgroupPane();
 		if (checkBoxgroupPane != null) {
-			filterPane.add(createCheckBoxgroupPane(), BorderLayout.NORTH);
+			tableViewBorderPane.add(createCheckBoxgroupPane(), BorderLayout.SOUTH);
 		}
+		return tableViewBorderPane;
+	}
+
+	/**
+	 * 创建搜索Panel，用于搜索表或视图
+	 * @return
+	 */
+	private JPanel createSearchPane() {
+		JPanel panel = FRGUIPaneFactory.createBorderLayout_S_Pane();
 		JPanel searchPane = new JPanel(new BorderLayout(10, 0));
+		searchPane.setBorder(BorderFactory.createLineBorder(UIConstants.TOOLBAR_BORDER_COLOR));
+		searchPane.setBackground(Color.WHITE);
 		searchField = new UITextField();
-		searchPane.add(searchField, BorderLayout.CENTER);
+		searchField.setBorderPainted(false);
+		searchField.setPlaceholder(Toolkit.i18nText("Fine-Design_Basic_Table_Search"));
 		searchField.getDocument().addDocumentListener(searchListener);
-		filterPane.add(searchPane, BorderLayout.CENTER);
+		searchField.addMouseListener(new MouseAdapter() {
-		UIScrollPane tableViewListPane = new UIScrollPane(tableViewList);
+			@Override
-		tableViewListPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC));
+			public void mouseEntered(MouseEvent e) {
-		this.add(connectionComboBox, BorderLayout.NORTH);
+				super.mouseEntered(e);
-		this.add(tableViewListPane, BorderLayout.CENTER);
+				searchPane.setBorder(BorderFactory.createLineBorder(UIConstants.CHECKBOX_HOVER_SELECTED));
-		this.add(filterPane, BorderLayout.SOUTH);
+			}
-		this.setPreferredSize(new Dimension(WIDTH, getPreferredSize().height));
+
-		addKeyMonitor();
+			@Override
+			public void mouseExited(MouseEvent e) {
+				super.mouseExited(e);
+				searchPane.setBorder(BorderFactory.createLineBorder(UIConstants.TOOLBAR_BORDER_COLOR));
+			}
+		});
+		// 搜索图标
+		UILabel searchLabel = new UILabel(IconUtils.readIcon("/com/fr/design/images/data/search"));
+		searchLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 5));
+		searchPane.add(searchField, BorderLayout.CENTER);
+		searchPane.add(searchLabel, BorderLayout.EAST);
+		panel.add(searchPane, BorderLayout.CENTER);
+		return panel;
 	}
 
 	protected void filter(Connection connection, String conName, List<String> nameList) {

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

@@ -127,10 +127,12 @@ public abstract class ItemEditableComboBoxPanel extends JPanel {
 						itemComboBox.setMaximumRowCount(itemComboBox.getMaximumRowCount() + 1);
 						itemComboBox.setMaximumRowCount(itemComboBox.getMaximumRowCount() - 1);
 					}
+					afterRefreshItems();
 				} catch (Exception e) {
 					if (!(e instanceof CancellationException)) {
 						FineLoggerFactory.getLogger().error(e.getMessage(), e);
 					}
+					refreshItemsError();
 				}
 
 			}
@@ -160,6 +162,20 @@ public abstract class ItemEditableComboBoxPanel extends JPanel {
 	 */
 	protected abstract java.util.Iterator<String> items();
 
+	/**
+	 * 刷新ComboBox.items之后
+	 */
+	protected void afterRefreshItems() {
+		// 空实现，供子类重写
+	}
+
+	/**
+	 * 刷新ComboBox.items时出现异常
+	 */
+	protected void refreshItemsError() {
+		// 空实现，供子类重写
+	}
+
 	/*
 	 * 弹出对话框编辑Items
 	 */

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

@@ -20,6 +20,8 @@ import com.fr.design.data.datapane.preview.sql.PreviewPerformedSqlPane;
 import com.fr.design.data.datapane.sqlpane.SQLEditPane;
 import com.fr.design.data.tabledata.strategy.StrategyConfigHandler;
 import com.fr.design.data.tabledata.tabledatapane.db.StrategyConfigFrom;
+import com.fr.design.data.tabledata.tabledatapane.loading.SwitchableTableDataPane;
+import com.fr.design.data.tabledata.tabledatapane.loading.TipsPane;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.DialogActionAdapter;
@@ -36,6 +38,7 @@ import com.fr.design.gui.itoolbar.UIToolbar;
 import com.fr.design.gui.syntax.ui.rsyntaxtextarea.SyntaxConstants;
 import com.fr.design.gui.syntax.ui.rtextarea.RTextScrollPane;
 import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.menu.SeparatorDef;
 import com.fr.design.menu.ToolBarDef;
@@ -70,6 +73,7 @@ import javax.swing.SwingUtilities;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.Document;
 import java.awt.BorderLayout;
+import java.awt.CardLayout;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
@@ -86,7 +90,7 @@ import java.util.List;
  * @version 10.0
  * Created by rinoux on 2020/7/22
  */
-public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
+public class DBTableDataPane extends AbstractTableDataPane<DBTableData> implements SwitchableTableDataPane {
 
     private static final int BOTTOM = 6;
     private static final String PREVIEW_BUTTON = Toolkit.i18nText("Fine-Design_Basic_Preview");
@@ -109,14 +113,42 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 
     private StrategyConfigHandler<DBTableData> configHandler;
 
+    private CardLayout card;
+    /** 数据库查询面板真正的内容面板 */
+    private JPanel contentPane;
+    /** 加载中面板 */
+    private JPanel loadingPane;
 
     public DBTableDataPane() {
+        initCards();
+        initContentPane();
+    }
+
+    /**
+     * 初始化内容面板
+     */
+    protected void initContentPane() {
         init();
         initMainSplitPane();
     }
 
+    /**
+     * 初始化cardLayout以及LoadingPane等，并且布局切到LoadingPane
+     */
+    protected void initCards() {
+        card = new CardLayout();
+        setLayout(card);
+
+        loadingPane = new TipsPane(true);
+        contentPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+
+        add(LOADING_PANE_NAME, loadingPane);
+        add(CONTENT_PANE_NAME, contentPane);
+        switchTo(LOADING_PANE_NAME);
+    }
+
     private void init() {
-        setLayout(new BorderLayout(4, 4));
+        contentPane.setLayout(new BorderLayout(4, 4));
 
         this.sqlTextPane = new SQLEditPane();
         this.sqlTextPane.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_SQL);
@@ -130,7 +162,7 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
         editorPane = new UITableEditorPane<>(model);
 
 
-        this.connectionTableProcedurePane = new ConnectionTableProcedurePane() {
+        this.connectionTableProcedurePane = new ConnectionTableProcedurePane(this) {
             @Override
             protected void filter(Connection connection, String conName, List<String> nameList) {
                 connection.addConnection(nameList, conName, new Class[]{
@@ -231,7 +263,21 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
         JSplitPane mainSplitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, this.connectionTableProcedurePane, sqlSplitPane);
         mainSplitPane.setBorder(BorderFactory.createLineBorder(GUICoreUtils.getTitleLineBorderColor()));
         mainSplitPane.setOneTouchExpandable(true);
-        add(mainSplitPane, BorderLayout.CENTER);
+        contentPane.add(mainSplitPane, BorderLayout.CENTER);
+    }
+
+    @Override
+    public void switchTo(String panelName) {
+        try {
+            if (panelName != null) {
+                card.show(this, panelName);
+            }
+        } catch (IllegalArgumentException ingore) {
+            // 有些直接继承此面板或者替换掉此面板的插件，在未适配此功能时会出现报错，因为不是CardLayout，无法切换，这里处理下
+            FineLoggerFactory.getLogger().info("cannot switch pane by {}", this.getClass().getName());
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+        }
     }
 
     private boolean isPreviewOrRefreshButton(FocusEvent e) {

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

@@ -0,0 +1,23 @@
+package com.fr.design.data.tabledata.tabledatapane.loading;
+
+
+
+/**
+ * 可切换的DBTableData对应的数据集面板，需要使用CardLayout布局
+ * 主要是给插件适配用的
+ * @author Yvan
+ */
+public interface SwitchableTableDataPane {
+
+    /** Loading面板 */
+    String LOADING_PANE_NAME = "Loading";
+    /** 内容面板 */
+    String CONTENT_PANE_NAME = "Content";
+
+    /**
+     * 根据面板名称切换面板
+     * @param paneName 面板名称
+     */
+    void switchTo(String paneName);
+
+}

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

@@ -0,0 +1,54 @@
+package com.fr.design.data.tabledata.tabledatapane.loading;
+
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.i18n.Toolkit;
+
+import javax.swing.JPanel;
+import java.awt.CardLayout;
+
+/**
+ * @author Yvan
+ */
+public class TableDataLoadingPane extends BasicPane {
+
+    /** Loading面板 */
+    public static final String LOADING_PANE_NAME = "Loading";
+    /** 无权限提示面板 */
+    public static final String NO_AUTH_PANE_NAME = "NoAuthority";
+    /** 错误提示面板 */
+    public static final String ERROR_NAME = "Error";
+
+    private CardLayout card;
+
+    /** 加载中面板 */
+    private JPanel loadingPane;
+    /** 错误提示面板 */
+    private JPanel errorPane;
+    /** 数据连接无权限面板 */
+    private JPanel noAuthorityPane;
+
+    public TableDataLoadingPane() {
+        initPanes();
+    }
+
+    private void initPanes() {
+        card = new CardLayout();
+        this.setLayout(card);
+        loadingPane = new TipsPane(true);
+        errorPane = new TipsPane(Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Error"));
+        noAuthorityPane = new TipsPane(Toolkit.i18nText("Fine-Design_Basic_Database_Connection_No_Auth"));
+        add(LOADING_PANE_NAME, loadingPane);
+        add(NO_AUTH_PANE_NAME, noAuthorityPane);
+        add(ERROR_NAME, errorPane);
+        switchTo(LOADING_PANE_NAME);
+    }
+
+    public void switchTo(String panelName) {
+        card.show(this, panelName);
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return Toolkit.i18nText("Fine-Design_Basic_DS-Database_Query");
+    }
+}

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

@@ -0,0 +1,45 @@
+package com.fr.design.data.tabledata.tabledatapane.loading;
+
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.FRGUIPaneFactory;
+
+import javax.swing.JPanel;
+import javax.swing.JProgressBar;
+import javax.swing.SwingConstants;
+import java.awt.BorderLayout;
+
+/**
+ * 提示面板，支持自定义提示，支持进度条配置可选
+ * @author Yvan
+ */
+public class TipsPane extends JPanel {
+
+    /**
+     * 默认提示
+     */
+    private static final String LOADING = Toolkit.i18nText("Fine-Design_Basic_Loading_And_Waiting");
+
+    public TipsPane () {
+        this(LOADING, false);
+    }
+
+    public TipsPane (String tip) {
+        this(tip, false);
+    }
+
+    public TipsPane (boolean needProgressBar) {
+        this(LOADING, needProgressBar);
+    }
+
+    public TipsPane (String tips, boolean needProgressBar) {
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        UILabel tipsLabel = new UILabel(tips, SwingConstants.CENTER);
+        this.add(tipsLabel, BorderLayout.CENTER);
+        if (needProgressBar) {
+            JProgressBar progressBar = new JProgressBar();
+            progressBar.setIndeterminate(true);
+            this.add(progressBar, BorderLayout.SOUTH);
+        }
+    }
+}

designer-base/src/main/java/com/fr/design/gui/ilable/ActionLabel.java

@@ -14,11 +14,18 @@ import java.awt.event.MouseEvent;
 public class ActionLabel extends UILabel {
     private ActionListener actionListener;
     private Color color;
+    // 文字是否有下划线
+    private boolean drawUnderLine = true;
 
     public ActionLabel(String text) {
        this(text, Color.blue);
     }
 
+    public ActionLabel(String text, boolean drawUnderLine) {
+        this(text, Color.blue);
+        this.drawUnderLine = drawUnderLine;
+    }
+
     public ActionLabel(String text, Color color) {
         super(text);
         this.color = color;
@@ -39,8 +46,10 @@ public class ActionLabel extends UILabel {
         super.paintComponent(_gfx);
 
         _gfx.setColor(this.color);
+        if (drawUnderLine) {
             _gfx.drawLine(0, this.getHeight() - 1, this.getWidth(), this.getHeight() - 1);
         }
+    }
 
     private MouseInputAdapter mouseInputAdapter = new MouseInputAdapter() {
         @Override
@@ -95,4 +104,12 @@ public class ActionLabel extends UILabel {
             }
         }
     };
+
+    public boolean isDrawUnderLine() {
+        return drawUnderLine;
+    }
+
+    public void setDrawUnderLine(boolean drawUnderLine) {
+        this.drawUnderLine = drawUnderLine;
+    }
 }

designer-base/src/main/java/com/fr/design/plugin/remind/PluginErrorDesignReminder.java

@@ -7,7 +7,6 @@ import com.fr.design.notification.Notification;
 import com.fr.design.notification.NotificationCenter;
 import com.fr.plugin.error.PluginErrorRemindHandler;
 import com.fr.plugin.error.PluginErrorReminder;
-import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
 import com.fr.stable.collections.CollectionUtils;
 import com.fr.workspace.WorkContext;
@@ -23,9 +22,10 @@ import java.util.List;
 public class PluginErrorDesignReminder implements PluginErrorReminder {
 
     private static final String MESSAGE_ID = "plugin-invalidate-remind";
-    private static final String COMMA = "、";
+    public static final String COMMA = "、";
-    private static final String COLON = "：";
+    public static final String COLON = "：";
-    private static final String NEW_LINE_TAG = "<br/>";
+    public static final String NEW_LINE_TAG = "<br/>";
+    private static final int MAX_PLUGIN_NAME_PER_LINE = 3;
 
     private static class Holder {
         private static final PluginErrorDesignReminder INSTANCE = new PluginErrorDesignReminder();
@@ -84,13 +84,33 @@ public class PluginErrorDesignReminder implements PluginErrorReminder {
                 .append(Toolkit.i18nText("Fine-Design_Plugin_Embed_Notice"))
                 .append(COLON)
                 .append(NEW_LINE_TAG)
-                .append(StableUtils.join(invalidatePluginNames, COMMA))
+                .append(NEW_LINE_TAG)
+                .append(dealWithPluginNames(invalidatePluginNames))
+                .append(NEW_LINE_TAG)
                 .append(NEW_LINE_TAG)
                 .append(Toolkit.i18nText("Fine-Design_Plugin_Embed_Description"))
                 .append(NEW_LINE_TAG)
                 .toString();
     }
 
+    /**
+     * 处理消息中的插件名称展示
+     * 由于Notification那边展示的弹窗是随消息宽度变化的，所以插件名称很多时会变得很长。这里做个分行
+     * @return
+     * @param invalidatePluginNames
+     */
+    public String dealWithPluginNames(List<String> invalidatePluginNames) {
+        StringBuilder builder = new StringBuilder();
+        for (int i = 0; i < invalidatePluginNames.size(); i++) {
+            String pluginName = invalidatePluginNames.get(i);
+            builder.append(pluginName);
+            if (i != invalidatePluginNames.size() - 1) {
+                builder.append(i % MAX_PLUGIN_NAME_PER_LINE == (MAX_PLUGIN_NAME_PER_LINE - 1) ? NEW_LINE_TAG : COMMA);
+            }
+        }
+        return builder.toString();
+    }
+
     /**
      * 构建通知对象
      * @param message

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

@@ -96,8 +96,6 @@ public class UpdateMainDialog extends UIDialog {
     private LoadingLabel loadingLabel;
     //更新按钮
     private UIButton updateButton;
-    //有新版本提示标签
-    private UILabel updateLabel;
 
     //jar包版本信息面板，包括当前版本和最新版本
     private JPanel jarVersionInfoPane;
@@ -160,13 +158,8 @@ public class UpdateMainDialog extends UIDialog {
         progressBar.setStringPainted(true);
         progressBar.setPreferredSize(PROGRESSBAR);
 
-        updateLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_New_Version_Available"));
-        updateLabel.setHorizontalAlignment(SwingConstants.RIGHT);
-        updateLabel.setVisible(false);
-
         progressBarPane.add(GUICoreUtils.createBorderLayoutPane(
-                progressBar, BorderLayout.CENTER,
+                progressBar, BorderLayout.CENTER
-                updateLabel, BorderLayout.EAST
         ), BorderLayout.CENTER);
 
         updateActionPane = TableLayoutHelper.createCommonTableLayoutPane(new Component[][]{
@@ -186,7 +179,7 @@ public class UpdateMainDialog extends UIDialog {
         double[] rowUpdatePaneSize = {UPDATE_PANE_ROW_SIZE, TableLayout.PREFERRED, TableLayout.PREFERRED};
         double[] columnUpdatePaneSize = {TableLayout.PREFERRED, TableLayout.FILL, TableLayout.PREFERRED};
         double[] rowUpdateContentPaneSize = {TableLayout.PREFERRED};
-        double[] columnUpdateContentPaneSize = {TableLayout.PREFERRED, TableLayout.FILL, TableLayout.PREFERRED};
+        double[] columnUpdateContentPaneSize = {TableLayout.PREFERRED, TableLayout.FILL};
         double[] rowUpdateSubContentPaneSize = {UPDATE_CONTENT_PANE_ROW_SIZE, TableLayout.PREFERRED, TableLayout.PREFERRED, TableLayout.PREFERRED, UPDATE_CONTENT_PANE_ROW_SIZE};
         double[] columnUpdateSubContentPaneSize = {UPDATE_CONTENT_PANE_COLUMN_SIZE, TableLayout.PREFERRED, TableLayout.PREFERRED};
         double[] columnUpdateSubContentPaneLabelSize = {UPDATE_CONTENT_PANE_LABEL_COLUMN_SIZE, TableLayout.PREFERRED};
@@ -198,7 +191,7 @@ public class UpdateMainDialog extends UIDialog {
         JPanel jarUpdateContentPane2 = TableLayoutHelper.createCommonTableLayoutPane(new Component[][]{
                 new Component[]{new UILabel(), new UILabel(), new UILabel()},
                 new Component[]{new UILabel(), updateVersionReminderPane, new UILabel()},
-                new Component[]{new UILabel(), initPaneContent(Color.WHITE, rowUpdateContentPaneSize, columnUpdateSubContentPaneLabelSize, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_JAR_Version")), jarCurrentLabel), new UILabel()},
+                new Component[]{new UILabel(), initPaneContent(Color.WHITE, rowUpdateContentPaneSize, columnUpdateSubContentPaneLabelSize, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_JAR_Version")), jarCurrentLabel), jarRestoreLabel},
                 new Component[]{new UILabel(), initPaneContent(Color.WHITE, rowUpdateContentPaneSize, columnUpdateSubContentPaneLabelSize, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Latest_JAR")), loadingLabel),
                         getNewFeatureActionLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Latest_Feature_Detail"))},
                 new Component[]{new UILabel(), new UILabel(), new UILabel()}
@@ -207,7 +200,6 @@ public class UpdateMainDialog extends UIDialog {
         jarUpdateContentPane.add(jarUpdateContentPane2);
         jarVersionInfoPane = TableLayoutHelper.createCommonTableLayoutPane(new Component[][]{
                 new Component[]{new UILabel(), new UILabel(), new UILabel()},
-                new Component[]{new UILabel(), initPaneContent(getBackground(), rowUpdateContentPaneSize, columnUpdateContentPaneSize, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_JarUpdate")), new UILabel(), jarRestoreLabel), new UILabel()},
                 new Component[]{new UILabel(), jarUpdateContentPane, new UILabel()}
         }, rowUpdatePaneSize, columnUpdatePaneSize, LayoutConstants.VGAP_LARGE);
     }
@@ -225,7 +217,7 @@ public class UpdateMainDialog extends UIDialog {
                 new Component[]{new UILabel(), new UILabel(), new UILabel()}
         }, searchRow, searchColumn, LayoutConstants.VGAP_LARGE);
 
-        String[] columnNames = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Date"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Content"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_SignHeader")};
+        String[] columnNames = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Date"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Version"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Content"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_SignHeader")};
         initUpdateInfoTable(columnNames);
 
         UIScrollPane uiScrollPane = new UIScrollPane(updateInfoTable);
@@ -236,31 +228,32 @@ public class UpdateMainDialog extends UIDialog {
     }
 
     private void initUpdateInfoTable(String[] columnNames) {
-        int updateTimeColIndex = 0;
-        int updateTitleColIndex = 1;
-        int updateSignColIndex = 2;
-
         updateInfoTable = new UpdateInfoTable(columnNames);
 
         updateInfoTable.setShowGrid(false);
         updateInfoTable.setCellSelectionEnabled(false);
         TableRowSorter<UpdateInfoTableModel> sorter = new TableRowSorter<>(updateInfoTable.getDataModel());
-        sorter.setSortable(updateTimeColIndex, true);
+        sorter.setSortable(UpdateInfoTable.UPDATE_DATE_INDEX, true);
-        sorter.setSortable(updateTitleColIndex, false);
+        sorter.setSortable(UpdateInfoTable.UPDATE_VERSION_INDEX, true);
-        sorter.setSortable(updateSignColIndex, false);
+        sorter.setSortable(UpdateInfoTable.UPDATE_TITLE_INDEX, false);
+        sorter.setSortable(UpdateInfoTable.SIGN_INDEX, false);
         updateInfoTable.setRowSorter(sorter);
         List<RowSorter.SortKey> sortKeys = new ArrayList<>();
-        sortKeys.add(new RowSorter.SortKey(updateTimeColIndex, SortOrder.DESCENDING));
+        sortKeys.add(new RowSorter.SortKey(UpdateInfoTable.UPDATE_DATE_INDEX, SortOrder.DESCENDING));
+        sortKeys.add(new RowSorter.SortKey(UpdateInfoTable.UPDATE_VERSION_INDEX, SortOrder.DESCENDING));
         sorter.setSortKeys(sortKeys);
 
         updateInfoTable.getTableHeader().setReorderingAllowed(false);
-        updateInfoTable.getColumnModel().getColumn(updateTimeColIndex).setMaxWidth(UPDATE_INFO_TABLE_HEADER_TIME_WIDTH);
+        updateInfoTable.getColumnModel().getColumn(UpdateInfoTable.UPDATE_DATE_INDEX).setMaxWidth(UPDATE_INFO_TABLE_HEADER_TIME_WIDTH);
-        updateInfoTable.getColumnModel().getColumn(updateTimeColIndex).setMinWidth(UPDATE_INFO_TABLE_HEADER_TIME_WIDTH);
+        updateInfoTable.getColumnModel().getColumn(UpdateInfoTable.UPDATE_DATE_INDEX).setMinWidth(UPDATE_INFO_TABLE_HEADER_TIME_WIDTH);
-        updateInfoTable.getColumnModel().getColumn(updateSignColIndex).setMaxWidth(0);
+        updateInfoTable.getColumnModel().getColumn(UpdateInfoTable.UPDATE_VERSION_INDEX).setMaxWidth(UPDATE_INFO_TABLE_HEADER_TIME_WIDTH);
-        updateInfoTable.getColumnModel().getColumn(updateSignColIndex).setMinWidth(0);
+        updateInfoTable.getColumnModel().getColumn(UpdateInfoTable.UPDATE_VERSION_INDEX).setMinWidth(UPDATE_INFO_TABLE_HEADER_TIME_WIDTH);
-        updateInfoTable.getTableHeader().getColumnModel().getColumn(updateSignColIndex).setMaxWidth(0);
+        updateInfoTable.getColumnModel().getColumn(UpdateInfoTable.SIGN_INDEX).setMaxWidth(0);
-        updateInfoTable.getTableHeader().getColumnModel().getColumn(updateSignColIndex).setMinWidth(0);
+        updateInfoTable.getColumnModel().getColumn(UpdateInfoTable.SIGN_INDEX).setMinWidth(0);
+        updateInfoTable.getTableHeader().getColumnModel().getColumn(UpdateInfoTable.SIGN_INDEX).setMaxWidth(0);
+        updateInfoTable.getTableHeader().getColumnModel().getColumn(UpdateInfoTable.SIGN_INDEX).setMinWidth(0);
         updateInfoTable.getColumn(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Date")).setCellRenderer(new UpdateInfoTableCellRender());
+        updateInfoTable.getColumn(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Version")).setCellRenderer(new UpdateInfoTableCellRender());
         updateInfoTable.getColumn(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Content")).setCellRenderer(new UpdateInfoTextAreaCellRender());
     }
 
@@ -304,18 +297,18 @@ public class UpdateMainDialog extends UIDialog {
         updateButton.setEnabled(false);
 
         double[] rowSize = {TableLayout.PREFERRED};
+        double[] colSize = {TableLayout.PREFERRED};
+        UILabel versionLabel = new UILabel(UpdateConstants.DEFAULT_APP_NAME + StringUtils.BLANK + ProductConstants.VERSION);
+        versionLabel.setFont(new Font("Default", Font.BOLD, 16));
+
 
-        double[] colSize = {UPDATE_CONTENT_PANE_LABEL_COLUMN_SIZE, TableLayout.PREFERRED};
         updateVersionReminderPane = initPaneContent(
-                Color.WHITE, rowSize, colSize,
+                Color.WHITE, rowSize, colSize, versionLabel
-                new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Designer_Version")),
-                new UILabel(UpdateConstants.DEFAULT_APP_NAME + StringUtils.BLANK + ProductConstants.VERSION)
         );
 
         String notInstallVersion = InterProviderFactory.getProvider().getLocText("Fine-Core_Basic_About_No_Build");
         String versionBuildNo = GeneralUtils.getVersion() + HYPHEN + GeneralUtils.readBuildNO();
         jarCurrentLabel = new UILabel(ComparatorUtils.equals(notInstallVersion, GeneralUtils.readBuildNO()) ? notInstallVersion : versionBuildNo, SwingConstants.CENTER);
-        UILabel noJarPreviousRevision = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_No_Previous_Version"));
         UpdateActionLabel jarRestorePreviousRevision = new UpdateActionLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Restore"), false);
         jarRestorePreviousRevision.setForeground(new Color(RESTORE_LABEL_COLOR));
         jarRestorePreviousRevision.addActionListener(new ActionListener() {
@@ -327,7 +320,7 @@ public class UpdateMainDialog extends UIDialog {
         });
         //choose RestoreLabel to show
         boolean isNeedRestore = ArrayUtils.isNotEmpty(UpdateFileUtils.listBackupVersions());
-        jarRestoreLabel = isNeedRestore ? jarRestorePreviousRevision : noJarPreviousRevision;
+        jarRestoreLabel = isNeedRestore ? jarRestorePreviousRevision : null;
     }
 
     private void initComponents() {
@@ -542,7 +535,8 @@ public class UpdateMainDialog extends UIDialog {
     private ArrayList<Object[]> generateUpdateInfoList(JSONArray jsonArray, String keyword) throws Exception {
         for (int i = 0; i < jsonArray.length(); i++) {
             JSONObject jo = (JSONObject) jsonArray.get(i);
-            String updateTitle = (String) jo.get("jiraId") + jo.get("info");
+            String updateTitle = (String) jo.get("jiraId") + " " + jo.get("info");
+            String updateVersionStr = (String) jo.get("version");
             String updateTimeStr = (String) jo.get("updateTime");
             Date updateTime = UPDATELOG_FORMAT.parse(updateTimeStr);
             //形如 Build#release-2018.07.31.03.03.52.80
@@ -557,7 +551,7 @@ public class UpdateMainDialog extends UIDialog {
                 }
             }
             if (isValidLogInfo(updateTitle)) {
-                updateInfoList.add(new Object[]{UPDATE_INFO_TABLE_FORMAT.format(updateTime), updateTitle, updateTime.after(curJarDate)});
+                updateInfoList.add(new Object[]{UPDATE_INFO_TABLE_FORMAT.format(updateTime), updateVersionStr, updateTitle, updateTime.after(curJarDate)});
             }
         }
         return new ArrayList<>(updateInfoList);
@@ -590,14 +584,12 @@ public class UpdateMainDialog extends UIDialog {
             Date currentDate = (new SimpleDateFormat("yyyy.MM.dd.HH.mm.ss")).parse(currentNO, new ParsePosition(currentNO.indexOf("-") + 1));
             if (DateUtils.subtractDate(jarDate, currentDate, DateUtils.SECOND) > 0) {
                 updateButton.setEnabled(true);
-                updateLabel.setVisible(true);
                 loadingLabel.stopLoading(buildNO.contains("-") ? buildNO.substring(buildNO.lastIndexOf("-") + 1) : buildNO);
             } else {
                 loadingLabel.stopLoading(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Already_Latest_Version"));
             }
         } else {
             updateButton.setEnabled(true);
-            updateLabel.setVisible(true);
             loadingLabel.stopLoading(buildNO.contains("-") ? buildNO.substring(buildNO.lastIndexOf("-") + 1) : buildNO);
         }
 
@@ -666,7 +658,8 @@ public class UpdateMainDialog extends UIDialog {
     }
 
     private ActionLabel getNewFeatureActionLabel(final String text){
-        ActionLabel actionLabel = new ActionLabel(text);
+        ActionLabel actionLabel = new ActionLabel(text, new Color(RESTORE_LABEL_COLOR));
+        actionLabel.setDrawUnderLine(false);
         actionLabel.addActionListener(new NewFeatureAction());
         return actionLabel;
     }
@@ -701,7 +694,6 @@ public class UpdateMainDialog extends UIDialog {
                 progressBar.setString(Toolkit.i18nText("Fine-Design_Update_Info_Wait_Message"));
                 UpdateCallBack callBack = new UpdateProgressCallBack(progressBar);
                 updateButton.setEnabled(false);
-                updateLabel.setVisible(false);
                 RestoreResultDialog.deletePreviousPropertyFile();
                 final String installLib = StableUtils.pathJoin(StableUtils.getInstallHome(), ProjectConstants.LOGS_NAME, UpdateConstants.INSTALL_LIB);
                 final JFrame frame = DesignerContext.getDesignerFrame();

designer-base/src/main/java/com/fr/design/update/ui/widget/UpdateInfoTable.java

@@ -10,6 +10,12 @@ import java.util.Vector;
  * Created by XINZAI on 2018/8/21.
  */
 public class UpdateInfoTable extends JTable {
+
+    public static int UPDATE_DATE_INDEX = 0;
+    public static int UPDATE_VERSION_INDEX = 1;
+    public static int UPDATE_TITLE_INDEX = 2;
+    public static int SIGN_INDEX = 3;
+
     private UpdateInfoTableModel dataModel;
 
     public UpdateInfoTable(TableModel dm) {

designer-base/src/main/java/com/fr/design/update/ui/widget/UpdateInfoTableCellRender.java

@@ -18,11 +18,11 @@ public class UpdateInfoTableCellRender extends DefaultTableCellRenderer {
     public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
         Component cell = super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
         cell.setBackground((row & 1) != 0 ? new Color(0xf0f0f0) : Color.WHITE);
-        if ((Boolean) table.getValueAt(row, 2)) {
+        if ((Boolean) table.getValueAt(row, UpdateInfoTable.SIGN_INDEX)) {
             cell.setBackground(new Color(0xdfecfd));
         }
-        if (column == 0) {
+        if (column == UpdateInfoTable.UPDATE_DATE_INDEX || column == UpdateInfoTable.UPDATE_VERSION_INDEX) {
-            //设置首列日期居中显示
+            //设置日期,版本居中显示
             setHorizontalAlignment(JLabel.CENTER);
 
             for (int i = 1; row - i >= 0; i++) {

designer-base/src/main/java/com/fr/design/update/ui/widget/UpdateInfoTextAreaCellRender.java

@@ -35,7 +35,7 @@ public class UpdateInfoTextAreaCellRender extends JTextArea implements TableCell
 
         setText(value == null ? "" : value.toString());
         setBackground((row & 1) != 0 ? new Color(0xf0f0f0) : Color.WHITE);
-        if ((Boolean) table.getValueAt(row, 2)) {
+        if ((Boolean) table.getValueAt(row, UpdateInfoTable.SIGN_INDEX)) {
             setBackground(new Color(0xdfecfd));
         }
         return this;

designer-base/src/test/java/com/fr/design/plugin/remind/PluginErrorDesignReminderTest.java

@@ -5,6 +5,7 @@ import com.fr.workspace.WorkContext;
 import com.fr.workspace.empty.EmptyWorkspace;
 import junit.framework.TestCase;
 import org.easymock.EasyMock;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.runner.RunWith;
 import org.powermock.api.easymock.PowerMock;
@@ -12,6 +13,8 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * @author Yvan
@@ -44,4 +47,26 @@ public class PluginErrorDesignReminderTest extends TestCase {
 
         PowerMock.verifyAll();
     }
+
+    public void testDealWithPluginNames() {
+        List<String> pluginNames1 = Arrays.asList("1");
+        String content1 = PluginErrorDesignReminder.getInstance().dealWithPluginNames(pluginNames1);
+        Assert.assertFalse(content1.contains(PluginErrorDesignReminder.COMMA));
+        Assert.assertFalse(content1.contains(PluginErrorDesignReminder.NEW_LINE_TAG));
+
+        List<String> pluginNames2 = Arrays.asList("1", "2");
+        String content2 = PluginErrorDesignReminder.getInstance().dealWithPluginNames(pluginNames2);
+        Assert.assertTrue(content2.contains(PluginErrorDesignReminder.COMMA));
+        Assert.assertFalse(content2.contains(PluginErrorDesignReminder.NEW_LINE_TAG));
+
+        List<String> pluginNames3 = Arrays.asList("1", "2", "3", "4");
+        String content3 = PluginErrorDesignReminder.getInstance().dealWithPluginNames(pluginNames3);
+        Assert.assertTrue(content3.contains(PluginErrorDesignReminder.COMMA));
+        Assert.assertTrue(content3.contains(PluginErrorDesignReminder.NEW_LINE_TAG));
+
+        List<String> pluginNames4 = Arrays.asList("1", "2", "3");
+        String content4 = PluginErrorDesignReminder.getInstance().dealWithPluginNames(pluginNames4);
+        Assert.assertTrue(content4.contains(PluginErrorDesignReminder.COMMA));
+        Assert.assertFalse(content4.contains(PluginErrorDesignReminder.NEW_LINE_TAG));
+    }
 }

designer-realize/src/main/java/com/fr/start/MainDesigner.java

@@ -119,9 +119,8 @@ public class MainDesigner extends BaseDesigner {
      * @param args 参数
      */
     public static void main(String[] args) {
-    
         DesignerStartupContext.getRecorder().start();
-    
+        showSplash();
         startPreload0();
     
         DeepLinkManager.getInstance().start(args);
@@ -192,12 +191,6 @@ public class MainDesigner extends BaseDesigner {
         };
         PreLoadService.getInstance().addRunnable(fontLoad);
     
-        CompletableFuture<Void> splashFuture = CompletableFuture.runAsync(() -> {
-                    DesignerEnvManager.getEnvManager(false);
-                })
-                .thenRun(MainDesigner::showSplash);
-        PreLoadService.getInstance().addFuture(splashFuture);
-    
     }
     
     private static void showSplash() {

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

@@ -521,7 +521,6 @@ public class DesignerActivator extends Activator implements Prepare {
 
     @Override
     public void prepare() {
-    
         if (!OptimizeUtil.isOpen()) {
             LoginAuthServer.getInstance().compatibleStart();
         }