Merge pull request #4607 in DESIGN/design from feature/10.0 to feature/x

* commit 'a403f09e6b5794786ed55947f1d3134025c39f41':
  fix
  CHART-19525 富文本编辑框设置为可调整
  修改延迟时间
  REPORT-51360 设计器消息提醒
  REPORT-53706 关闭按钮样式调整
  REPORT-51958 远程环境检测及同步
  REPORT-51958 远程环境检测及同步
  REPORT-51958 远程环境检测及同步
  REPORT-53806【组件复用】组件生成时，数据集查询的数据集变成了内置数据集，而不是保留查询
  REPORT-53821  driver加上trim函数
  REPORT-52871 聚合报表部分内容不显示，点击之后才可显示完全

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

@@ -5,10 +5,10 @@ import com.fr.data.impl.JDBCDatabaseConnection;
 import com.fr.design.border.UITitledBorder;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.gui.ilable.ActionLabel;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ipasswordfield.UIPasswordFieldWithFixedLength;
 import com.fr.design.gui.itextfield.UITextField;
-import com.fr.design.gui.ilable.ActionLabel;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
@@ -21,17 +21,13 @@ import com.fr.general.ComparatorUtils;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.EncodeConstants;
 import com.fr.stable.StringUtils;
-import java.awt.event.InputMethodEvent;
+
-import java.awt.event.InputMethodListener;
-import java.awt.event.KeyAdapter;
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import javax.swing.BorderFactory;
 import javax.swing.JFileChooser;
 import javax.swing.JPanel;
 import javax.swing.JPasswordField;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
@@ -39,13 +35,18 @@ import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.InputMethodEvent;
+import java.awt.event.InputMethodListener;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
 import java.io.File;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
-import javax.swing.event.DocumentEvent;
+import java.util.regex.Matcher;
-import javax.swing.event.DocumentListener;
+import java.util.regex.Pattern;
 
 public class JDBCDefPane extends JPanel {
     public static final String DRIVER_TYPE = "driver_type";
@@ -291,7 +292,7 @@ public class JDBCDefPane extends JPanel {
             jdbcDatabase = new JDBCDatabaseConnection();
         }
         Object driveItem = this.driverComboBox.getSelectedItem();
-        jdbcDatabase.setDriver(driveItem == null ? null : driveItem.toString());
+        jdbcDatabase.setDriver(driveItem == null ? null : driveItem.toString().trim());
         jdbcDatabase.setURL(this.urlTextField.getText().trim());
         jdbcDatabase.setUser(this.userNameTextField.getText().trim());
         jdbcDatabase.setPassword(new String(this.passwordTextField.getPassword()).trim());

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

@@ -4,6 +4,8 @@ package com.fr.design.dialog;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.notification.Notification;
+import com.fr.design.notification.NotificationCenter;
 import com.fr.design.utils.gui.GUICoreUtils;
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -46,6 +48,7 @@ public class NotificationDialog extends JDialog {
     }
 
     public void initComponents(int messageType, String message, boolean isModal,NotificationDialogAction action) {
+        NotificationCenter.getInstance().addNotification(new Notification(messageType,message,action));
         notificationDialogAction = action;
         setModal(isModal);
         setResizable(false);
@@ -116,7 +119,7 @@ public class NotificationDialog extends JDialog {
                 propertyName = "OptionPane.newMessageIcon";
                 break;
             case 2:
-                propertyName = "OptionPane.warningIcon";
+                propertyName = "OptionPane.circularWarningIcon";
                 break;
             default:
                 return null;

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

@@ -179,6 +179,7 @@ public class UILookAndFeel extends MetalLookAndFeel {
         table.put("OptionPane.circularWarningIcon", loadIcon("circularWarningIcon.png", this));
         table.put("OptionPane.newMessageIcon", loadIcon("newMessageIcon.png", this));
         table.put("OptionPane.circularErrorIcon", loadIcon("circularErrorIcon.png", this));
+        table.put("OptionPane.deleteIcon", loadIcon("deleteIcon.png", this));
         table.put("OptionPane.questionIcon", loadIcon("QuestionIcon.png", this));
         table.put("OptionPane.tipIcon", loadIcon("TipIcon.png", this));
         table.put("ScrollPane.border", new UIScrollPaneBorder());

designer-base/src/main/java/com/fr/design/login/message/DesignerMessageHelper.java

@@ -0,0 +1,120 @@
+package com.fr.design.login.message;
+
+import com.fr.concurrent.NamedThreadFactory;
+import com.fr.design.DesignerEnvManager;
+import com.fr.design.dialog.NotificationDialog;
+import com.fr.design.dialog.NotificationDialogAction;
+import com.fr.design.event.DesignerOpenedListener;
+import com.fr.design.login.utils.DesignerLoginUtils;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.utils.BrowseUtils;
+import com.fr.general.CloudCenter;
+import com.fr.general.http.HttpToolbox;
+import com.fr.json.JSON;
+import com.fr.json.JSONFactory;
+import com.fr.json.JSONObject;
+import com.fr.log.FineLoggerFactory;
+import com.fr.stable.StringUtils;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author Lanlan
+ * @version 10.0
+ * Created by Lanlan on 2021/6/11
+ */
+public class DesignerMessageHelper {
+
+    private static final long DELAY = 7L;
+    private static final String STATUS = "status";
+    private static final String DATA = "data";
+    private static final String SUCCESS = "success";
+    private static final String MESSAGE_ID = "messageId";
+    private static final String TITLE = "title";
+    private static final String BODY = "body";
+    private static final String JUMP_TYPE = "jumpType";
+    private static final String JUMP_TO = "jumpTo";
+
+    private static DesignerMessageHelper instance;
+
+    private DesignerMessageHelper() {
+    }
+
+    public static DesignerMessageHelper getInstance() {
+        if (instance == null) {
+            instance = new DesignerMessageHelper();
+        }
+        return instance;
+    }
+
+    public void prepareShowMessage() {
+        DesignerContext.getDesignerFrame().addDesignerOpenedListener(new DesignerOpenedListener() {
+            @Override
+            public void designerOpened() {
+                ScheduledExecutorService service = Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("DesignerMessageHelper"));
+                service.schedule(new Runnable() {
+                    @Override
+                    public void run() {
+                        try {
+                            pullLatestMessageAndShow();
+                        } catch (Exception e) {
+                            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+                        }
+                    }
+                }, DELAY, TimeUnit.MINUTES);
+                service.shutdown();
+            }
+        });
+    }
+
+    private void pullLatestMessageAndShow() throws Exception {
+        String url = CloudCenter.getInstance().acquireUrlByKind("designer.message.push", "https://market.fanruan.com/api/v1/message/designer");
+        Map<String, String> params = new HashMap<>();
+        params.put("designerId", DesignerEnvManager.getEnvManager().getUUID());
+        String result = HttpToolbox.post(url, params);
+        JSONObject response = JSONFactory.createJSON(JSON.OBJECT, result);
+        String status = response.optString(STATUS);
+        if (SUCCESS.equals(status)) {
+            JSONObject data = response.optJSONObject(DATA);
+            String messageId = data.optString(MESSAGE_ID);
+            String title = data.optString(TITLE);
+            String body = data.optString(BODY);
+            int jumpType = data.optInt(JUMP_TYPE);
+            String jumpTo = data.optString(JUMP_TO);
+            if (StringUtils.isNotEmpty(messageId) && StringUtils.isNotEmpty(title) && StringUtils.isNotEmpty(body) && jumpType > 0 && StringUtils.isNotEmpty(jumpTo)) {
+                NotificationJumpType notificationJumpType = NotificationJumpType.valueOf(jumpType);
+                if (notificationJumpType == NotificationJumpType.WEB_URL) {
+                    NotificationDialog.Builder()
+                            .owner(DesignerContext.getDesignerFrame())
+                            .title(title)
+                            .modal(true)
+                            .messageType(NotificationDialog.NEW_MESSAGE)
+                            .message(body)
+                            .notificationDialogAction(new NotificationDialogAction() {
+                                @Override
+                                public void doClick() {
+                                    String ssoUrl = DesignerLoginUtils.generateDesignerSSOUrl(jumpTo);
+                                    BrowseUtils.browser(ssoUrl);
+                                }
+                            })
+                            .build()
+                            .setVisible(true);
+                } else if (notificationJumpType == NotificationJumpType.DESIGNER_MODULE) {
+                    DesignerModuleClickType designerModuleClickType = DesignerModuleClickType.valueOf(jumpTo);
+                    NotificationDialog.Builder()
+                            .owner(DesignerContext.getDesignerFrame())
+                            .title(title)
+                            .modal(true)
+                            .messageType(NotificationDialog.NEW_MESSAGE)
+                            .message(body)
+                            .notificationDialogAction(designerModuleClickType.getAction())
+                            .build()
+                            .setVisible(true);
+                }
+            }
+        }
+    }
+}

designer-base/src/main/java/com/fr/design/login/message/DesignerModuleClickType.java

@@ -0,0 +1,69 @@
+package com.fr.design.login.message;
+
+import com.fr.config.ServerPreferenceConfig;
+import com.fr.design.dialog.NotificationDialogAction;
+import com.fr.design.extra.WebViewDlgHelper;
+import com.fr.design.os.impl.SupportOSImpl;
+import com.fr.design.upm.UpmFinder;
+import com.fr.design.utils.DesignUtils;
+import com.fr.log.FineLoggerFactory;
+import com.fr.stable.StringUtils;
+import com.fr.stable.os.Arch;
+import com.fr.stable.os.OperatingSystem;
+
+/**
+ * @author Lanlan
+ * @version 10.0
+ * Created by Lanlan on 2021/6/11
+ */
+public enum DesignerModuleClickType {
+    PLUGIN("PLUGIN", new NotificationDialogAction() {
+        @Override
+        public void doClick() {
+            try {
+                if (Arch.getArch() == Arch.ARM || OperatingSystem.isLinux() || SupportOSImpl.MACOS_WEB_PLUGIN_MANAGEMENT.support()) {
+                    DesignUtils.visitEnvServerByParameters("#management/plugin", null, null);
+                    return;
+                }
+                if (ServerPreferenceConfig.getInstance().isUseOptimizedUPM() || SupportOSImpl.MACOS_NEW_PLUGIN_MANAGEMENT.support()) {
+                    UpmFinder.showUPMDialog();
+                } else {
+                    WebViewDlgHelper.createPluginDialog();
+                }
+            } catch (Exception e) {
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            }
+        }
+    }),
+    REUSE("REUSE", new NotificationDialogAction() {
+        @Override
+        public void doClick() {
+            try {
+                // TODO
+            } catch (Exception e) {
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            }
+        }
+    }),
+    UNKNOWN(StringUtils.EMPTY, new NotificationDialogAction() {
+        @Override
+        public void doClick() {
+        }
+    });
+
+    private String jumpTo;
+    private NotificationDialogAction action;
+
+    DesignerModuleClickType(String jumpTo, NotificationDialogAction action) {
+        this.jumpTo = jumpTo;
+        this.action = action;
+    }
+
+    public String getJumpTo() {
+        return jumpTo;
+    }
+
+    public NotificationDialogAction getAction() {
+        return action;
+    }
+}

designer-base/src/main/java/com/fr/design/login/message/NotificationJumpType.java

@@ -0,0 +1,31 @@
+package com.fr.design.login.message;
+
+/**
+ * @author Lanlan
+ * @version 10.0
+ * Created by Lanlan on 2021/6/11
+ */
+public enum NotificationJumpType {
+    WEB_URL(1),
+    DESIGNER_MODULE(2),
+    UNKNOWN(-1);
+
+    private int jumpType;
+
+    NotificationJumpType(int jumpType) {
+        this.jumpType = jumpType;
+    }
+
+    public int getJumpType() {
+        return jumpType;
+    }
+
+    public static NotificationJumpType valueOf(int jumpType) {
+        for(NotificationJumpType value : NotificationJumpType.values()) {
+            if(value.getJumpType() == jumpType) {
+                return value;
+            }
+        }
+        return UNKNOWN;
+    }
+}

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

@@ -486,6 +486,8 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
         if (!DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().isEnabled()) {
             ad.createAlphaFinePane().setVisible(false);
         }
+        northEastPane.add(ad.createNotificationCenterPane());
+
         OSSupportCenter.buildAction(new OSBasedAction() {
             @Override
             public void execute(Object... objects) {

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

@@ -465,6 +465,10 @@ public abstract class ToolBarMenuDock {
         return new UILabel();
     }
 
+    public Component createNotificationCenterPane(){
+        return new UILabel();
+    }
+
     protected MenuDef createServerMenuDef(ToolBarMenuDockPlus plus) {
         MenuDef menuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic__M_Server"), 'S');
 

designer-base/src/main/java/com/fr/design/notification/Notification.java

@@ -0,0 +1,40 @@
+package com.fr.design.notification;
+
+import com.fr.design.dialog.NotificationDialogAction;
+
+public class Notification {
+    private int type;
+    private String message;
+    private NotificationDialogAction notificationDialogAction;
+    public static final int ERROR_MESSAGE = 0;
+    public static final int NEW_MESSAGE = 1;
+    public static final int WARNING_MESSAGE = 2;
+    public Notification(int type,String message,NotificationDialogAction notificationDialogAction){
+        this.type = type;
+        this.message = message;
+        this.notificationDialogAction = notificationDialogAction;
+    }
+
+    public Notification(String message){
+        this.type = WARNING_MESSAGE;
+        this.message = message;
+        this.notificationDialogAction = new NotificationDialogAction() {
+            @Override
+            public void doClick() {
+                //do nothing
+            }
+        };
+    }
+
+    public NotificationDialogAction getNotificationDialogAction() {
+        return notificationDialogAction;
+    }
+
+    public int getType(){
+        return type;
+    }
+
+    public String getMessage(){
+        return message;
+    }
+}

designer-base/src/main/java/com/fr/design/notification/NotificationCenter.java

@@ -0,0 +1,42 @@
+package com.fr.design.notification;
+
+
+import com.fr.design.notification.ui.NotificationCenterPane;
+import java.util.ArrayList;
+import java.util.List;
+
+public class NotificationCenter {
+    private static NotificationCenter notificationCenter = new NotificationCenter();
+    private List<Notification> notifications;
+    private NotificationCenter(){
+        notifications = new ArrayList<>();
+    }
+
+    public static NotificationCenter getInstance(){
+        return notificationCenter;
+    }
+
+    public void addNotification(Notification message){
+        notifications.add(message);
+        NotificationCenterPane.getNotificationCenterPane().refreshButton();
+    }
+
+    public int getNotificationsCount(){
+        return notifications.size();
+    }
+
+    public void removeNotification(int index){
+         notifications.remove(index);
+         NotificationCenterPane.getNotificationCenterPane().refreshButton();
+    }
+
+    public Notification getNotification(int index){
+       return notifications.get(index);
+    }
+
+    public void clearAllNotifications(){
+        notifications.clear();
+        NotificationCenterPane.getNotificationCenterPane().refreshButton();
+    }
+
+}

designer-base/src/main/java/com/fr/design/notification/ui/NotificationCenterDialog.java

@@ -0,0 +1,222 @@
+package com.fr.design.notification.ui;
+
+import com.fr.design.dialog.NotificationDialogAction;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.notification.Notification;
+import com.fr.design.notification.NotificationCenter;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Cursor;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.Toolkit;
+import java.awt.Window;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.util.ArrayList;
+import java.util.List;
+import javax.swing.BorderFactory;
+import javax.swing.Icon;
+import javax.swing.JDialog;
+import javax.swing.JPanel;
+
+import javax.swing.UIManager;
+
+public class NotificationCenterDialog extends JDialog {
+
+    private ArrayList<NotificationPane> notificationNeedShow;
+    private JPanel centerPanel;
+    private UILabel deleteLabel;
+    private static final int NOTIFICATIONCOUNT = 5;
+
+    public NotificationCenterDialog(Frame parent) {
+        super(parent, true);
+        setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Notification"));
+        setResizable(false);
+        notificationNeedShow = new ArrayList<>();
+        initComponents();
+    }
+
+    public void initComponents() {
+        centerPanel = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(1);
+        addNotification();
+        deleteLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Clear_Notifications") + "(" + NotificationCenter.getInstance().getNotificationsCount() + ")");
+        deleteLabel.setForeground(Color.BLUE);
+
+        deleteLabel.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                NotificationCenter.getInstance().clearAllNotifications();
+                centerPanel.removeAll();
+                addNotification();
+                pack();
+                deleteLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Clear_Notifications") + "(" + NotificationCenter.getInstance().getNotificationsCount() + ")");
+                if (notificationNeedShow.size() == 0) {
+                    hideDialog();
+                }
+            }
+        });
+        JPanel deletePane = new JPanel(FRGUIPaneFactory.createCenterFlowLayout());
+        deletePane.add(deleteLabel);
+        deletePane.setPreferredSize(new Dimension(240, 30));
+        add(centerPanel, BorderLayout.CENTER);
+        add(deletePane, BorderLayout.SOUTH);
+        pack();
+        centerWindow();
+    }
+
+    private void hideDialog() {
+        this.dispose();
+    }
+
+    private void addNotification() {
+        notificationNeedShow.clear();
+
+        int size = NotificationCenter.getInstance().getNotificationsCount();
+        for (int i = NOTIFICATIONCOUNT; i > 0; i--) {
+            int j = size - i;
+            if (j >= 0) {
+                Notification notification = NotificationCenter.getInstance().getNotification(j);
+                NotificationPane notificationPane = new NotificationPane(notification.getType(), notification.getMessage(), i, notification.getNotificationDialogAction());
+                notificationNeedShow.add(notificationPane);
+            }
+        }
+        size = notificationNeedShow.size();
+        for (int i = size - 1; i >= 0; i--) {
+            centerPanel.add(notificationNeedShow.get(i));
+        }
+    }
+
+    private void centerWindow() {
+        Window win = this;
+        Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+
+        Dimension winSize = win.getSize();
+
+        if (winSize.height > screenSize.height) {
+            winSize.height = screenSize.height;
+        }
+        if (winSize.width > screenSize.width) {
+            winSize.width = screenSize.width;
+        }
+        //这里设置位置：水平居中，竖直偏上
+        win.setLocation(screenSize.width - winSize.width - 90, 50);
+    }
+
+    /**
+     * 一条消息面板
+     */
+
+    class NotificationPane extends JPanel {
+        private int index;
+        private UILabel messageLabel;
+        private UILabel messageIcon;
+        private NotificationDialogAction notificationDialogAction;
+
+        public NotificationPane(int type, String message, int index, NotificationDialogAction notificationDialogAction) {
+            this.index = index;
+            this.notificationDialogAction = notificationDialogAction;
+            this.setLayout(FRGUIPaneFactory.createBorderLayout());
+            setTypeIcon(getIconForType(type));
+            setNotification(message);
+            setDeleteIcon();
+        }
+
+        public void setTypeIcon(Icon icon) {
+            messageIcon = new UILabel(icon);
+            messageIcon.addMouseListener(messageAndIconListener);
+            JPanel messageIconPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+            messageIconPanel.setBorder(BorderFactory.createEmptyBorder(0, 8, 0, 8));
+            messageIconPanel.add(messageIcon);
+            add(messageIconPanel, BorderLayout.WEST);
+        }
+
+        public void setDeleteIcon() {
+            UILabel deleteIcon = new UILabel(UIManager.getIcon("OptionPane.deleteIcon"));
+            JPanel deleteIconPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+            deleteIconPane.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 7));
+            deleteIconPane.add(deleteIcon);
+            deleteIconPane.addMouseListener(new MouseAdapter() {
+                @Override
+                public void mouseClicked(MouseEvent e) {
+                    NotificationCenter.getInstance().removeNotification(NotificationCenter.getInstance().getNotificationsCount() - index);
+                    centerPanel.removeAll();
+                    addNotification();
+                    deleteLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Clear_Notifications") + "(" + NotificationCenter.getInstance().getNotificationsCount() + ")");
+                    pack();
+                    if (notificationNeedShow.size() == 0) {
+                        centerWindow();
+                    }
+                    NotificationCenterPane.getNotificationCenterPane().refreshButton();
+                }
+
+                @Override
+                public void mouseEntered(MouseEvent e) {
+                    deleteIcon.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+
+                }
+
+                @Override
+                public void mouseExited(MouseEvent e) {
+                    deleteIcon.setCursor(Cursor.getDefaultCursor());
+                }
+            });
+            add(deleteIconPane, BorderLayout.EAST);
+        }
+
+        public int getIndex() {
+            return index;
+        }
+
+        public void setNotification(String message) {
+            messageLabel = new UILabel("<html>" + message + "</html>");
+            messageLabel.addMouseListener(messageAndIconListener);
+            JPanel labelPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+            labelPanel.add(messageLabel);
+            this.add(labelPanel, BorderLayout.CENTER);
+        }
+
+        protected Icon getIconForType(int messageType) {
+            String propertyName;
+            switch (messageType) {
+                case 0:
+                    propertyName = "OptionPane.circularErrorIcon";
+                    break;
+                case 1:
+                    propertyName = "OptionPane.newMessageIcon";
+                    break;
+                case 2:
+                    propertyName = "OptionPane.circularWarningIcon";
+                    break;
+                default:
+                    return null;
+            }
+            return UIManager.getIcon(propertyName);
+        }
+
+        private MouseListener messageAndIconListener = new MouseAdapter() {
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                hideDialog();
+                notificationDialogAction.doClick();
+            }
+
+            @Override
+            public void mouseEntered(MouseEvent e) {
+                messageLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+                messageIcon.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+                messageLabel.setForeground(new Color(250, 170, 57));
+
+            }
+
+            @Override
+            public void mouseExited(MouseEvent e) {
+                messageLabel.setCursor(Cursor.getDefaultCursor());
+                messageIcon.setCursor(Cursor.getDefaultCursor());
+                messageLabel.setForeground(Color.BLACK);
+            }
+        };
+    }
+}

designer-base/src/main/java/com/fr/design/notification/ui/NotificationCenterPane.java

@@ -0,0 +1,54 @@
+package com.fr.design.notification.ui;
+
+import com.fr.design.constants.UIConstants;
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.notification.NotificationCenter;
+import com.fr.general.IOUtils;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+public class NotificationCenterPane extends BasicPane {
+    private static NotificationCenterPane notificationCenterPane = new NotificationCenterPane();
+    private static UIButton notificationCenterButton;
+
+    private NotificationCenterPane() {
+        setPreferredSize(new Dimension(24, 24));
+        setLayout(new BorderLayout());
+        notificationCenterButton = new UIButton();
+        notificationCenterButton.setIcon(IOUtils.readIcon("/com/fr/design/mainframe/notificationcenter/notificationCenter.png"));
+        notificationCenterButton.setToolTipText(Toolkit.i18nText("Fine-Design_Basic_Show_Notification"));
+        notificationCenterButton.set4ToolbarButton();
+        notificationCenterButton.setRolloverEnabled(false);
+        this.add(notificationCenterButton);
+        notificationCenterButton.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                NotificationCenterDialog notificationCenterDialog = new NotificationCenterDialog(DesignerContext.getDesignerFrame());
+                notificationCenterDialog.setVisible(true);
+            }
+        });
+        this.setBackground(UIConstants.TEMPLATE_TAB_PANE_BACKGROUND);
+    }
+
+    public static NotificationCenterPane getNotificationCenterPane() {
+        return notificationCenterPane;
+    }
+
+    public void refreshButton() {
+        if (NotificationCenter.getInstance().getNotificationsCount() > 0) {
+            notificationCenterButton.setIcon(IOUtils.readIcon("/com/fr/design/mainframe/notificationcenter/normal.png"));
+        } else {
+            notificationCenterButton.setIcon(IOUtils.readIcon("/com/fr/design/mainframe/notificationcenter/notificationCenter.png"));
+        }
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return "NotificationCenter";
+    }
+}

designer-base/src/main/java/com/fr/design/versioncheck/VersionCheckUtils.java

@@ -2,11 +2,14 @@ package com.fr.design.versioncheck;
 
 import com.fr.base.FRContext;
 import com.fr.design.DesignerEnvManager;
+import com.fr.design.dialog.NotificationDialog;
+import com.fr.design.dialog.NotificationDialogAction;
 import com.fr.design.env.DesignerWorkspaceInfo;
 import com.fr.design.env.DesignerWorkspaceType;
 import com.fr.design.env.RemoteWorkspace;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.DesignerContext;
+import com.fr.env.CheckServiceDialog;
 import com.fr.env.VersionCheckMessageDialog;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.GeneralUtils;
@@ -68,8 +71,15 @@ public class VersionCheckUtils {
 
     public static void showVersionCheckDialog(String envName) {
         if (!VersionCheckUtils.versionCheck(envName)) {
-            VersionCheckMessageDialog versionCheckMessageDialog = new VersionCheckMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Sync_Check_Brief_Info"), envName);
+            NotificationDialog notificationDialog = new NotificationDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Sync_Prompt"),
-            versionCheckMessageDialog.setVisible(true);
+                    true, NotificationDialog.WARNING_MESSAGE, Toolkit.i18nText("Fine-Design_Basic_Sync_Check_Brief_Info"), new NotificationDialogAction() {
+                @Override
+                public void doClick() {
+                    CheckServiceDialog checkServiceDialog = new CheckServiceDialog(DesignerContext.getDesignerFrame(), GeneralUtils.readFullBuildNO(), getRemoteBranch(envName),getNoExistServiceDescription(envName));
+                    checkServiceDialog.setVisible(true);
+                }
+            });
+            notificationDialog.setVisible(true);
         }
     }
 

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

@@ -167,7 +167,8 @@ public class CheckServiceDialog extends JDialog implements ActionListener {
         centerPanel.add(detailsPane, BorderLayout.CENTER);
         JPanel buttonPanel = FRGUIPaneFactory.createBorderLayout_M_Pane();
         buttonPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 10, 10));
-        if (isOnline()) {
+        boolean Sync = false;
+        if (Sync && isOnline()) {
             ignoreButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Sync_Ignore"));
             ignoreButton.addActionListener(this);
             syncButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Sync_To_Local"));
@@ -183,8 +184,6 @@ public class CheckServiceDialog extends JDialog implements ActionListener {
             buttonPanel.add(progressBar, BorderLayout.CENTER);
             buttonPanel.add(syncButton, BorderLayout.EAST);
         } else {
-            UILabel adviceLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Sync_Suggestion"));
-            centerPanel.add(adviceLabel, BorderLayout.SOUTH);
             UIButton okButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Button_Confirm"));
             okButton.addActionListener(this);
             buttonPanel.add(okButton, BorderLayout.EAST);

designer-base/src/main/resources/com/fr/design/login/guide.css

@@ -4,9 +4,14 @@
   font-size: 14px;
 }
 .background-guide-close {
-  color: black !important;
+  background: url(./img/icon_install_normal.png) no-repeat center center;
-  font-weight: bold;
+  background-size: cover;
-  font-size: 16px;
+  width: 20px;
+  height: 20px;
+  cursor: pointer;
+}
+.background-guide-close:hover {
+  background-color: #E8E8E9;
 }
 .background-login-loading {
   background: url(./img/login_loading.gif) no-repeat center center;

designer-base/src/main/resources/com/fr/design/login/login.css

@@ -4,9 +4,14 @@
   font-size: 14px;
 }
 .background-guide-close {
-  color: black !important;
+  background: url(./img/icon_install_normal.png) no-repeat center center;
-  font-weight: bold;
+  background-size: cover;
-  font-size: 16px;
+  width: 20px;
+  height: 20px;
+  cursor: pointer;
+}
+.background-guide-close:hover {
+  background-color: #E8E8E9;
 }
 .background-login-loading {
   background: url(./img/login_loading.gif) no-repeat center center;
@@ -50,9 +55,14 @@
   font-size: 14px;
 }
 .background-guide-close {
-  color: black !important;
+  background: url(./img/icon_install_normal.png) no-repeat center center;
-  font-weight: bold;
+  background-size: cover;
-  font-size: 16px;
+  width: 20px;
+  height: 20px;
+  cursor: pointer;
+}
+.background-guide-close:hover {
+  background-color: #E8E8E9;
 }
 .background-login-loading {
   background: url(./img/login_loading.gif) no-repeat center center;
@@ -136,9 +146,14 @@
   font-size: 14px;
 }
 .background-guide-close {
-  color: black !important;
+  background: url(./img/icon_install_normal.png) no-repeat center center;
-  font-weight: bold;
+  background-size: cover;
-  font-size: 16px;
+  width: 20px;
+  height: 20px;
+  cursor: pointer;
+}
+.background-guide-close:hover {
+  background-color: #E8E8E9;
 }
 .background-login-loading {
   background: url(./img/login_loading.gif) no-repeat center center;
@@ -186,9 +201,14 @@
   font-size: 14px;
 }
 .background-guide-close {
-  color: black !important;
+  background: url(./img/icon_install_normal.png) no-repeat center center;
-  font-weight: bold;
+  background-size: cover;
-  font-size: 16px;
+  width: 20px;
+  height: 20px;
+  cursor: pointer;
+}
+.background-guide-close:hover {
+  background-color: #E8E8E9;
 }
 .background-login-loading {
   background: url(./img/login_loading.gif) no-repeat center center;

designer-chart/src/main/java/com/fr/van/chart/designer/component/richText/VanChartRichTextDialog.java

@@ -18,7 +18,7 @@ public class VanChartRichTextDialog extends BasicDialog {
         this.setTitle(Toolkit.i18nText("Fine-Design_Report_RichTextEditor"));
         this.setBasicDialogSize(DEFAULT);
         GUICoreUtils.centerWindow(this);
-        this.setResizable(false);
+        this.setResizable(true);
         this.setModal(true);
     }
 

designer-form/src/main/java/com/fr/design/mainframe/share/generate/task/ComponentCreator.java

@@ -1,5 +1,6 @@
 package com.fr.design.mainframe.share.generate.task;
 
+import com.fr.base.TableData;
 import com.fr.base.iofile.attr.ExtendSharableAttrMark;
 import com.fr.base.iofile.attr.SharableAttrMark;
 import com.fr.design.i18n.Toolkit;
@@ -21,6 +22,7 @@ import com.fr.workspace.WorkContext;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
 
 /**
@@ -91,10 +93,16 @@ public class ComponentCreator extends AbstractComponentCreatorProcessor {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
 
-//        //内置数据集
+        //内置数据集
-        ShareEmbeddedConverter embeddedConverter = WorkContext.getCurrent().get(ShareEmbeddedConverter.class);
+        if (tpl != null) {
-        embeddedConverter.convertToEmbeddedTableData(tpl, paraMap);
+            ShareEmbeddedConverter embeddedConverter = WorkContext.getCurrent().get(ShareEmbeddedConverter.class);
-
+            Map<String, TableData> map = embeddedConverter.convertToEmbeddedTableData(tpl, paraMap);
+            Iterator<Map.Entry<String, TableData>> iterator = map.entrySet().iterator();
+            while (iterator.hasNext()) {
+                Map.Entry<String, TableData> entry = iterator.next();
+                tpl.putTableData(entry.getKey(), entry.getValue());
+            }
+        }
         return tpl;
     }
 

designer-realize/src/main/java/com/fr/poly/creator/PolyElementCasePane.java

@@ -13,12 +13,18 @@ import com.fr.report.poly.PolyECBlock;
  */
 public abstract class PolyElementCasePane extends ElementCasePane<PolyECBlock> {
 
+	/**
+	 * 水平方向在一个屏幕内可见的可扩展的列数
+	 */
+	private static final int HORIZONTAL_EXTENT_VALUE = 200;
+
 	public PolyElementCasePane(PolyECBlock block) {
 		super(block);
         setSelection(new CellSelection(0, 0, 1, 1));
         // 都不加这两个组件，当然他们也就没可见性了
 		setHorizontalScrollBarVisible(false);
 		setVerticalScrollBarVisible(false);
+		this.getGrid().setHorizontalExtent(HORIZONTAL_EXTENT_VALUE);
 	}
 
     @Override

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

@@ -30,6 +30,7 @@ import com.fr.design.mainframe.JWorkBook;
 import com.fr.design.mainframe.alphafine.component.AlphaFinePane;
 import com.fr.design.mainframe.bbs.UserInfoLabel;
 import com.fr.design.mainframe.bbs.UserInfoPane;
+import com.fr.design.notification.ui.NotificationCenterPane;
 import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus;
 import com.fr.design.menu.KeySetUtils;
 import com.fr.design.menu.MenuDef;
@@ -415,6 +416,10 @@ public class MainDesigner extends BaseDesigner {
         return AlphaFinePane.getAlphaFinePane();
     }
 
+    public Component createNotificationCenterPane(){
+        return NotificationCenterPane.getNotificationCenterPane();
+    }
+
     /**
      * 收集用户信息吗
      */

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

@@ -43,6 +43,7 @@ import com.fr.design.javascript.ParameterJavaScriptPane;
 import com.fr.design.javascript.ProcessTransitionAdapter;
 import com.fr.design.login.DesignerLoginType;
 import com.fr.design.login.guide.DesignerGuideHelper;
+import com.fr.design.login.message.DesignerMessageHelper;
 import com.fr.design.login.socketio.LoginAuthServer;
 import com.fr.design.mainframe.BaseJForm;
 import com.fr.design.mainframe.FormHierarchyTreePane;
@@ -145,6 +146,7 @@ public class DesignerActivator extends Activator implements Prepare {
         public void run() {
             DesignerPushUpdateManager.getInstance().preparePushUpdate();
             DesignerGuideHelper.prepareShowGuideDialog();
+            DesignerMessageHelper.getInstance().prepareShowMessage();
         }
     });