Merge pull request #3992 in DESIGN/design from bugfix/10.0 to release/10.0

* commit '215cd3f652684a821d4c9d8a864d8569373ec0d7': REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题 REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题 REPORT-50096 处理下切换数据连接场景
4 years ago · 37b7e3c39d
4 changed files with 106 additions and 10 deletions
--- a/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java
@ -1,6 +1,7 @@
 package com.fr.design.data.datapane;

 import com.fr.base.TableData;
+import com.fr.concurrent.NamedThreadFactory;
 import com.fr.data.core.DataCoreUtils;
 import com.fr.data.core.db.DBUtils;
 import com.fr.data.core.db.TableProcedure;
@ -17,7 +18,7 @@ import com.fr.design.data.datapane.preview.PreviewLabel.Previewable;
 import com.fr.design.data.datapane.preview.PreviewTablePane;
 import com.fr.design.data.tabledata.Prepare4DataSourceChange;
 import com.fr.design.dialog.FineJOptionPane;
-import com.fr.design.gui.icombobox.FRTreeComboBox;
+import com.fr.design.gui.icombobox.SearchPreTaskTreeComboBox;
 import com.fr.design.gui.icombobox.FilterableComboBoxModel;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.icombobox.UIComboBoxEditor;
@ -59,6 +60,10 @@ import java.util.Collection;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.FutureTask;

 /**
 * @author zhou
@ -80,21 +85,25 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
    /**
     * 表名
     */
-    protected FRTreeComboBox tableNameComboBox;
+    protected SearchPreTaskTreeComboBox tableNameComboBox;

    private SwingWorker populateWorker;

+    private static final ExecutorService SERVICE = Executors.newSingleThreadExecutor(new NamedThreadFactory("ChoosePaneThread"));

    private PopupMenuListener popupMenuListener = new PopupMenuListener() {

        @Override
        public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
-            new Thread() {
+            FutureTask<Void> task = new FutureTask<Void>(new Callable() {
                @Override
-                public void run() {
+                public Object call() {
                    calculateTableDataNames();
+                    return null;
                }
-            }.start();
+            });
+            SERVICE.submit(task);
+            tableNameComboBox.setPreSearchTask(task);
        }

        @Override
@ -158,7 +167,7 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
        schemaBox = new StringUIComboBox();
        schemaBox.setEditor(new ComboBoxEditor());

-        tableNameComboBox = new FRTreeComboBox(new JTree(new DefaultMutableTreeNode()), tableNameTreeRenderer, false);
+        tableNameComboBox = new SearchPreTaskTreeComboBox(new JTree(new DefaultMutableTreeNode()), tableNameTreeRenderer, false);
        tableNameComboBox.setEditable(true);
        tableNameComboBox.setRenderer(listCellRenderer);
        registerDSChangeListener();
--- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java
@ -100,6 +100,7 @@ public class JDBCDefPane extends JPanel {
    private IntegerEditor DBCP_MINEVICTABLEIDLETIMEMILLIS = new IntegerEditor();

    private JDBCDatabaseConnection jdbcDatabase;
+    private boolean needRefresh = true;

    public JDBCDefPane() {
        this.setBorder(UITitledBorder.createBorderWithTitle("JDBC" + ":"));
@ -201,11 +202,11 @@ public class JDBCDefPane extends JPanel {
    }

    public void populate(JDBCDatabaseConnection jdbcDatabase) {
+        needRefresh = false;
        if (jdbcDatabase == null) {
            jdbcDatabase = new JDBCDatabaseConnection();
        }
        this.jdbcDatabase = jdbcDatabase;
-        this.dbtypeComboBox.removeActionListener(dbtypeActionListener);
        if (ComparatorUtils.equals(jdbcDatabase.getDriver(), "sun.jdbc.odbc.JdbcOdbcDriver")
                && jdbcDatabase.getURL().startsWith("jdbc:odbc:Driver={Microsoft")) {
            this.dbtypeComboBox.setSelectedItem("Access");
@ -230,7 +231,6 @@ public class JDBCDefPane extends JPanel {
                this.dbtypeComboBox.setSelectedItem(OTHER_DB);
            }
        }
-        this.dbtypeComboBox.addActionListener(dbtypeActionListener);
        this.driverComboBox.setSelectedItem(jdbcDatabase.getDriver());
        this.urlTextField.setText(jdbcDatabase.getURL());
        this.userNameTextField.setText(jdbcDatabase.getUser());
@ -254,6 +254,7 @@ public class JDBCDefPane extends JPanel {
        this.DBCP_MINEVICTABLEIDLETIMEMILLIS.setValue(dbcpAttr.getMinEvictableIdleTimeMillis() / TIME_MULTIPLE);
        this.DBCP_NUMTESTSPEREVICTIONRUN.setValue(dbcpAttr.getNumTestsPerEvictionRun());
        this.DBCP_TIMEBETWEENEVICTIONRUNSMILLS.setValue(dbcpAttr.getTimeBetweenEvictionRunsMillis());
+        needRefresh = true;
    }

    public JDBCDatabaseConnection update() {
@ -306,8 +307,10 @@ public class JDBCDefPane extends JPanel {
                }
            }
            // 更改数据库类型后 数据库名称置空和之前逻辑保持一致
+            if (needRefresh) {
                jdbcDatabase.setDatabase(StringUtils.EMPTY);
            }
+        }
    };

    ActionListener driverListener = new ActionListener() {
--- a/designer-base/src/main/java/com/fr/design/gui/icombobox/FRTreeComboBox.java
+++ b/designer-base/src/main/java/com/fr/design/gui/icombobox/FRTreeComboBox.java
@ -597,6 +597,10 @@ public class FRTreeComboBox extends UIComboBox {
            return this.item;
        }

+        public boolean isSetting() {
+            return setting;
+        }
+
        public void insertUpdate(DocumentEvent e) {
            changeHandler();
        }
@ -614,11 +618,18 @@ public class FRTreeComboBox extends UIComboBox {
                return;
            }
            setPopupVisible(true);
+            search();
+        }
+
+        /**
+         * 模糊搜索，选中首个匹配项
+         */
+        protected void search() {
            this.item = textField.getText();
            TreeNode root = (TreeNode) tree.getModel().getRoot();
            TreePath parent = new TreePath(root);
            TreeNode node = (TreeNode) parent.getLastPathComponent();
-            dealSamePath(parent,node,textField);
+            dealSamePath(parent, node, textField);
            this.getEditorComponent().requestFocus();
        }

--- a/designer-base/src/main/java/com/fr/design/gui/icombobox/SearchPreTaskTreeComboBox.java
+++ b/designer-base/src/main/java/com/fr/design/gui/icombobox/SearchPreTaskTreeComboBox.java
@ -0,0 +1,73 @@
+package com.fr.design.gui.icombobox;
+
+import com.fr.log.FineLoggerFactory;
+
+import javax.swing.JTree;
+import javax.swing.SwingWorker;
+import javax.swing.tree.TreeCellRenderer;
+import java.util.concurrent.FutureTask;
+
+/**
+ * 模糊搜索前需执行完前置任务的TreeComboBox
+ * @author Lucian.Chen
+ * @version 10.0
+ * Created by Lucian.Chen on 2021/4/14
+ */
+public class SearchPreTaskTreeComboBox extends FRTreeComboBox {
+
+    /**
+     * 模糊搜索前任务
+     */
+    private FutureTask<Void> preSearchTask;
+
+    public SearchPreTaskTreeComboBox(JTree tree, TreeCellRenderer renderer, boolean editable) {
+        super(tree, renderer, editable);
+    }
+
+    public FutureTask<Void> getPreSearchTask() {
+        return preSearchTask;
+    }
+
+    public void setPreSearchTask(FutureTask<Void> preSearchTask) {
+        this.preSearchTask = preSearchTask;
+    }
+
+    protected UIComboBoxEditor createEditor() {
+        return new SearchPreTaskComboBoxEditor(this);
+    }
+
+    private class SearchPreTaskComboBoxEditor extends FrTreeSearchComboBoxEditor {
+
+        public SearchPreTaskComboBoxEditor(FRTreeComboBox comboBox) {
+            super(comboBox);
+        }
+
+        protected void changeHandler() {
+            if (isSetting()) {
+                return;
+            }
+            setPopupVisible(true);
+            // 模糊搜索异步
+            new SwingWorker<Void, Void>() {
+                @Override
+                protected Void doInBackground() {
+                    FutureTask<Void> task = getPreSearchTask();
+                    try {
+                        // 确保模糊搜索前任务执行完成后，再进行模糊搜索
+                        if (task != null) {
+                            task.get();
+                        }
+                    } catch (Exception e) {
+                        FineLoggerFactory.getLogger().error(e.getMessage(), e);
+                    }
+                    if (task != null) {
+                        // 任务执行后置空，否则会被别的操作重复触发
+                        setPreSearchTask(null);
+                    }
+                    search();
+                    return null;
+                }
+            }.execute();
+        }
+    }
+}