Pull request #3994: 无jira 解决冲突

Merge in DESIGN/design from ~HENRY.WANG/design:feature/10.0 to feature/10.0

* commit '09f503171958ff3416466d8a33da4fdf38383031':
  REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
  REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
  REPORT-50096 处理下切换数据连接场景

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

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

@@ -98,6 +98,7 @@ public class JDBCDefPane extends JPanel {
 
 
     private JDBCDatabaseConnection jdbcDatabase;
+    private boolean needRefresh = true;
 
     public JDBCDefPane() {
         this.setBorder(UITitledBorder.createBorderWithTitle("JDBC" + ":"));
@@ -223,6 +224,7 @@ public class JDBCDefPane extends JPanel {
     }
 
     public void populate(JDBCDatabaseConnection jdbcDatabase) {
+        needRefresh = false;
         if (jdbcDatabase == null) {
             jdbcDatabase = new JDBCDatabaseConnection();
         }
@@ -261,6 +263,7 @@ public class JDBCDefPane extends JPanel {
         } else {
             this.charSetComboBox.setSelectedItem(jdbcDatabase.getOriginalCharsetName());
         }
+        needRefresh = false;
     }
 
     protected JDBCDatabaseConnection getJDBCDatabase() {
@@ -321,7 +324,9 @@ public class JDBCDefPane extends JPanel {
                 }
             }
             // 更改数据库类型后 数据库名称置空和之前逻辑保持一致
-            jdbcDatabase.setDatabase(StringUtils.EMPTY);
+            if (needRefresh) {
+                jdbcDatabase.setDatabase(StringUtils.EMPTY);
+            }
             changePane(dbtypeComboBox.getSelectedItem());
         }
     };

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

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