Merge pull request #6913 in DESIGN/design from release/11.0 to final/11.0

* commit '6341419726da42de17684f0c742ea871ca9b05ac': (148 commits)
  REPORT-63311【接触点优化】轮播期间切换组件设置页面，轮播停住了
  REPORT-62672【接触点优化】部分埋点无法模拟对应埋点数据
  CHART-22060 fix:fvs图表第一个不是跟随主题default 是normal
  REPORT-63308【接触点优化】轮播期间在组件上右键的交互问题
  REPORT-62175 && REPORT-63204 1.埋点适配 2.针对sum(1,)等此类公式进行合法性判断
  CHART-22038 决策报表，安装ECharts后，图表块插入图表区域不显示echarts的图标
  REPORT-63305 设计器获取父容器，需要对拓展的布局插件兼容处理下
  REPORT-63196 && REPORT-63186 1.在双击之后使搜索框消失； 2.模拟计算在计算错误的时候提示计算异常
  REPORT-62672【接触点优化】部分埋点无法模拟对应埋点数据
  REPORT-63250 组件可更新视觉验收
  REPORT-63190【接触点优化】轮播过程中切换组件包，再回来发现显示有问题
  REPORT-63194 【组件可更新提醒】组件复用-适配设计器字段输入框输入时会出现字符消失的情况
  REPORT-63192 【组件可更新提醒】组件复用-设计器端生成组件弹窗的类型改为必填
  REPORT-63102 公式编辑器优化，多行函数错误返回值异常 1.定制一个没有newline的frformulalexer
  REPORT-62477 组件复用-10设计器在线组件预期不能看到11组件
  REPORT-62808 公式编辑器优化，辅助框内选择函数后，函数名没有正确跳转 1.修复单击实现偶然失效的bug； 2.修复上下键不生效的bug。
  REPORT-62808 公式编辑器优化，辅助框内选择函数后，函数名没有正确跳转 1.修复单击实现偶然失效的bug； 2.修复上下键不生效的bug。
  REPORT-62964【接触点优化】视觉调整
  REPORT-60163 公式编辑器优化2.0 1.修改一些测试问题
  REPORT-62961 11内置组件没有安装
  ...

build.gradle

@@ -68,7 +68,7 @@ allprojects {
         implementation 'org.swingexplorer:swexpl:2.0.1'
         implementation 'org.swingexplorer:swag:1.0'
         implementation 'net.java.dev.jna:jna:5.4.0'
-        implementation 'org.apache.tomcat:tomcat-catalina:8.5.69'
+        implementation 'org.apache.tomcat:tomcat-catalina:8.5.72'
         implementation 'io.socket:socket.io-client:0.7.0'
         implementation 'com.fr.third:fine-third:' + frVersion
         implementation 'com.fr.core:fine-core:' + frDevVersion

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

@@ -0,0 +1,193 @@
+package com.fr.design;
+
+import com.fr.concurrent.NamedThreadFactory;
+import com.fr.general.CloudCenter;
+import com.fr.general.CloudCenterConfig;
+import com.fr.general.http.HttpToolbox;
+import com.fr.log.FineLoggerFactory;
+import com.fr.stable.ProductConstants;
+import com.fr.stable.StableUtils;
+import com.fr.stable.StringUtils;
+import com.fr.stable.xml.XMLPrintWriter;
+import com.fr.stable.xml.XMLReaderHelper;
+import com.fr.stable.xml.XMLTools;
+import com.fr.stable.xml.XMLable;
+import com.fr.stable.xml.XMLableReader;
+import com.fr.third.javax.xml.stream.XMLStreamException;
+import com.fr.third.org.apache.commons.io.FileUtils;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * Created by kerry on 2021/10/22
+ */
+public class DesignerCloudURLManager implements XMLable {
+    private static final String CLOUD_URL_INFO = "cloudUrl.info";
+    private static final String ROOT_XML_TAG = "CloudUrlInfoList";
+    private static final String CHILD_XML_TAG = "CloudUrlInfo";
+    private final Map<String, String> urlMap = new HashMap<>();
+
+    public static DesignerCloudURLManager getInstance() {
+        return DesignerCloudURLManager.HOLDER.singleton;
+    }
+
+    private final ExecutorService executorService = Executors.newSingleThreadExecutor(new NamedThreadFactory("TestCloudConnectThread"));
+
+    private volatile boolean testResult;
+
+
+    private static class HOLDER {
+        private static final DesignerCloudURLManager singleton = new DesignerCloudURLManager();
+    }
+
+    private DesignerCloudURLManager() {
+        loadURLXMLFile();
+    }
+
+    public String acquireUrlByKind(String key) {
+        String url = urlMap.getOrDefault(key, StringUtils.EMPTY);
+        if (StringUtils.isEmpty(url)) {
+            //本地缓存中为空时，直接从云中心获取，获取完成后异步更新本地缓存文件
+            String latestUrl = CloudCenter.getInstance().acquireConf(key, StringUtils.EMPTY);
+            executorService.submit(() -> {
+                updateURLXMLFile(key, latestUrl);
+            });
+            return latestUrl;
+        }
+        //本地缓存不为空时，直接返回对应 url，同时异步更新
+        executorService.submit(() -> {
+            String latestUrl = CloudCenter.getInstance().acquireConf(key, StringUtils.EMPTY);
+            updateURLXMLFile(key, latestUrl);
+        });
+        return url;
+    }
+
+    private synchronized void updateURLXMLFile(String key, String url) {
+        if (StringUtils.isNotEmpty(url) && (!urlMap.containsKey(key) || !url.equals(urlMap.get(key)))) {
+            urlMap.put(key, url);
+            saveURLXMLFile();
+        }
+    }
+
+
+    public void testConnect() {
+        executorService.submit(() -> {
+            testResult = isOnline();
+        });
+    }
+
+    public boolean isConnected() {
+        return testResult;
+    }
+
+    public boolean isOnline() {
+        if (CloudCenterConfig.getInstance().isOnline()) {
+            String ping = acquireUrlByKind("ping");
+            if (StringUtils.isNotEmpty(ping)) {
+                try {
+                    return StringUtils.isEmpty(HttpToolbox.get(ping));
+                } catch (Exception ignore) {
+                }
+            }
+        }
+        return false;
+    }
+
+
+    /**
+     * 加载本地 url 管理文件
+     */
+    private void loadURLXMLFile() {
+        if (!getInfoFile().exists()) {
+            return;
+        }
+        XMLableReader reader = null;
+        try (InputStream in = new FileInputStream(getInfoFile())) {
+            // XMLableReader 还是应该考虑实现 Closable 接口的，这样就能使用 try-with 语句了
+            reader = XMLReaderHelper.createXMLableReader(in, XMLPrintWriter.XML_ENCODER);
+            if (reader == null) {
+                return;
+            }
+            reader.readXMLObject(this);
+        } catch (FileNotFoundException e) {
+            // do nothing
+        } catch (XMLStreamException | IOException e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+        } finally {
+            try {
+                if (reader != null) {
+                    reader.close();
+                }
+            } catch (XMLStreamException e) {
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            }
+        }
+    }
+
+    private File getInfoFile() {
+
+        File file = new File(StableUtils.pathJoin(ProductConstants.getEnvHome(), CLOUD_URL_INFO));
+        try {
+            if (!file.exists()) {
+                file.createNewFile();
+            }
+        } catch (Exception ex) {
+            FineLoggerFactory.getLogger().error(ex.getMessage(), ex);
+        }
+        return file;
+    }
+
+    /**
+     * 保存到本地 URL 管理文件中，存放在 .Finereport110 中
+     */
+    void saveURLXMLFile() {
+        try {
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            XMLTools.writeOutputStreamXML(this, out);
+            out.flush();
+            out.close();
+            String fileContent = new String(out.toByteArray(), StandardCharsets.UTF_8);
+            FileUtils.writeStringToFile(getInfoFile(), fileContent, StandardCharsets.UTF_8);
+        } catch (Exception ex) {
+            FineLoggerFactory.getLogger().error(ex.getMessage());
+        }
+    }
+
+
+    @Override
+    public void readXML(XMLableReader reader) {
+        String tagName = reader.getTagName();
+        if (tagName.equals(CHILD_XML_TAG)) {
+            String key = reader.getAttrAsString("key", StringUtils.EMPTY);
+            String value = reader.getAttrAsString("url", StringUtils.EMPTY);
+            this.urlMap.put(key, value);
+        }
+    }
+
+    @Override
+    public void writeXML(XMLPrintWriter xmlPrintWriter) {
+        xmlPrintWriter.startTAG(ROOT_XML_TAG);
+        Iterator<Map.Entry<String, String>> iterable = urlMap.entrySet().iterator();
+        while (iterable.hasNext()) {
+            Map.Entry<String, String> entry = iterable.next();
+            xmlPrintWriter.startTAG(CHILD_XML_TAG).attr("key", entry.getKey()).attr("url", entry.getValue()).end();
+        }
+        xmlPrintWriter.end();
+    }
+
+    @Override
+    public Object clone() throws CloneNotSupportedException {
+        return null;
+    }
+}

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

@@ -19,6 +19,7 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.design.locale.impl.ProductImproveMark;
 import com.fr.design.login.DesignerLoginType;
 import com.fr.design.login.config.DesignerLoginConfigManager;
+import com.fr.design.mainframe.ComponentReuseNotifyUtil;
 import com.fr.design.mainframe.reuse.ComponentReuseNotificationInfo;
 import com.fr.design.mainframe.vcs.VcsConfigManager;
 import com.fr.design.notification.SnapChatConfig;
@@ -415,6 +416,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
     private void compatibilityPrevVersion(File prevEnvFile) {
         try {
             XMLTools.readFileXML(designerEnvManager, prevEnvFile);
+            clearOldVersionDesignerEnvProperties();
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
@@ -424,6 +426,11 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         designerEnvManager.saveXMLFile();
     }
 
+    private void clearOldVersionDesignerEnvProperties() {
+        SnapChatConfig snapChatConfig = designerEnvManager.getSnapChatConfig();
+        snapChatConfig.resetRead(ComponentReuseNotifyUtil.COMPONENT_SNAP_CHAT_KEY);
+    }
+
     public static void setEnvFile(File envFile) {
         DesignerEnvManager.envFile = envFile;
     }
@@ -885,6 +892,14 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         designerLoginConfigManager.setPluginRemindOnFirstLaunch(pluginRemindOnFirstLaunch);
     }
 
+    public boolean isUseOldVersionLogin() {
+        return designerLoginConfigManager.isUseOldVersionLogin();
+    }
+
+    public void setUseOldVersionLogin(boolean useOldVersionLogin) {
+        designerLoginConfigManager.setUseOldVersionLogin(useOldVersionLogin);
+    }
+
     /**
      * 内置服务器是否使用时启动
      *
@@ -2324,4 +2339,8 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
             DesignerExiter.getInstance().execute();
         }
     }
+
+    public SnapChatConfig getSnapChatConfig() {
+        return snapChatConfig;
+    }
 }

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

@@ -167,6 +167,7 @@ public class PreferencePane extends BasicPane {
     private UICheckBox oracleSpace;
     private UISpinner cachingTemplateSpinner;
     private UICheckBox useOptimizedUPMCheckbox;
+    private UICheckBox useNewVersionLoginCheckbox;
     private UICheckBox useUniverseDBMCheckbox;
     private UICheckBox joinProductImproveCheckBox;
     private UICheckBox autoPushUpdateCheckBox;
@@ -233,6 +234,13 @@ public class PreferencePane extends BasicPane {
             advancePane.add(upmSelectorPane);
         }
 
+        if (SupportOSImpl.DESIGNER_LOGIN.support()) {
+            JPanel loginSelectorPane = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Login_Manager"));
+            useNewVersionLoginCheckbox = new UICheckBox(i18nText("Fine-Design_Basic_Use_New_Login_Manager"));
+            loginSelectorPane.add(useNewVersionLoginCheckbox);
+            advancePane.add(loginSelectorPane);
+        }
+
         JPanel dbmSelectorPane = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Database_Manager"));
         useUniverseDBMCheckbox = new UICheckBox(i18nText("Fine-Design_Basic_Use_Universe_Database_Manager"));
         //dbmSelectorPane.add(useUniverseDBMCheckbox);
@@ -726,6 +734,10 @@ public class PreferencePane extends BasicPane {
             useOptimizedUPMCheckbox.setSelected(ServerPreferenceConfig.getInstance().isUseOptimizedUPM());
         }
 
+        if (useNewVersionLoginCheckbox != null) {
+            useNewVersionLoginCheckbox.setSelected(!DesignerEnvManager.getEnvManager().isUseOldVersionLogin());
+        }
+
         useUniverseDBMCheckbox.setSelected(ServerPreferenceConfig.getInstance().isUseUniverseDBM());
 
         this.oracleSpace.setSelected(designerEnvManager.isOracleSystemSpace());
@@ -820,6 +832,10 @@ public class PreferencePane extends BasicPane {
             designerEnvManager.setAutoPushUpdateEnabled(this.autoPushUpdateCheckBox.isSelected());
         }
 
+        if (useNewVersionLoginCheckbox != null) {
+            designerEnvManager.setUseOldVersionLogin(!this.useNewVersionLoginCheckbox.isSelected());
+        }
+
         designerEnvManager.setUndoLimit(maxUndoLimit.getSelectedIndex() * SELECTED_INDEX_5);
         if (maxUndoLimit.getSelectedIndex() == SELECTED_INDEX_5) {
             designerEnvManager.setUndoLimit(MAX_UNDO_LIMIT_50);

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

@@ -12,6 +12,7 @@ import java.awt.Composite;
 import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
+import java.awt.RenderingHints;
 import java.awt.image.BufferedImage;
 
 /**
@@ -44,21 +45,18 @@ public class CellStylePreviewPane extends JPanel {
     public void paint(Graphics g) {
         Graphics2D g2d = (Graphics2D) g;
         g.clearRect(0, 0, getWidth(), getHeight());
+        g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+        g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
 
         paintTransparentBackground(g2d, style);
-
         paintCellStyle(g2d, style);
+
+        g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
+        g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_OFF);
     }
 
     private void paintTransparentBackground(Graphics2D g2d, Style style) {
-        Color fontColor = style.getFRFont().getForeground();
-        float g = fontColor.getRed() * 0.299F + fontColor.getGreen() * 0.587F * fontColor.getBlue() * 0.114F;
-        float alpha = 1.0F;
-        if (g < 50) {
-            alpha = 0.2F;
-        } else if (g < 160){
-            alpha = 0.5F;
-        }
+        float alpha = computeTransparentBackgroundAlpha(style);
 
         float scaleWidth = 1.0F * getWidth() / transparentBackgroundWidth;
         float scaleHeight = 1.0F * getHeight() / transparentBackgroundHeight;
@@ -76,6 +74,23 @@ public class CellStylePreviewPane extends JPanel {
         g2d.setComposite(oldComposite);
     }
 
+    private float computeTextColorBrightness(Style style) {
+        Color fontColor = style.getFRFont().getForeground();
+        return fontColor.getRed() * 0.299F + fontColor.getGreen() * 0.587F + fontColor.getBlue() * 0.114F;
+    }
+
+    private float computeTransparentBackgroundAlpha(Style style) {
+        float textBrightness = computeTextColorBrightness(style);
+
+        float alpha = 1.0F;
+        if (textBrightness < 50) {
+            alpha = 0.2F;
+        } else if (textBrightness < 160){
+            alpha = 0.5F;
+        }
+        return alpha;
+    }
+
     private void paintCellStyle(Graphics2D g2d, Style style) {
         int resolution = ScreenResolution.getScreenResolution();
 

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

@@ -11,6 +11,7 @@ import com.fr.design.fun.ConnectionProvider;
 import com.fr.design.gui.controlpane.JListControlPane;
 import com.fr.design.gui.controlpane.NameObjectCreator;
 import com.fr.design.gui.controlpane.NameableCreator;
+import com.fr.design.gui.ilist.ListModelElement;
 import com.fr.design.i18n.Toolkit;
 import com.fr.event.EventDispatcher;
 import com.fr.file.ConnectionConfig;
@@ -30,6 +31,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.UUID;
 
 /**
  * Connection List Pane.
@@ -190,4 +192,18 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
         connectionListDialog.addDialogActionListener(new ConnectionListDialogActionAdapter(connectionManagerPane, connectionListDialog, connectionConfig));
         connectionListDialog.setVisible(true);
     }
+
+    @Override
+    public void onCopyItem() {
+        super.onCopyItem();
+        ListModelElement selectedValue = getSelectedValue();
+        // identity 需要重置
+        if (selectedValue != null && selectedValue.wrapper != null) {
+            Object temp = ((NameObject) selectedValue.wrapper).getObject();
+            if (temp instanceof JDBCDatabaseConnection) {
+                JDBCDatabaseConnection object = (JDBCDatabaseConnection) temp;
+                object.setIdentity(UUID.randomUUID().toString());
+            }
+        }
+    }
 }

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

@@ -1,10 +1,13 @@
 package com.fr.design.data.datapane.connect;
 
 import com.fr.base.GraphHelper;
+import com.fr.data.driver.DriverLoader;
+import com.fr.data.driver.config.DriverLoaderConfig;
 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.icombobox.UIComboBoxUI;
 import com.fr.design.gui.ilable.ActionLabel;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ipasswordfield.UIPasswordFieldWithFixedLength;
@@ -21,6 +24,8 @@ import com.fr.general.ComparatorUtils;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.EncodeConstants;
 import com.fr.stable.StringUtils;
+import com.fr.third.guava.collect.HashBiMap;
+import com.fr.workspace.WorkContext;
 
 import javax.swing.BorderFactory;
 import javax.swing.JFileChooser;
@@ -28,6 +33,8 @@ import javax.swing.JPanel;
 import javax.swing.JPasswordField;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
+import javax.swing.plaf.ComboBoxUI;
+import javax.swing.plaf.basic.ComboPopup;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
@@ -45,6 +52,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -101,8 +109,55 @@ public class JDBCDefPane extends JPanel {
 
     private JDBCDatabaseConnection jdbcDatabase;
     private boolean needRefresh = true;
+    private UIComboBox driverManageBox;
+    private ActionLabel driverManageLabel;
+    private UIComboBox driverLoaderBox;
+    ActionListener driverManageListener = new ActionListener() {
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            boolean selectSelfDefine = isSelfDefine();
+            driverManageLabel.setVisible(selectSelfDefine);
+            driverLoaderBox.setVisible(selectSelfDefine);
+            driverComboBox.setVisible(!selectSelfDefine);
+            odbcTipsLink.setVisible(driverComboBox.isVisible() && ComparatorUtils.equals("sun.jdbc.odbc.JdbcOdbcDriver", driverComboBox.getSelectedItem()));
+        }
+    };
+    ActionListener dbtypeActionListener = new ActionListener() {
+        @Override
+        public void actionPerformed(ActionEvent evt) {
+
+            urlTextField.setText(StringUtils.EMPTY);
+            driverComboBox.removeAllItems();
+            driverManageBox.setSelectedItem(Toolkit.i18nText("Fine-Design_Driver_Manage_Default"));
+            if (driverLoaderBox.getItemCount() > 0) {
+                driverLoaderBox.setSelectedIndex(0);
+            }
+            if (ComparatorUtils.equals(dbtypeComboBox.getSelectedItem(), StringUtils.EMPTY)) {
+                driverComboBox.setSelectedItem(StringUtils.EMPTY);
+                return;
+            }
+
+            DriverURLName[] dus = jdbcMap.get(dbtypeComboBox.getSelectedItem());
+            for (int i = 0, len = dus.length; i < len; i++) {
+                driverComboBox.addItem(dus[i].getDriver());
+                if (i == 0) {
+                    driverComboBox.setSelectedItem(dus[i].getDriver());
+                    urlTextField.setText(dus[i].getURL());
+                }
+            }
+            // 更改数据库类型后 数据库名称置空和之前逻辑保持一致
+            if (needRefresh) {
+                jdbcDatabase.setDatabase(StringUtils.EMPTY);
+            }
+            changePane(dbtypeComboBox.getSelectedItem());
+            JDBCConnectionDef.getInstance().setConnection((String) dbtypeComboBox.getSelectedItem(), jdbcDatabase);
+            DatabaseConnectionPane.JDBC.getAdvancedAttrPane().populate(jdbcDatabase);
+        }
+    };
+    private HashBiMap<String, String> nameAndRepresent;
 
     public JDBCDefPane() {
+        initMap();
         this.setBorder(UITitledBorder.createBorderWithTitle("JDBC" + ":"));
         this.setLayout(FRGUIPaneFactory.createLabelFlowLayout());
         JPanel innerthis = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
@@ -115,7 +170,15 @@ public class JDBCDefPane extends JPanel {
         }
         dbtypeComboBox.addActionListener(dbtypeActionListener);
         dbtypeComboBox.setMaximumRowCount(10);
-
+        driverLoaderBox = new SpecialUIComboBox();
+        refreshDriverLoader();
+        driverLoaderBox.setPreferredSize(new Dimension(200, driverLoaderBox.getPreferredSize().height));
+        driverLoaderBox.setEditable(false);
+        driverManageBox = new UIComboBox();
+        refreshDriverManage(true);
+        driverManageBox.setEditable(false);
+        driverManageBox.addActionListener(driverManageListener);
+        driverLoaderBox.setVisible(isSelfDefine());
         driverComboBox = new UIComboBox();
         driverComboBox.setEditable(true);
         driverComboBox.addActionListener(driverListener);
@@ -163,9 +226,33 @@ public class JDBCDefPane extends JPanel {
                 BrowseUtils.browser(url);
             }
         });
+        driverManageLabel = new ActionLabel(Toolkit.i18nText("Fine-Design_Driver_Manage_Add_Driver")) {
+            @Override
+            public void paintComponent(Graphics _gfx) {
+                super.paintComponent(_gfx);
+                _gfx.setColor(Color.blue);
+                _gfx.drawLine(0, this.getHeight() - 1, GraphHelper.getWidth(this.getText()), this.getHeight() - 1);
+            }
+        };
+        driverManageLabel.setPreferredSize(new Dimension(GraphHelper.getWidth(Toolkit.i18nText("Fine-Design_Driver_Manage_Add_Driver")), driverManageLabel.getPreferredSize().height));
+        driverManageLabel.setVisible(isSelfDefine());
+        driverManageLabel.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent evt) {
+                String url = CloudCenter.getInstance().acquireUrlByKind("driver.add.help");
+                BrowseUtils.browser(url);
+            }
+        });
+
+        odbcTipsPane.add(driverManageLabel);
+        odbcTipsPane.add(odbcTipsLink);
 
         JPanel driverComboBoxAndTips = new JPanel(new BorderLayout());
-        driverComboBoxAndTips.add(driverComboBox, BorderLayout.WEST);
+        JPanel normalFlowInnerContainer_s_pane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(0, 5, 0);
+        normalFlowInnerContainer_s_pane.add(driverManageBox);
+        normalFlowInnerContainer_s_pane.add(driverComboBox);
+        normalFlowInnerContainer_s_pane.add(driverLoaderBox);
+        driverComboBoxAndTips.add(normalFlowInnerContainer_s_pane, BorderLayout.WEST);
         driverComboBoxAndTips.add(odbcTipsPane, BorderLayout.CENTER);
 
         JPanel hostPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
@@ -225,7 +312,71 @@ public class JDBCDefPane extends JPanel {
         innerthis.add(centerPanel);
     }
 
+    private void refreshDriverLoader() {
+        Set<String> representSet = nameAndRepresent.values();
+        driverLoaderBox.clearBoxItems();
+        for (String represent : representSet) {
+            driverLoaderBox.addItem(represent);
+        }
+    }
+
+    private String getRepresent(String driverClass, String driverName) {
+        return driverClass + "(" + driverName + ")";
+    }
+
+    private boolean isSelfDefine() {
+        return ComparatorUtils.equals(Toolkit.i18nText("Fine-Design_Driver_Manage_Self_Define"), driverManageBox.getSelectedItem());
+    }
+
+    private void refreshDriverManage(boolean addSelfDefine) {
+        driverManageBox.clearBoxItems();
+        driverManageBox.addItem(Toolkit.i18nText("Fine-Design_Driver_Manage_Default"));
+        if (addSelfDefine) {
+            driverManageBox.addItem(Toolkit.i18nText("Fine-Design_Driver_Manage_Self_Define"));
+        }
+    }
+
+    private void initMap() {
+        Map<String, DriverLoader> driverLoaders = DriverLoaderConfig.getInstance().getDriverLoaders();
+        nameAndRepresent = getDriverLoaderAndRepresent(driverLoaders);
+    }
+
+    private HashBiMap<String, String> getDriverLoaderAndRepresent(Map<String, DriverLoader> driverLoaders) {
+        HashBiMap<String, String> driverHashBiMap = HashBiMap.create();
+        if (WorkContext.getCurrent().isWarDeploy()) {
+            return driverHashBiMap;
+        }
+        // name 是唯一的，name+driver自然也是唯一的
+        for (DriverLoader driverLoader : driverLoaders.values()) {
+            driverHashBiMap.put(driverLoader.getName(), getRepresent(driverLoader.getDriverClass(), driverLoader.getName()));
+        }
+        return driverHashBiMap;
+    }
+
+
+    protected JDBCDatabaseConnection getJDBCDatabase() {
+        return this.jdbcDatabase;
+    }
+
+    private void changePane(Object dbType) {
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+        double[] columnSize = {p, f, 22};
+        if (ComparatorUtils.equals(dbType, OTHER_DB) || ComparatorUtils.equals(dbType, "Access") || ComparatorUtils.equals(dbType, "SQLite")) {
+            if (this.centerPanel.getComponentCount() != partComponents.length * 2) {
+                centerPanel.removeAll();
+                TableLayoutHelper.addComponent2ResultPane(partComponents, new double[]{p, p, p, p, p}, columnSize, centerPanel);
+            }
+        } else if (this.centerPanel.getComponentCount() != allComponents.length * 2) {
+            centerPanel.removeAll();
+            TableLayoutHelper.addComponent2ResultPane(allComponents, new double[]{p, p, p, p, p, p, p, p}, columnSize, centerPanel);
+        }
+    }
+
     public void populate(JDBCDatabaseConnection jdbcDatabase) {
+        // 单例对象，重新打开的时候并不会新建，但是由于driverloaderbox里面需要是动态内容，因此需要进行刷新动作
+        initMap();
+        refreshDriverLoader();
         needRefresh = false;
         if (jdbcDatabase == null) {
             jdbcDatabase = new JDBCDatabaseConnection();
@@ -255,7 +406,24 @@ public class JDBCDefPane extends JPanel {
                 this.dbtypeComboBox.setSelectedItem(OTHER_DB);
             }
         }
+        // jdbcDatabase.getDriverSource() 只会是空或者是有值，但是为了保险起见，还是应该做个处理
+        String driverSource = jdbcDatabase.getDriverSource();
+        if (driverSource == null) {
+            driverSource = StringUtils.EMPTY;
+        }
+        if (driverSource.isEmpty()) {
+            refreshDriverManage(!nameAndRepresent.isEmpty());
+            this.driverManageBox.setSelectedItem(Toolkit.i18nText("Fine-Design_Driver_Manage_Default"));
             this.driverComboBox.setSelectedItem(jdbcDatabase.getDriver());
+        } else {
+            refreshDriverManage(true);
+            this.driverManageBox.setSelectedItem(Toolkit.i18nText("Fine-Design_Driver_Manage_Self_Define"));
+            String represent = getRepresent(jdbcDatabase.getDriver(), jdbcDatabase.getDriverSource());
+            if (!nameAndRepresent.containsValue(represent)) {
+                this.driverLoaderBox.addItem(represent);
+            }
+            this.driverLoaderBox.setSelectedItem(represent);
+        }
         this.urlTextField.setText(jdbcDatabase.getURL());
         this.userNameTextField.setText(jdbcDatabase.getUser());
         this.passwordTextField.setText(jdbcDatabase.getPassword());
@@ -268,31 +436,10 @@ public class JDBCDefPane extends JPanel {
         needRefresh = false;
     }
 
-    protected JDBCDatabaseConnection getJDBCDatabase() {
-        return this.jdbcDatabase;
-    }
-
-    private void changePane(Object dbType) {
-        double p = TableLayout.PREFERRED;
-        double f = TableLayout.FILL;
-        double[] columnSize = {p, f, 22};
-        if (ComparatorUtils.equals(dbType, OTHER_DB) || ComparatorUtils.equals(dbType, "Access") || ComparatorUtils.equals(dbType, "SQLite")) {
-            if (this.centerPanel.getComponentCount() != partComponents.length * 2) {
-                centerPanel.removeAll();
-                TableLayoutHelper.addComponent2ResultPane(partComponents, new double[]{p, p, p, p, p}, columnSize, centerPanel);
-            }
-        } else if (this.centerPanel.getComponentCount() != allComponents.length * 2) {
-            centerPanel.removeAll();
-            TableLayoutHelper.addComponent2ResultPane(allComponents, new double[]{p, p, p, p, p, p, p, p}, columnSize, centerPanel);
-        }
-    }
-
     public JDBCDatabaseConnection update() {
         if (jdbcDatabase == null) {
             jdbcDatabase = new JDBCDatabaseConnection();
         }
-        Object driveItem = this.driverComboBox.getSelectedItem();
-        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());
@@ -304,36 +451,30 @@ public class JDBCDefPane extends JPanel {
             jdbcDatabase.setNewCharsetName(EncodeConstants.ENCODING_GBK);
             jdbcDatabase.setOriginalCharsetName(((String) this.charSetComboBox.getSelectedItem()));
         }
-        return jdbcDatabase;
-    }
-
-    ActionListener dbtypeActionListener = new ActionListener() {
-        public void actionPerformed(ActionEvent evt) {
-
-            urlTextField.setText(StringUtils.EMPTY);
-            driverComboBox.removeAllItems();
-            if (ComparatorUtils.equals(dbtypeComboBox.getSelectedItem(), StringUtils.EMPTY)) {
-                driverComboBox.setSelectedItem(StringUtils.EMPTY);
-                return;
+        String driverLoader = (String) this.driverLoaderBox.getSelectedItem();
+        if (driverLoader == null) {
+            driverLoader = StringUtils.EMPTY;
         }
-
-            DriverURLName[] dus = jdbcMap.get(dbtypeComboBox.getSelectedItem());
-            for (int i = 0, len = dus.length; i < len; i++) {
-                driverComboBox.addItem(dus[i].getDriver());
-                if (i == 0) {
-                    driverComboBox.setSelectedItem(dus[i].getDriver());
-                    urlTextField.setText(dus[i].getURL());
+        if (isSelfDefine()) {
+            String[] split = driverLoader.split("\\(");
+            if (split.length > 1) {
+                String name = split[1];
+                if (name.length() > 0) {
+                    jdbcDatabase.setDriverSource(name.substring(0, name.length() - 1));
+                } else {
+                    jdbcDatabase.setDriverSource(StringUtils.EMPTY);
                 }
+            } else {
+                jdbcDatabase.setDriverSource(StringUtils.EMPTY);
             }
-            // 更改数据库类型后 数据库名称置空和之前逻辑保持一致
-            if (needRefresh) {
-                jdbcDatabase.setDatabase(StringUtils.EMPTY);
+            jdbcDatabase.setDriver(split[0]);
+        } else {
+            Object driveItem = this.driverComboBox.getSelectedItem();
+            jdbcDatabase.setDriver(driveItem == null ? null : driveItem.toString().trim());
+            jdbcDatabase.setDriverSource(StringUtils.EMPTY);
         }
-            changePane(dbtypeComboBox.getSelectedItem());
-            JDBCConnectionDef.getInstance().setConnection((String) dbtypeComboBox.getSelectedItem(), jdbcDatabase);
-            DatabaseConnectionPane.JDBC.getAdvancedAttrPane().populate(jdbcDatabase);
+        return jdbcDatabase;
     }
-    };
 
     ActionListener driverListener = new ActionListener() {
         public void actionPerformed(ActionEvent e) {
@@ -579,4 +720,22 @@ public class JDBCDefPane extends JPanel {
         private String driver;
         private String url;
     }
+
+    private static class SpecialUIComboBox extends UIComboBox {
+
+        @Override
+        public ComboBoxUI getUIComboBoxUI() {
+            return new SpecialUIComboBoxUI();
+        }
+    }
+
+    private static class SpecialUIComboBoxUI extends UIComboBoxUI {
+
+        @Override
+        public ComboPopup createPopup() {
+            return createHorizontalNeverUIComboPopUp();
+        }
+
+    }
+
 }

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

@@ -8,9 +8,14 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.stable.core.PropertyChangeAdapter;
 
-import javax.swing.*;
+import javax.swing.JPanel;
 import javax.swing.event.DocumentEvent;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dialog;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.Window;
 
 @Open
 public abstract class BasicPane extends JPanel {
@@ -262,6 +267,10 @@ public abstract class BasicPane extends JPanel {
     public void checkValid() throws Exception {
     }
 
+    public boolean confirmContinueBeforeDoOK() {
+        return true;
+    }
+
     public static class NamePane extends BasicPane {
         private UITextField nameTextField;
         private UILabel Name;
@@ -390,6 +399,10 @@ public abstract class BasicPane extends JPanel {
             BasicPane.this.checkValid();
         }
 
+        public boolean confirmContinueBeforeDoOK() {
+            return BasicPane.this.confirmContinueBeforeDoOK();
+        }
+
     }
 
     private class UnsizedDialog extends UIDialog {

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

@@ -92,7 +92,7 @@ public class UIDetailErrorLinkDialog extends UIDialog {
         contentPane.add(link, BorderLayout.SOUTH);
 
         // 确定 + 取消
-        JPanel actionPane = new JPanel(new FlowLayout(FlowLayout.RIGHT, GAP_10, GAP_10));
+        JPanel actionPane = new JPanel(new FlowLayout(FlowLayout.RIGHT, GAP_10, GAP_5));
         actionPane.add(createButton(Toolkit.i18nText("Fine-Design_Report_OK")));
         actionPane.add(createButton(Toolkit.i18nText("Fine-Design_Basic_Cancel")));
         this.getContentPane().add(topPane, BorderLayout.NORTH);

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

@@ -33,6 +33,7 @@ public abstract class UIDialog extends JDialog {
     private BasicPane pane;
     private java.util.List<DialogActionListener> listeners = new ArrayList<DialogActionListener>();
     private boolean isDoOKSucceed;
+    private boolean needExceptionCheck = true;
 
 
     public UIDialog(Frame parent) {
@@ -151,6 +152,10 @@ public abstract class UIDialog extends JDialog {
         });
     }
 
+    public void setNeedExceptionCheck(boolean needExceptionCheck) {
+        this.needExceptionCheck = needExceptionCheck;
+    }
+
 
     /**
      * 添加监听器
@@ -172,14 +177,21 @@ public abstract class UIDialog extends JDialog {
      * 确定操作
      */
     public void doOK() {
+        //由于checkValid不可以加入自定义的弹窗以及操作，添加一个接口
+        if (!confirmContinueBeforeDoOK()) {
+            return;
+        }
+
         try {
             checkValid();
         } catch (Exception exp) {
+            if (needExceptionCheck) {
                 FineJOptionPane.showMessageDialog(
                         this,
                         exp.getMessage(),
                         com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
                         JOptionPane.WARNING_MESSAGE);
+            }
             return;
         }
 
@@ -253,6 +265,10 @@ public abstract class UIDialog extends JDialog {
      */
     public abstract void checkValid() throws Exception;
 
+    public boolean confirmContinueBeforeDoOK() {
+        return true;
+    }
+
     public void setButtonEnabled(boolean b) {
         this.okButton.setEnabled(b);
     }

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

@@ -25,6 +25,8 @@ import com.fr.plugin.manage.control.PluginTask;
 import com.fr.plugin.manage.control.PluginTaskCallback;
 import com.fr.plugin.manage.control.PluginTaskResult;
 import com.fr.plugin.view.PluginView;
+import com.fr.plugin.xml.PluginElementName;
+import com.fr.plugin.xml.PluginXmlElement;
 import com.fr.stable.StringUtils;
 
 import javax.swing.JOptionPane;
@@ -91,16 +93,38 @@ public class PluginOperateUtils {
 
 
     public static void setPluginActive(String pluginInfo, JSCallback jsCallback) {
+        SwingUtilities.invokeLater(new Runnable() {
+
+            @Override
+            public void run() {
                 PluginMarker pluginMarker = PluginUtils.createPluginMarker(pluginInfo);
                 PluginContext plugin = PluginManager.getContext(pluginMarker);
                 boolean active = plugin.isActive();
                 PluginTaskCallback modifyStatusCallback = new ModifyStatusCallback(active, jsCallback);
                 if (active) {
+                    PluginXmlElement forbidReminder = plugin.getXml().getElement(PluginElementName.ForbidReminder);
+                    if (forbidReminder != null && forbidReminder.getContent() != null) {
+                        // 禁用前提示
+                        int rv = FineJOptionPane.showConfirmDialog(
+                                null,
+                                forbidReminder.getContent(),
+                                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
+                                JOptionPane.OK_CANCEL_OPTION,
+                                JOptionPane.WARNING_MESSAGE
+                        );
+                        if (rv == JOptionPane.OK_OPTION) {
+                            PluginManager.getController().forbid(pluginMarker, modifyStatusCallback);
+                        }
+                    } else {
+                        // 正常禁用
                         PluginManager.getController().forbid(pluginMarker, modifyStatusCallback);
+                    }
                 } else {
                     PluginManager.getController().enable(pluginMarker, modifyStatusCallback);
                 }
             }
+        });
+    }
 
     public static void uninstallPlugin(final String pluginInfo, final boolean isForce, final JSCallback jsCallback) {
 

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

@@ -12,7 +12,6 @@ import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.DesignerFrameFileDealerPane;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.design.mainframe.JVirtualTemplate;
-import com.fr.design.module.DesignModuleFactory;
 import com.fr.design.ui.util.UIUtil;
 import com.fr.file.FILE;
 import com.fr.file.FileNodeFILE;
@@ -361,20 +360,28 @@ public class HistoryTemplateListCache implements CallbackEvent {
         int size = historyList.size();
         for (int i = 0; i < size; i++) {
             JTemplate<?, ?> template = historyList.get(i);
+            FILE file = templateToStashFile(template);
+            if (file != null) {
+                stashFILEMap.put(i, file);
+            }
+        }
+        FineLoggerFactory.getLogger().info("Env Change Template Stashed.");
+    }
+
+    private FILE templateToStashFile(JTemplate<?, ?> template) {
         FILE file = template.getEditingFILE();
         try {
             ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
             BaseBook target = template.getTarget();
             if (target != null) {
                 target.export(outputStream);
-                    stashFILEMap.put(i, new StashedFILE(file, outputStream.toByteArray()));
+                return new StashedFILE(file, outputStream.toByteArray(), template.suffix());
             }
             // 如果 target == null 那么这个模板是被模板内存优化功能处理过的，不用处理
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
-        }
-        FineLoggerFactory.getLogger().info("Env Change Template Stashed.");
+        return null;
     }
 
     private boolean checkStash() {
@@ -458,18 +465,10 @@ public class HistoryTemplateListCache implements CallbackEvent {
             FILE file = template.getEditingFILE();
             boolean needReload = context == null || needReloadTemplate(context, template);
             if (needReload) {
-                try {
-                    ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-                    BaseBook target = template.getTarget();
-                    if (target != null) {
+                FILE stashFile = templateToStashFile(template);
+                if (stashFile != null) {
                     FineLoggerFactory.getLogger().info("{} is being reloaded", file.getName());
-                        target.export(outputStream);
-                        FILE stashedFile = new StashedFILE(file, outputStream.toByteArray());
-                        template.refreshResource(stashedFile);
-                    }
-                    // 如果 target == null 那么这个模板是被模板内存优化功能处理过的，不用处理
-                } catch (Exception e) {
-                    FineLoggerFactory.getLogger().error(e.getMessage(), e);
+                    template.refreshResource(stashFile);
                 }
             }
         }

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

@@ -1,91 +1,48 @@
 package com.fr.design.formula;
 
+import com.fr.design.formula.exception.FormulaExceptionTipsProcessor;
 import com.fr.design.i18n.Toolkit;
-import com.fr.log.FineLoggerFactory;
-import com.fr.parser.FRLexer;
 import com.fr.parser.FRParser;
 import com.fr.script.checker.FunctionCheckerDispatcher;
-import com.fr.script.checker.exception.ConditionCheckWrongException;
-import com.fr.script.checker.exception.FunctionCheckWrongException;
-import com.fr.script.rules.FunctionParameterType;
-import com.fr.script.rules.FunctionRule;
+import com.fr.script.checker.result.FormulaCheckResult;
+import com.fr.script.checker.result.FormulaCoordinates;
 import com.fr.stable.StringUtils;
 import com.fr.stable.script.Expression;
 import com.fr.stable.script.Node;
+import com.fr.third.antlr.TokenStreamRecognitionException;
 
 import java.io.StringReader;
-import java.util.List;
 
 /**
  * @author Hoky
  * @date 2021/9/28
  */
 public class FormulaChecker {
-    private static final String VALID_FORMULA = Toolkit.i18nText("Fine-Design_Basic_FormulaD_Valid_Formula");
-    private static final String INVALID_FORMULA = Toolkit.i18nText("Fine-Design_Basic_FormulaD_Invalid_Formula");
-    public static final String COLON = ":";
+    public static final String VALID_FORMULA = Toolkit.i18nText("Fine-Design_Basic_FormulaD_Valid_Formula");
+    public static final String INVALID_FORMULA = Toolkit.i18nText("Fine-Design_Basic_FormulaD_Invalid_Formula");
+    private static FormulaExceptionTipsProcessor processor = FormulaExceptionTipsProcessor.getProcessor();
 
-    public static String check(String formulaText) throws FormulaCheckerException {
+    public static FormulaCheckResult check(String formulaText) {
+        if (StringUtils.isEmpty(formulaText) || formulaText.equals(Toolkit.i18nText("Fine-Design_Basic_FormulaPane_Tips"))) {
+            return new FormulaCheckResult(true, VALID_FORMULA, FormulaCoordinates.INVALID, true);
+        }
+        //过滤一些空格等符号
         StringReader in = new StringReader(formulaText);
-
-        FRLexer lexer = new FRLexer(in);
+        //此lexer为公式校验定制
+        FRFormulaLexer lexer = new FRFormulaLexer(in);
         FRParser parser = new FRParser(lexer);
 
         try {
             Expression expression = parser.parse();
             Node node = expression.getConditionalExpression();
-            boolean valid = FunctionCheckerDispatcher.getInstance().getFunctionChecker(node).checkFunction(node);
-            if (valid) {
-                return VALID_FORMULA;
-            } else {
-                throw new FormulaCheckerException(INVALID_FORMULA);
-            }
-        } catch (ConditionCheckWrongException cce) {
-            String functionName = cce.getFunctionName();
-            throw new FormulaCheckerException(functionName + Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Condition_Tips") + COLON);
-        } catch (FunctionCheckWrongException ce) {
-            List<FunctionRule> rules = ce.getRules();
-            String functionName = ce.getFunctionName();
-            StringBuilder errorMsg = new StringBuilder(functionName + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Error_Tips") + COLON);
-            for (int i = 0; i < rules.size(); i++) {
-                errorMsg.append("(");
-                if (rules.get(i).getParameterList().isEmpty()) {
-                    errorMsg.append(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_No_Param"));
-                }
-                for (FunctionParameterType functionParameterType : rules.get(i).getParameterList()) {
-                    errorMsg.append(getTypeString(functionParameterType)).append(",");
-                }
-                if (",".equals(errorMsg.charAt(errorMsg.length() - 1) + "")) {
-                    errorMsg.deleteCharAt(errorMsg.length() - 1);
-                }
-                errorMsg.append(")");
-                if (i != rules.size() - 1) {
-                    errorMsg.append(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Or"));
-                }
-            }
-            throw new FormulaCheckerException(errorMsg.toString());
+            boolean valid = FunctionCheckerDispatcher.getInstance().getFunctionChecker(node).checkFunction(formulaText, node);
+            return new FormulaCheckResult(valid, valid ? Toolkit.i18nText("Fine-Design_Basic_FormulaD_Valid_Formula") :
+                    Toolkit.i18nText("Fine-Design_Basic_FormulaD_Invalid_Formula"), FormulaCoordinates.INVALID, true);
         } catch (Exception e) {
-            FineLoggerFactory.getLogger().error(e.getMessage(), e);
-            throw new FormulaCheckerException(INVALID_FORMULA);
-            // alex:继续往下面走,expression为null时告知不合法公式
+            if (e instanceof TokenStreamRecognitionException) {
+                return processor.getExceptionTips(((TokenStreamRecognitionException) e).recog);
             }
+            return processor.getExceptionTips(e);
         }
-
-    private static String getTypeString(FunctionParameterType type) {
-        switch (type) {
-            case NUMBER:
-                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_Check_ParamType_Number");
-            case STRING:
-                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_Check_ParamType_String");
-            case ANY:
-                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_Check_ParamType_Any");
-            case DATE:
-                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_Check_ParamType_Date");
-            case BOOLEAN:
-                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_Check_ParamType_Boolean");
-            case ARRAY:
-                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_Check_ParamType_Array");
-        }
-        return StringUtils.EMPTY;
     }
 }

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

@@ -16,7 +16,13 @@ import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.file.HistoryTemplateListCache;
+import com.fr.design.gui.autocomplete.CompletionCellRenderer;
+import com.fr.design.gui.autocomplete.CompletionProvider;
+import com.fr.design.gui.autocomplete.DefaultCompletionProvider;
+import com.fr.design.gui.autocomplete.FormulaCompletion;
+import com.fr.design.gui.autocomplete.FormulaPaneAutoCompletion;
 import com.fr.design.gui.ibutton.UIButton;
+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.QuickList;
@@ -40,14 +46,15 @@ import com.fr.parser.BlockIntervalLiteral;
 import com.fr.parser.ColumnRowRangeInPage;
 import com.fr.parser.NumberLiteral;
 import com.fr.parser.SheetIntervalLiteral;
+import com.fr.record.analyzer.EnableMetrics;
 import com.fr.report.core.namespace.SimpleCellValueNameSpace;
 import com.fr.script.Calculator;
 import com.fr.script.ScriptConstants;
+import com.fr.script.checker.result.FormulaCheckResult;
 import com.fr.stable.EncodeConstants;
 import com.fr.stable.EssentialUtils;
 import com.fr.stable.ParameterProvider;
 import com.fr.stable.StringUtils;
-import com.fr.stable.UtilEvalError;
 import com.fr.stable.script.CRAddress;
 import com.fr.stable.script.ColumnRowRange;
 import com.fr.stable.script.Expression;
@@ -65,6 +72,7 @@ import javax.swing.JList;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
+import javax.swing.JScrollPane;
 import javax.swing.JTree;
 import javax.swing.SwingUtilities;
 import javax.swing.event.ListSelectionEvent;
@@ -80,8 +88,11 @@ import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Dimension;
+import java.awt.FlowLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
@@ -111,19 +122,25 @@ import java.util.Set;
  * @editor zhou
  * @since 2012-3-29下午1:50:53
  */
+@EnableMetrics
 public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
-
-    public static final String VALID_FORMULA = Toolkit.i18nText("Fine-Design_Basic_FormulaD_Valid_Formula");
-    public static final String INVALID_FORMULA = Toolkit.i18nText("Fine-Design_Basic_FormulaD_Invalid_Formula");
     public static final int DEFUAL_FOMULA_LENGTH = 103;
     public static final String ELLIPSIS = "...";
+    public static final char KEY_CODE_A = 'A';
+    public static final char KEY_CODE_Z = 'z';
+    public static final String NEWLINE = "\n";
+    public static final String FORMULA_ICON = "/com/fr/design/images/m_file/formula.png";
+    public static final String PARAM_ICON = "/com/fr/design/images/m_file/param.png";
     private VariableTreeAndDescriptionArea variableTreeAndDescriptionArea;
     private RSyntaxTextArea formulaTextArea;
     private UITextField keyWordTextField = new UITextField(18);
     private int currentPosition = 0;
     private int beginPosition = 0;
     private int insertPosition = 0;
+    protected static UICheckBox autoCompletionCheck;
+    protected static UICheckBox checkBeforeColse;
     private JList tipsList;
+    private JPopupMenu popupMenu;
     protected DefaultListModel listModel = new DefaultListModel();
     private int ifHasBeenWriten = 0;
     private DefaultListModel functionTypeListModel = new DefaultListModel();
@@ -131,6 +148,9 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
     private DefaultListModel functionNameModel;
     private JList functionNameList;
     private UITableEditorPane<ParameterProvider> editor4CalPane;
+    private FormulaPaneAutoCompletion autoCompletion;
+    private DefaultCompletionProvider completionProvider;
+    private static final Map<String, String> PARAM_PREFIX_MAP = new HashMap<>();
 
     public FormulaPane() {
         initComponents();
@@ -139,6 +159,20 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
     private void initFormulaTextAreaKeyListener() {
         formulaTextArea.addKeyListener(this);
         formulaTextArea.addKeyListener(new KeyAdapter() {
+            //用来判断一下是不是组合键
+
+            @Override
+            public void keyTyped(KeyEvent e) {
+                if (inKeyCodeRange(e) && autoCompletionCheck.isSelected()) {
+                    autoCompletion.doCompletion();
+                }
+            }
+
+            private boolean inKeyCodeRange(KeyEvent e) {
+                return (e.getKeyChar() >= KEY_CODE_A && e.getKeyChar() <= KEY_CODE_Z);
+            }
+
+            @Override
             public void keyReleased(KeyEvent e) {
                 formulaTextArea.setForeground(Color.black);
                 String text = formulaTextArea.getText();
@@ -174,7 +208,9 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
                     beginPosition = getBeginPosition();
                     insertPosition = beginPosition;
                     firstStepToFindTips(beginPosition);
-                    fixFunctionNameList();
+                    if (tipsList.getSelectedValue() != null) {
+                        fixFunctionNameList(tipsList.getSelectedValue().toString());
+                    }
                 }
             }
         });
@@ -204,7 +240,9 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
                 if (e.getKeyCode() == KeyEvent.VK_ENTER) {
                     String toFind = keyWordTextField.getText();
                     search(toFind, false);
-                    fixFunctionNameList();
+                    if (tipsList.getSelectedValue() != null) {
+                        fixFunctionNameList(tipsList.getSelectedValue().toString());
+                    }
                     e.consume();
                 }
             }
@@ -213,28 +251,35 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
 
     private void initTipsPane() {
         // tipsPane
-        JPanel tipsPane = new JPanel(new BorderLayout(4, 4));
-        this.add(tipsPane, BorderLayout.EAST);
+        JPanel containerSPane = new JPanel(new BorderLayout(4, 1));
+        JPanel labelPane = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0), true);
+        JPanel searchPane = new JPanel(new FlowLayout(FlowLayout.RIGHT, 0, 0), true);
+        containerSPane.setPreferredSize(new Dimension(892, 23));
+        this.add(containerSPane, BorderLayout.NORTH);
 
-        JPanel searchPane = new JPanel(new BorderLayout(4, 4));
-        searchPane.add(keyWordTextField, BorderLayout.CENTER);
         UIButton searchButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaPane_Search"));
+        UILabel formulaLabel = new UILabel(
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Input_Formula_In_The_Text_Area_Below") + ":");
+        formulaLabel.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4));
+
+        labelPane.add(formulaLabel, BorderLayout.WEST);
+        keyWordTextField.setPreferredSize(new Dimension(240, 23));
+        searchPane.add(keyWordTextField, BorderLayout.EAST);
         searchPane.add(searchButton, BorderLayout.EAST);
-        tipsPane.add(searchPane, BorderLayout.NORTH);
+
+        containerSPane.add(labelPane, BorderLayout.WEST);
+        containerSPane.add(searchPane, BorderLayout.EAST);
+
         initKeyWordTextFieldKeyListener();
         tipsList = new JList(listModel);
         tipsList.addMouseListener(new DoubleClick());
-        UIScrollPane tipsScrollPane = new UIScrollPane(tipsList);
-        tipsScrollPane.setPreferredSize(new Dimension(170, 75));
-        tipsScrollPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC));
-        tipsPane.add(tipsScrollPane, BorderLayout.CENTER);
-        searchButton.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
+        searchButton.addActionListener(e -> {
             String toFind = keyWordTextField.getText();
             search(toFind, false);
+            popTips();
             formulaTextArea.requestFocusInWindow();
-                fixFunctionNameList();
+            if (tipsList.getSelectedValue() != null) {
+                fixFunctionNameList(tipsList.getSelectedValue().toString());
             }
         });
     }
@@ -254,18 +299,13 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
 
     private void initTextPane() {
         // text
-
         JPanel textPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         this.add(textPane, BorderLayout.CENTER);
-        JPanel checkBoxandbuttonPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
-        UILabel formulaLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Input_Formula_In_The_Text_Area_Below") + ":"
-                + "                         ");
-        formulaLabel.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4));
+        JPanel checkBoxandbuttonPane = FRGUIPaneFactory.createX_AXISBoxInnerContainer_S_Pane();
         initFormulaTextArea();
 
         UIScrollPane formulaTextAreaScrollPane = new UIScrollPane(formulaTextArea);
         formulaTextAreaScrollPane.setBorder(null);
-        textPane.add(formulaLabel, BorderLayout.NORTH);
         textPane.add(formulaTextAreaScrollPane, BorderLayout.CENTER);
         textPane.add(checkBoxandbuttonPane, BorderLayout.SOUTH);
 
@@ -275,19 +315,108 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
         checkValidButton.addActionListener(checkValidActionListener);
         calButton.addActionListener(calculateActionListener);
 
+        //靠左流式布局
         JPanel checkBoxPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
-        checkBoxPane.setPreferredSize(new Dimension(450, 30));
         checkBoxandbuttonPane.add(checkBoxPane, BorderLayout.WEST);
-        checkBoxandbuttonPane.add(checkValidButton, BorderLayout.EAST);
-        checkBoxandbuttonPane.add(calButton, BorderLayout.EAST);
+        //靠右流式布局
+        JPanel buttonPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
+        buttonPane.add(checkValidButton, BorderLayout.EAST);
+        buttonPane.add(calButton, BorderLayout.EAST);
+        checkBoxandbuttonPane.add(buttonPane, BorderLayout.EAST);
+        if (autoCompletionCheck == null) {
+            autoCompletionCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_AutoCompletion"));
+            autoCompletionCheck.setSelected(true);
+        }
+        if (checkBeforeColse == null) {
+            checkBeforeColse = new UICheckBox(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Before_Closed"));
+            checkBeforeColse.setSelected(true);
+        }
+        checkBoxPane.add(autoCompletionCheck, BorderLayout.WEST);
+        checkBoxPane.add(checkBeforeColse, BorderLayout.WEST);
         extendCheckBoxPane(checkBoxPane);
 
         ParameterTableModel model = new ParameterTableModel(0);
         editor4CalPane = new UITableEditorPane<>(model);
+        formulaTextArea.addFocusListener(new FocusListener() {
+            @Override
+            public void focusGained(FocusEvent e) {
+                // 获得焦点时 安装
+                installAutoCompletion();
+            }
+
+            @Override
+            public void focusLost(FocusEvent e) {
+                // 失去焦点时 卸载
+                uninstallAutoCompletion();
+            }
+        });
+    }
+
+    private CompletionProvider createCompletionProvider() {
+        if (completionProvider == null) {
+            completionProvider = new DefaultCompletionProvider();
+            NameAndDescription[] nameAndDescriptions = FunctionConstants.ALL.getDescriptions();
+            for (NameAndDescription nameAndDescription : nameAndDescriptions) {
+                completionProvider.addCompletion(new FormulaCompletion(completionProvider, nameAndDescription.getName(), BaseUtils.readIcon(FORMULA_ICON)));
+            }
+
+            VariableResolver variableResolver = VariableResolver.DEFAULT;
+            List<String> allParameters = new ArrayList<>();
+            allParameters.addAll(Arrays.asList(variableResolver.resolveCurReportVariables()));
+            allParameters.addAll(Arrays.asList(variableResolver.resolveColumnNames()));
+            allParameters.addAll(Arrays.asList(variableResolver.resolveGlobalParameterVariables()));
+            allParameters.addAll(Arrays.asList(variableResolver.resolveReportParameterVariables()));
+            allParameters.addAll(Arrays.asList(variableResolver.resolveTableDataParameterVariables()));
+
+            //先把参数前缀拿出来
+            for (String parameter : allParameters) {
+                String paramWithoutPre;
+                if (parameter.startsWith("$$")) {
+                    paramWithoutPre = parameter.substring(2);
+                    PARAM_PREFIX_MAP.put(paramWithoutPre, "$$");
+                } else if (parameter.startsWith("$")) {
+                    paramWithoutPre = parameter.substring(1);
+                    PARAM_PREFIX_MAP.put(paramWithoutPre, "$");
+                } else {
+                    paramWithoutPre = parameter;
+                    PARAM_PREFIX_MAP.put(paramWithoutPre, StringUtils.EMPTY);
+                }
+                completionProvider.addCompletion(new FormulaCompletion(completionProvider, paramWithoutPre, BaseUtils.readIcon(PARAM_ICON)));
+            }
+
+            return completionProvider;
+        }
+        return completionProvider;
+    }
+
+    public static boolean containsParam(String param) {
+        return PARAM_PREFIX_MAP.containsKey(param);
+    }
+
+    public static String getParamPrefix(String param) {
+        return PARAM_PREFIX_MAP.getOrDefault(param, StringUtils.EMPTY);
+    }
+
+    private void uninstallAutoCompletion() {
+        if (autoCompletion != null) {
+            autoCompletion.uninstall();
+            autoCompletion = null;
+        }
+    }
+
+    private void installAutoCompletion() {
+        if (autoCompletion == null && autoCompletionCheck.isSelected()) {
+            CompletionProvider provider = createCompletionProvider();
+            autoCompletion = new FormulaPaneAutoCompletion(provider);
+            autoCompletion.setListCellRenderer(new CompletionCellRenderer());
+            autoCompletion.install(formulaTextArea);
+            autoCompletion.installVariableTree(variableTreeAndDescriptionArea);
+        }
     }
 
 
     protected void extendCheckBoxPane(JPanel checkBoxPane) {
+
         // do nothing
     }
 
@@ -334,6 +463,9 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
                     if (ComparatorUtils.equals((String) listModel.getElementAt(index), doublePressContent)) {
                         doubleClickActuator(doublePressContent);
                     }
+                    if (popupMenu != null) {
+                        popupMenu.setVisible(false);
+                    }
                 }
             }
         }
@@ -341,7 +473,9 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
         private void singleClickActuator(String currentLineContent) {
             refreshDescriptionTextArea(currentLineContent);
             formulaTextArea.requestFocusInWindow();
-            fixFunctionNameList();
+            if (tipsList.getSelectedValue() != null) {
+                fixFunctionNameList(tipsList.getSelectedValue().toString());
+            }
         }
 
         private void doubleClickActuator(String currentLineContent) {
@@ -405,14 +539,15 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
                 beginPosition = getBeginPosition();
                 insertPosition = beginPosition;
                 firstStepToFindTips(beginPosition);
-                fixFunctionNameList();
+                if (tipsList.getSelectedValue() != null) {
+                    fixFunctionNameList(tipsList.getSelectedValue().toString());
+                }
                 ifHasBeenWriten = 1;
             }
         }
     }
 
-    private void fixFunctionNameList() {
-        if (tipsList.getSelectedValue() != null) {
+    private void fixFunctionNameList(String functionName) {
         int signOfContinue = 1;
         int indexOfFunction = 0;
         for (int i = 0; i < functionTypeListModel.size(); i++) {
@@ -421,7 +556,6 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
             NameAndDescription[] nads = functionType.getDescriptions();
             if (signOfContinue == 1) {
                 functionNameModel.removeAllElements();
-                    String functionName = ((String) tipsList.getSelectedValue());
                 for (int k = 0; k < nads.length; k++) {
                     functionNameModel.addElement(nads[k]);
                     if (functionName.equals(nads[k].getName()))//若相等，找出显示的函数的index，setSelectedIndex（）
@@ -442,8 +576,6 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
         functionNameList.ensureIndexIsVisible(indexOfFunction);
     }
 
-    }
-
     private int getBeginPosition() {
         int i = currentPosition;
         String textArea = formulaTextArea.getText();
@@ -492,9 +624,17 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
         // do nothing
     }
 
+    private void popTips() {
+        popupMenu = new JPopupMenu();
+        JScrollPane tipsScrollPane = new JScrollPane(tipsList);
+        popupMenu.add(tipsScrollPane);
+        tipsScrollPane.setPreferredSize(new Dimension(240, 146));
+        tipsScrollPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC));
+        popupMenu.show(keyWordTextField, 0, 23);
+    }
+
     protected void search(String keyWord, boolean findDescription) {
         listModel.removeAllElements();
-
         keyWord = removeAllSpace(keyWord);
         if (keyWord.length() != 0) {
             NameAndDescription[] descriptions = FunctionConstants.ALL.getDescriptions();
@@ -610,7 +750,9 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
                 beginPosition = getBeginPosition();
                 insertPosition = beginPosition;
                 firstStepToFindTips(beginPosition);
-                fixFunctionNameList();
+                if (tipsList.getSelectedValue() != null) {
+                    fixFunctionNameList(tipsList.getSelectedValue().toString());
+                }
                 ifHasBeenWriten = 1;
             } else {
                 this.formulaTextArea.setText(content);
@@ -618,7 +760,9 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
                 beginPosition = getBeginPosition();
                 insertPosition = beginPosition;
                 firstStepToFindTips(beginPosition);
-                fixFunctionNameList();
+                if (tipsList.getSelectedValue() != null) {
+                    fixFunctionNameList(tipsList.getSelectedValue().toString());
+                }
                 ifHasBeenWriten = 1;
             }
         }
@@ -650,20 +794,12 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
         public void actionPerformed(ActionEvent evt) {
             // Execute Formula default cell element.
             String formulaText = formulaTextArea.getText().trim();
-            String formulaValidMessage;
-            try {
-                formulaValidMessage = FormulaChecker.check(formulaText);
-                showMessageDialog(formulaValidMessage + ".");
-            } catch (FormulaCheckerException e) {
-                formulaValidMessage = e.getMessage();
-                showMessageDialog(formulaValidMessage + ".", false);
-            }
+            FormulaCheckResult checkResult = FormulaChecker.check(formulaText);
+            confirmCheckResult(checkResult, checkResult.getTips());
         }
     };
 
-    private final ActionListener calculateActionListener = new ActionListener() {
-        @Override
-        public void actionPerformed(ActionEvent e) {
+    private void calculateFormula() {
         String formulaText = formulaTextArea.getText().trim();
         String unSupportFormula = containsUnsupportedSimulationFormulas(formulaText);
         if (unSupportFormula != null) {
@@ -671,20 +807,10 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
             return;
         }
 
-            String formulaValidMessage;
-            boolean formulaValid;
-            try {
-                formulaValidMessage = FormulaChecker.check(formulaText);
-                formulaValid = true;
-            } catch (FormulaCheckerException formulaCheckerException) {
-                formulaValidMessage = formulaCheckerException.getMessage();
-                formulaValid = false;
-            }
         String messageTips;
-            if (ComparatorUtils.equals(formulaValidMessage, INVALID_FORMULA)) {
-                messageTips = INVALID_FORMULA;
-            } else {
-                messageTips = ComparatorUtils.equals(formulaValidMessage, VALID_FORMULA) ? "" : formulaValidMessage + "\n";
+        FormulaCheckResult checkResult = FormulaChecker.check(formulaText);
+        if (checkResult.grammarValid()) {
+            messageTips = checkResult.getTips() + NEWLINE;
             Map<String, Object> paramsMap = setParamsIfExist(formulaText);
             Calculator calculator = Calculator.createCalculator();
             ParameterMapNameSpace parameterMapNameSpace = ParameterMapNameSpace.create(paramsMap);
@@ -699,24 +825,61 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
             }
 
             BaseFormula baseFormula = BaseFormula.createFormulaBuilder().build(formulaText);
+            Object calResult;
             try {
-                    Object value = calculator.evalValue(baseFormula);
-                    String objectToString = EssentialUtils.objectToString(value);
+                calResult = calculator.evalValue(baseFormula);
+                String objectToString = EssentialUtils.objectToString(calResult);
                 String result = objectToString.length() > DEFUAL_FOMULA_LENGTH ?
                         objectToString.substring(0, DEFUAL_FOMULA_LENGTH - ELLIPSIS.length()) + ELLIPSIS : objectToString;
-                    messageTips = messageTips +
-                            Toolkit.i18nText("Fine-Design_Basic_Formula_Cal_Result") + ":" + result;
-                    FineLoggerFactory.getLogger().info("value:{}", value);
-                } catch (UtilEvalError utilEvalError) {
-                    FineLoggerFactory.getLogger().error("", utilEvalError);
+                messageTips = messageTips + Toolkit.i18nText("Fine-Design_Basic_Formula_Cal_Result") + ":" + result;
+            } catch (Exception ce) {
+                //模拟计算如果出现错误，则抛出错误
+                calResult = ce.getMessage();
+                FineLoggerFactory.getLogger().error(ce.getMessage(), ce);
+                messageTips = messageTips + Toolkit.i18nText("Fine-Design_Basic_Formula_Cal_Error") + ":" + calResult;
+            }
+            FineLoggerFactory.getLogger().info("value:{}", calResult);
+        } else {
+            messageTips = checkResult.getTips();
+        }
+        if (checkResult.isValid()) {
+            showMessageDialog(messageTips, checkResult.isValid());
+        } else {
+            confirmCheckResult(checkResult, messageTips);
         }
     }
-            showMessageDialog(messageTips, formulaValid);
+
+
+    private final ActionListener calculateActionListener = new ActionListener() {
+
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            calculateFormula();
         }
     };
 
-    private void showMessageDialog(String message) {
-        showMessageDialog(message, true);
+    private boolean confirmCheckResult(FormulaCheckResult checkResult, String messageTips) {
+        if (checkResult.isValid()) {
+            showMessageDialog(checkResult.getTips(), checkResult.isValid());
+        } else {
+            String position = Toolkit.i18nText("Fine-Design_Basic_Formula_The") + (checkResult.getFormulaCoordinates().getColumns())
+                    + Toolkit.i18nText("Fine-Design_Basic_Formula_Error_Position") + " ";
+            int confirmDialog = FineJOptionPane.showConfirmDialog(
+                    FormulaPane.this,
+                    position + messageTips,
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
+                    JOptionPane.YES_NO_OPTION,
+                    JOptionPane.WARNING_MESSAGE,
+                    null,
+                    new String[]{Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Result"), Toolkit.i18nText("Fine-Design_Basic_Formula_Continue")},
+                    Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Result"));
+            if (confirmDialog == 0) {
+                formulaTextArea.setCaretPosition(checkResult.getFormulaCoordinates().getColumns());
+                formulaTextArea.requestFocus();
+                return false;
+            }
+        }
+        return true;
     }
 
     private void showMessageDialog(String message, boolean formulaValid) {
@@ -750,6 +913,18 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
         return null;
     }
 
+    @Override
+    public boolean confirmContinueBeforeDoOK() {
+        if (checkBeforeColse.isSelected()) {
+            String formula = formulaTextArea.getText().trim();
+            FormulaCheckResult checkResult = FormulaChecker.check(formula);
+            if (!checkResult.isValid()) {
+                return confirmCheckResult(checkResult, checkResult.getTips());
+            }
+        }
+        return true;
+    }
+
     private Map<String, Object> setParamsIfExist(String formulaText) {
         Map<String, Object> parameterMap = new HashMap<>();
         try {
@@ -990,7 +1165,8 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
 
         private void initDescriptionTextArea() {
             // Description
-            descriptionTextArea = new UITextArea(16, 27);
+            descriptionTextArea = new UITextArea();
+            descriptionTextArea.setPreferredSize(new Dimension(350, 200));
 
             UIScrollPane desScrollPane = new UIScrollPane(descriptionTextArea);
             desScrollPane.setBorder(null);
@@ -1118,7 +1294,6 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
             };
             basicPane.setLayout(FRGUIPaneFactory.createBorderLayout());
             UITextArea desArea = new UITextArea();
-//            desArea。setEnabled(false);
             desArea.setText(this.getTextAreaText());
             basicPane.add(new UIScrollPane(desArea), BorderLayout.CENTER);
             BasicDialog dialog = basicPane.showWindow(DesignerContext.getDesignerFrame());
@@ -1191,6 +1366,11 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
             }
         };
 
+        public void refreshText(String line) {
+            fixFunctionNameList(line);
+            refreshDescriptionTextArea(line);
+        }
+
         public void populate(VariableResolver variableResolver) {
             // varibale tree.
             DefaultTreeModel variableModel = (DefaultTreeModel) variablesTree.getModel();
@@ -1326,12 +1506,12 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
             buffer.append(name.toUpperCase());
             buffer.append("\"");
             buffer.append("|");
-            buffer.append("\n");
+            buffer.append(NEWLINE);
             buffer.append("\"");
             buffer.append(name.toLowerCase());
             buffer.append("\"");
             buffer.append("|");
-            buffer.append("\n");
+            buffer.append(NEWLINE);
         }
         FineLoggerFactory.getLogger().debug(buffer.toString());
     }

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

@@ -3,11 +3,10 @@ package com.fr.design.formula;
 import com.fr.base.BaseFormula;
 import com.fr.design.gui.icheckbox.UICheckBox;
 
-
-import javax.swing.*;
+import javax.swing.JPanel;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import java.awt.*;
+import java.awt.BorderLayout;
 
 /**
  * @author richie
@@ -41,8 +40,8 @@ public class FormulaPaneWhenReserveFormula extends FormulaPane {
         reserveCheckBox4Write = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Write_Save_Formula"));
         reserveCheckBox4Write.setSelected(false);
 
-        checkBoxPane.add(reserveCheckBox4Result, BorderLayout.CENTER);
-        checkBoxPane.add(reserveCheckBox4Write, BorderLayout.SOUTH);
+        checkBoxPane.add(reserveCheckBox4Result, BorderLayout.WEST);
+        checkBoxPane.add(reserveCheckBox4Write, BorderLayout.WEST);
     }
 
     @Override

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

@@ -0,0 +1,48 @@
+package com.fr.design.formula.exception;
+
+import com.fr.design.formula.FormulaChecker;
+import com.fr.design.formula.exception.function.FormulaCheckWrongFunction;
+import com.fr.design.formula.exception.function.MismatchedCharFunction;
+import com.fr.design.formula.exception.function.MismatchedTokenFunction;
+import com.fr.design.formula.exception.function.NoViableAltForCharFunction;
+import com.fr.design.formula.exception.function.NoViableAltFunction;
+import com.fr.script.checker.exception.FunctionCheckWrongException;
+import com.fr.script.checker.result.FormulaCheckResult;
+import com.fr.script.checker.result.FormulaCoordinates;
+import com.fr.third.antlr.MismatchedCharException;
+import com.fr.third.antlr.MismatchedTokenException;
+import com.fr.third.antlr.NoViableAltException;
+import com.fr.third.antlr.NoViableAltForCharException;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+
+/**
+ * @author Hoky
+ * @date 2021/10/26
+ */
+public class FormulaExceptionTipsProcessor {
+    private static final Map<Class, Function<Exception, FormulaCheckResult>> EXCEPTION_TIPS = new ConcurrentHashMap<>();
+
+    private static final FormulaExceptionTipsProcessor PROCESSOR = new FormulaExceptionTipsProcessor();
+
+    static {
+        EXCEPTION_TIPS.put(FunctionCheckWrongException.class, FormulaCheckWrongFunction.getFunction());
+        EXCEPTION_TIPS.put(MismatchedCharException.class, MismatchedCharFunction.getFunction());
+        EXCEPTION_TIPS.put(MismatchedTokenException.class, MismatchedTokenFunction.getFunction());
+        EXCEPTION_TIPS.put(NoViableAltException.class, NoViableAltFunction.getFunction());
+        EXCEPTION_TIPS.put(NoViableAltForCharException.class, NoViableAltForCharFunction.getFunction());
+
+    }
+
+    public FormulaCheckResult getExceptionTips(Exception e) {
+        return EXCEPTION_TIPS.getOrDefault(e.getClass(),
+                e1 -> new FormulaCheckResult(false, FormulaChecker.INVALID_FORMULA, FormulaCoordinates.INVALID, false))
+                .apply(e);
+    }
+
+    public static FormulaExceptionTipsProcessor getProcessor() {
+        return PROCESSOR;
+    }
+}

designer-base/src/main/java/com/fr/design/formula/exception/function/FormulaCheckConstants.java

@@ -0,0 +1,14 @@
+package com.fr.design.formula.exception.function;
+
+/**
+ * @author Hoky
+ * @date 2021/10/28
+ */
+public class FormulaCheckConstants {
+    public static final String COLON = ":";
+    public static final String LEFT = "(";
+    public static final String COMMON = ",";
+    public static final String RIGHT = ")";
+    public static final String BLANK = " ";
+    public static final String SINGLE_QUOTES = "'";
+}

designer-base/src/main/java/com/fr/design/formula/exception/function/FormulaCheckWrongFunction.java

@@ -0,0 +1,78 @@
+package com.fr.design.formula.exception.function;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.script.checker.exception.FunctionCheckWrongException;
+import com.fr.script.checker.result.FormulaCheckResult;
+import com.fr.script.checker.result.FormulaCoordinates;
+import com.fr.script.rules.FunctionParameterType;
+import com.fr.script.rules.FunctionRule;
+import com.fr.stable.StringUtils;
+
+import java.util.List;
+import java.util.function.Function;
+
+/**
+ * @author Hoky
+ * @date 2021/10/26
+ */
+public class FormulaCheckWrongFunction implements Function<Exception, FormulaCheckResult> {
+    private final static FormulaCheckWrongFunction FUNCTION = new FormulaCheckWrongFunction();
+
+    @Override
+    public FormulaCheckResult apply(Exception e) {
+        if (e instanceof FunctionCheckWrongException) {
+            FunctionCheckWrongException ce = (FunctionCheckWrongException) e;
+            List<FunctionRule> rules = ce.getRules();
+            String functionName = ce.getFunctionName();
+            StringBuilder errorMsg = new StringBuilder(functionName + Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Error_Tips") + FormulaCheckConstants.COLON);
+            for (int i = 0; i < rules.size(); i++) {
+                errorMsg.append(FormulaCheckConstants.LEFT);
+                if (rules.get(i).getParameterList().isEmpty()) {
+                    errorMsg.append(Toolkit.i18nText("Fine-Design_Basic_Formula_No_Param"));
+                }
+                for (FunctionParameterType functionParameterType : rules.get(i).getParameterList()) {
+                    errorMsg.append(getTypeString(functionParameterType)).append(FormulaCheckConstants.COMMON);
+                }
+                if (FormulaCheckConstants.COMMON.equals(errorMsg.charAt(errorMsg.length() - 1) + StringUtils.EMPTY)) {
+                    errorMsg.deleteCharAt(errorMsg.length() - 1);
+                }
+                errorMsg.append(FormulaCheckConstants.RIGHT);
+                if (i != rules.size() - 1) {
+                    errorMsg.append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Or"));
+                }
+            }
+            return new FormulaCheckResult(false, errorMsg.toString(), new FormulaCoordinates(1, indexPosition(ce.getFormulaText(), ce.getNode().toString())), true);
+        }
+        return new FormulaCheckResult(false, StringUtils.EMPTY, new FormulaCoordinates(-1, -1), true);
+    }
+
+    private static String getTypeString(FunctionParameterType type) {
+        switch (type) {
+            case NUMBER:
+                return Toolkit.i18nText("Fine-Design_Basic_Formula_Check_ParamType_Number");
+            case STRING:
+                return Toolkit.i18nText("Fine-Design_Basic_Formula_Check_ParamType_String");
+            case ANY:
+                return Toolkit.i18nText("Fine-Design_Basic_Formula_Check_ParamType_Any");
+            case DATE:
+                return Toolkit.i18nText("Fine-Design_Basic_Formula_Check_ParamType_Date");
+            case BOOLEAN:
+                return Toolkit.i18nText("Fine-Design_Basic_Formula_Check_ParamType_Boolean");
+            case ARRAY:
+                return Toolkit.i18nText("Fine-Design_Basic_Formula_Check_ParamType_Array");
+        }
+        return StringUtils.EMPTY;
+    }
+
+    public static Function<Exception, FormulaCheckResult> getFunction() {
+        return FUNCTION;
+    }
+
+    private int indexPosition(String formulaText, String invalidFormula) {
+        //处理一下自己FunctionCall自己拼的逗号逻辑
+        if (invalidFormula.contains(",")) {
+            invalidFormula = invalidFormula.substring(0, invalidFormula.indexOf(","));
+        }
+        return formulaText.indexOf(invalidFormula);
+    }
+}

designer-base/src/main/java/com/fr/design/formula/exception/function/MismatchedCharFunction.java

@@ -0,0 +1,104 @@
+package com.fr.design.formula.exception.function;
+
+import com.fr.design.formula.FormulaChecker;
+import com.fr.design.i18n.Toolkit;
+import com.fr.script.checker.result.FormulaCheckResult;
+import com.fr.script.checker.result.FormulaCoordinates;
+import com.fr.third.antlr.MismatchedCharException;
+
+import java.util.function.Function;
+
+/**
+ * @author Hoky
+ * @date 2021/10/28
+ */
+public class MismatchedCharFunction implements Function<Exception, FormulaCheckResult> {
+    private final static MismatchedCharFunction FUNCTION = new MismatchedCharFunction();
+
+    @Override
+    public FormulaCheckResult apply(Exception e) {
+        if (e instanceof MismatchedCharException) {
+            MismatchedCharException charException = (MismatchedCharException) e;
+            FormulaCoordinates formulaCoordinates = new FormulaCoordinates(charException.line, charException.column - 1);
+            return new FormulaCheckResult(false, getMessage(charException), formulaCoordinates, false);
+        }
+        return new FormulaCheckResult(false, FormulaChecker.INVALID_FORMULA, FormulaCoordinates.INVALID, false);
+    }
+
+    public static Function<Exception, FormulaCheckResult> getFunction() {
+        return FUNCTION;
+    }
+
+    private String getMessage(MismatchedCharException charException) {
+        StringBuffer sb = new StringBuffer();
+        switch (charException.mismatchType) {
+            case 1:
+                sb.append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Expecting") + ": ");
+                appendCharName(sb, charException.expecting);
+                sb.append(FormulaCheckConstants.COMMON)
+                        .append(FormulaCheckConstants.BLANK)
+                        .append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Found"));
+                appendCharName(sb, charException.foundChar);
+                break;
+            case 2:
+                sb.append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Expecting_Anything") + ": ")
+                        .append(FormulaCheckConstants.BLANK)
+                        .append(FormulaCheckConstants.SINGLE_QUOTES);
+                appendCharName(sb, charException.expecting);
+                sb.append("';").append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_GotItAnyway"));
+                break;
+            case 3:
+            case 4:
+                sb.append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Expecting") + ": ").append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Token"));
+                if (charException.mismatchType == 4) {
+                    sb.append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Not"));
+                }
+
+                sb.append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_In_Range")).append(": ");
+                appendCharName(sb, charException.expecting);
+                sb.append("..");
+                appendCharName(sb, charException.upper);
+                sb.append(", ").append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Found"));
+                appendCharName(sb, charException.foundChar);
+                break;
+            case 5:
+            case 6:
+                sb.append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Expecting") + ": ")
+                        .append(charException.mismatchType == 6 ? Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Not") : FormulaCheckConstants.BLANK)
+                        .append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_ONE_OF")).append(" (");
+                int[] elems = charException.set.toArray();
+
+                for (int i = 0; i < elems.length; ++i) {
+                    appendCharName(sb, elems[i]);
+                }
+
+                sb.append("), ").append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Found"));
+                appendCharName(sb, charException.foundChar);
+                break;
+            default:
+                sb.append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Mismatched_Char"));
+        }
+
+        return sb.toString();
+    }
+
+    private void appendCharName(StringBuffer sb, int c) {
+        switch (c) {
+            case 9:
+                sb.append("'\\t'");
+                break;
+            case 10:
+                sb.append("'\\n'");
+                break;
+            case 13:
+                sb.append("'\\r'");
+                break;
+            case 65535:
+                sb.append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Mismatched_EOF"));
+                break;
+            default:
+                sb.append((char) c);
+        }
+
+    }
+}

designer-base/src/main/java/com/fr/design/formula/exception/function/MismatchedTokenFunction.java

@@ -0,0 +1,140 @@
+package com.fr.design.formula.exception.function;
+
+import com.fr.design.formula.FormulaChecker;
+import com.fr.design.i18n.Toolkit;
+import com.fr.log.FineLoggerFactory;
+import com.fr.script.checker.result.FormulaCheckResult;
+import com.fr.script.checker.result.FormulaCoordinates;
+import com.fr.stable.StringUtils;
+import com.fr.third.antlr.MismatchedTokenException;
+
+import java.lang.reflect.Field;
+import java.util.function.Function;
+
+/**
+ * @author Hoky
+ * @date 2021/10/28
+ */
+public class MismatchedTokenFunction implements Function<Exception, FormulaCheckResult> {
+    private final static MismatchedTokenFunction FUNCTION = new MismatchedTokenFunction();
+    public static final String NULL_STRING = "null";
+
+    @Override
+    public FormulaCheckResult apply(Exception e) {
+        if (e instanceof MismatchedTokenException) {
+            MismatchedTokenException charException = (MismatchedTokenException) e;
+            FormulaCoordinates formulaCoordinates = new FormulaCoordinates(charException.line, charException.column - 1);
+            return new FormulaCheckResult(false, getMessage(charException), formulaCoordinates, false);
+        }
+        return new FormulaCheckResult(false, FormulaChecker.INVALID_FORMULA, FormulaCoordinates.INVALID, false);
+    }
+
+    public static Function<Exception, FormulaCheckResult> getFunction() {
+        return FUNCTION;
+    }
+
+    public String getMessage(MismatchedTokenException exception) {
+        StringBuilder sb = new StringBuilder();
+        Object fieldValue = getFieldValue(exception, "tokenText");
+        String tokenText = fieldValue == null ? NULL_STRING : fieldValue.toString();
+        switch (exception.mismatchType) {
+            case 1:
+                sb.append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Expecting") + ": ")
+                        .append(tokenName(exception.expecting, exception))
+                        .append(", ")
+                        .append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Found"))
+                        .append(FormulaCheckConstants.BLANK + FormulaCheckConstants.SINGLE_QUOTES)
+                        .append(tokenText).append("'");
+                break;
+            case 2:
+                sb.append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Expecting_Anything") + ": ")
+                        .append(tokenName(exception.expecting, exception))
+                        .append("; ")
+                        .append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_GotItAnyway"));
+                break;
+            case 3:
+                sb.append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Expecting") + ": ")
+                        .append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Token"))
+                        .append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_In_Range"))
+                        .append(": ")
+                        .append(tokenName(exception.expecting, exception))
+                        .append("..")
+                        .append(tokenName(exception.upper, exception))
+                        .append(", ").append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Found"))
+                        .append("'").append(tokenText).append("'");
+                break;
+            case 4:
+                sb.append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Expecting") + ": ")
+                        .append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Token"))
+                        .append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Not"))
+                        .append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_In_Range"))
+                        .append(": ")
+                        .append(tokenName(exception.expecting, exception))
+                        .append("..")
+                        .append(tokenName(exception.upper, exception))
+                        .append(",").
+                        append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Found"))
+                        .append(" '")
+                        .append(tokenText)
+                        .append("'");
+                break;
+            case 5:
+            case 6:
+                sb.append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Expecting") + ": ")
+                        .append(exception.mismatchType == 6 ? Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Not") : FormulaCheckConstants.BLANK)
+                        .append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_ONE_OF")).append("(");
+                int[] elms = exception.set.toArray();
+
+                for (int i = 0; i < elms.length; ++i) {
+                    sb.append(' ');
+                    sb.append(tokenName(elms[i], exception));
+                }
+
+                sb.append("),")
+                        .append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Found"))
+                        .append("'")
+                        .append(tokenText)
+                        .append("'");
+                break;
+            default:
+                sb.append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Mismatched_Token"));
+        }
+
+        return sb.toString();
+    }
+
+    private String tokenName(int tokenType, MismatchedTokenException exception) {
+        if (tokenType == 0) {
+            return "<Set of tokens>";
+        } else {
+            String[] tokenNames = (String[]) getFieldValue(exception, "tokenNames");
+            return tokenType >= 0 && tokenType < tokenNames.length ? translateToken(tokenNames[tokenType]) : "<" + tokenType + ">";
+        }
+    }
+
+    private String translateToken(String token) {
+        switch (token) {
+            case ("RPAREN"):
+                return ")";
+            case ("LPAREN"):
+                return "(";
+            case ("COMMA"):
+                return ",";
+            case ("COLON"):
+                return ":";
+            default:
+                return token;
+        }
+    }
+
+    private Object getFieldValue(Object object, String fieldName) {
+        try {
+            Field field = object.getClass().getDeclaredField(fieldName);
+            field.setAccessible(true);
+            return field.get(object);
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().warn(e.getMessage(), e);
+            return StringUtils.EMPTY;
+        }
+    }
+}

designer-base/src/main/java/com/fr/design/formula/exception/function/NoViableAltForCharFunction.java

@@ -0,0 +1,44 @@
+package com.fr.design.formula.exception.function;
+
+import com.fr.design.formula.FormulaChecker;
+import com.fr.design.i18n.Toolkit;
+import com.fr.script.checker.result.FormulaCheckResult;
+import com.fr.script.checker.result.FormulaCoordinates;
+import com.fr.third.antlr.NoViableAltForCharException;
+
+import java.util.function.Function;
+
+/**
+ * @author Hoky
+ * @date 2021/10/28
+ */
+public class NoViableAltForCharFunction implements Function<Exception, FormulaCheckResult> {
+    private final static NoViableAltForCharFunction FUNCTION = new NoViableAltForCharFunction();
+
+    @Override
+    public FormulaCheckResult apply(Exception e) {
+        if (e instanceof NoViableAltForCharException) {
+            NoViableAltForCharException charException = (NoViableAltForCharException) e;
+            FormulaCoordinates formulaCoordinates = new FormulaCoordinates(charException.line, charException.column - 1);
+            return new FormulaCheckResult(false, getMessage(charException), formulaCoordinates, false);
+        }
+        return new FormulaCheckResult(false, FormulaChecker.INVALID_FORMULA, FormulaCoordinates.INVALID, false);
+    }
+
+    public static Function<Exception, FormulaCheckResult> getFunction() {
+        return FUNCTION;
+    }
+
+    public String getMessage(NoViableAltForCharException exception) {
+        String mesg = Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Unexpected_Char") + ": ";
+        if (exception.foundChar >= ' ' && exception.foundChar <= '~') {
+            mesg = mesg + '\'';
+            mesg = mesg + exception.foundChar;
+            mesg = mesg + '\'';
+        } else {
+            mesg = mesg + exception.foundChar;
+        }
+
+        return mesg;
+    }
+}

designer-base/src/main/java/com/fr/design/formula/exception/function/NoViableAltFunction.java

@@ -0,0 +1,41 @@
+package com.fr.design.formula.exception.function;
+
+import com.fr.design.formula.FormulaChecker;
+import com.fr.design.i18n.Toolkit;
+import com.fr.script.checker.result.FormulaCheckResult;
+import com.fr.script.checker.result.FormulaCoordinates;
+import com.fr.third.antlr.NoViableAltException;
+import com.fr.third.antlr.TreeParser;
+
+import java.util.function.Function;
+
+/**
+ * @author Hoky
+ * @date 2021/10/28
+ */
+public class NoViableAltFunction implements Function<Exception, FormulaCheckResult> {
+    private final static NoViableAltFunction FUNCTION = new NoViableAltFunction();
+
+    @Override
+    public FormulaCheckResult apply(Exception e) {
+        if (e instanceof NoViableAltException) {
+            NoViableAltException altException = (NoViableAltException) e;
+            FormulaCoordinates formulaCoordinates = new FormulaCoordinates(altException.line, altException.column - 1);
+            return new FormulaCheckResult(false, getMessage(altException), formulaCoordinates, false);
+        }
+        return new FormulaCheckResult(false, FormulaChecker.INVALID_FORMULA, FormulaCoordinates.INVALID, false);
+    }
+
+    public static Function<Exception, FormulaCheckResult> getFunction() {
+        return FUNCTION;
+    }
+
+    public String getMessage(NoViableAltException exception) {
+        if (exception.token != null) {
+            return Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Unexpected_Token") + ": " + exception.token.getText();
+        } else {
+            return exception.node == TreeParser.ASTNULL ? Toolkit.i18nText("Fine-Design_Basic_Formula_Check_End_Of_Subtree") :
+                    Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Unexpected_AST_Node") + ": " + exception.node.toString();
+        }
+    }
+}

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

@@ -0,0 +1,22 @@
+package com.fr.design.gui.autocomplete;
+
+import javax.swing.Icon;
+
+/**
+ * @author Hoky
+ * @date 2021/11/5
+ */
+public class FormulaCompletion extends BasicCompletion {
+    private Icon icon;
+
+    public FormulaCompletion(CompletionProvider provider, String replacementText, Icon icon) {
+        super(provider, replacementText);
+        this.icon = icon;
+    }
+
+    @Override
+    public Icon getIcon() {
+        return icon;
+    }
+
+}

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

@@ -16,16 +16,34 @@ import com.fr.design.gui.syntax.ui.rsyntaxtextarea.RSyntaxTextArea;
 import com.fr.design.gui.syntax.ui.rtextarea.ChangeableHighlightPainter;
 import com.fr.log.FineLoggerFactory;
 
-import javax.swing.*;
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.ActionMap;
+import javax.swing.InputMap;
+import javax.swing.KeyStroke;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
 import javax.swing.event.CaretEvent;
 import javax.swing.event.CaretListener;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
-import javax.swing.text.*;
+import javax.swing.text.AbstractDocument;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.DefaultEditorKit;
+import javax.swing.text.Document;
+import javax.swing.text.Highlighter;
 import javax.swing.text.Highlighter.Highlight;
 import javax.swing.text.Highlighter.HighlightPainter;
-import java.awt.*;
-import java.awt.event.*;
+import javax.swing.text.JTextComponent;
+import javax.swing.text.Position;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -41,7 +59,7 @@ import java.util.List;
  * @author Robert Futrell
  * @version 1.0
  */
-class ParameterizedCompletionContext {
+public class ParameterizedCompletionContext {
 
     /**
      * The parent window.

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

@@ -399,7 +399,10 @@ public class UIButtonGroup<T> extends JPanel implements GlobalNameObserver, UIOb
      * @param l
      */
     public void removeChangeListener(ChangeListener l) {
-        this.listenerList.remove(ChangeListener.class, l);
+        for (int i = 0; i < labelButtonList.size(); i++) {
+            labelButtonList.get(i).removeChangeListener(l);
+            listenerList.remove(ChangeListener.class, l);
+        }
     }
 
 

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

@@ -153,7 +153,7 @@ public class ColorSchemeComboBox extends UIComboBox {
         if (selectedIndex == itemCount - 2) {
             return SelectType.COMBINATION_COLOR;
         }
-        if (selectedIndex == 0) {
+        if (selectedIndex == 0 && ChartEditContext.supportTheme()) {
             return SelectType.DEFAULT;
         }
         return SelectType.NORMAL;

designer-base/src/main/java/com/fr/design/gui/itree/filetree/FileTreeIcon.java

@@ -2,6 +2,7 @@ package com.fr.design.gui.itree.filetree;
 
 import com.fr.base.BaseUtils;
 import com.fr.design.ExtraDesignClassManager;
+import com.fr.design.icon.LocalFileIcon;
 import com.fr.design.icon.LockIcon;
 import com.fr.design.fun.ReportSupportedFileUIProvider;
 import com.fr.file.filetree.FileNode;
@@ -19,6 +20,8 @@ public class FileTreeIcon {
     private FileTreeIcon() {
     }
 
+    public static final String FILE_LOCKED_ICON_PATH = "/com/fr/design/images/gui/file_lock.png";
+
     public static final Icon BLANK_IMAGE_ICON = BaseUtils.readIcon("/com/fr/design/images/gui/blank.gif");
 
     public static final Icon FOLDER_IMAGE_ICON = BaseUtils.readIcon("/com/fr/design/images/gui/folder.png");
@@ -153,7 +156,7 @@ public class FileTreeIcon {
                 if (node.isDirectory()) {
                     return FileTreeIcon.FOLDER_IMAGE_ICON;
                 }
-                return getLocalFileIcon(path);
+                return getLocalFileIcon(path, isShowLock);
             }
         }
         if (node.isDirectory()) {
@@ -163,12 +166,12 @@ public class FileTreeIcon {
         }
     }
 
-    private static Icon getLocalFileIcon(String path) {
-        Icon icon = getExtraIcon(path, false);
+    private static Icon getLocalFileIcon(String path, boolean isShowLock) {
+        Icon icon = getExtraIcon(path, isShowLock);
         if (icon != null) {
             return icon;
         }
-        return FileSystemView.getFileSystemView().getSystemIcon(new File(path));
+        return new LocalFileIcon(FileSystemView.getFileSystemView().getSystemIcon(new File(path)), isShowLock);
     }
 
     private static Icon getRemoteFileIcon(FileNode node, boolean isShowLock) {

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

@@ -26,6 +26,7 @@ import com.fr.design.style.color.NewColorSelectBox;
 import com.fr.env.utils.DesignerInteractionHistory;
 import com.fr.general.Background;
 import com.fr.general.IOUtils;
+import com.fr.i18n.UrlI18nManager;
 import com.fr.general.act.BorderPacker;
 import com.fr.stable.Constants;
 import com.fr.stable.GraphDrawHelper;
@@ -117,7 +118,7 @@ public class TranslucentBorderSpecialPane extends AbstractBorderPackerPane imple
             public void actionPerformed(ActionEvent e) {
                 Desktop desktop = Desktop.getDesktop();
                 try {
-                    desktop.browse(new URI(TWEAK_NINE_POINT_HELP_URL));
+                    desktop.browse(new URI(UrlI18nManager.getInstance().getI18nUrl("nine.point.help")));
                 } catch (IOException | URISyntaxException ioException) {
                     ioException.printStackTrace();
                 }

designer-base/src/main/java/com/fr/design/icon/LocalFileIcon.java

@@ -0,0 +1,42 @@
+package com.fr.design.icon;
+
+import com.fr.base.BaseUtils;
+import com.fr.design.gui.itree.filetree.FileTreeIcon;
+
+import javax.swing.Icon;
+import java.awt.Component;
+import java.awt.Graphics;
+
+/**
+ * Created by kerry on 2021/11/11
+ */
+public class LocalFileIcon implements Icon {
+    private static final Icon FILE_LOCKED_ICON = BaseUtils.readIcon(FileTreeIcon.FILE_LOCKED_ICON_PATH);
+    private static final int OFFSET_X = 9;
+    private static final int OFFSET_Y = 8;
+    private final Icon mainIcon;
+    private final boolean showLock;
+
+    public LocalFileIcon(Icon mainIcon, boolean showLock) {
+        this.mainIcon = mainIcon;
+        this.showLock = showLock;
+    }
+
+    @Override
+    public void paintIcon(Component c, Graphics g, int x, int y) {
+        mainIcon.paintIcon(c, g, x, y);
+        if (showLock) {
+            FILE_LOCKED_ICON.paintIcon(c, g, OFFSET_X, OFFSET_Y);
+        }
+    }
+
+    @Override
+    public int getIconWidth() {
+        return mainIcon.getIconWidth();
+    }
+
+    @Override
+    public int getIconHeight() {
+        return mainIcon.getIconHeight();
+    }
+}

designer-base/src/main/java/com/fr/design/icon/LockIcon.java

@@ -1,6 +1,7 @@
 package com.fr.design.icon;
 
 import com.fr.base.BaseUtils;
+import com.fr.design.gui.itree.filetree.FileTreeIcon;
 import com.fr.log.FineLoggerFactory;
 
 import javax.swing.GrayFilter;
@@ -12,7 +13,7 @@ import java.awt.MediaTracker;
 import java.awt.image.ImageObserver;
 
 public class LockIcon extends ImageIcon {
-    private final static Image lockImage = BaseUtils.readImage("/com/fr/design/images/gui/locked.gif");
+    private final static Image lockImage = BaseUtils.readImage(FileTreeIcon.FILE_LOCKED_ICON_PATH);
 
     private Image mainImage = null;
 

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

@@ -0,0 +1,26 @@
+package com.fr.design.locale.impl;
+
+import com.fr.general.GeneralContext;
+import com.fr.general.locale.LocaleMark;
+
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+public class ShowOnlineWidgetMark implements LocaleMark<Boolean> {
+    private Map<Locale, Boolean> map = new HashMap<>();
+
+    public ShowOnlineWidgetMark() {
+        map.put(Locale.CHINA, true);
+        map.put(Locale.TAIWAN, true);
+        map.put(Locale.US, false);
+        map.put(Locale.KOREA, false);
+        map.put(Locale.JAPAN, false);
+    }
+
+    @Override
+    public Boolean getValue() {
+        Boolean result = map.get(GeneralContext.getLocale());
+        return result == null ? false : result;
+    }
+}

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

@@ -47,7 +47,7 @@ public class DesignerLoginHelper {
     }
 
     public static void showLoginDialog(DesignerLoginSource source, Map<String, String> params, Window window) {
-        if (!SupportOSImpl.DESIGNER_LOGIN.support()) {
+        if (!SupportOSImpl.DESIGNER_LOGIN.support() || DesignerEnvManager.getEnvManager().isUseOldVersionLogin()) {
             WebViewDlgHelper.createLoginDialog(window);
             return;
         }

designer-base/src/main/java/com/fr/design/login/config/DesignerLoginConfigManager.java

@@ -70,6 +70,10 @@ public class DesignerLoginConfigManager implements XMLReadable, XMLWriter {
      * 插件管理第一次启动时的提醒
      */
     private boolean pluginRemindOnFirstLaunch = true;
+    /**
+     * 使用旧版登录
+     */
+    private boolean useOldVersionLogin = false;
 
     private DesignerLoginConfigManager() {
 
@@ -98,6 +102,7 @@ public class DesignerLoginConfigManager implements XMLReadable, XMLWriter {
             this.setLastLoginAccount(reader.getAttrAsString("lastLoginAccount", StringUtils.EMPTY));
             this.setLoginRemindBeforeJumpBBS(reader.getAttrAsBoolean("loginRemindBeforeJumpBBS", true));
             this.setPluginRemindOnFirstLaunch(reader.getAttrAsBoolean("pluginRemindOnFirstLaunch", true));
+            this.setUseOldVersionLogin(reader.getAttrAsBoolean("useOldVersionLogin", false));
         }
     }
 
@@ -117,6 +122,7 @@ public class DesignerLoginConfigManager implements XMLReadable, XMLWriter {
         writer.attr("lastLoginAccount", lastLoginAccount);
         writer.attr("loginRemindBeforeJumpBBS", loginRemindBeforeJumpBBS);
         writer.attr("pluginRemindOnFirstLaunch", pluginRemindOnFirstLaunch);
+        writer.attr("useOldVersionLogin", useOldVersionLogin);
         writer.end();
     }
 
@@ -223,4 +229,12 @@ public class DesignerLoginConfigManager implements XMLReadable, XMLWriter {
     public void setPluginRemindOnFirstLaunch(boolean pluginRemindOnFirstLaunch) {
         this.pluginRemindOnFirstLaunch = pluginRemindOnFirstLaunch;
     }
+
+    public boolean isUseOldVersionLogin() {
+        return useOldVersionLogin;
+    }
+
+    public void setUseOldVersionLogin(boolean useOldVersionLogin) {
+        this.useOldVersionLogin = useOldVersionLogin;
+    }
 }

designer-base/src/main/java/com/fr/design/login/guide/DesignerGuideHelper.java

@@ -8,9 +8,7 @@ import com.fr.design.login.utils.DesignerLoginUtils;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.os.impl.SupportOSImpl;
 import com.fr.design.update.push.DesignerPushUpdateManager;
-import com.fr.general.CloudCenter;
-import com.fr.general.CloudCenterConfig;
-import com.fr.general.http.HttpToolbox;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 import javax.swing.WindowConstants;
 
@@ -39,7 +37,11 @@ public class DesignerGuideHelper {
 
     public static void prepareShowGuideDialog() {
         // 如果存在更新升级的弹窗，则不显示引导页面
-        if (!DesignerLoginUtils.isOnline() || !SupportOSImpl.DESIGNER_LOGIN.support() || !FRContext.isChineseEnv() || DesignerPushUpdateManager.getInstance().isShouldPopUp()) {
+        if (!DesignerLoginUtils.isOnline()
+                || !SupportOSImpl.DESIGNER_LOGIN.support()
+                || !FRContext.isChineseEnv()
+                || DesignerPushUpdateManager.getInstance().isShouldPopUp()
+                || DesignerEnvManager.getEnvManager().isUseOldVersionLogin()) {
             return;
         }
         if (isActivatedForOneWeek()) {
@@ -52,7 +54,11 @@ public class DesignerGuideHelper {
             DesignerContext.getDesignerFrame().addDesignerOpenedListener(new DesignerOpenedListener() {
                 @Override
                 public void designerOpened() {
+                    try {
                         showGuideDialog();
+                    } catch (Throwable t) {
+                        FineLoggerFactory.getLogger().warn(t.getMessage(), t);
+                    }
                 }
             });
         }

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

@@ -12,7 +12,7 @@ import com.fr.design.notification.SnapChatKey;
  * Created by kerry on 5/8/21
  */
 public class ComponentReuseNotifyUtil {
-    private static final String COMPONENT_SNAP_CHAT_KEY = "com.fr.component.share-components";
+    public static final String COMPONENT_SNAP_CHAT_KEY = "com.fr.component.share-components";
 
     private ComponentReuseNotifyUtil() {
 

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

@@ -34,6 +34,7 @@ import com.fr.design.menu.KeySetUtils;
 import com.fr.design.menu.ShortCut;
 import com.fr.design.menu.ToolBarDef;
 import com.fr.design.roleAuthority.RolesAlreadyEditedPane;
+import com.fr.design.ui.util.UIUtil;
 import com.fr.design.utils.DesignUtils;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.event.Event;
@@ -101,6 +102,23 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
                 return context.contain(PluginModule.ExtraDesign, ShortCut.TEMPLATE_TREE);
             }
         });
+        GeneralContext.listenPluginRunningChanged(new PluginEventListener() {
+            @Override
+            public void on(PluginEvent event) {
+                UIUtil.invokeLaterIfNeeded(new Runnable() {
+                    @Override
+                    public void run() {
+                        DesignerFrameFileDealerPane.getInstance().refresh();
+                        DesignerFrameFileDealerPane.getInstance().stateChange();
+                    }
+                });
+            }
+        }, new PluginFilter() {
+            @Override
+            public boolean accept(PluginContext context) {
+                return context.contain(PluginModule.ExtraDesign, App.MARK_STRING);
+            }
+        });
     }
 
     private List<FileToolbarStateChangeListener> otherToolbarStateChangeListeners = new ArrayList<>();

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

@@ -13,7 +13,6 @@ import com.fr.design.gui.ibutton.UIButtonUI;
 import com.fr.design.gui.icontainer.UIEastResizableContainer;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.VerticalFlowLayout;
-import com.fr.design.mainframe.reuse.ReuseGuideDialog;
 import com.fr.design.mainframe.reuse.SnapChatKeys;
 import com.fr.design.mainframe.share.collect.ComponentCollector;
 import com.fr.design.notification.SnapChat;
@@ -292,7 +291,12 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         // 控件设置
         PropertyItem widgetSettings = new PropertyItem(KEY_WIDGET_SETTINGS, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Component_Settings"),
                 "widgetsettings", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_PARA_WIDGET, PropertyMode.REPORT_FLOAT, PropertyMode.FORM, PropertyMode.POLY},
-                new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_PARA_WIDGET, PropertyMode.FORM, PropertyMode.POLY_REPORT, PropertyMode.POLY_CHART});
+                new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_PARA_WIDGET, PropertyMode.FORM, PropertyMode.POLY_REPORT, PropertyMode.POLY_CHART}, new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                ComponentCollector.getInstance().clickComponentSetting();
+            }
+        });
         // 条件属性
         PropertyItem conditionAttr = new PropertyItem(KEY_CONDITION_ATTR, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Condition_Attributes"),
                 "conditionattr", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_PARA_WIDGET, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
@@ -538,9 +542,6 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
     }
 
     public PromptWindow getWidgetLibPromptWindow() {
-        if (!getWidgetLibSnapChat().hasRead()) {
-            return new ReuseGuideDialog(DesignerContext.getDesignerFrame());
-        }
         return null;
     }
 

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

@@ -7,11 +7,11 @@ import com.fr.base.io.BaseBook;
 import com.fr.base.iofile.attr.DesignBanCopyAttrMark;
 import com.fr.base.iofile.attr.TemplateIdAttrMark;
 import com.fr.base.iofile.attr.TemplateThemeAttrMark;
+import com.fr.base.theme.TemplateTheme;
 import com.fr.base.theme.TemplateThemeCompatible;
+import com.fr.base.theme.TemplateThemeConfig;
 import com.fr.base.theme.ThemedTemplate;
 import com.fr.base.vcs.DesignerMode;
-import com.fr.base.theme.TemplateTheme;
-import com.fr.base.theme.TemplateThemeConfig;
 import com.fr.decision.config.FSConfig;
 import com.fr.design.DesignModelAdapter;
 import com.fr.design.DesignState;
@@ -70,14 +70,13 @@ import com.fr.general.ComparatorUtils;
 import com.fr.general.IOUtils;
 import com.fr.locale.InterProviderFactory;
 import com.fr.log.FineLoggerFactory;
+import com.fr.nx.app.designer.toolbar.TemplateTransformer;
 import com.fr.nx.app.designer.utils.CptAndCptxCompatibilityUtil;
 import com.fr.nx.app.designer.utils.CptCompileUtil;
 import com.fr.nx.cptx.entry.metadata.CptxMetadata;
 import com.fr.nx.cptx.utils.CptxFileUtils;
 import com.fr.plugin.context.PluginContext;
 import com.fr.plugin.context.PluginRuntime;
-import com.fr.nx.app.designer.toolbar.CompileAction;
-import com.fr.nx.app.designer.toolbar.TemplateTransformer;
 import com.fr.plugin.injectable.PluginModule;
 import com.fr.plugin.manage.PluginFilter;
 import com.fr.plugin.observer.PluginEvent;
@@ -124,6 +123,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     protected U undoState;
     protected U authorityUndoState = null;
     protected T template; // 当前模板
+    private boolean isNewCreateTpl = false; //当前模板是否为新建模板
     /**
      * 模板过程的相关信息
      *
@@ -198,7 +198,8 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
             designModel = createDesignModel(parameters);
         }
         addCenterPane();
-        if (isNewFile) {
+        isNewCreateTpl = isNewFile;
+        if (isNewCreateTpl) {
             // REPORT-58486: 必须在初始的UndoState创建前设置主题，使得初始的UndoState就包含了主题效果
             setUpTheme4NewTemplate();
         }
@@ -441,8 +442,10 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
      */
     @Deprecated
     public void refreshResource() {
+        if (JTemplateFactory.isAvailable()) {
             refreshResource(this.editingFILE);
         }
+    }
 
     public void refreshResource(FILE file) {
 
@@ -464,9 +467,12 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     }
 
     private void setTargetByFile(FILE file) {
-        this.template = JTemplateFactory.asIOFile(file, this.suffix());
+        T newTemplate = JTemplateFactory.asIOFile(file, this.suffix());
+        if (newTemplate != null) {
+            this.template = newTemplate;
             setTarget(this.template);
         }
+    }
 
     private void addCenterPane() {
 
@@ -637,6 +643,16 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         fireSuperTargetModified();
     }
 
+    public void undoToCurrent() {
+        UIUtil.invokeLaterIfNeeded(new Runnable() {
+            @Override
+            public void run() {
+                BaseUndoState current = JTemplate.this.getUndoState();
+                current.applyState();
+            }
+        });
+    }
+
     /**
      * 模板更新
      */
@@ -957,6 +973,10 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         return true;
     }
 
+    public boolean isNewCreateTpl(){
+        return isNewCreateTpl;
+    }
+
     protected boolean export() throws Exception {
         return this.getTarget().export(TemplateResourceManager.getResource().saveTemplate(getEditingFILE()));
 

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

@@ -93,4 +93,7 @@ public final class JTemplateFactory {
             ALL_APP.remove(app);
         }
     }
-}
+
+    public static boolean isAvailable() {
+        return !ALL_APP.isEmpty();
+    }}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/PredefinedStyleBlock.java

@@ -32,7 +32,7 @@ import java.awt.event.MouseListener;
 public class PredefinedStyleBlock extends JPanel {
     private PredefinedStyle previewObject;
     private PredefinedStyleSelectPane parentPane;
-    private Icon markedMode = IOUtils.readIcon("/com/fr/design/form/images/marked.png");
+    private Icon markedMode = IOUtils.readIcon("/com/fr/design/form/images/marker_selected.png");
     private static final Color BORDER_COLOR = new Color(141, 194, 249);
 
     private boolean mouseOver = false;

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

@@ -1,6 +1,5 @@
 package com.fr.design.mainframe.reuse;
 
-import com.fr.design.DesignerEnvManager;
 import com.fr.stable.xml.XMLPrintWriter;
 import com.fr.stable.xml.XMLable;
 import com.fr.stable.xml.XMLableReader;
@@ -10,6 +9,7 @@ import com.fr.stable.xml.XMLableReader;
  */
 public class ComponentReuseNotificationInfo implements XMLable {
     public static final String XML_TAG = "ComponentReuseNotificationInfo";
+    private static final int INVALID_NUM = -1;
 
     private static final ComponentReuseNotificationInfo INSTANCE = new ComponentReuseNotificationInfo();
 
@@ -17,51 +17,66 @@ public class ComponentReuseNotificationInfo implements XMLable {
         return INSTANCE;
     }
 
-    private long lastNotifyTime = 0;
+    private boolean clickedWidgetLib = false;
 
-    private int notifiedNumber = 0;
+    private long firstDragEndTime = 0L;
 
-    private boolean clickedWidgetLib = false;
+    private boolean completeEmbedFilter = false;
 
-    private long lastGuidePopUpTime = 0;
+    private boolean firstDrag = true;
 
     private String historyCreatedReuses = "[]";
 
-    public long getLastNotifyTime() {
-        return lastNotifyTime;
+    private boolean widgetLibHasRefreshed = false;
+
+    private boolean completeFirstShowComponentLib = false;
+
+    public boolean isClickedWidgetLib() {
+        return clickedWidgetLib;
     }
 
-    public void setLastNotifyTime(long lastNotifyTime) {
-        this.lastNotifyTime = lastNotifyTime;
+    public void setClickedWidgetLib(boolean clickedWidgetLib) {
+        this.clickedWidgetLib = clickedWidgetLib;
     }
 
-    public int getNotifiedNumber() {
-        return notifiedNumber;
+    public boolean isCompleteEmbedFilter() {
+        return completeEmbedFilter;
     }
 
-    public void setNotifiedNumber(int notifiedNumber) {
-        this.notifiedNumber = notifiedNumber;
+    public void setCompleteEmbedFilter(boolean completeEmbedFilter) {
+        this.completeEmbedFilter = completeEmbedFilter;
     }
 
-    public boolean isClickedWidgetLib() {
-        return clickedWidgetLib;
+    public long getFirstDragEndTime() {
+        return firstDragEndTime;
     }
 
-    public void setClickedWidgetLib(boolean clickedWidgetLib) {
-        this.clickedWidgetLib = clickedWidgetLib;
+    public void setFirstDragEndTime(long firstDragEndTime) {
+        this.firstDragEndTime = firstDragEndTime;
     }
 
-    public long getLastGuidePopUpTime() {
-        return lastGuidePopUpTime;
+    public boolean isFirstDrag() {
+        return firstDrag;
     }
 
-    public void setLastGuidePopUpTime(long lastGuidePopUpTime) {
-        this.lastGuidePopUpTime = lastGuidePopUpTime;
+    public void setFirstDrag(boolean firstDrag) {
+        this.firstDrag = firstDrag;
     }
 
-    public void updateLastGuidePopUpTime() {
-        this.setLastGuidePopUpTime(System.currentTimeMillis());
-        DesignerEnvManager.getEnvManager().saveXMLFile();
+    public boolean isWidgetLibHasRefreshed() {
+        return widgetLibHasRefreshed;
+    }
+
+    public void setWidgetLibHasRefreshed(boolean widgetLibHasRefreshed) {
+        this.widgetLibHasRefreshed = widgetLibHasRefreshed;
+    }
+
+    public boolean isCompleteFirstShowComponentLib() {
+        return completeFirstShowComponentLib;
+    }
+
+    public void setCompleteFirstShowComponentLib(boolean completeFirstShowComponentLib) {
+        this.completeFirstShowComponentLib = completeFirstShowComponentLib;
     }
 
     public String getHistoryCreatedReuses() {
@@ -72,23 +87,41 @@ public class ComponentReuseNotificationInfo implements XMLable {
         this.historyCreatedReuses = historyCreatedReuses;
     }
 
+    //兼容老版本云端埋点的记录
+    public long getLastNotifyTime() {
+        return INVALID_NUM;
+    }
+
+    public int getNotifiedNumber() {
+        return INVALID_NUM;
+    }
+
+    public long getLastGuidePopUpTime() {
+        return INVALID_NUM;
+    }
+
     @Override
     public void readXML(XMLableReader reader) {
-        this.setLastNotifyTime(reader.getAttrAsLong("lastNotifyTime", 0L));
-        this.setNotifiedNumber(reader.getAttrAsInt("notifiedNumber", 0));
         this.setClickedWidgetLib(reader.getAttrAsBoolean("clickedWidgetLib", false));
-        this.setLastGuidePopUpTime(reader.getAttrAsLong("lastGuidePopUpTime", 0L));
+        this.setCompleteEmbedFilter(reader.getAttrAsBoolean("completeEmbedFilter", false));
+        this.setCompleteFirstShowComponentLib(reader.getAttrAsBoolean("completeFirstShowComponentLib", false));
+        this.setWidgetLibHasRefreshed(reader.getAttrAsBoolean("widgetLibHasRefreshed", false));
+        this.setFirstDrag(reader.getAttrAsBoolean("firstDrag", true));
         this.setHistoryCreatedReuses(reader.getAttrAsString("historyCreatedReuses", "[]"));
+        this.setFirstDragEndTime(reader.getAttrAsLong("firstDragEndTime", 0L));
     }
 
     @Override
     public void writeXML(XMLPrintWriter writer) {
         writer.startTAG("ComponentReuseNotificationInfo");
-        writer.attr("lastNotifyTime", this.lastNotifyTime)
-                .attr("notifiedNumber", this.notifiedNumber)
-                .attr("clickedWidgetLib", this.clickedWidgetLib)
-                .attr("lastGuidePopUpTime", this.lastGuidePopUpTime)
-                .attr("historyCreatedReuses", this.historyCreatedReuses);;
+        writer.attr("clickedWidgetLib", this.clickedWidgetLib)
+                .attr("completeEmbedFilter", this.completeEmbedFilter)
+                .attr("completeFirstShowComponentLib", this.completeFirstShowComponentLib)
+                .attr("firstDrag", this.firstDrag)
+                .attr("widgetLibHasRefreshed", this.widgetLibHasRefreshed)
+                .attr("firstDragEndTime", this.firstDragEndTime)
+                .attr("historyCreatedReuses", this.historyCreatedReuses);
+        ;
         writer.end();
     }
 

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

@@ -1,169 +0,0 @@
-package com.fr.design.mainframe.reuse;
-
-import com.fr.base.background.ColorBackground;
-import com.fr.design.dialog.UIDialog;
-import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.i18n.Toolkit;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.mainframe.PromptWindow;
-import com.fr.design.mainframe.share.collect.ComponentCollector;
-import com.fr.design.utils.gui.GUICoreUtils;
-import com.fr.general.IOUtils;
-
-import javax.swing.BorderFactory;
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JPanel;
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Dialog;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.Frame;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.Image;
-import java.awt.RenderingHints;
-import java.awt.geom.RoundRectangle2D;
-
-public class ReuseGuideDialog extends UIDialog implements PromptWindow {
-    InnerDialog innerDialog;
-    private static final Dimension DEFAULT = new Dimension(735, 510);
-
-    public ReuseGuideDialog(Frame parent) {
-        super(parent);
-    }
-
-    @Override
-    public void showWindow() {
-        innerDialog = new InnerDialog(this);
-        JPanel backGroundPane = new JPanel() {
-            @Override
-            protected void paintComponent(Graphics g) {
-                Image icon = IOUtils.readImage("com/fr/base/images/share/background.png");// 003.jpg是测试图片在项目的根目录下
-                g.drawImage(icon, 0, 0, getSize().width, getSize().height, this);// 图片会自动缩放
-            }
-        };
-        add(backGroundPane, BorderLayout.CENTER);
-        initStyle();
-        innerDialog.showWindow();
-    }
-
-    private void initStyle() {
-        setSize(DEFAULT);
-        setUndecorated(true);
-        setBackground(new Color(0, 0, 0, 0));
-        GUICoreUtils.centerWindow(this);
-    }
-
-    @Override
-    public void hideWindow() {
-        ComponentReuseNotificationInfo.getInstance().updateLastGuidePopUpTime();
-        this.setVisible(false);
-        if (innerDialog != null) {
-            innerDialog.setVisible(false);
-            innerDialog.dispose();
-            innerDialog = null;
-        }
-        this.dispose();
-    }
-
-    @Override
-    public void checkValid() {
-
-    }
-
-    class InnerDialog extends UIDialog {
-        private final Dimension DEFAULT = new Dimension(700, 475);
-        private static final int TITLE_FONT_SIZE = 20;
-
-        public InnerDialog(Dialog dialog) {
-            super(dialog);
-        }
-
-        public void showWindow() {
-            add(createCenterPanel(), BorderLayout.CENTER);
-            add(createSouthPanel(), BorderLayout.SOUTH);
-            add(createNorthPanel(), BorderLayout.NORTH);
-            showDialog();
-        }
-
-        private JPanel createNorthPanel() {
-            JPanel northPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
-
-            //右上角关闭按钮
-            JButton button = new JButton(new ImageIcon(IOUtils.readImage("/com/fr/base/images/share/close.png").getScaledInstance(15, 15, Image.SCALE_SMOOTH)));
-            button.setBorder(null);
-            button.setOpaque(false);
-            button.addActionListener(e -> ReuseGuideDialog.this.hideWindow());
-
-            northPanel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 15));
-            northPanel.setOpaque(false);
-            northPanel.add(button);
-            return northPanel;
-        }
-
-        private JPanel createCenterPanel() {
-            JPanel centerPanel = new JPanel(new BorderLayout());
-
-            UILabel titleLabel = new UILabel(Toolkit.i18nText("Fine-Design_Share_Drag_And_Make_Component"));
-            UILabel imageLabel = new UILabel(new ImageIcon(IOUtils.readImage("com/fr/design/images/dashboard/guide.png").getScaledInstance(DEFAULT.width, DEFAULT.height, Image.SCALE_SMOOTH)));
-            titleLabel.setFont(new Font(titleLabel.getFont().getName(), Font.BOLD, TITLE_FONT_SIZE));
-            titleLabel.setBorder(BorderFactory.createEmptyBorder());
-
-            JPanel panel = new JPanel(new FlowLayout(FlowLayout.CENTER));
-            panel.setOpaque(false);
-            panel.add(titleLabel);
-
-            centerPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0));
-            centerPanel.setOpaque(false);
-            centerPanel.add(imageLabel, BorderLayout.CENTER);
-            centerPanel.add(panel, BorderLayout.NORTH);
-            return centerPanel;
-        }
-
-        private JPanel createSouthPanel() {
-            JPanel southPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
-
-            JButton button = new JButton(Toolkit.i18nText("Fine-Design_Share_Try_Drag")) {
-                @Override
-                public void paint(Graphics g) {
-                    ColorBackground buttonBackground = ColorBackground.getInstance(Color.decode("#419BF9"));
-                    Graphics2D g2d = (Graphics2D) g;
-                    g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-                    buttonBackground.paint(g2d, new RoundRectangle2D.Double(0, 0, getWidth(), getHeight(), 8, 8));
-                    g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
-                    super.paint(g);
-                }
-            };
-            button.setBorder(null);
-            button.setForeground(Color.WHITE);
-            button.setOpaque(false);
-            button.addActionListener(e -> ReuseGuideDialog.this.hideWindow());
-
-            southPanel.setBorder(BorderFactory.createEmptyBorder(0, 290, 19, 290));
-            southPanel.setPreferredSize(new Dimension(DEFAULT.width, 51));
-            southPanel.setOpaque(false);
-            southPanel.add(button);
-            return southPanel;
-        }
-
-        /**
-         * 显示窗口
-         */
-        private void showDialog() {
-            setSize(DEFAULT);
-            setUndecorated(true);
-            GUICoreUtils.centerWindow(this);
-            setModalityType(ModalityType.APPLICATION_MODAL);
-            ReuseGuideDialog.this.setVisible(true);
-            setVisible(true);
-        }
-
-        @Override
-        public void checkValid() {
-
-        }
-    }
-}

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

@@ -0,0 +1,99 @@
+package com.fr.design.mainframe.share;
+
+import com.fr.design.DesignerEnvManager;
+import com.fr.design.file.HistoryTemplateListCache;
+import com.fr.design.mainframe.JTemplate;
+import com.fr.design.mainframe.reuse.ComponentReuseNotificationInfo;
+import com.fr.form.share.constants.ComponentPath;
+import com.fr.form.share.group.filter.ReuFilter;
+import com.fr.design.DesignerCloudURLManager;
+import com.fr.workspace.WorkContext;
+
+/**
+ * Created by kerry on 2021/10/27
+ */
+public class ComponentShareUtil {
+    private ComponentShareUtil() {
+
+    }
+
+    /**
+     * 判断是否需要切换到在线组件库
+     *
+     * @return
+     */
+    public static boolean needSwitch2OnlineTab() {
+        return DesignerCloudURLManager.getInstance().isConnected() && !hasTouched() && isCurrentTplNewCreate();
+    }
+
+    /**
+     * 判断是否可触达
+     *
+     * @return boolean
+     */
+    public static boolean hasTouched() {
+        String sharePath = ComponentPath.SHARE_PATH.path();
+        String[] components = WorkContext.getWorkResource().list(sharePath, new ReuFilter());
+        return components != null && components.length > 6;
+    }
+
+    /**
+     * 判断当前模板是否是新建模板
+     *
+     * @return boolean
+     */
+    public static boolean isCurrentTplNewCreate() {
+        JTemplate jTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+        return jTemplate.isNewCreateTpl();
+    }
+
+    /**
+     * 判断是否在需要展示组件库界面
+     *
+     * @return boolean
+     */
+    public static boolean needShowEmbedFilterPane() {
+        return !ComponentReuseNotificationInfo.getInstance().isCompleteEmbedFilter() && !hasTouched() && isCurrentTplNewCreate();
+    }
+
+    public static boolean needShowComponentLib() {
+        return !ComponentReuseNotificationInfo.getInstance().isCompleteFirstShowComponentLib() && !hasTouched() && isCurrentTplNewCreate();
+    }
+
+    /**
+     * 判断是否需要展示首次拖拽动效
+     *
+     * @return boolean
+     */
+    public static boolean needShowFirstDragAnimate() {
+        return ComponentReuseNotificationInfo.getInstance().isFirstDrag();
+    }
+
+    /**
+     * 完成嵌入式筛选
+     */
+    public static void completeEmbedFilter() {
+        boolean changed = false;
+        if (!ComponentReuseNotificationInfo.getInstance().isWidgetLibHasRefreshed()) {
+            ComponentReuseNotificationInfo.getInstance().setWidgetLibHasRefreshed(true);
+            changed = true;
+        }
+        if (!ComponentReuseNotificationInfo.getInstance().isCompleteEmbedFilter()) {
+            ComponentReuseNotificationInfo.getInstance().setCompleteEmbedFilter(true);
+            changed = true;
+        }
+        if (changed) {
+            DesignerEnvManager.getEnvManager().saveXMLFile();
+        }
+    }
+
+    /**
+     * 记录组件库刷新
+     */
+    public static void recordWidgetLibHasRefreshed() {
+        if (!ComponentReuseNotificationInfo.getInstance().isWidgetLibHasRefreshed()) {
+            ComponentReuseNotificationInfo.getInstance().setWidgetLibHasRefreshed(true);
+            DesignerEnvManager.getEnvManager().saveXMLFile();
+        }
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/share/collect/ComponentCollector.java

@@ -4,6 +4,7 @@ import com.fr.base.io.XMLReadHelper;
 import com.fr.config.MarketConfig;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.mainframe.reuse.ComponentReuseNotificationInfo;
+import com.fr.design.mainframe.share.ComponentShareUtil;
 import com.fr.form.share.DefaultSharableWidget;
 import com.fr.form.share.SharableWidgetProvider;
 import com.fr.form.share.constants.ComponentPath;
@@ -19,7 +20,6 @@ import com.fr.json.JSONException;
 import com.fr.json.JSONFactory;
 import com.fr.json.JSONObject;
 import com.fr.log.FineLoggerFactory;
-import com.fr.plugin.context.PluginContexts;
 import com.fr.stable.ProductConstants;
 import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
@@ -48,10 +48,6 @@ import java.util.Iterator;
 public class ComponentCollector implements XMLable {
     private static final long ONE_MINUTE = 60 * 1000L;
 
-    private static final int REUSE_INFO_FIRST_POPUP = 1;
-
-    private static final int REUSE_INFO_SECOND_POPUP = 2;
-
     private static final String SIMPLE_DATE_PATTERN = "yyyy-MM-dd";
 
     private static final String XML = "ComponentCollector";
@@ -98,11 +94,11 @@ public class ComponentCollector implements XMLable {
 
     private static final String MARKET_CLICK = "marketClick";
 
-    private static final String PROMPT_JUMP = "promptJump";
+    private static final String FIRST_SHOW_REACT = "firstShowReact";
 
-    private static final String TOOLBAR_JUMP = "toolbarJump";
+    private static final String EMBEDED_FILTER_REACT = "embededFilterReact";
 
-    private static final String POPUP_JUMP = "popupJump";
+    private static final String DYNAMIC_EFFECT_REACT = "dynamicEffectReact";
 
     private static final String uuid = DesignerEnvManager.getEnvManager().getUUID();
 
@@ -116,11 +112,11 @@ public class ComponentCollector implements XMLable {
 
     private int cmpBoardClick = 0;
 
-    private int promptJump = 0;
+    private int firstShowReact = 0;
 
-    private int toolbarJump = 0;
+    private int embededFilterReact = 0;
 
-    private int popupJump = 0;
+    private int dynamicEffectReact = 0;
 
     private JSONArray activateRecord = JSONFactory.createJSON(JSON.ARRAY);
 
@@ -288,13 +284,18 @@ public class ComponentCollector implements XMLable {
 
     private JSONArray getGroupingDetail() {
         JSONArray ja = JSONFactory.createJSON(JSON.ARRAY);
+        try {
+            DefaultShareGroupManager.getInstance().refresh();
             Group[] groups = DefaultShareGroupManager.getInstance().getAllGroup();
-        for(Group group : groups) {
+            for (Group group : groups) {
                 JSONObject jo = JSONFactory.createJSON(JSON.OBJECT);
                 jo.put(GROUP_NAME, group.getGroupName());
                 jo.put(CONTAIN_AMOUNT, group.getAllBindInfoList().length);
                 ja.add(jo);
             }
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage());
+        }
         return ja;
     }
 
@@ -333,40 +334,46 @@ public class ComponentCollector implements XMLable {
         saveInfo();
     }
 
-    public void collectPromptJumpWhenJump(){
-        if (ComponentReuseNotificationInfo.getInstance().getNotifiedNumber() == REUSE_INFO_FIRST_POPUP) {
-            this.promptJump = 1;
-            saveInfo();
-        }else if(ComponentReuseNotificationInfo.getInstance().getNotifiedNumber() == REUSE_INFO_SECOND_POPUP){
-            this.promptJump = 2;
-            saveInfo();
+    public void collectFirstShowReact(int flag) {
+        if (this.firstShowReact == flag) {
+            return;
         }
+        this.firstShowReact = flag;
+        saveInfo();
     }
 
-
-    public void collectPromptJumpWhenShow() {
-        if (ComponentReuseNotificationInfo.getInstance().getNotifiedNumber() == REUSE_INFO_SECOND_POPUP) {
-            this.promptJump = -1;
-            saveInfo();
+    public void clickComponentSetting() {
+        int firstShowReact = ComponentReuseNotificationInfo.getInstance().isWidgetLibHasRefreshed() ? 2 : -1;
+        if (this.firstShowReact != firstShowReact) {
+            collectFirstShowReact(firstShowReact);
+        }
+        if (this.embededFilterReact == 0 && ComponentReuseNotificationInfo.getInstance().isWidgetLibHasRefreshed()) {
+            collectEmbededFilterReact(-1);
         }
     }
 
-    public void collectToolbarJump() {
-        if (this.toolbarJump == 0) {
-            this.toolbarJump = 1;
+    public void collectEmbededFilterReact(int flag) {
+        if (this.embededFilterReact == flag) {
+            return;
+        }
+        this.embededFilterReact = flag;
         saveInfo();
     }
 
+    public void collectDynamicEffectReact() {
+        if (this.dynamicEffectReact == 1) {
+            return;
+        }
+        if (System.currentTimeMillis() - ComponentReuseNotificationInfo.getInstance().getFirstDragEndTime() <= ONE_MINUTE) {
+            collectDynamicEffectReactFlag(1);
+        }
     }
 
-    public void collectPopupJump() {
-        long currentTime = System.currentTimeMillis();
-        long lastGuidePopUpTime = ComponentReuseNotificationInfo.getInstance().getLastGuidePopUpTime();
-        if (currentTime - lastGuidePopUpTime <= ONE_MINUTE && this.popupJump == 0) {
-            this.popupJump = 1;
+    public void collectDynamicEffectReactFlag(int flag) {
+        this.dynamicEffectReact = flag;
         saveInfo();
     }
-    }
+
 
     public void clearSortType() {
         sortType = JSONFactory.createJSON(JSON.ARRAY);
@@ -463,6 +470,10 @@ public class ComponentCollector implements XMLable {
             this.generateCmpNumber = reader.getAttrAsInt("generateCmpNumber", 0);
             this.uploadCmpNumber = reader.getAttrAsInt("uploadCmpNumber", 0);
 
+            this.firstShowReact = reader.getAttrAsInt(FIRST_SHOW_REACT, 0);
+            this.embededFilterReact = reader.getAttrAsInt(EMBEDED_FILTER_REACT, 0);
+            this.dynamicEffectReact = reader.getAttrAsInt(DYNAMIC_EFFECT_REACT, 0);
+
             String activateRecordStr = reader.getAttrAsString("activateRecord", StringUtils.EMPTY);
             activateRecord = parseJSONArray(activateRecordStr);
             String generateCmpRecordStr = reader.getAttrAsString("generateCmpRecord", StringUtils.EMPTY);
@@ -470,13 +481,9 @@ public class ComponentCollector implements XMLable {
 
             this.helpConfigInfo = parseJSONArray(reader.getAttrAsString(HELP_CONFIG_INFO, StringUtils.EMPTY));
             this.helpConfigUseInfo = parseJSONArray(reader.getAttrAsString(HELP_CONFIG_USE_INFO, StringUtils.EMPTY));
-            this.searchContent = parseJSONArray(reader.getAttrAsString(SEARCH_CONTENT,StringUtils.EMPTY));
+            this.searchContent = parseJSONArray(reader.getAttrAsString(SEARCH_CONTENT, StringUtils.EMPTY));
             this.filterContent = parseJSONArray(reader.getAttrAsString(FILTER_CONTENT, StringUtils.EMPTY));
             this.sortType = parseJSONArray(reader.getAttrAsString(SORT_TYPE, StringUtils.EMPTY));
-            this.promptJump = reader.getAttrAsInt(PROMPT_JUMP, 0);
-            this.toolbarJump = reader.getAttrAsInt(TOOLBAR_JUMP, 0);
-            this.popupJump = reader.getAttrAsInt(POPUP_JUMP, 0);
-
         }
     }
 
@@ -510,9 +517,9 @@ public class ComponentCollector implements XMLable {
                 .attr(SEARCH_CONTENT, searchContent.toString())
                 .attr(FILTER_CONTENT, filterContent.toString())
                 .attr(SORT_TYPE, sortType.toString())
-                .attr(PROMPT_JUMP, promptJump)
-                .attr(TOOLBAR_JUMP, toolbarJump)
-                .attr(POPUP_JUMP, popupJump)
+                .attr(FIRST_SHOW_REACT, firstShowReact)
+                .attr(EMBEDED_FILTER_REACT, embededFilterReact)
+                .attr(DYNAMIC_EFFECT_REACT, dynamicEffectReact)
                 .end();
     }
 
@@ -537,15 +544,9 @@ public class ComponentCollector implements XMLable {
         jo.put(SEARCH_CONTENT, searchContent.toString());
         jo.put(FILTER_CONTENT, filterContent.toString());
         jo.put(SORT_TYPE, sortType.toString());
-        jo.put("guideInfo", assembleGuideInfo());
-        return jo.toString();
-    }
-
-    private String assembleGuideInfo() {
-        JSONObject jo = JSONFactory.createJSON(JSON.OBJECT);
-        jo.put(PROMPT_JUMP, promptJump)
-                .put(TOOLBAR_JUMP, toolbarJump)
-                .put(POPUP_JUMP, popupJump);
+        jo.put(FIRST_SHOW_REACT, firstShowReact);
+        jo.put(EMBEDED_FILTER_REACT, embededFilterReact);
+        jo.put(DYNAMIC_EFFECT_REACT, dynamicEffectReact);
         return jo.toString();
     }
 
@@ -598,7 +599,7 @@ public class ComponentCollector implements XMLable {
         return JSONFactory.createJSON(JSON.ARRAY);
     }
 
-    public void clear(){
+    public void clear() {
         clearActiveRecord();
         clearGenerateCmpRecord();
         clearFilterContent();

designer-base/src/main/java/com/fr/design/mainframe/theme/edit/ui/LabelUtils.java

@@ -37,7 +37,7 @@ public class LabelUtils {
         Font newFont = FRFont.getInstance(tipLabel.getFont().getFontName(), Font.PLAIN, 12);
         tipLabel.setFont(newFont);
         tipLabel.setBorder(BorderFactory.createEmptyBorder());
-        tipLabel.setEnabled(false);
+        tipLabel.setEditable(false);
         tipLabel.setText(title);
         tipLabel.setLineWrap(true);
         tipLabel.setWrapStyleWord(true);

designer-base/src/main/java/com/fr/design/mainframe/theme/preview/ReportThemePreviewPane.java

@@ -41,7 +41,7 @@ public class ReportThemePreviewPane extends TemplateThemePreviewPane<ReportTheme
     public ReportThemePreviewPane() {
         setLayout(FRGUIPaneFactory.createBorderLayout());
         chartPreviewPane = new ChartPreviewPane();
-        chartPreviewPane.setPreferredSize(new Dimension(615, 237));
+        chartPreviewPane.setPreferredSize(new Dimension(615, 207));
         chartPreviewPane.populate(initColumnChart());
         chartPreviewPane.setCallbackEvent(this);
         reportPreviewPane = new ECReportPreviewPane();

designer-base/src/main/java/com/fr/design/mainframe/theme/preview/ecpreview/AbstractECPreviewPane.java

@@ -30,6 +30,10 @@ public abstract class AbstractECPreviewPane extends UINoOpaquePanel implements T
         return getCellStyle(cellStyleList.getUse4SmallTitle());
     }
 
+    protected Style getAssistMsgStyle(ThemedCellStyleList cellStyleList) {
+        return getCellStyle(cellStyleList.getUse4SupportInfo());
+    }
+
     private Style getCellStyle(ThemedCellStyle themedCellStyle) {
         if (themedCellStyle == null) {
             return Style.DEFAULT_STYLE;

designer-base/src/main/java/com/fr/design/mainframe/theme/preview/ecpreview/ECPreviewPane.java

@@ -24,15 +24,18 @@ public class ECPreviewPane extends AbstractECPreviewPane {
     private final List<AbstractPreviewCell> headerCellList = new ArrayList<>();
     private final List<AbstractPreviewCell> contentCellList = new ArrayList<>();
     private final List<AbstractPreviewCell> highLightCellList = new ArrayList<>();
+    private final List<AbstractPreviewCell> assistCellList = new ArrayList<>();
     private static final int COL_COUNT = 5;
     private static final int CONTENT_ROW_COUNT = 2;
 
     public ECPreviewPane() {
-        this.setPreferredSize(new Dimension(517, 147));
+        this.setPreferredSize(new Dimension(517, 158));
         this.setBorder(BorderFactory.createEmptyBorder(0, 1, 2, 1));
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         JPanel titlePane = new UINoOpaquePanel(new GridLayout());
-        this.add(titlePane, BorderLayout.NORTH);
+        JPanel extCenterPane = FRGUIPaneFactory.createBorderLayout_NO_Opaque_Pane();
+        this.add(extCenterPane, BorderLayout.CENTER);
+        extCenterPane.add(titlePane, BorderLayout.NORTH);
         for (int i = 0; i < COL_COUNT; i++) {
             PreviewCell cell = new PreviewCell(Toolkit.i18nText("Fine-Design_Basic_Predefined_Style_Header"));
             cell.setPreferredSize(new Dimension(103, 36));
@@ -40,22 +43,29 @@ public class ECPreviewPane extends AbstractECPreviewPane {
             headerCellList.add(cell);
         }
         JPanel contentPane = new UINoOpaquePanel(new GridLayout(2, 5, 0, 0));
-        this.add(contentPane, BorderLayout.CENTER);
+        extCenterPane.add(contentPane, BorderLayout.CENTER);
         for (int i = 0; i < COL_COUNT * CONTENT_ROW_COUNT; i++) {
             PreviewCell cell = new PreviewCell(Toolkit.i18nText("Fine-Design_Basic_Predefined_Style_Main_Text"));
-            cell.setPreferredSize(new Dimension(103, 33));
+            cell.setPreferredSize(new Dimension(103, 30));
             contentPane.add(cell);
             contentCellList.add(cell);
         }
 
         JPanel endPane = new UINoOpaquePanel(new GridLayout());
-        this.add(endPane, BorderLayout.SOUTH);
+        extCenterPane.add(endPane, BorderLayout.SOUTH);
         for (int i = 0; i < COL_COUNT; i++) {
             PreviewCell cell = new PreviewCell(Toolkit.i18nText("Fine-Design_Basic_Predefined_Style_Highlight_Text"));
-            cell.setPreferredSize(new Dimension(103, 33));
+            cell.setPreferredSize(new Dimension(103, 30));
             endPane.add(cell);
             highLightCellList.add(cell);
         }
+
+        JPanel extSouthPane = FRGUIPaneFactory.createBorderLayout_NO_Opaque_Pane();
+        PreviewCell assistCell = new PreviewCell(Toolkit.i18nText("Fine-Design_Basic_Predefined_Style_Assist_Text"));
+        assistCell.setPreferredSize(new Dimension(123, 30));
+        assistCellList.add(assistCell);
+        extSouthPane.add(assistCell);
+        this.add(extSouthPane, BorderLayout.SOUTH);
     }
 
     @Override
@@ -64,6 +74,8 @@ public class ECPreviewPane extends AbstractECPreviewPane {
         refresh(headerCellList, getReportHeaderStyle(cellStyleConfig));
         refresh(contentCellList, getMainContentStyle(cellStyleConfig));
         refresh(highLightCellList, getHighLightStyle(cellStyleConfig));
+        refresh(highLightCellList, getHighLightStyle(cellStyleConfig));
+        refresh(assistCellList, getAssistMsgStyle(cellStyleConfig));
     }
 
 

designer-base/src/main/java/com/fr/design/mainframe/theme/preview/ecpreview/ECReportPreviewPane.java

@@ -27,6 +27,7 @@ public class ECReportPreviewPane extends UINoOpaquePanel implements ThemePreview
     private final List<AbstractPreviewCell> titleCellList = new ArrayList<>();
     private final List<AbstractPreviewCell> contentCellList = new ArrayList<>();
     private final List<AbstractPreviewCell> highLightCellList = new ArrayList<>();
+    private final List<AbstractPreviewCell> assistCellList = new ArrayList<>();
     private static final int CONTENT_ROW_COUNT = 3;
     private static final int COL_COUNT = 5;
 
@@ -54,8 +55,10 @@ public class ECReportPreviewPane extends UINoOpaquePanel implements ThemePreview
             this.setLayout(FRGUIPaneFactory.createBorderLayout());
             JPanel northPane = createNorthPane();
             JPanel centerPane = createCenterPane();
+            JPanel southPane = createSouthPane();
             this.add(northPane, BorderLayout.NORTH);
             this.add(centerPane, BorderLayout.CENTER);
+            this.add(southPane, BorderLayout.SOUTH);
         }
 
         private JPanel createNorthPane() {
@@ -126,6 +129,15 @@ public class ECReportPreviewPane extends UINoOpaquePanel implements ThemePreview
             return centerPane;
         }
 
+        private JPanel createSouthPane(){
+            JPanel southPane = FRGUIPaneFactory.createBorderLayout_NO_Opaque_Pane();
+            PreviewCell assistCell = new PreviewCell(Toolkit.i18nText("Fine-Design_Basic_Predefined_Style_Assist_Text"));
+            assistCell.setPreferredSize(new Dimension(123, 30));
+            assistCellList.add(assistCell);
+            southPane.add(assistCell, BorderLayout.CENTER);
+            return southPane;
+        }
+
         @Override
         public void refresh(TemplateTheme theme) {
             ThemedCellStyleList cellStyleConfig = theme.getCellStyleList();
@@ -134,6 +146,7 @@ public class ECReportPreviewPane extends UINoOpaquePanel implements ThemePreview
             refresh(contentCellList, getMainContentStyle(cellStyleConfig));
             refresh(titleCellList, getSmallTitleStyle(cellStyleConfig));
             refresh(highLightCellList, getHighLightStyle(cellStyleConfig));
+            refresh(assistCellList, getAssistMsgStyle(cellStyleConfig));
         }
     }
 }

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

@@ -31,6 +31,13 @@ public class DesignerToastMsgUtil {
 
     }
 
+    public static ToastMsgDialog createPromptDialog(String text) {
+        return createDialog(PROMPT_ICON, toastPane(text), DesignerContext.getDesignerFrame());
+    }
+
+    public static ToastMsgDialog createPromptDialog(JPanel contentPane) {
+        return createDialog(PROMPT_ICON, contentPane, DesignerContext.getDesignerFrame());
+    }
 
     public static void toastPrompt(JPanel contendPane) {
         toastPane(PROMPT_ICON, contendPane, DesignerContext.getDesignerFrame());
@@ -69,6 +76,11 @@ public class DesignerToastMsgUtil {
     }
 
     private static void toastPane(Icon icon, JPanel contendPane, Window parent) {
+        ToastMsgDialog dialog = createDialog(icon, contendPane, parent);
+        dialog.setVisible(true);
+    }
+
+    private static ToastMsgDialog createDialog(Icon icon, JPanel contendPane, Window parent) {
         JPanel pane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         UILabel uiLabel = new UILabel(icon);
         uiLabel.setVerticalAlignment(SwingConstants.TOP);
@@ -83,7 +95,7 @@ public class DesignerToastMsgUtil {
         } else {
             dialog = new ToastMsgDialog((Frame) parent, pane);
         }
-        dialog.setVisible(true);
+        return dialog;
     }
 
 

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

@@ -24,6 +24,7 @@ public class ToastMsgDialog extends UIDialog {
     private ScheduledExecutorService TIMER;
     private int hide_height = 0;
     private JPanel contentPane;
+    private boolean show = false;
 
     public ToastMsgDialog(Frame parent, JPanel panel) {
         super(parent);
@@ -65,6 +66,7 @@ public class ToastMsgDialog extends UIDialog {
 
 
     public void display(JPanel outerJPanel) {
+        show = true;
         outerJPanel.setLocation(0, -hide_height);
         ScheduledExecutorService TIP_TOOL_TIMER = createToastScheduleExecutorService();
         TIP_TOOL_TIMER.scheduleAtFixedRate(new Runnable() {
@@ -98,6 +100,7 @@ public class ToastMsgDialog extends UIDialog {
                             TIP_TOOL_TIMER.shutdown();
                             ToastMsgDialog.this.setVisible(false);
                             ToastMsgDialog.this.dispose();
+                            ToastMsgDialog.this.show = false;
                         }
                         outerJPanel.setLocation(point.x, point.y - 5);
                         Dimension dimension = ToastMsgDialog.this.getSize();
@@ -159,5 +162,7 @@ public class ToastMsgDialog extends UIDialog {
         super.dispose();
     }
 
-
+    public boolean isShow() {
+        return show;
+    }
 }

designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/AbstractTemplateStylePane.java

@@ -7,4 +7,8 @@ public abstract class AbstractTemplateStylePane<T> extends BasicPane {
     public abstract void populate(T ob);
 
     public abstract T update();
+
+    public AbstractTemplateStylePane<T> generateCleanPane() {
+        return this;
+    }
 }

designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/AccessibleTemplateStyleEditor.java

@@ -32,6 +32,11 @@ public class AccessibleTemplateStyleEditor extends UneditableAccessibleEditor {
                 setValue(stylePane.update());
                 fireStateChanged();
             }
+
+            @Override
+            public void doCancel() {
+                stylePane = stylePane.generateCleanPane();
+            }
         });
         stylePane.populate(getValue());
         dlg.setVisible(true);

designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/MobileTemplateStylePane.java

@@ -44,12 +44,14 @@ public class MobileTemplateStylePane extends AbstractTemplateStylePane<MobileTem
     private JPanel right;
     private CardLayout card;
     private Set<Class<? extends MobileTemplateStyle>> extraStyle = new HashSet<>();
+    private WCardTagLayout tagLayout;
     public MobileTemplateStylePane(WCardTagLayout tagLayout){
         init(tagLayout);
     }
 
     public void init(WCardTagLayout tagLayout){
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        this.tagLayout = tagLayout;
         listModel = new DefaultListModel();
         card = new CardLayout();
         right = FRGUIPaneFactory.createCardLayout_S_Pane();
@@ -147,4 +149,9 @@ public class MobileTemplateStylePane extends AbstractTemplateStylePane<MobileTem
         list.addAll(sets);
         return Collections.unmodifiableList(list);
     }
+
+    @Override
+    public AbstractTemplateStylePane<MobileTemplateStyle> generateCleanPane() {
+        return new MobileTemplateStylePane(this.tagLayout);
+    }
 }

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

@@ -2,6 +2,7 @@ package com.fr.design.notification.ui;
 
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.notification.Notification;
 import com.fr.design.notification.NotificationCenter;
 import java.awt.BorderLayout;
@@ -119,7 +120,7 @@ public class NotificationCenterDialog extends JDialog {
         if (winSize.width > screenSize.width) {
             winSize.width = screenSize.width;
         }
-        //这里设置位置：水平居中，竖直偏上
-        win.setLocation(screenSize.width - winSize.width - 90, 50);
+        win.setLocation((DesignerContext.getDesignerFrame().getWidth() - winSize.width - 100 + DesignerContext.getDesignerFrame().getX()),
+                DesignerContext.getDesignerFrame().getY()  + winSize.height);
     }
 }

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

@@ -1,30 +1,33 @@
 package com.fr.design.style;
 
+import com.fr.design.constants.UIConstants;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.ibutton.UIButtonUI;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.style.background.BackgroundJComponent;
+import com.fr.design.utils.gui.GUIPaintUtils;
+import com.fr.stable.Constants;
+
+import javax.swing.AbstractButton;
+import javax.swing.JPanel;
+import javax.swing.JWindow;
+import javax.swing.border.AbstractBorder;
+import javax.swing.event.AncestorEvent;
+import javax.swing.event.AncestorListener;
+import javax.swing.plaf.ButtonUI;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.Insets;
+import java.awt.Point;
+import java.awt.Rectangle;
 import java.awt.RenderingHints;
+import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 
-import javax.swing.AbstractButton;
-import javax.swing.JPanel;
-import javax.swing.border.AbstractBorder;
-import javax.swing.event.AncestorEvent;
-import javax.swing.event.AncestorListener;
-import javax.swing.plaf.ButtonUI;
-
-import com.fr.design.constants.UIConstants;
-import com.fr.design.gui.ibutton.UIButton;
-import com.fr.design.gui.ibutton.UIButtonUI;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.utils.gui.GUIPaintUtils;
-import com.fr.design.style.background.BackgroundJComponent;
-import com.fr.stable.Constants;
-
 /**
  * @author kunsnat E-mail:kunsnat@gmail.com
  * @version 创建时间：2011-10-31 下午03:28:31 类说明: 抽象出来的弹出box. 可以弹出颜色选择, 图案选择, 纹理选择.
@@ -93,6 +96,34 @@ public abstract class AbstractSelectBox<T> extends AbstractPopBox implements Mou
 				hidePopupMenu();
 			}
 		});
+
+		displayComponent.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseExited(MouseEvent e) {
+				if (!isPopupVisible()) {
+					//如果弹出框==null 或者 弹出框不可见 直接return
+					return;
+				}
+				Point popMenuP = getControlWindow().getLocation();
+				Point displayComponentP = displayComponent.getLocationOnScreen();
+				if (popMenuP.getX() < displayComponentP.getX() - 1) {
+					//如果 弹出框横向超出屏幕 往左调整了 和displayComponent横向错开 就不处理了
+					return;
+				}
+
+				Rectangle rectangle = displayComponent.getBounds();
+				boolean bottomPopAndExitTop = displayComponentP.getY() < popMenuP.getY() && e.getY() <= rectangle.y;
+				boolean topPopAndExitBottom = displayComponentP.getY() > popMenuP.getY() && e.getY() >= rectangle.y + rectangle.getHeight();
+				boolean exitLeftOrRight = rectangle.x > e.getX() || rectangle.x + rectangle.getWidth() < e.getX();
+				if (bottomPopAndExitTop || topPopAndExitBottom || exitLeftOrRight) {
+					//弹出框在displayComponent下面 且 鼠标是从displayComponent上面离开的，隐藏弹出界面。
+					//弹出框在displayComponent上面 且 鼠标是从displayComponent下面离开的，隐藏弹出界面。
+					//鼠标从displayComponent左边 或者 右边 离开，隐藏弹出界面。
+					hidePopupMenu();
+				}
+
+			}
+		});
 	}
 
 	public void setEnabled(boolean enabled) {

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

@@ -18,6 +18,16 @@ public class AdjustWorkBookDefaultStyleUtils {
     private static final Color TEMPLATE_BACKGROUND = new Color(16, 11, 43);
     private static final Color CELL_ELEMENT_BORDER = new Color(110, 110, 110);
 
+    private static Color currentStoryBack = null;
+
+    public static void setCurrentStoryBack(Color color) {
+        currentStoryBack = color;
+    }
+
+    private static Color getCurrentStoryBack() {
+        return currentStoryBack == null ? TEMPLATE_BACKGROUND : currentStoryBack;
+    }
+
     public static void adjustCellElement(CellElement cellElement) {
         if (DesignModeContext.isDuchampMode()) {
             Style style = cellElement.getStyle();
@@ -33,14 +43,14 @@ public class AdjustWorkBookDefaultStyleUtils {
     public static void adjustFloatElement(FloatElement floatElement) {
         if (DesignModeContext.isDuchampMode()) {
             Style style = floatElement.getStyle();
-            style = style.deriveBackground(ColorBackground.getInstance(TEMPLATE_BACKGROUND));
+            style = style.deriveBackground(ColorBackground.getInstance(getCurrentStoryBack()));
             style = style.deriveFRFont(style.getFRFont().applyForeground(Color.WHITE));
             floatElement.setStyle(style);
         }
     }
 
     public static Color adjustBack(Color color) {
-        return DesignModeContext.isDuchampMode() ? TEMPLATE_BACKGROUND : color;
+        return DesignModeContext.isDuchampMode() ? getCurrentStoryBack() : color;
     }
 
     /**

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

@@ -64,6 +64,11 @@ public class VersionCheckUtils {
     private static final String ID = "id";
     private static final String VERSION = "version";
     private static final String NAME = "name";
+    private static final String RUNNING = "running";
+    private static final String SYNC = "sync";
+    private static final String GROUP = "group";
+    private static final String BI = "bi";
+    private static final String BIPREFIX = "com.finebi";
     private static final Set<String> pluginsNeedIgnore = new HashSet<>();
     static {
         pluginsNeedIgnore.addAll(Arrays.asList(
@@ -263,13 +268,10 @@ public class VersionCheckUtils {
         Map<String, String> pluginsNameMap = ReportHelper.getPluginNameMap();
         for (int i = 0; i < remotePlugins.size(); i++) {
             remotePlugin = remotePlugins.getJSONObject(i);
-            if (ComparatorUtils.equals(remotePlugin.getString("running"), "false") || (remotePlugin.containsKey("sync") && !remotePlugin.getBoolean("sync"))) {
+            if (isPluginNeedIgnore(remotePlugin)) {
                 continue;
             }
             String remotePluginID = remotePlugin.getString(ID);
-            if (pluginsNeedIgnore.contains(remotePluginID)) {
-                continue;
-            }
             if (localPluginsMap.containsKey(remotePluginID)) {
                 if (ComparatorUtils.equals(localPluginsMap.get(remotePluginID).getVersion(), remotePlugin.getString(VERSION))) {
                     continue;
@@ -290,6 +292,12 @@ public class VersionCheckUtils {
         return differentPlugins;
     }
 
+    private static boolean isPluginNeedIgnore(JSONObject remotePlugin) {
+        return ComparatorUtils.equals(remotePlugin.getString(RUNNING), "false") || (remotePlugin.containsKey(SYNC) && !remotePlugin.getBoolean(SYNC))
+                || (remotePlugin.containsKey(GROUP) && ComparatorUtils.equals(remotePlugin.containsKey(GROUP), BI) || remotePlugin.getString(ID).startsWith(BIPREFIX)
+                || pluginsNeedIgnore.contains(remotePlugin.getString(ID)));
+    }
+
     public static JSONArray syncPlugins(JSONArray differentPlugins) {
         Set<String> uninstallFailed = uninstallPlugins(differentPlugins);
         List<PluginMarker> plugins = getSyncPlugins(differentPlugins, uninstallFailed);

designer-base/src/main/java/com/fr/design/widget/WidgetBoundsPaneFactory.java

@@ -46,12 +46,12 @@ public class WidgetBoundsPaneFactory {
 
     private static final int RIGHT_PANE_WIDTH = 145;
 
-    public static UIExpandablePane createBoundsPane(UISpinner width, UISpinner height, JComponent ratioLocked) {
+    public static UIExpandablePane createBoundsPane(UISpinner width, UISpinner height, JComponent ratioLocked, NameAttribute nameAttribute) {
         JPanel boundsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
         Component[][] components = new Component[][]{
-                new Component[]{FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Basic_Component_Size")),
+                new Component[]{FRWidgetFactory.createLineWrapLabel(nameAttribute.getSizeName()),
                         ratioLocked != null ? createRightPane(width, ratioLocked, height) : createRightPane(width, height)},
                 new Component[]{null, createRightPane(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Tree_Width"), SwingConstants.CENTER), new UILabel(Toolkit.i18nText("Fine-Design_Basic_Tree_Height"), SwingConstants.CENTER))},
         };
@@ -65,7 +65,7 @@ public class WidgetBoundsPaneFactory {
     }
 
     public static UIExpandablePane createBoundsPane(UISpinner width, UISpinner height) {
-        return createBoundsPane(width, height, null);
+        return createBoundsPane(width, height, null, NameAttribute.DEFAULT);
     }
 
     public static JPanel createRightPane(Component com1, Component com2) {

designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java

@@ -1,6 +1,10 @@
 package com.fr.design.widget.component;
 
+import com.fr.design.ExtraDesignClassManager;
+import com.fr.design.beans.ErrorMsgTextFieldAdapter;
+import com.fr.design.beans.UITextFieldAdapter;
 import com.fr.design.designer.IntervalConstants;
+import com.fr.design.fun.TextFieldAdapterProvider;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UISpinner;
@@ -9,6 +13,7 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.form.ui.NumberEditor;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.AssistUtils;
 import com.fr.stable.StringUtils;
 
@@ -35,7 +40,7 @@ public class NumberEditorValidatePane extends JPanel {
     private UISpinner minValueSpinner;
     private UISpinner decimalLength;
     private JPanel limitNumberPane;
-    private UITextField errorMsgTextField;
+    private ErrorMsgTextFieldAdapter errorMsgTextField;
     private JPanel errorMsgTextFieldPane;
 
     private ActionListener allowDecimalsListener;
@@ -100,9 +105,20 @@ public class NumberEditorValidatePane extends JPanel {
     }
 
     private void initErrorMsgPane() {
-        errorMsgTextField = new UITextField();
+        TextFieldAdapterProvider provider = ExtraDesignClassManager.getInstance().getSingle(TextFieldAdapterProvider.XML_TAG);
+        if (provider != null) {
+            try {
+                errorMsgTextField = provider.createTextFieldAdapter();
+            } catch (Exception e) {
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
+                errorMsgTextField = new UITextFieldAdapter();
+            }
+        } else {
+            errorMsgTextField = new UITextFieldAdapter();
+        }
+
         errorMsgTextFieldPane = TableLayoutHelper.createGapTableLayoutPane(
-                new Component[][]{new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Error_Tip")), errorMsgTextField}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);
+                new Component[][]{new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Error_Tip")), errorMsgTextField.getErrorMsgTextField()}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);
     }
 
 

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

@@ -1,5 +1,9 @@
 package com.fr.file;
 
+import com.fr.base.io.XMLEncryptUtils;
+import com.fr.io.EncryptUtils;
+import com.fr.io.FineEncryptUtils;
+import com.fr.stable.StringUtils;
 import javax.swing.Icon;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
@@ -11,10 +15,16 @@ public class StashedFILE extends AbstractFILE {
 
     private FILE file;
     private byte[] content;
+    private String suffix;
 
     public StashedFILE(FILE file, byte[] content) {
+        this(file, content, null);
+    }
+
+    public StashedFILE(FILE file, byte[] content, String suffix) {
         this.file = file;
         this.content = content;
+        this.suffix = suffix;
     }
 
     @Override
@@ -54,7 +64,12 @@ public class StashedFILE extends AbstractFILE {
 
     @Override
     public InputStream asInputStream() throws Exception {
-        return new ByteArrayInputStream(content);
+        ByteArrayInputStream in = new ByteArrayInputStream(content);
+        return needDecode() ? XMLEncryptUtils.decodeInputStream(EncryptUtils.decodeInputStream(FineEncryptUtils.decode(in))) : in;
+    }
+
+    private boolean needDecode() {
+        return StringUtils.isNotEmpty(suffix) && (suffix.endsWith(".cpt") || suffix.endsWith(".frm"));
     }
 
     @Override

designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties

@@ -1,6 +1,6 @@
 com.fr.design.mainframe.check.CheckButton=305*118
 com.fr.design.mainframe.check.CheckFontInfoDialog.collapse=630*185
-com.fr.design.mainframe.check.CheckFontInfoDialog.messageWithLink=630*31
+com.fr.design.mainframe.check.CheckFontInfoDialog.messageWithLink=570*31
 com.fr.design.mainframe.check.CheckFontInfoDialog.unfold=630*280
 com.fr.design.report.ReportColumnsPane=800*600
 com.fr.env.RemoteEnvPane.dialog=458*132

designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties

@@ -1,6 +1,6 @@
 com.fr.design.mainframe.check.CheckButton=280*118
 com.fr.design.mainframe.check.CheckFontInfoDialog.collapse=610*185
-com.fr.design.mainframe.check.CheckFontInfoDialog.messageWithLink=610*31
+com.fr.design.mainframe.check.CheckFontInfoDialog.messageWithLink=550*31
 com.fr.design.mainframe.check.CheckFontInfoDialog.unfold=610*280
 com.fr.env.RemoteEnvPane.dialog=458*132
 com.fr.design.version.check.dialog=430*95

designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties

@@ -1,7 +1,7 @@
 com.fr.design.mainframe.check.CheckButton=230*118
-com.fr.design.mainframe.check.CheckFontInfoDialog.collapse=490*185
+com.fr.design.mainframe.check.CheckFontInfoDialog.collapse=550*185
 com.fr.design.mainframe.check.CheckFontInfoDialog.messageWithLink=490*35
-com.fr.design.mainframe.check.CheckFontInfoDialog.unfold=490*280
+com.fr.design.mainframe.check.CheckFontInfoDialog.unfold=550*280
 com.fr.env.RemoteEnvPane.dialog=458*132
 com.fr.design.version.check.dialog=450*95
 com.fr.design.version.detail.label=700*30

designer-base/src/main/resources/com/fr/design/i18n/dimension_zh.properties

@@ -1,7 +1,7 @@
 # \u9ED8\u8BA4\u4E3A\u7C7B\u7684\u5168\u9650\u5B9A\u540D\uFF08\u53EF\u81EA\u5B9A\u4E49key\uFF09= width * height
 com.fr.design.mainframe.check.CheckButton=250*118
 com.fr.design.mainframe.check.CheckFontInfoDialog.collapse=385*185
-com.fr.design.mainframe.check.CheckFontInfoDialog.messageWithLink=385*31
+com.fr.design.mainframe.check.CheckFontInfoDialog.messageWithLink=325*31
 com.fr.design.mainframe.check.CheckFontInfoDialog.unfold=385*280
 com.fr.env.RemoteEnvPane.dialog=308*132
 com.fr.design.version.check.dialog=230*95

designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties

@@ -1,6 +1,6 @@
 com.fr.design.mainframe.check.CheckButton=250*118
 com.fr.design.mainframe.check.CheckFontInfoDialog.collapse=385*185
-com.fr.design.mainframe.check.CheckFontInfoDialog.messageWithLink=385*31
+com.fr.design.mainframe.check.CheckFontInfoDialog.messageWithLink=325*31
 com.fr.design.mainframe.check.CheckFontInfoDialog.unfold=385*280
 com.fr.env.RemoteEnvPane.dialog=308*132
 com.fr.design.version.check.dialog=230*95

designer-base/src/test/java/com/fr/design/mainframe/reuse/ComponentReuseNotificationInfoTest.java

@@ -18,13 +18,11 @@ public class ComponentReuseNotificationInfoTest {
     @Test
     public void testReadXML() {
         try {
-            XMLableReader xmlReader = XMLableReader.createXMLableReader(new StringReader("<ComponentReuseNotificationInfo lastNotifyTime=\"1620612153215\" notifiedNumber=\"2\" clickedWidgetLib=\"true\"/>\n"));
+            XMLableReader xmlReader = XMLableReader.createXMLableReader(new StringReader("<ComponentReuseNotificationInfo lastNotifyTime=\"1620612153215\" clickedWidgetLib=\"true\"/>\n"));
             ComponentReuseNotificationInfo notificationInfo = ComponentReuseNotificationInfo.getInstance();
             notificationInfo.readXML(xmlReader);
             xmlReader.close();
-            Assert.assertEquals(2, notificationInfo.getNotifiedNumber());
             Assert.assertEquals(true, notificationInfo.isClickedWidgetLib());
-            Assert.assertEquals(1620612153215L, notificationInfo.getLastNotifyTime());
         } catch (XMLStreamException e) {
             Assert.fail(e.getMessage());
         }
@@ -35,12 +33,11 @@ public class ComponentReuseNotificationInfoTest {
         StringWriter sw = new StringWriter();
         XMLPrintWriter writer = XMLPrintWriter.create(new PrintWriter(sw));
         ComponentReuseNotificationInfo notificationInfo = ComponentReuseNotificationInfo.getInstance();
-        notificationInfo.setNotifiedNumber(1);
         notificationInfo.writeXML(writer);
         writer.flush();
         writer.close();
         Assert.assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-                "<ComponentReuseNotificationInfo xmlVersion=\"20170720\" releaseVersion=\"\" lastNotifyTime=\"0\" notifiedNumber=\"1\" clickedWidgetLib=\"false\"/>\n", sw.toString());
+                "<ComponentReuseNotificationInfo xmlVersion=\"20170720\" releaseVersion=\"\" clickedWidgetLib=\"false\" hasCompleteEmbedFilter=\"false\" firstDrag=\"true\" widgetLibHasRefreshed=\"false\" firstDragEndTime=\"0\" historyCreatedReuses=\"[]\"/>\n", sw.toString());
     }
 
 }

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

@@ -16,7 +16,6 @@ import com.fr.design.gui.chart.ChartEditPaneProvider;
 import com.fr.design.gui.frpane.UITitlePanel;
 import com.fr.design.mainframe.chart.ChartEditPane;
 import com.fr.design.utils.gui.GUICoreUtils;
-import com.fr.stable.AssistUtils;
 
 import javax.swing.BorderFactory;
 import javax.swing.Icon;
@@ -36,9 +35,6 @@ public class ChartPropertyPane extends BaseChartPropertyPane {
 
     protected ChartEditPane chartEditPane;
 
-    //ID一样的话 不用新建chartEditPane
-    private String currentID;
-
     private ChartPropertyPane() {
         initComponent();
     }
@@ -50,14 +46,9 @@ public class ChartPropertyPane extends BaseChartPropertyPane {
 
     @Override
     public void updateChartEditPane(String plotID) {
-        if (!AssistUtils.equals(currentID, plotID)) {
         chartEditPane = ChartTypeInterfaceManager.getInstance().getChartEditPane(plotID);
         chartEditPane.setContainer(container);
-            currentID = plotID;
         resetChartEditPane();
-        } else {
-            chartEditPane.resetLastChartCollection();
-        }
     }
 
     @Override

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

@@ -22,9 +22,11 @@ import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.ChartTypePane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
 import com.fr.design.mainframe.chart.info.ChartInfoCollector;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.form.main.Form;
 import com.fr.general.ComparatorUtils;
 import com.fr.log.FineLoggerFactory;
+import com.fr.plugin.chart.custom.VanChartCustomPlot;
 import com.fr.plugin.chart.vanchart.VanChart;
 
 import javax.swing.JPanel;
@@ -334,7 +336,10 @@ public class ChartEditPane extends BasicPane implements AttributeChange, Prepare
             String chartID = chart.getID();
             boolean currentPane = ChartTypeInterfaceManager.getInstance().isUseDefaultPane(chartID);
 
-            return (currentPane != isDefaultPane) || (!currentPane && lastIndex != currentIndex);
+            boolean duchampCustomChart = ChartEditContext.duchampMode()
+                    && VanChartCustomPlot.VAN_CHART_CUSTOM_PLOT_ID.equals(chartID);
+
+            return (currentPane != isDefaultPane) || (!currentPane && lastIndex != currentIndex) || duchampCustomChart;
         }
         return false;
     }

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java

@@ -29,8 +29,6 @@ import javax.swing.JPanel;
 import javax.swing.SwingConstants;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import java.util.ArrayList;
-import java.util.List;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
@@ -42,6 +40,8 @@ import java.awt.LayoutManager;
 import java.awt.Point;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+import java.util.List;
 
 public class UIColorPickerPane extends BasicPane implements UIObserver {
 	private static final int MARGIN_TOP = 7;
@@ -696,14 +696,18 @@ public class UIColorPickerPane extends BasicPane implements UIObserver {
 		fillStyleCombox.setSelectObject(mainColor);
 		designTypeButtonGroup.setSelectedIndex(hotAreaColor.getUseType());
 
-		double value = (double) hotAreaColor.getAreaNumber();
+        int value = hotAreaColor.getAreaNumber();
 		UIColorPickerPane.this.add(textGroup);
 		UIColorPickerPane.this.add(colorGroup);
 		Color[] colors = hotAreaColor.initColor();
 		BaseFormula[] values = hotAreaColor.initValues();
+        if (value != colors.length && hotAreaColor.getUseType() == MapHotAreaColor.CUSTOM) {
+            colors = getColorArray(mainColor, value);
+            values = getValueArray(value);
+        }
 		refreshGroupPane(colors, values);
 		this.initContainerLister();
-		regionNumPane.populateBean(value);
+        regionNumPane.populateBean((double) value);
 		refreshPane();
 	}
 

designer-chart/src/main/java/com/fr/van/chart/config/DefaultStyleConstants.java

@@ -0,0 +1,91 @@
+package com.fr.van.chart.config;
+
+import com.fr.base.ChartPreStyleConfig;
+import com.fr.chart.base.ChartBaseUtils;
+import com.fr.chart.base.ChartConstants;
+import com.fr.general.Background;
+import com.fr.general.FRFont;
+import com.fr.general.GeneralUtils;
+import com.fr.stable.CodeUtils;
+import com.fr.stable.Constants;
+
+import java.awt.Color;
+import java.awt.Font;
+
+/**
+ * @author shine
+ * @version 10.0
+ * Created by shine on 2021/6/25
+ */
+public class DefaultStyleConstants {
+    static final FRFont TITLE = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.BOLD, 14, new Color(241, 246, 255));
+    static final FRFont LEGEND = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.PLAIN, 9, new Color(159, 173, 191));
+
+    static final FRFont AXIS_LABEL = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.PLAIN, 9, new Color(159, 173, 191));
+    static final FRFont AXIS_TITLE = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.PLAIN, 9, new Color(200, 211, 228));
+    static final Color AXIS_LINE = new Color(46, 75, 102);
+    static final Color GRID_LINE = new Color(30, 55, 78);
+
+    static final FRFont ALERT_FONT = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.PLAIN, 9, new Color(255, 0, 0));
+
+    static final FRFont DATA_SHEET = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.PLAIN, 9, new Color(159, 173, 191));
+    static final Color DATA_SHEET_BORDER = new Color(46, 75, 102);
+
+    static final Color BORDER = Color.BLACK;
+    static final int BORDER_WIDTH = Constants.LINE_NONE;
+    static final int SPECIAL_BORDER_WIDTH = Constants.LINE_THIN;
+
+    static final FRFont PIE_CATEGORY_LABEL = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.PLAIN, 10, new Color(232, 232, 232));
+
+    static final Color GAUGE_PANE_BACK_COLOR = null;
+    static final Color GAUGE_HINGE = null;
+    static final Color GAUGE_PANE_BACK_COLOR_4_RING = new Color(72, 73, 79);
+    static final Color GAUGE_SLOT_BACKGROUND_COLOR = new Color(72, 73, 79);
+    private static final String FONT_NAME = ChartBaseUtils.getLocalDefaultFont("verdana");
+    static final FRFont THERMOMETER_LABEL_FONT = FRFont.getInstance(FONT_NAME, Font.BOLD, 9, new Color(232, 232, 232));//试管仪表盘标签的默认样式
+    static final FRFont THERMOMETER_AXIS_LABEL = FRFont.getInstance(FONT_NAME, Font.PLAIN, 8, new Color(159, 173, 191));
+    static final FRFont RING_VALUE_LABEL_FONT = FRFont.getInstance(FONT_NAME, Font.PLAIN, ChartConstants.AUTO_FONT_SIZE, new Color(232, 232, 232));//百分比圆环仪表盘值标签的默认样式
+    static final FRFont POINTER_VALUE_LABEL_FONT = FRFont.getInstance(FONT_NAME, Font.PLAIN, ChartConstants.AUTO_FONT_SIZE, new Color(232, 232, 232));//多指针仪表盘值标签的默认样式
+    static final FRFont POINTER_CATE_LABEL_FONT = FRFont.getInstance(FONT_NAME, Font.PLAIN, 10, new Color(232, 232, 232));//多指针仪表盘分类标签的默认样式
+
+    static final Color MAP_NULL_VALUE_COLOR = new Color(168, 168, 168);
+    static final Color MAP_BORDER = Color.BLACK;
+    static final Color MAP_LEGEND_BACK = Color.BLACK;
+    static final Color MAP_TITLE_BACK = Color.BLACK;
+
+    static final Color DRILL_MAP_DRILL_TOOLS_BACK = Color.BLACK;
+    static final float DRILL_MAP_DRILL_TOOLS_BACK_OPACITY = 0.8f;
+
+    //todo vancharts
+    private static final Color GANTT_OUT_LINE = GRID_LINE;
+    private static final FRFont GANTT_LABEL = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.PLAIN, 8, new Color(217, 217, 217));
+    private static final Color GANTT_BORDER_LINE = new Color(30, 36, 58);
+    private static final Color GAUGE_TICK = new Color(39, 49, 71);
+
+    static final Background BACK = null;
+
+    static String COLORS = null;
+
+    static {
+        ChartPreStyleConfig config = ChartPreStyleConfig.getInstance();
+        try {
+            DefaultStyleConstants.COLORS = CodeUtils.cjkDecode("\u7ecf\u5178\u9ad8\u4eae");
+            // 没有经典高亮, 用新特性
+            if (config.getPreStyle(DefaultStyleConstants.COLORS) == null) {
+                DefaultStyleConstants.COLORS = CodeUtils.cjkDecode("\u65b0\u7279\u6027");
+            }
+            // 没有新特性, 用第一个配色
+            if (config.getPreStyle(DefaultStyleConstants.COLORS) == null) {
+                if (config.names().hasNext()) {
+
+                    String name = GeneralUtils.objectToString(config.names().next());
+                    if (config.getPreStyle(name) != null) {
+                        DefaultStyleConstants.COLORS = name;
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/config/DefaultStyleHelper4Van.java

@@ -0,0 +1,186 @@
+package com.fr.van.chart.config;
+
+import com.fr.chart.base.AttrBorder;
+import com.fr.chart.base.AttrFillStyle;
+import com.fr.chart.base.ChartConstants;
+import com.fr.chart.chartattr.Plot;
+import com.fr.chart.chartglyph.ConditionAttr;
+import com.fr.chart.chartglyph.DataSheet;
+import com.fr.config.predefined.ColorFillStyle;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
+import com.fr.plugin.chart.PiePlot4VanChart;
+import com.fr.plugin.chart.attr.axis.VanChartAlertValue;
+import com.fr.plugin.chart.attr.axis.VanChartAxis;
+import com.fr.plugin.chart.attr.plot.VanChartPlot;
+import com.fr.plugin.chart.attr.plot.VanChartRectanglePlot;
+import com.fr.plugin.chart.base.AttrLabel;
+import com.fr.plugin.chart.base.AttrLabelDetail;
+import com.fr.plugin.chart.custom.type.CustomPlotType;
+import com.fr.plugin.chart.gauge.VanChartGaugePlot;
+import com.fr.plugin.chart.map.VanChartMapPlot;
+import com.fr.plugin.chart.type.GaugeStyle;
+
+/**
+ * @author shine
+ * @version 10.0
+ * Created by shine on 2021/10/22
+ * vanchart的抽出来，因为主体代码 新增y轴 组合图新增图表都要用
+ */
+public class DefaultStyleHelper4Van {
+
+    public static void dealVanPlot4Custom(VanChartPlot plot, CustomPlotType customPlotType) {
+        if (!ChartEditContext.duchampMode()) {
+            return;
+        }
+        dealVanPlotCommonAttr(plot);
+        switch (customPlotType) {
+            case PIE:
+            case DIFFERENT_PIE:
+            case SAME_PIE:
+                dealPie(plot);
+                break;
+            case SLOT:
+            case POINTER_360:
+            case POINTER_180:
+            case CUVETTE:
+            case RING:
+                dealGauge(plot);
+                break;
+            case COLUMN:
+            case LINE:
+            case AREA:
+            case BUBBLE:
+            case RADAR:
+            case STACK_RADAR:
+            case SCATTER:
+            default:
+                break;
+        }
+
+    }
+
+    public static VanChartAxis dealAxisDefault(VanChartAxis axis) {
+        if (!ChartEditContext.duchampMode()) {
+            return axis;
+        }
+        axis.getTitle().getTextAttr().setFRFont(DefaultStyleConstants.AXIS_TITLE);
+        axis.getTextAttr().setFRFont(DefaultStyleConstants.AXIS_LABEL);
+        axis.setAxisColor(DefaultStyleConstants.AXIS_LINE);
+        axis.setMainGridColor(DefaultStyleConstants.GRID_LINE);
+        return axis;
+    }
+
+    public static void dealAxisAlert(VanChartAlertValue vanChartAlertValue) {
+        if (!ChartEditContext.duchampMode()) {
+            return;
+        }
+        vanChartAlertValue.setAlertFont(DefaultStyleConstants.ALERT_FONT);
+    }
+
+    static void dealVanPlotCommonAttr(Plot plot) {
+        if (!ChartEditContext.duchampMode()) {
+            return;
+        }
+        if (plot instanceof VanChartPlot) {
+            VanChartPlot vanChartPlot = (VanChartPlot) plot;
+
+            ColorFillStyle colorFillStyle = new ColorFillStyle();
+            colorFillStyle.setColorStyle(ChartConstants.COLOR_ACC);
+            colorFillStyle.setFillStyleName(DefaultStyleConstants.COLORS);
+            AttrFillStyle plotFillStyle = vanChartPlot.getPlotFillStyle();
+            if (plotFillStyle == null) {
+                plotFillStyle = new AttrFillStyle();
+                vanChartPlot.setPlotFillStyle(plotFillStyle);
+            }
+            plotFillStyle.setColorFillStyle(colorFillStyle);
+
+            if (vanChartPlot.getLegend() != null) {
+                vanChartPlot.getLegend().setFRFont(DefaultStyleConstants.LEGEND);
+            }
+
+            if (vanChartPlot instanceof VanChartRectanglePlot) {
+                VanChartRectanglePlot vanChartRectanglePlot = (VanChartRectanglePlot) vanChartPlot;
+
+                for (VanChartAxis axis : vanChartRectanglePlot.getXAxisList()) {
+                    dealAxisDefault(axis);
+                }
+                for (VanChartAxis axis : vanChartRectanglePlot.getYAxisList()) {
+                    dealAxisDefault(axis);
+                }
+            }
+
+            dealBorder(vanChartPlot);
+
+            DataSheet dataSheet = vanChartPlot.getDataSheet();
+            dataSheet.getTextAttr().setFRFont(DefaultStyleConstants.DATA_SHEET);
+            dataSheet.setBorderColor(DefaultStyleConstants.DATA_SHEET_BORDER);
+        }
+
+    }
+
+    private static void dealBorder(VanChartPlot vanChartPlot) {
+        ConditionAttr defaultAttr = vanChartPlot.getConditionCollection().getDefaultAttr();
+        AttrBorder attrBorder = defaultAttr.getExisted(AttrBorder.class);
+        if (attrBorder != null) {
+            attrBorder.setBorderColor(DefaultStyleConstants.BORDER);
+            attrBorder.setBorderStyle(defaultBorderWidth(vanChartPlot));
+        }
+    }
+
+    private static int defaultBorderWidth(VanChartPlot vanChartPlot) {
+        //pie multipie treemap map drillmap heatmap
+        if (vanChartPlot instanceof PiePlot4VanChart
+                || vanChartPlot instanceof VanChartMapPlot) {
+            return DefaultStyleConstants.SPECIAL_BORDER_WIDTH;
+        }
+        return DefaultStyleConstants.BORDER_WIDTH;
+    }
+
+    static void dealPie(Plot plot) {
+        if (plot instanceof PiePlot4VanChart) {
+            ConditionAttr defaultAttr = plot.getConditionCollection().getDefaultAttr();
+            AttrLabel attrLabel = defaultAttr.getExisted(AttrLabel.class);
+            if (attrLabel == null) {
+                attrLabel = ((PiePlot4VanChart) plot).getDefaultAttrLabel();
+                defaultAttr.addDataSeriesCondition(attrLabel);
+            }
+            attrLabel.getSecondLabelDetail().getTextAttr().setFRFont(DefaultStyleConstants.PIE_CATEGORY_LABEL);
+        }
+    }
+
+    static void dealGauge(Plot param) {
+        if (!(param instanceof VanChartGaugePlot)) {
+            return;
+        }
+        VanChartGaugePlot plot = (VanChartGaugePlot) param;
+        plot.getGaugeDetailStyle().setPaneBackgroundColor(plot.getGaugeStyle() == GaugeStyle.RING ? DefaultStyleConstants.GAUGE_PANE_BACK_COLOR_4_RING : DefaultStyleConstants.GAUGE_PANE_BACK_COLOR);
+        plot.getGaugeDetailStyle().setSlotBackgroundColor(DefaultStyleConstants.GAUGE_SLOT_BACKGROUND_COLOR);
+        plot.getGaugeDetailStyle().setHingeColor(DefaultStyleConstants.GAUGE_HINGE);
+
+        ConditionAttr defaultAttr = plot.getConditionCollection().getDefaultAttr();
+        AttrLabel attrLabel = defaultAttr.getExisted(AttrLabel.class);
+        if (attrLabel != null) {
+            AttrLabelDetail detail = attrLabel.getAttrLabelDetail();
+            AttrLabelDetail valueDetail = attrLabel.getGaugeValueLabelDetail();
+
+            switch (plot.getGaugeStyle()) {
+                case POINTER:
+                case POINTER_SEMI:
+                    detail.getContent().getCategoryFormat().setEnable(false);
+                    detail.getTextAttr().setFRFont(DefaultStyleConstants.POINTER_CATE_LABEL_FONT);
+                    valueDetail.getTextAttr().setFRFont(DefaultStyleConstants.POINTER_VALUE_LABEL_FONT);
+                    break;
+                case RING:
+                case SLOT:
+                    valueDetail.getTextAttr().setFRFont(DefaultStyleConstants.RING_VALUE_LABEL_FONT);
+                    break;
+                case THERMOMETER:
+                    detail.getTextAttr().setFRFont(DefaultStyleConstants.THERMOMETER_LABEL_FONT);
+                    valueDetail.getTextAttr().setFRFont(DefaultStyleConstants.THERMOMETER_LABEL_FONT);
+                    plot.getGaugeAxis().getTextAttr().setFRFont(DefaultStyleConstants.THERMOMETER_AXIS_LABEL);
+                    break;
+            }
+
+        }
+    }
+}

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

@@ -14,6 +14,7 @@ import com.fr.plugin.chart.custom.CustomPlotFactory;
 import com.fr.plugin.chart.custom.VanChartCustomPlot;
 import com.fr.plugin.chart.custom.type.CustomPlotType;
 import com.fr.plugin.chart.custom.type.CustomStyle;
+import com.fr.van.chart.config.DefaultStyleHelper4Van;
 import com.fr.van.chart.custom.CustomPlotDesignerPaneFactory;
 
 import javax.swing.JOptionPane;
@@ -261,6 +262,7 @@ public class VanChartCustomPlotSelectPane extends BasicBeanPane<Chart> {
             CustomPlotType customPlotType = selectedPlotTypeList.get(i);
             if (!CustomPlotFactory.customPlotContains(newCustomPlotList, customPlotType)){
                 VanChartPlot vanChartPlot = CustomPlotFactory.getCustomPlot(customPlotType);
+                DefaultStyleHelper4Van.dealVanPlot4Custom(vanChartPlot, customPlotType);
                 vanChartPlot.setCustomType(CustomStyle.CUSTOM.toString());
                 //设置公共属性
                 setCommonAttr(vanChartPlot, customPlot);

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

@@ -5,6 +5,7 @@ import com.fr.design.constants.KeyWords;
 import com.fr.design.gui.autocomplete.AutoCompletion;
 import com.fr.design.gui.autocomplete.BasicCompletion;
 import com.fr.design.gui.autocomplete.DefaultCompletionProvider;
+import com.fr.design.gui.frpane.AbstractAttrNoScrollPane;
 import com.fr.design.gui.ibutton.UIToggleButton;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.icontainer.UIScrollPane;
@@ -45,7 +46,7 @@ public class VanChartHtmlLabelPane extends JPanel {
     private UICheckBox isCustomHeight;
     private UITextField customHeight;
 
-    private VanChartStylePane parent;
+    private AbstractAttrNoScrollPane parent;
 
     private JPanel widthAndHeightPane;
 
@@ -53,7 +54,7 @@ public class VanChartHtmlLabelPane extends JPanel {
         contentTextArea.setText(text);
     }
 
-    public void setParent(VanChartStylePane parent) {
+    public void setParent(AbstractAttrNoScrollPane parent) {
         this.parent = parent;
     }
 
@@ -126,7 +127,7 @@ public class VanChartHtmlLabelPane extends JPanel {
         };
     }
 
-    private void fireJSChange() {
+    protected void fireJSChange() {
         if (parent != null) {
             parent.attributeChanged();
         }

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

@@ -14,16 +14,17 @@ import com.fr.plugin.chart.attr.plot.VanChartRectanglePlot;
 import com.fr.plugin.chart.base.AttrSeriesStackAndAxis;
 import com.fr.plugin.chart.base.VanChartConstants;
 import com.fr.plugin.chart.vanchart.VanChart;
+import com.fr.van.chart.config.DefaultStyleHelper4Van;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 import com.fr.van.chart.designer.style.axis.component.VanChartAxisButtonPane;
 
 import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.awt.BorderLayout;
-import java.awt.CardLayout;
 
 /**
  * 样式-坐标轴界面
@@ -104,6 +105,7 @@ public class VanChartAxisPane extends BasicBeanPane<VanChart> {
         List<VanChartAxis> xAxisList = editingPlot.getXAxisList();
         VanChartAxis axis = editingPlot.createXAxis(name, VanChartConstants.AXIS_BOTTOM);
         xAxisList.add(axis);
+        DefaultStyleHelper4Van.dealAxisDefault(axis);
 
         VanChartXYAxisPaneInterface axisPane = initXAxisPane(axis);
         axisPane.populate(axis);
@@ -119,6 +121,7 @@ public class VanChartAxisPane extends BasicBeanPane<VanChart> {
         List<VanChartAxis> yAxisList = editingPlot.getYAxisList();
         VanChartAxis axis = editingPlot.createYAxis(name, VanChartConstants.AXIS_LEFT);
         yAxisList.add(axis);
+        DefaultStyleHelper4Van.dealAxisDefault(axis);
 
         VanChartXYAxisPaneInterface axisPane = initYAxisPane(axis);
         axisPane.populate(axis);

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

@@ -11,6 +11,7 @@ import com.fr.plugin.chart.attr.axis.VanChartAxis;
 import com.fr.plugin.chart.attr.axis.VanChartTimeAxis;
 import com.fr.plugin.chart.attr.axis.VanChartValueAxis;
 import com.fr.plugin.chart.type.AxisType;
+import com.fr.van.chart.config.DefaultStyleHelper4Van;
 import com.fr.van.chart.designer.AbstractVanChartScrollPane;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 import com.fr.van.chart.designer.style.VanChartStylePane;
@@ -84,9 +85,9 @@ public class VanChartAxisScrollPaneWithTypeSelect extends AbstractVanChartScroll
 
     public void populate(VanChartAxis axis){
         AxisType axisType = axis.getAxisType();
-        textAxisPane.populateBean(new VanChartAxis(axis.getAxisName(), axis.getPosition()));
-        timeAxisPane.populateBean(new VanChartTimeAxis(axis.getAxisName(), axis.getPosition()));
-        valueAxisPane.populateBean(new VanChartValueAxis(axis.getAxisName(), axis.getPosition()));
+        textAxisPane.populateBean(DefaultStyleHelper4Van.dealAxisDefault(new VanChartAxis(axis.getAxisName(), axis.getPosition())));
+        timeAxisPane.populateBean(DefaultStyleHelper4Van.dealAxisDefault(new VanChartTimeAxis(axis.getAxisName(), axis.getPosition())));
+        valueAxisPane.populateBean(DefaultStyleHelper4Van.dealAxisDefault(new VanChartValueAxis(axis.getAxisName(), axis.getPosition())));
         if(ComparatorUtils.equals(axisType, AxisType.AXIS_CATEGORY)){
             textAxisPane.populateBean(axis);
         } else if(ComparatorUtils.equals(axisType, AxisType.AXIS_TIME)){

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

@@ -3,10 +3,11 @@ package com.fr.van.chart.designer.style.background;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.controlpane.NameObjectCreator;
 import com.fr.design.gui.controlpane.UnrepeatedNameHelper;
-import com.fr.log.FineLoggerFactory;
 import com.fr.general.NameObject;
+import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.chart.attr.axis.VanChartAlertValue;
 import com.fr.stable.Nameable;
+import com.fr.van.chart.config.DefaultStyleHelper4Van;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -37,6 +38,7 @@ public class ChartNameObjectCreator extends NameObjectCreator {
             VanChartAlertValue vanChartAlertValue = constructor.newInstance();
             vanChartAlertValue.setAxisNamesArray((String[]) object);
             vanChartAlertValue.setAxisName(((String[]) object)[0]);
+            DefaultStyleHelper4Van.dealAxisAlert(vanChartAlertValue);
             return new NameObject(helper.createUnrepeatedName(this.menuName()), vanChartAlertValue);
 
         } catch (NoSuchMethodException e) {

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

@@ -165,6 +165,9 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane<Van
 //            ((VanChart) chart4Update).setAutoThemeCustom();
             }
         }
+        if (!ChartEditContext.supportTheme()) {
+            chart.setAutoThemeCustom();
+        }
         if (!acceptDefinition(chart.getChartDataDefinition(), newPlot)) {
             chart.setChartDataDefinition(null);
         }

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

@@ -85,7 +85,7 @@ public class GisLayerPane extends JPanel implements UIObserver {
     private JPanel createGISLayerPane() {
         gisButton = new UIButtonGroup(new String[]{Toolkit.i18nText("Fine-Design_Chart_Mode_Auto"),
                 Toolkit.i18nText("Fine-Design_Form_Widget_Style_Standard"), Toolkit.i18nText("Fine-Design_Chart_Custom")});
-        gisButton.setSelectedIndex(0);
+        gisButton.setSelectedIndex(ChartEditContext.supportTheme() ? 0 : 1);
         gisGaoDeLayer = new UIComboBox(MapLayerConfigManager.getGaoDeLayerItems());
         gisButton.addActionListener(event -> {
             refreshZoomLevel();

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

@@ -140,5 +140,4 @@ public interface LayoutAdapter {
     default void dragOver(XCreator xCreator, SelectionModel selectionModel, int x, int y) {
 
     };
-
 }

designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/AbstractLayoutAdapter.java

@@ -13,7 +13,7 @@ import com.fr.design.utils.ComponentUtils;
 import com.fr.design.utils.gui.LayoutUtils;
 import com.fr.general.ComparatorUtils;
 
-import java.awt.*;
+import java.awt.LayoutManager;
 
 public abstract class AbstractLayoutAdapter implements LayoutAdapter {
 
@@ -209,6 +209,4 @@ public abstract class AbstractLayoutAdapter implements LayoutAdapter {
         selectionModel.removeCreator(xCreator, xCreator.getWidth(), xCreator.getHeight());
         selectionModel.setSelectedCreator(container);
     }
-
-
 }

designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRBorderLayoutAdapter.java

@@ -184,5 +184,4 @@ public class FRBorderLayoutAdapter extends AbstractLayoutAdapter {
 	public ConstraintsGroupModel getLayoutConstraints(XCreator creator) {
 		return new FRBorderLayoutConstraints(container, creator);
 	}
-
 }

designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRCardMainBorderLayoutAdapter.java

@@ -1,13 +1,15 @@
 package com.fr.design.designer.beans.adapters.layout;
 
+import com.fr.design.designer.beans.models.AddingModel;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.designer.creator.XLayoutContainer;
 import com.fr.design.designer.creator.cardlayout.XWCardTagLayout;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.form.layout.FRBorderLayout;
+import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.JTemplate;
-import com.fr.design.ui.util.UIUtil;
+import com.fr.design.mainframe.WidgetPropertyPane;
 import com.fr.general.ComparatorUtils;
 
 import java.awt.BorderLayout;
@@ -65,18 +67,13 @@ public class FRCardMainBorderLayoutAdapter extends FRBorderLayoutAdapter {
         if (minConstraint > value) {
             FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Beyond_Tablayout_Bounds"));
             JTemplate<?, ?> jt = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
-            if (jt != null && jt.getUndoManager().canUndo()) {
-                // 自适应布局平分高度导致变矮的场景，优先做撤销
-                UIUtil.invokeLaterIfNeeded(new Runnable() {
-                    @Override
-                    public void run() {
-                        jt.undo();
-                    }
-                });
-            } else if (container.getBackupBound() != null) {
-                // 手动拖动导致变矮的场景
-                container.setSize(container.getBackupBound().getSize());
+            if (jt != null) {
+                jt.undoToCurrent();
             }
+
+            FormDesigner formDesigner = WidgetPropertyPane.getInstance().getEditingFormDesigner();
+            AddingModel model = formDesigner.getAddingModel();
+            model.setAddedIllegal(true);
             return true;
         } else {
             return false;

designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRFitLayoutAdapter.java

@@ -1243,5 +1243,5 @@ public class FRFitLayoutAdapter extends FRBodyLayoutAdapter {
 
     public void dragOver(XCreator xCreator, SelectionModel selectionModel,int x, int y) {
         frLayoutState.dragOver(xCreator, selectionModel,x,y);
-    };
+    }
 }

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

@@ -24,6 +24,7 @@ public class AddingModel {
     private int currentX;
     private int currentY;
     private boolean added;
+    private boolean addedIllegal = false; // 有时候是添加完成了，但是添加会造成某些控件size不合法，例如tab
 
     public AddingModel(FormDesigner designer, XCreator xCreator) {
         this.creator = xCreator;
@@ -141,4 +142,11 @@ public class AddingModel {
         return added;
     }
 
+    public boolean isAddedIllegal() {
+        return addedIllegal;
+    }
+
+    public void setAddedIllegal(boolean addedIllegal) {
+        this.addedIllegal = addedIllegal;
+    }
 }

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

@@ -25,7 +25,6 @@ import com.fr.design.fun.FormWidgetOptionProvider;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.FormSelection;
 import com.fr.design.mainframe.FormSelectionUtils;
-import com.fr.design.mainframe.share.encrypt.clipboard.impl.EncryptSelectionClipboardHandler;
 import com.fr.design.utils.ComponentUtils;
 import com.fr.design.utils.gui.LayoutUtils;
 import com.fr.general.ComparatorUtils;

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

@@ -20,7 +20,6 @@ import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.widget.editors.WLayoutBorderStyleEditor;
 import com.fr.design.module.DesignModuleFactory;
 import com.fr.form.ui.BaseChartEditor;
-import com.fr.form.ui.PaddingMargin;
 import com.fr.form.ui.Widget;
 import com.fr.stable.Constants;
 import com.fr.stable.core.PropertyChangeAdapter;
@@ -29,9 +28,15 @@ import javax.swing.BorderFactory;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
-import java.awt.*;
-import java.beans.IntrospectionException;
+import java.awt.Color;
+import java.awt.Cursor;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Insets;
+import java.awt.Rectangle;
 import java.awt.event.MouseEvent;
+import java.beans.IntrospectionException;
 
 /**
  * form中的图表按钮弹出的控件, 创建初始化图表内容.
@@ -367,4 +372,9 @@ public class XChartEditor extends XBorderStyleWidgetCreator {
         return false;
     }
 
+    @Override
+    public boolean isComponent() {
+        return true;
+    }
+
 }

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

@@ -9,10 +9,11 @@ import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.designer.beans.events.DesignerEditor;
 import com.fr.design.designer.beans.models.SelectionModel;
-import com.fr.design.designer.creator.operate.XCreatorBaseOperate;
 import com.fr.design.designer.creator.operate.DefaultXCreatorBaseOperate;
+import com.fr.design.designer.creator.operate.XCreatorBaseOperate;
 import com.fr.design.designer.treeview.DefaultXCreatorTreeCellRender;
 import com.fr.design.designer.treeview.XCreatorTreeCellRender;
+import com.fr.design.designer.ui.PopupDialogContext;
 import com.fr.design.designer.ui.SelectedPopupDialog;
 import com.fr.design.fun.ShareWidgetUIProcessor;
 import com.fr.design.fun.WidgetPropertyUIProvider;
@@ -35,7 +36,6 @@ import com.fr.stable.Constants;
 import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
 
-import java.awt.event.MouseListener;
 import javax.swing.BorderFactory;
 import javax.swing.JComponent;
 import javax.swing.JFrame;
@@ -49,6 +49,7 @@ import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Rectangle;
 import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
 import java.beans.IntrospectionException;
 import java.util.ArrayList;
 import java.util.List;
@@ -796,6 +797,7 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 		if (popup == null) {
 			popup = new SelectedPopupDialog(this, designer);
 		}
+		PopupDialogContext.checkSelectedPop(this);
 		JFrame frame = LogMessageBar.getInstance().getLogFrame();
 		if (frame!= null && frame.isActive()) {
 			return;
@@ -894,6 +896,7 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 		if (popup != null) {
 			popup.setVisible(false);
 		}
+		PopupDialogContext.checkSelectedPop(this);
 	}
 
 	public void processPopup(boolean canVisible) {
@@ -932,4 +935,12 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 		return new DefaultXCreatorBaseOperate();
 	}
 
+	/**
+	 * 是否是组件（控件还是组件）
+	 * @return 是否是组件
+	 */
+	public boolean isComponent() {
+		return false;
+	}
+
 }

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

@@ -71,6 +71,7 @@ import com.fr.form.ui.container.cardlayout.WCardMainBorderLayout;
 import com.fr.form.ui.container.cardlayout.WCardTagLayout;
 import com.fr.form.ui.container.cardlayout.WCardTitleLayout;
 import com.fr.form.ui.container.cardlayout.WTabFitLayout;
+import com.fr.general.ComparatorUtils;
 import com.fr.general.GeneralContext;
 import com.fr.general.IOUtils;
 import com.fr.invoke.Reflect;
@@ -82,6 +83,7 @@ import com.fr.plugin.observer.PluginEvent;
 import com.fr.plugin.observer.PluginEventListener;
 import com.fr.stable.StringUtils;
 import com.fr.third.javax.annotation.Nonnull;
+import java.util.Set;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.Icon;
@@ -427,4 +429,47 @@ public class XCreatorUtils {
         }
         return null;
     }
+
+    /**
+     * 把控件例如textEditor外层的容器剥掉
+     * @param xCreator 控件
+     * @return 内层控件
+     */
+    public static XCreator getXCreatorInnerWidget(XCreator xCreator) {
+        if (xCreator.acceptType(XWScaleLayout.class)) {
+            if (xCreator.getComponentCount() > 0 && ((XCreator) xCreator.getComponent(0)).shouldScaleCreator()) {
+                return (XCreator) xCreator.getComponent(0);
+            }
+        }
+
+        if (xCreator.acceptType(XWTitleLayout.class)) {
+            return (XCreator) xCreator.getComponent(0);
+        }
+
+        return xCreator;
+    }
+
+    public static boolean isExtraContainer(XCreator creator) {
+        Set<FormWidgetOptionProvider> set = ExtraDesignClassManager.getInstance().getArray(FormWidgetOptionProvider.XML_TAG);
+        for (FormWidgetOptionProvider provider : set) {
+            if (provider.isContainer()
+                    && ComparatorUtils.equals(provider.appearanceForWidget(), provider.appearanceForWidget())
+                    && ComparatorUtils.equals(provider.classForWidget(), creator.toData().getClass())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static XLayoutContainer getParent(XCreator source) {
+        if (source.acceptType(XWCardTagLayout.class) ) {
+            return (XLayoutContainer)source.getParent();
+        }
+        XLayoutContainer container = XCreatorUtils.getParentXLayoutContainer(source);
+        boolean accept = (source.acceptType(XWFitLayout.class) || source.acceptType(XWParameterLayout.class)) && !isExtraContainer(source);
+        if (accept) {
+            container = null;
+        }
+        return container;
+    }
 }

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

@@ -366,4 +366,9 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
     public void releaseResources() {
         imageLable.setIcon(null);
     }
+
+    @Override
+    public boolean isComponent() {
+        return true;
+    }
 }

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

@@ -612,4 +612,9 @@ public abstract class XLayoutContainer extends XBorderStyleWidgetCreator impleme
     public void replaceXcreator(XCreator newCreator, XCreator oldCreator){
 
     }
+
+    @Override
+    public boolean isComponent() {
+        return true;
+    }
 }

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

@@ -0,0 +1,47 @@
+package com.fr.design.designer.ui;
+
+import com.fr.design.designer.creator.XCreator;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+
+/**
+ * 把弹窗统一管理起来 防止出现异常情况下游离的弹窗
+ *
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/11/02
+ */
+public class PopupDialogContext {
+
+    private static List<SelectedPopupDialog> dialogs = new ArrayList<>();
+
+    public static void add(SelectedPopupDialog selectedPopupDialog) {
+        if (dialogs.contains(selectedPopupDialog)) {
+            return;
+        }
+        dialogs.add(selectedPopupDialog);
+    }
+
+    public static void remove(SelectedPopupDialog selectedPopupDialog) {
+        dialogs.remove(selectedPopupDialog);
+    }
+
+    public static void checkSelectedPop(XCreator creator) {
+        Iterator<SelectedPopupDialog> iterator = dialogs.iterator();
+        List<SelectedPopupDialog> removedDialog = new ArrayList<>();
+        while (iterator.hasNext()) {
+             SelectedPopupDialog dialog = iterator.next();
+            if (dialog.isVisible() && creator != dialog.getCreator()) {
+                iterator.remove();
+                removedDialog.add(dialog);
+            }
+        }
+        for (SelectedPopupDialog dialog : removedDialog) {
+            dialog.setVisible(false);
+        }
+    }
+
+}

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

@@ -25,11 +25,14 @@ public class SelectedPopupDialog extends JDialog {
 
     private boolean canVisible = true;
 
+    private final XCreator creator;
+
     public SelectedPopupDialog(XCreator creator, FormDesigner designer) {
         super(OperatingSystem.isMacos() ? new JFrame() : DesignerContext.getDesignerFrame());
         this.setUndecorated(true);
         this.setModal(false);
         this.setFocusableWindowState(false);
+        this.creator = creator;
         controlPanel = new PopupControlPanel(creator, designer);
         this.getContentPane().add(controlPanel);
         this.setSize(controlPanel.getDefaultDimension());
@@ -44,6 +47,16 @@ public class SelectedPopupDialog extends JDialog {
         return controlPanel.hasVisibleButtons();
     }
 
+    @Override
+    public void setVisible(boolean visible) {
+        super.setVisible(visible);
+        if (visible) {
+            PopupDialogContext.add(this);
+        } else {
+            PopupDialogContext.remove(this);
+        }
+    }
+
     public void setRelativeBounds(Rectangle rectangle) {
         this.controlPanel.setRelativeBounds(rectangle);
     }
@@ -55,4 +68,8 @@ public class SelectedPopupDialog extends JDialog {
     public void setCanVisible(boolean canVisible) {
         this.canVisible = canVisible;
     }
+
+    public XCreator getCreator() {
+        return this.creator;
+    }
 }

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

@@ -1,12 +1,11 @@
 package com.fr.design.mainframe;
 
-import java.awt.datatransfer.Transferable;
+import com.fr.design.designer.beans.models.AddingModel;
+import com.fr.design.file.HistoryTemplateListPane;
 
 import javax.swing.JComponent;
 import javax.swing.TransferHandler;
-
-import com.fr.design.designer.beans.events.DesignerEvent;
-import com.fr.design.designer.beans.models.AddingModel;
+import java.awt.datatransfer.Transferable;
 
 public class DesignerTransferHandler extends TransferHandler {
 
@@ -21,7 +20,14 @@ public class DesignerTransferHandler extends TransferHandler {
 
 	protected void exportDone(JComponent source, Transferable data, int action) {
 		if (!addingModel.isCreatorAdded()) {
-			designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_CUTED);
+			undoWhenAddingFailed();
+		}
+	}
+
+	private void undoWhenAddingFailed() {
+		JTemplate<?, ?> jt = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
+		if (jt != null) {
+			jt.undoToCurrent();
 		}
 	}
 }