Merging in latest from upstream (DESIGN/design:refs/heads/release/10.0)

* commit '54d2a0c729e6e38a4355a1f8183dbd83d25f0fb9': (28 commits)
  REPORT-58533 附件模板中报表块无法进入编辑
  REPORT-58713  加些注释
  REPORT-58713 决策报表中公式模拟计算的参数编辑窗口会出现“闪屏”现象
  REPORT-58573 打开11.0制作的模板不向上兼容提示- 提示内容中应建议升级至11
  REPORT-56134 js提交事件报错中添加定位信息
  REPORT-55048 websocket使用代理的情况处理下
  REPORT-55748 处理下import 问题
  REPORT-58535 【稳定共创】附件模板概率出现2个编辑按钮
  REPORT-50784 单元格文本包含生僻字情况下，双击单元格进入编辑状态后字符无法用默认字体绘制
  CHART-20517  图表类型编辑之后再重置标题
  CHART-20517  图表类型编辑之后再重置标题
  无jira 忽略异常
  REPORT-58394 fix:不安装旧版本图表插件 只是不能新建 图表配置面板也是要出来的
  REPORT-57171 AF打不开
  无jira 加个切换时处理 防止工具栏残留
  REPORT-58296 调整参数面板高度消失问题
  REPORT-58159 组件编辑按钮-表单组件选中-设计器日志框无法置于设计器上方
  无jira 调整下日志等级
  REPORT-58260 组件包安装适配zip
  REPORT-58260 组件包安装适配zip
  ...

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

@@ -1,13 +1,10 @@
 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;
@@ -24,8 +21,6 @@ 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;
@@ -33,8 +28,6 @@ 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;
@@ -52,7 +45,6 @@ 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;
 
@@ -105,167 +97,12 @@ public class JDBCDefPane extends JPanel {
     private Component[][] partComponents;
     // 请不要改动dbtype,只应该最后添加
     private final String[] dbtype = {"Oracle", "DB2", "SQL Server", "MySQL", "Sybase", "Access", "Derby", "Postgre", "SQLite", "Inceptor", OTHER_DB};
-    private JDBCDatabaseConnection jdbcDatabase;
-    private boolean needRefresh = true;
-    private UIComboBox driverManageBox;
-    private ActionLabel driverManageLabel;
-    private UIComboBox driverLoaderBox;
-    private HashBiMap<String, String> nameAndRepresent;
-
-    ActionListener driverListener = new ActionListener() {
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            if (driverComboBox.getSelectedItem() == null || ComparatorUtils.equals(driverComboBox.getSelectedItem(), StringUtils.EMPTY)) {
-                return;
-            }
-            odbcTipsLink.setVisible(ComparatorUtils.equals("sun.jdbc.odbc.JdbcOdbcDriver", driverComboBox.getSelectedItem())); // 选择的如果是ODBC就显示提示
-            Iterator<Entry<String, DriverURLName[]>> jdbc = jdbcMap.entrySet().iterator();
-            while (jdbc.hasNext()) {
-                Entry<String, DriverURLName[]> entry = jdbc.next();
-                DriverURLName[] dus = entry.getValue();
-                for (int i = 0, len = dus.length; i < len; i++) {
-                    if (ComparatorUtils.equals(dus[i].getDriver(), (driverComboBox.getSelectedItem()))) {
-                        urlTextField.setText(dus[i].getURL());
-                        return;
-                    }
-                }
-            }
-        }
-    };
-    ActionListener dbtypeButtonActionListener = new ActionListener() {
-        @Override
-        public void actionPerformed(ActionEvent evt) {
-            if (ComparatorUtils.equals(dbtypeComboBox.getSelectedItem(), StringUtils.EMPTY)) {
-                return;
-            }
-            DriverURLName[] dus = jdbcMap.get(dbtypeComboBox.getSelectedItem());
-            for (int i = 0, len = dus.length; i < len; i++) {
-                if (ComparatorUtils.equals(driverComboBox.getSelectedItem(), (dus[i].getDriver()))) {
-                    urlTextField.setText(dus[i].getURL());
-                    if (ComparatorUtils.equals(dbtypeComboBox.getSelectedItem(), ("Access"))) {
-                        // ben:这个能不能换种处理方案- -
-                        JFileChooser filechooser = new JFileChooser();
-                        filechooser.setDialogTitle(Toolkit.i18nText("Fine-Design_Basic_Open"));
-                        filechooser.setMultiSelectionEnabled(false);
-                        filechooser.addChoosableFileFilter(new ChooseFileFilter(new String[]{"accdb", "mdb"}, "Microsoft Office Access"));
-                        int result = filechooser.showOpenDialog(DesignerContext.getDesignerFrame());
-                        File selectedfile = null;
-
-                        if (result == JFileChooser.APPROVE_OPTION) {
-                            selectedfile = filechooser.getSelectedFile();
-                            if (selectedfile != null) {
-                                String selectedName = selectedfile.getPath().substring(selectedfile.getPath().lastIndexOf('.') + 1);
-                                if (selectedName.equalsIgnoreCase("mdb") || selectedName.equalsIgnoreCase("accdb")) {
-                                    urlTextField.setText(urlTextField.getText() + selectedfile.getPath());
-                                }
-                            }
-                        }
-                    }
-                    break;
-                }
-            }
-        }
-    };
-    KeyListener portKeyListener = new KeyAdapter() {
-        @Override
-        public void keyReleased(KeyEvent e) {
-            String port = portTextField.getText();
-            if (isPortValid(port)) {
-                updateURL();
-            } else {
-                portTextField.setText(port.replaceAll(getCharNeedReplace(e.getKeyChar()), ""));
-                if (!isPortValid(portTextField.getText())) {
-                    portTextField.setText(StringUtils.EMPTY);
-                    updateURL();
-                }
-            }
-        }
-    };
-    ActionListener driverManageListener = new ActionListener() {
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            boolean selectSelfDefine = isSelfDefine();
-            driverManageLabel.setVisible(selectSelfDefine);
-            driverLoaderBox.setVisible(selectSelfDefine);
-            driverComboBox.setVisible(!selectSelfDefine);
-            // 选中自定义的话，将odbc的屏蔽，选中默认的话，重新触发一次driverComboBox的事件
-            if (selectSelfDefine) {
-                odbcTipsLink.setVisible(false);
-            } else {
-                driverComboBox.setSelectedItem(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);
-        }
-    };
-
-    InputMethodListener portInputMethodListener = new InputMethodListener() {
-        @Override
-        public void inputMethodTextChanged(InputMethodEvent event) {
-            if (null == event.getText()) {
-                return;
-            }
-            char ch = event.getText().current();
-            if (!(ch >= '0' && ch <= '9')) {
-                event.consume();
-            }
-        }
-
-        @Override
-        public void caretPositionChanged(InputMethodEvent event) {
 
-        }
-    };
 
-    DocumentListener updateParaListener = new DocumentListener() {
+    private JDBCDatabaseConnection jdbcDatabase;
-        @Override
+    private boolean needRefresh = true;
-        public void insertUpdate(DocumentEvent e) {
-            updatePara();
-        }
-
-        @Override
-        public void removeUpdate(DocumentEvent e) {
-            updatePara();
-        }
-
-        @Override
-        public void changedUpdate(DocumentEvent e) {
-            updatePara();
-        }
-    };
 
     public JDBCDefPane() {
-        initMap();
         this.setBorder(UITitledBorder.createBorderWithTitle("JDBC" + ":"));
         this.setLayout(FRGUIPaneFactory.createLabelFlowLayout());
         JPanel innerthis = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
@@ -278,15 +115,7 @@ 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);
@@ -326,39 +155,17 @@ public class JDBCDefPane extends JPanel {
                 _gfx.drawLine(0, this.getHeight() - 1, GraphHelper.getWidth(this.getText()), this.getHeight() - 1);
             }
         };
+        odbcTipsPane.add(odbcTipsLink);
         odbcTipsLink.setPreferredSize(new Dimension(GraphHelper.getWidth(Toolkit.i18nText("Fine-Design_Basic_Odbc_Tips")), odbcTipsLink.getPreferredSize().height));
         odbcTipsLink.addActionListener(new ActionListener() {
-            @Override
             public void actionPerformed(ActionEvent evt) {
                 String url = CloudCenter.getInstance().acquireUrlByKind("odbc.help");
                 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());
-        JPanel normalFlowInnerContainer_s_pane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(0, 5, 0);
+        driverComboBoxAndTips.add(driverComboBox, BorderLayout.WEST);
-        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();
@@ -418,70 +225,7 @@ public class JDBCDefPane extends JPanel {
         innerthis.add(centerPanel);
     }
 
-    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);
-        }
-    }
-
-    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 refreshDriverLoader() {
-        Set<String> representSet = nameAndRepresent.values();
-        driverLoaderBox.clearBoxItems();
-        for (String represent : representSet) {
-            driverLoaderBox.addItem(represent);
-        }
-    }
-
-    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"));
-        }
-    }
-
     public void populate(JDBCDatabaseConnection jdbcDatabase) {
-        // 单例对象，重新打开的时候并不会新建，但是由于driverloaderbox里面需要是动态内容，因此需要进行刷新动作
-        initMap();
-        refreshDriverLoader();
         needRefresh = false;
         if (jdbcDatabase == null) {
             jdbcDatabase = new JDBCDatabaseConnection();
@@ -511,24 +255,7 @@ 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());
@@ -541,10 +268,31 @@ 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());
@@ -556,30 +304,126 @@ public class JDBCDefPane extends JPanel {
             jdbcDatabase.setNewCharsetName(EncodeConstants.ENCODING_GBK);
             jdbcDatabase.setOriginalCharsetName(((String) this.charSetComboBox.getSelectedItem()));
         }
-        String driverLoader = (String) this.driverLoaderBox.getSelectedItem();
+        return jdbcDatabase;
-        if (driverLoader == null) {
-            driverLoader = StringUtils.EMPTY;
     }
-        if (isSelfDefine()) {
+
-            String[] split = driverLoader.split("\\(");
+    ActionListener dbtypeActionListener = new ActionListener() {
-            if (split.length > 1) {
+        public void actionPerformed(ActionEvent evt) {
-                String name = split[1];
+
-                if (name.length() > 0) {
+            urlTextField.setText(StringUtils.EMPTY);
-                    jdbcDatabase.setDriverSource(name.substring(0, name.length() - 1));
+            driverComboBox.removeAllItems();
-                } else {
+            if (ComparatorUtils.equals(dbtypeComboBox.getSelectedItem(), StringUtils.EMPTY)) {
-                    jdbcDatabase.setDriverSource(StringUtils.EMPTY);
+                driverComboBox.setSelectedItem(StringUtils.EMPTY);
+                return;
             }
-            } else {
+
-                jdbcDatabase.setDriverSource(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());
                 }
-            jdbcDatabase.setDriver(split[0]);
-        } else {
-            Object driveItem = this.driverComboBox.getSelectedItem();
-            jdbcDatabase.setDriver(driveItem == null ? null : driveItem.toString().trim());
-            jdbcDatabase.setDriverSource(StringUtils.EMPTY);
             }
-        return jdbcDatabase;
+            // 更改数据库类型后 数据库名称置空和之前逻辑保持一致
+            if (needRefresh) {
+                jdbcDatabase.setDatabase(StringUtils.EMPTY);
+            }
+            changePane(dbtypeComboBox.getSelectedItem());
+            JDBCConnectionDef.getInstance().setConnection((String) dbtypeComboBox.getSelectedItem(), jdbcDatabase);
+            DatabaseConnectionPane.JDBC.getAdvancedAttrPane().populate(jdbcDatabase);
+        }
+    };
+
+    ActionListener driverListener = new ActionListener() {
+        public void actionPerformed(ActionEvent e) {
+            if (driverComboBox.getSelectedItem() == null || ComparatorUtils.equals(driverComboBox.getSelectedItem(), StringUtils.EMPTY)) {
+                return;
             }
+            odbcTipsLink.setVisible(ComparatorUtils.equals("sun.jdbc.odbc.JdbcOdbcDriver", driverComboBox.getSelectedItem())); // 选择的如果是ODBC就显示提示
+            Iterator<Entry<String, DriverURLName[]>> jdbc = jdbcMap.entrySet().iterator();
+            while (jdbc.hasNext()) {
+                Entry<String, DriverURLName[]> entry = jdbc.next();
+                DriverURLName[] dus = entry.getValue();
+                for (int i = 0, len = dus.length; i < len; i++) {
+                    if (ComparatorUtils.equals(dus[i].getDriver(), (driverComboBox.getSelectedItem()))) {
+                        urlTextField.setText(dus[i].getURL());
+                        return;
+                    }
+                }
+            }
+        }
+
+    };
+
+    ActionListener dbtypeButtonActionListener = new ActionListener() {
+        public void actionPerformed(ActionEvent evt) {
+            if (ComparatorUtils.equals(dbtypeComboBox.getSelectedItem(), StringUtils.EMPTY)) {
+                return;
+            }
+            DriverURLName[] dus = jdbcMap.get(dbtypeComboBox.getSelectedItem());
+            for (int i = 0, len = dus.length; i < len; i++) {
+                if (ComparatorUtils.equals(driverComboBox.getSelectedItem(), (dus[i].getDriver()))) {
+                    urlTextField.setText(dus[i].getURL());
+                    if (ComparatorUtils.equals(dbtypeComboBox.getSelectedItem(), ("Access"))) {
+                        // ben:这个能不能换种处理方案- -
+                        JFileChooser filechooser = new JFileChooser();
+                        filechooser.setDialogTitle(Toolkit.i18nText("Fine-Design_Basic_Open"));
+                        filechooser.setMultiSelectionEnabled(false);
+                        filechooser.addChoosableFileFilter(new ChooseFileFilter(new String[]{"accdb", "mdb"}, "Microsoft Office Access"));
+                        int result = filechooser.showOpenDialog(DesignerContext.getDesignerFrame());
+                        File selectedfile = null;
+
+                        if (result == JFileChooser.APPROVE_OPTION) {
+                            selectedfile = filechooser.getSelectedFile();
+                            if (selectedfile != null) {
+                                String selectedName = selectedfile.getPath().substring(selectedfile.getPath().lastIndexOf('.') + 1);
+                                if (selectedName.equalsIgnoreCase("mdb") || selectedName.equalsIgnoreCase("accdb")) {
+                                    urlTextField.setText(urlTextField.getText() + selectedfile.getPath());
+                                }
+                            }
+                        }
+                    }
+                    break;
+                }
+            }
+        }
+    };
+
+    InputMethodListener portInputMethodListener = new InputMethodListener() {
+        @Override
+        public void inputMethodTextChanged(InputMethodEvent event) {
+            if (null == event.getText()) {
+                return;
+            }
+            char ch = event.getText().current();
+            if (!(ch >= '0' && ch <= '9')) {
+                event.consume();
+            }
+        }
+
+        @Override
+        public void caretPositionChanged(InputMethodEvent event) {
+
+        }
+    };
+
+    DocumentListener updateParaListener = new DocumentListener() {
+        @Override
+        public void insertUpdate(DocumentEvent e) {
+            updatePara();
+        }
+
+        @Override
+        public void removeUpdate(DocumentEvent e) {
+            updatePara();
+        }
+
+        @Override
+        public void changedUpdate(DocumentEvent e) {
+            updatePara();
+        }
+    };
 
     private void updatePara() {
         String dbType = dbtypeComboBox.getSelectedItem().toString();
@@ -644,6 +488,21 @@ public class JDBCDefPane extends JPanel {
         this.hostTextField.getDocument().removeDocumentListener(updateURLListener);
     }
 
+    KeyListener portKeyListener = new KeyAdapter() {
+        @Override
+        public void keyReleased(KeyEvent e) {
+            String port = portTextField.getText();
+            if (isPortValid(port)) {
+                updateURL();
+            } else {
+                portTextField.setText(port.replaceAll(getCharNeedReplace(e.getKeyChar()), ""));
+                if (!isPortValid(portTextField.getText())) {
+                    portTextField.setText(StringUtils.EMPTY);
+                    updateURL();
+                }
+            }
+        }
+    };
 
     private boolean isPortValid(String port) {
         return PORT.matcher(port).find();
@@ -720,22 +579,4 @@ 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/gui/itextfield/EditTextField.java

@@ -13,6 +13,9 @@ import javax.swing.text.PlainDocument;
  * Number Field.
  */
 public class EditTextField extends UIGridTextField {
+
+	private static final String I18NProperty = "i18n";
+
 	private int maxLength = 24;
 
 	public EditTextField() {
@@ -39,7 +42,11 @@ public class EditTextField extends UIGridTextField {
 	}
 
 	class TextDocument extends PlainDocument {
+
+		private Object defaultI18NProperty;
+
 		public TextDocument() {
+			defaultI18NProperty = getProperty(I18NProperty);
 		}
 
 		@Override
@@ -49,6 +56,7 @@ public class EditTextField extends UIGridTextField {
 				Toolkit.getDefaultToolkit().beep();
 				return;
 			}
+			putProperty(I18NProperty, defaultI18NProperty);
 			super.insertString(offset, s, a);
 		}
 	}

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

@@ -47,6 +47,7 @@ import com.fr.design.menu.NameSeparator;
 import com.fr.design.menu.ShortCut;
 import com.fr.design.preview.PagePreview;
 import com.fr.design.ui.util.UIUtil;
+import com.fr.design.utils.DesignUtils;
 import com.fr.design.worker.save.CallbackSaveWorker;
 import com.fr.design.worker.save.EmptyCallBackSaveWorker;
 import com.fr.design.write.submit.DBManipulationInWidgetEventPane;
@@ -1071,7 +1072,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     public boolean isOldDesigner() {
         String xmlDesignerVersion = getTarget().getXMLDesignerVersion();
         if (isHigherThanCurrent(xmlDesignerVersion)) {
-            String infor = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_Version_Not_Match", StringUtils.parseVersion(xmlDesignerVersion));
+            String infor = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_Version_Not_Match", DesignUtils.parseVersion(xmlDesignerVersion));
             String moreInfo = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Server_Version_Tip_More_Info");
             new InformationWarnPane(infor, moreInfo, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips")).show();
             return true;

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

@@ -53,6 +53,9 @@ public class JTemplateNameHelper {
      * @Date 2021/4/9 11:13
      **/
     private static Integer getFileNameIndex(String prefix, String fileName) {
+		if (fileName.length() <= prefix.length()) {
+            return null;
+        }
         char[] chars = new char[fileName.length()];
         int i = 0;
         for (; i < fileName.length(); i++) {

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

@@ -88,4 +88,8 @@ public class LogMessageBar extends JPanel {
 		}
 		THIS = null;
 	}
+
+	public JFrame getLogFrame() {
+		return dlg;
+	}
 }

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

@@ -425,4 +425,17 @@ public class DesignUtils {
         return true;
     }
 
+    /**
+     * FR25.0版本出来需要进行适配下
+     *
+     * @param xmlDesignerVersion
+     * @return
+     */
+    public static String parseVersion(String xmlDesignerVersion) {
+        if (StringUtils.isNotEmpty(xmlDesignerVersion)) {
+            return String.valueOf(xmlDesignerVersion.charAt(0) - 'A');
+        }
+        return xmlDesignerVersion;
+    }
+
 }

designer-base/src/test/java/com/fr/design/utils/DesignUtilsTest.java

@@ -3,6 +3,7 @@ package com.fr.design.utils;
 
 import com.fr.general.ComparatorUtils;
 import junit.framework.TestCase;
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.net.ServerSocket;
@@ -29,4 +30,10 @@ public class DesignUtilsTest extends TestCase {
         assertTrue(DesignUtils.isPortOccupied());
     }
 
+    @Test
+    public void testParseVersion() {
+        Assert.assertEquals("10", DesignUtils.parseVersion("KAA"));
+        Assert.assertEquals("11", DesignUtils.parseVersion("LAA"));
+    }
+
 }

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

@@ -173,8 +173,7 @@ public class ChartTypePane extends AbstractChartAttrPane {
                                             Map<Integer, Map<String, FurtherBasicBeanPane<? extends ChartProvider>>> allChartTypePane,
                                             ActionListener autoButtonListener) {
 
-
+        String[] chartIDs = ChartTypeManager.getInstance().getAllChartIDsIncludeDisabled();
-        String[] chartIDs = ChartTypeManager.getInstance().getAllChartIDs();
 
         for (String id : chartIDs) {
 
@@ -222,6 +221,7 @@ public class ChartTypePane extends AbstractChartAttrPane {
 
             String lastPlotID = chart.getID();
 
+            boolean chartTypeChange = false;
             try {
                 AbstractChartTypePane selectedPane = (AbstractChartTypePane) getSelectedPane();
                 ChartProvider newDefaultChart = (ChartProvider) ChartTypeManager.getInstanceWithCheck().getCharts(selectedPane.getPlotID())[0].clone();
@@ -231,13 +231,16 @@ public class ChartTypePane extends AbstractChartAttrPane {
                     editingCollection.removeNameObject(editingCollection.getSelectedIndex());
                     editingCollection.addChart(newDefaultChart);
                     chart = newDefaultChart;
+                    chartTypeChange = true;
                 }
             } catch (CloneNotSupportedException e) {
                 FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
             //这一步会替换plot
+            String id = chart.getID();
             ((AbstractChartTypePane) getSelectedPane()).updateBean(chart);
-            if (inForm) {
+            chartTypeChange = chartTypeChange || !ComparatorUtils.equals(id, chart.getID());
+            if (inForm && chartTypeChange) {
                 chart.resetAttrInForm();
             }
             reLayoutEditPane(chart, lastPlotID);
@@ -465,5 +468,6 @@ public class ChartTypePane extends AbstractChartAttrPane {
     public void registerChartEditPane(ChartEditPane currentEditPane) {
         this.editPane = currentEditPane;
         this.inForm = editPane.isInForm();
+        buttonPane.refreshChartInForm(inForm);
     }
 }

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

@@ -58,21 +58,26 @@ public class ChartHyperlinkGroup extends BaseHyperlinkGroup {
                 if (template == null) {
                     return false;
                 }
+
                 if (template.isJWorkBook() || DesignModeContext.isDuchampMode()) {
                     // 如果是普通报表单元格，那么没有 FormHyperlink 选项
                     FormHyperlinkProvider formHyperlink = StableFactory.getMarkedInstanceObjectFromClass(FormHyperlinkProvider.XML_TAG, FormHyperlinkProvider.class);
                     //返回true表示可用，返回false表示不可用
                     return !ComparatorUtils.equals(clazz, formHyperlink.getClass());
+
                 } else {
                     // 如果是决策报表
+                    Class[] classes = new Class[]{ChartHyperRelateCellLink.class, ChartHyperRelateFloatLink.class};
+                    for (Class aClass : classes) {
                         if (template.getEditingReportIndex() == BaseJForm.FORM_TAB) {
                             // 编辑的是决策报表中的图表，那么没有ChartHyperRelateFloatLink 和 ChartHyperRelateCellLink 选项，有FormHyperlink 选项
-                        Class[] classes = new Class[]{ChartHyperRelateCellLink.class, ChartHyperRelateFloatLink.class};
+                            if (ComparatorUtils.equals(aClass, clazz)) {
-                        return !ArrayUtils.contains(classes, clazz);
+                                return false;
+                            }
                         } else if (template.getEditingReportIndex() == BaseJForm.ELEMENTCASE_TAB) {
-                        // 编辑的是决策报表中的报表块，那么没有 ChartHyperPoplink 和 ChartHyperRelateFloatLink
+                            // 编辑的是决策报表中的报表块，那么没有 ChartHyperRelateFloatLink，有ChartHyperRelateCellLink 和 FormHyperlink 选项
-                        Class[] classes = new Class[]{ChartHyperPoplink.class, ChartHyperRelateFloatLink.class};
+                            return !ComparatorUtils.equals(clazz, ChartHyperRelateFloatLink.class);
-                        return !ArrayUtils.contains(classes, clazz);
+                        }
                     }
                 }
                 return true;
@@ -96,14 +101,17 @@ public class ChartHyperlinkGroup extends BaseHyperlinkGroup {
                     return !ComparatorUtils.equals(object.getClass(), formHyperlink.getClass());
                 } else {
                     // 如果是决策报表
+                    Class[] classes = new Class[]{ChartHyperRelateCellLink.class, ChartHyperRelateFloatLink.class};
+                    for (Class aClass : classes) {
                         if (template.getEditingReportIndex() == BaseJForm.FORM_TAB) {
                             // 编辑的是决策报表中的图表，那么没有ChartHyperRelateFloatLink 和 ChartHyperRelateCellLink 选项，有FormHyperlink 选项
-                        Class[] classes = new Class[]{ChartHyperRelateCellLink.class, ChartHyperRelateFloatLink.class};
+                            if (ComparatorUtils.equals(aClass, object.getClass())) {
-                        return !ArrayUtils.contains(classes, object.getClass());
+                                return false;
+                            }
                         } else if (template.getEditingReportIndex() == BaseJForm.ELEMENTCASE_TAB) {
-                        // 编辑的是决策报表中的报表块，那么没有 ChartHyperPoplink 和 ChartHyperRelateFloatLink
+                            // 编辑的是决策报表中的报表块，那么没有 ChartHyperRelateFloatLink，有ChartHyperRelateCellLink 和 FormHyperlink 选项
-                        Class[] classes = new Class[]{ChartHyperPoplink.class, ChartHyperRelateFloatLink.class};
+                            return !ComparatorUtils.equals(object.getClass(), ChartHyperRelateFloatLink.class);
-                        return !ArrayUtils.contains(classes, object.getClass());
+                        }
                     }
                 }
                 return true;

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

@@ -23,6 +23,7 @@ import com.fr.design.mainframe.EditingMouseListener;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.NoSupportAuthorityEdit;
 import com.fr.design.mainframe.WidgetPropertyPane;
+import com.fr.design.mainframe.loghandler.LogMessageBar;
 import com.fr.design.plugin.DesignerPluginContext;
 import com.fr.design.utils.gui.LayoutUtils;
 import com.fr.form.ui.Widget;
@@ -33,6 +34,7 @@ import com.fr.stable.StringUtils;
 
 import javax.swing.BorderFactory;
 import javax.swing.JComponent;
+import javax.swing.JFrame;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
 import javax.swing.border.Border;
@@ -776,6 +778,10 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 		if (popup == null) {
 			popup = new SelectedPopupDialog(this, designer);
 		}
+		JFrame frame = LogMessageBar.getInstance().getLogFrame();
+		if (frame!= null && frame.isActive()) {
+			return;
+		}
 		int creatorRightX = (int) ((bounds.x + bounds.width + SelectedPopupDialog.OFFSET_X) * designer.getScale());
 		int creatorRightY = (int) (bounds.y * designer.getScale());
 		int formDesignerWidth = designer.getWidth();
@@ -793,10 +799,20 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 		SwingUtilities.invokeLater(new Runnable() {
 			@Override
 			public void run() {
+				try {
 					popup.setLocation(designer.getLocationOnScreen().x + designer.getPaintX()  + extraX, designer.getLocationOnScreen().y + designer.getPaintY() + extraY);
 					popup.updatePane(designer);
-				popup.setVisible(selected && accept && popup.hasVisibleButtons() && popup.isCanVisible() && !isShowPluginDialog());
+					boolean needShowing = selected && accept && popup.hasVisibleButtons() && popup.isCanVisible() && !isShowPluginDialog();
+					// 当不可见时，且可以设置为可见状态，才去设置为可见
+					// 避免已经是可见状态时，重复设置可见，造成闪屏
+					if (!popup.isVisible() && needShowing) {
+						popup.setVisible(true);
+					} else if (!needShowing) {
+						popup.setVisible(false);
+					}
 					popup.setRelativeBounds(bounds);
+				} catch (Exception ignored) {
+				}
 			}
 		});
 	}

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

@@ -321,9 +321,8 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
         FormDesigner designer = editingMouseListener.getDesigner();
         if (e.getButton() == MouseEvent.BUTTON1 &&
                 (e.getClickCount() == 2 || designer.getCursor().getType() == Cursor.HAND_CURSOR)) {
-            FormElementCaseContainerProvider component = (FormElementCaseContainerProvider) designer.getComponentAt(e);
             //切换设计器
-            designer.switchTab(component);
+            designer.switchTab(this);
         }
     }
 

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

@@ -108,11 +108,6 @@ public class XWParameterLayout extends XWAbsoluteLayout {
         return false;
     }
 
-    @Override
-    public boolean canEnterIntoAdaptPane() {
-        return false;
-    }
-
     /**
      * 该组件是否可以拖拽(表单中参数面板和自适应布局不可以拖拽)
      * @return 是则返回true

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

@@ -34,6 +34,7 @@ import com.fr.design.utils.ComponentUtils;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.design.utils.gui.LayoutUtils;
 import com.fr.general.ComparatorUtils;
+import com.fr.stable.ArrayUtils;
 import com.fr.stable.Constants;
 
 import javax.swing.BorderFactory;
@@ -645,16 +646,15 @@ public class EditingMouseListener extends MouseInputAdapter {
                 selectionModel.selectACreatorAtMouseEvent(e);
                 refreshTopXCreator();
                 XCreator[] xCreators = selectionModel.getSelection().getSelectedCreators();
+                if (ArrayUtils.getLength(xCreators) == 1) {
                     // 放到事件队尾执行
                     SwingUtilities.invokeLater(new Runnable() {
                         @Override
                         public void run() {
-                        for (XCreator xCreator : xCreators) {
+                            xCreators[0].setSelected(!e.isShiftDown() && !e.isControlDown());
-                            xCreator.setSelected(!e.isShiftDown() && !e.isControlDown());
-                        }
                         }
                     });
-
+                }
             } else if (clickedNonCardButton && uneditedTab && responseTabLayout(oldCreator, e)) {
                 // do nothing
             } else {

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

@@ -84,24 +84,22 @@ public class FormSelectionUtils {
     }
 
     private static FormSelection filterFormSelection(FormSelection clipboard, XLayoutContainer parent) {
-        FormSelection newSelection = new FormSelection();
         for (XCreator xCreator : clipboard.getSelectedCreators()) {
             if (parent.acceptType(XWParameterLayout.class)) {
-                if (xCreator.canEnterIntoParaPane()) {
+                if (!xCreator.canEnterIntoParaPane()) {
-                    newSelection.addSelectedCreator(xCreator);
+                    clipboard.removeCreator(xCreator);
                 }
             } else if (parent.acceptType(XWAbsoluteLayout.class)) {
-                if (xCreator.canEnterIntoAbsolutePane()) {
+                if (!xCreator.canEnterIntoAbsolutePane()) {
-                    newSelection.addSelectedCreator(xCreator);
+                    clipboard.removeCreator(xCreator);
                 }
             } else if (parent.acceptType(XWFitLayout.class)) {
-                if (xCreator.canEnterIntoAdaptPane()) {
+                if (!xCreator.canEnterIntoAdaptPane()) {
-                    newSelection.addSelectedCreator(xCreator);
+                    clipboard.removeCreator(xCreator);
                 }
             }
-
         }
-        return newSelection;
+        return clipboard;
     }
 
     private static boolean isExtraContainer(XLayoutContainer parent) {

designer-form/src/main/java/com/fr/design/mainframe/share/action/InstallComponentAction.java

@@ -52,7 +52,8 @@ public class InstallComponentAction extends UpdateAction {
                         title(Toolkit.i18nText("Fine-Design_Basic_Select")).
                         filters(new FileChooser.ExtensionFilter[]{
                                 new FileChooser.ExtensionFilter("reu", "*.reu"),
-                                new FileChooser.ExtensionFilter("reus", "*.reus")}).
+                                new FileChooser.ExtensionFilter("reus", "*.reus"),
+                                new FileChooser.ExtensionFilter("zip", "*.zip")}).
                         build();
         int returnValue = fileChooserProvider.showDialog(null);
         installComponent(returnValue, fileChooserProvider.getSelectedFiles());
@@ -119,7 +120,7 @@ public class InstallComponentAction extends UpdateAction {
 
     private boolean containRues(File[] chosenFiles) {
         for (File file : chosenFiles) {
-            if (file.getName().endsWith(ReuxUtils.REUS_SUFFIX))
+            if (ReuxUtils.isReusFile(file))
                 return true;
         }
         return false;
@@ -141,8 +142,7 @@ public class InstallComponentAction extends UpdateAction {
             return false;
         }
         ShareComponentUtils.checkReadMe();
-        boolean isReus = chosenFile.getName().endsWith(ReuxUtils.REUS_SUFFIX);
+        return ReuxUtils.isReusFile(chosenFile) ? InstallUtils.installReusFile(chosenFile, installTime, failList) : InstallUtils.installReuFile(chosenFile, installTime, failList);
-        return isReus ? InstallUtils.installReusFile(chosenFile, installTime, failList) : InstallUtils.installReuFile(chosenFile, installTime, failList);
     }
 
     private static class InstallBackInfo {

designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/widgetpackage/OnlineWidgetPackagesShowPane.java

@@ -1,10 +1,13 @@
 package com.fr.design.mainframe.share.ui.online.widgetpackage;
 
 
+import com.fr.design.DesignerEnvManager;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.login.DesignerLoginHelper;
+import com.fr.design.login.DesignerLoginSource;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.share.ui.base.MouseClickListener;
 import com.fr.design.mainframe.share.ui.online.AbstractOnlineWidgetShowPane;
@@ -64,6 +67,11 @@ public class OnlineWidgetPackagesShowPane extends AbstractOnlineWidgetShowPane {
         downloadLabel = createLabel(Toolkit.i18nText("Fine-Design_Share_Download_All_Component"), new MouseClickListener() {
             @Override
             public void mouseClicked(MouseEvent e) {
+                String userName = DesignerEnvManager.getEnvManager().getDesignerLoginUsername();
+                if (StringUtils.isEmpty(userName)) {
+                    DesignerLoginHelper.showLoginDialog(DesignerLoginSource.NORMAL);
+                    return;
+                }
                 String message = Toolkit.i18nText("Fine-Design_Share_Download_All_Component_Message")
                         + "\n"
                         + Toolkit.i18nText("Fine-Design_Share_Total")

designer-form/src/main/java/com/fr/design/mainframe/share/util/InstallUtils.java

@@ -84,7 +84,7 @@ public class InstallUtils {
 
     @Nullable
     private static Group createComponentGroup(String fileName) {
-        String groupName = fileName.substring(0, fileName.indexOf(DOT + ReuxUtils.REUS_SUFFIX));
+        String groupName = createGroupName(fileName);
 
         //有重名分组则加后缀
         if (DefaultShareGroupManager.getInstance().getGroup(groupName) != null) {
@@ -101,6 +101,15 @@ public class InstallUtils {
         return DefaultShareGroupManager.getInstance().getGroup(groupName);
     }
 
+    private static String createGroupName(String fileName) {
+        for (String suffix : ReuxUtils.SUPPORT_REUS_SUFFIX) {
+            if (fileName.endsWith(suffix)) {
+                return fileName.substring(0, fileName.indexOf(DOT + suffix));
+            }
+        }
+        return fileName;
+    }
+
     private static boolean installReuFile(Group group, File chosenFile, long installTime) {
         try {
             if (!group.installModule(chosenFile)) {

designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormMultiWidgetCardPane.java

@@ -62,9 +62,6 @@ public class FormMultiWidgetCardPane extends FormWidgetCardPane {
                 },
                 new Component[] {
                         createAutoSpacingPane()
-                },
-                new Component[] {
-                        createManualSpacingPane()
                 }
         };
         return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 0, 16);

designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java

@@ -182,7 +182,10 @@ public class ListenerEditPane extends BasicBeanPane<Listener> {
     @Override
     public Listener updateBean() {
         String actionLocaleName = ReportEngineEventMapping.getLocaleName(listener.getEventName());
-        javaScriptActionPane.setResourceInfo(new JavaScriptResourceInfo(JavaScriptResourceInfo.Type.WEB_CONFIG, Toolkit.i18nText(actionLocaleName)));
+
+        JavaScriptResourceInfo.PathNode pathNode = JavaScriptResourceInfo.PathNode.create(JavaScriptResourceInfo.Type.WEB_CONFIG, Toolkit.i18nText(actionLocaleName));
+        JavaScriptResourceInfo javaScriptResourceInfo = new JavaScriptResourceInfo().addFirstPathNode(pathNode);
+        javaScriptActionPane.setResourceInfo(javaScriptResourceInfo);
         this.listener.setEventName(this.nameText.getText());
         FurtherBasicBeanPane<? extends JavaScript> pane = this.cards.get(this.styleBox.getSelectedIndex());
         this.listener.setAction(pane.updateBean());

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java

@@ -57,8 +57,6 @@ import javax.swing.KeyStroke;
 import javax.swing.SwingUtilities;
 import javax.swing.SwingWorker;
 import javax.swing.Timer;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
 import java.awt.AWTEvent;
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -242,21 +240,28 @@ public class AlphaFineDialog extends UIDialog {
             if (hotData == null) {
                 hotData = HotIssuesManager.getInstance().getHotIssues();
             }
-            for (int i = 0; i < hotData.length; i++) {
-                panel.add(new HotIssueJpanel(hotData[i], i + 1));
-            }
         } else {
             hotData = null;
-            for (int i = 0; i < AlphaFineConstants.HOT_ITEMS; i++) {
-                panel.add(new HotIssueJpanel(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Connection_Failed")}, i + 1));
-            }
         }
+        initHotPane(panel, hotData);
         hotPane.add(uiLabel, BorderLayout.NORTH);
         hotPane.add(panel, BorderLayout.CENTER);
         add(hotPane, BorderLayout.SOUTH);
         setSize(AlphaFineConstants.FULL_SIZE);
     }
 
+    private void initHotPane(JPanel panel, String[][] hotData) {
+        if (hotData == null) {
+            for (int i = 0; i < AlphaFineConstants.HOT_ITEMS; i++) {
+                panel.add(new HotIssueJpanel(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Connection_Failed")}, i + 1));
+            }
+        } else {
+            for (int i = 0; i < hotData.length; i++) {
+                panel.add(new HotIssueJpanel(hotData[i], i + 1));
+            }
+        }
+    }
+
     /**
      * 初始化输入框
      */

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/HotIssuesManager.java

@@ -20,6 +20,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.jetbrains.annotations.Nullable;
 
 
 /**
@@ -71,6 +72,7 @@ public class HotIssuesManager {
      * 从热门问题接口获取热门问题
      * @return
      */
+    @Nullable
     public String[][] getHotIssues() {
 
         try {
@@ -84,7 +86,7 @@ public class HotIssuesManager {
                 }
             }
         } catch (Exception e) {
-            FineLoggerFactory.getLogger().error("hotissues search error: " + e.getMessage());
+            FineLoggerFactory.getLogger().error("hotissues search error: " + e.getMessage(), e);
             return null;
         }
         return data;

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

@@ -156,11 +156,15 @@ public class DesignerSocketIO {
     private static String[] getSocketUri() throws IOException {
         Workspace current = WorkContext.getCurrent();
         URL url = new URL(current.getPath());
-        Integer[] ports = current.get(SocketInfoOperator.class).getPort();
+        Integer[] ports = WebSocketConfig.getInstance().getAvailablePorts();
         WorkspaceConnection connection = current.getConnection();
         // 服务器配置https  webSocket可能是wss也可能是ws webSocket的协议可以单独配置
         WebSocketProtocol webSocketProtocol = WebSocketConfig.getInstance().getProtocol();
         currentProtocol = webSocketProtocol == WebSocketProtocol.PLAIN ? HTTP : HTTPS;
+        if (WebSocketConfig.getInstance().isUsingProxy()) {
+            // 如果配置了代理服务器跟随服务器协议
+            currentProtocol = url.getProtocol();
+        }
         String[] result = new String[ports.length];
         for (int i = 0; i < ports.length; i++) {
             result[i] = String.format("%s://%s:%s%s?%s=%s&%s=%s",
@@ -173,7 +177,7 @@ public class DesignerSocketIO {
                     RemoteDesignConstants.USER_LOCK_ID,
                     connection.getId());
         }
-        FineLoggerFactory.getLogger().error("Available ports: {}, current Protocol: {}", Arrays.toString(ports), currentProtocol);
+        FineLoggerFactory.getLogger().info("Available ports: {}, current Protocol: {}", Arrays.toString(ports), currentProtocol);
         return result;
     }
 

designer-realize/src/main/java/com/fr/design/share/ui/config/table/ExpandEffectTable.java

@@ -114,15 +114,16 @@ public class ExpandEffectTable extends JPanel {
                     effectControlUpdatePane.populate();
                     effectPopupEditDialog = EffectPopupEditDialog.newInstance(ShareDialogUtils.getInstance().getConfigDialog(), effectControlUpdatePane);
                     effectPopupEditDialog.setTitle(selectEffectItem.getName());
-                    Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
-                    effectPopupEditDialog.setLocation((d.width - effectPopupEditDialog.getSize().width) / 2, (d.height - effectPopupEditDialog.getSize().height) / 2);
-                    effectPopupEditDialog.setVisible(true);
                     effectPopupEditDialog.addDialogActionListener(new DialogActionAdapter() {
                         @Override
                         public void doOk() {
                             effectControlUpdatePane.update();
                         }
                     });
+                    Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
+                    effectPopupEditDialog.setLocation((d.width - effectPopupEditDialog.getSize().width) / 2, (d.height - effectPopupEditDialog.getSize().height) / 2);
+                    effectPopupEditDialog.setModal(true);
+                    effectPopupEditDialog.setVisible(true);
                 }
             }
             public void mouseExited(MouseEvent e) {

designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java

@@ -519,7 +519,10 @@ public class EditToolBar extends BasicPane {
                 if (javaScriptPane == null || ((CustomToolBarButton) widget).getJSImpl() == null) {
                     javaScriptPane = JavaScriptActionPane.createDefault();
                 }
-                javaScriptPane.setResourceInfo(new JavaScriptResourceInfo(JavaScriptResourceInfo.Type.WIDGET, ((Button) widget).getText()));
+
+                JavaScriptResourceInfo.PathNode pathNode = JavaScriptResourceInfo.PathNode.create(JavaScriptResourceInfo.Type.WIDGET, ((Button) widget).getText());
+                JavaScriptResourceInfo javaScriptResourceInfo = new JavaScriptResourceInfo().addFirstPathNode(pathNode);
+                javaScriptPane.setResourceInfo(javaScriptResourceInfo);
 
                 javaScriptPane.setPreferredSize(new Dimension(750, 500));
                 BasicDialog dialog = javaScriptPane.showWindow(SwingUtilities.getWindowAncestor(ButtonPane.this));
@@ -541,6 +544,7 @@ public class EditToolBar extends BasicPane {
 
         /**
          * 更新
+         *
          * @param widget 对应组件
          */
         public void populate(Widget widget) {
@@ -572,7 +576,7 @@ public class EditToolBar extends BasicPane {
             count.setValue(((AppendColumnRow) widget).getCount());
         }
 
-		private void populateExport(){
+        private void populateExport() {
             card.show(centerPane, "export");
             Export export = (Export) widget;
             this.pdf.setSelected(export.isPdfAvailable());
@@ -581,9 +585,10 @@ public class EditToolBar extends BasicPane {
             this.excelS.setSelected(export.isExcelSAvailable());
             this.word.setSelected(export.isWordAvailable());
             this.image.setSelected(export.isImageAvailable());
-			if(exportToolBarProviders != null){
+            if (exportToolBarProviders != null) {
-				for(int i=0; i<exportToolBarProviders.length; i++){
+                for (int i = 0; i < exportToolBarProviders.length; i++) {
-					exportToolBarProviders[i].populate();;
+                    exportToolBarProviders[i].populate();
+                    ;
                 }
             }
         }
@@ -694,7 +699,10 @@ public class EditToolBar extends BasicPane {
             if (customToolBarButton.getJSImpl() == null) {
                 this.javaScriptPane = JavaScriptActionPane.createDefault();
             }
-            javaScriptPane.setResourceInfo(new JavaScriptResourceInfo(JavaScriptResourceInfo.Type.CUSTOM_BUTTON, ((Button) widget).getText()));
+
+            JavaScriptResourceInfo.PathNode pathNode = JavaScriptResourceInfo.PathNode.create(JavaScriptResourceInfo.Type.CUSTOM_BUTTON, ((Button) widget).getText());
+            JavaScriptResourceInfo javaScriptResourceInfo = new JavaScriptResourceInfo().addFirstPathNode(pathNode);
+            javaScriptPane.setResourceInfo(javaScriptResourceInfo);
 
             customToolBarButton.setJSImpl(this.javaScriptPane.updateBean());
         }

designer-realize/src/main/java/com/fr/design/widget/WidgetEventPane.java

@@ -70,11 +70,13 @@ public class WidgetEventPane extends UIListGroupControlPane {
 
     public static class WidgetEventListenerUpdatePane extends ListenerUpdatePane {
         private ElementCasePane epane;
+
         // 反射会用到
         public WidgetEventListenerUpdatePane() {
             this(null);
         }
-    	public WidgetEventListenerUpdatePane(ElementCasePane epane){
+
+        public WidgetEventListenerUpdatePane(ElementCasePane epane) {
             this.epane = epane;
             super.initComponents();
         }
@@ -94,7 +96,7 @@ public class WidgetEventPane extends UIListGroupControlPane {
 
                 @Override
                 protected DBManipulationPane createDBManipulationPane() {
-                    if(epane == null && DesignerContext.getDesignerFrame().getSelectedJTemplate() != null) {
+                    if (epane == null && DesignerContext.getDesignerFrame().getSelectedJTemplate() != null) {
                         return autoCreateDBManipulationInWidgetEventPane();
                     }
 
@@ -191,7 +193,13 @@ public class WidgetEventPane extends UIListGroupControlPane {
     public void wrapperListener(Listener listener) {
         if (listener.getAction() instanceof Commit2DBJavaScript) {
             Commit2DBJavaScript commit2DBJavaScript = (Commit2DBJavaScript) listener.getAction();
-            commit2DBJavaScript.setJsResourceInfo(new JavaScriptResourceInfo(JavaScriptResourceInfo.Type.WIDGET, targetWidget.getWidgetName()));
+            JavaScriptResourceInfo.PathNode widgetNode = JavaScriptResourceInfo.PathNode.create(JavaScriptResourceInfo.Type.WIDGET, targetWidget.getWidgetName());
+            JavaScriptResourceInfo.PathNode EventNode = JavaScriptResourceInfo.PathNode.create(JavaScriptResourceInfo.Type.EVENT, listener.getName());
+
+            JavaScriptResourceInfo javaScriptResourceInfo = new JavaScriptResourceInfo()
+                    .addFirstPathNode(EventNode)
+                    .addFirstPathNode(widgetNode);
+            commit2DBJavaScript.setJsResourceInfo(javaScriptResourceInfo);
         }
     }
 

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

@@ -53,6 +53,7 @@ public class DesignerWorkspaceActivator extends Activator {
             public void on(Event event, Workspace workspace) {
                 PluginClassRefreshManager.getInstance().removePluginListener();
                 HistoryTemplateListCache.getInstance().stash();
+                PluginClassRefreshManager.getInstance().fireTabChange();
             }
         });