Merge pull request #5588 in DESIGN/design from release/11.0 to feature/x

* commit '9aa118158ea2e6e96ead62fbde4eb6b68e7510c1':
  REPORT-58267 【FRM布局推荐】组件复用-手动间距后期需要优化，暂时先屏蔽掉界面上的入口
  REPORT-58250 文件选择器弹窗-组件安装弹窗的文件格式，需要有zip格式
  REPORT-58081 决策报表-绝对布局下，选中多个组件复制，粘贴到另一个绝对布局模板中，现在不能粘贴得到所有复制的组件了，只得到一个组件；8.2的persist还可以多个复制粘贴
  REPORT-58136 远程设计无法新建决策报表
  REPORT-58222   设计器数据连接jdbc面板回退
  REPORT-58081 决策报表-绝对布局下，选中多个组件复制，粘贴到另一个绝对布局模板中，现在不能粘贴得到所有复制的组件了，只得到一个组件；8.2的persist还可以多个复制粘贴
  REPORT-51276 组件批量下载前需要登录
  REPORT-55717 解决组件快捷配置编辑按钮会打开多个弹窗问题

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/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-form/src/main/java/com/fr/design/mainframe/FormSelection.java

@@ -109,7 +109,7 @@ public class FormSelection {
     }
 
     /**
-     * 是否是可以增加的
+     * 是否是可以增加组件到已选中的组件里面
      *
      * @param creator 组件
      * @return 是则返回true

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());

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/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/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) {