From 9a0b3023a07ab51950e4bbcc3611ead2980ff18b Mon Sep 17 00:00:00 2001
From: "Henry.Wang" <Henry.Wang@fanruan.com>
Date: Thu, 9 Jul 2020 15:01:07 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-31546=20=E5=85=AC=E5=BC=8F=E9=9D=A2?=
 =?UTF-8?q?=E6=9D=BF=E7=9A=84=E8=AF=B4=E6=98=8E=E5=88=87=E6=8D=A2=E5=81=B6?=
 =?UTF-8?q?=E5=B0=94=E4=BC=9A=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/formula/FormulaPane.java    | 83 ++++++++++++-------
 1 file changed, 54 insertions(+), 29 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/formula/FormulaPane.java b/designer-base/src/main/java/com/fr/design/formula/FormulaPane.java
index 9259248ac..96a82d228 100644
--- a/designer-base/src/main/java/com/fr/design/formula/FormulaPane.java
+++ b/designer-base/src/main/java/com/fr/design/formula/FormulaPane.java
@@ -246,44 +246,69 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
     }
 
     public class DoubleClick extends MouseAdapter {
+        String singlePressContent;
+
+        String doublePressContent;
+
+        @Override
+        public void mousePressed(MouseEvent e) {
+            int index = tipsList.getSelectedIndex();
+            if (index != -1) {
+                if (e.getClickCount() == 1) {
+                    singlePressContent = (String) listModel.getElementAt(index);
+                } else if (e.getClickCount() == 2) {
+                    doublePressContent = (String) listModel.getElementAt(index);
+                }
+            }
+        }
 
         @Override
-        public void mouseClicked(MouseEvent e) {
+        public void mouseReleased(MouseEvent e) {
             int index = tipsList.getSelectedIndex();
             if (index != -1) {
-                String currentLineContent = (String) listModel.getElementAt(index);
-                if (e.getClickCount() == 2) {
-                    if (ifHasBeenWriten == 0) {
-                        formulaTextArea.setForeground(Color.black);
-                        formulaTextArea.setText("");
+                if (e.getClickCount() == 1) {
+                    if (ComparatorUtils.equals((String) listModel.getElementAt(index), singlePressContent)) {
+                        singleClickActuator(singlePressContent);
                     }
-                    formulaTextArea.setForeground(Color.black);
-                    currentPosition = formulaTextArea.getCaretPosition();
-                    String output = currentLineContent + "()";
-                    String textAll = formulaTextArea.getText();
-                    String textReplaced;
-                    int position = 0;
-                    if (insertPosition <= currentPosition) {
-                        textReplaced = textAll.substring(0, insertPosition) + output + textAll.substring(currentPosition);
-                        position = insertPosition + output.length() - 1;
-                    } else {
-                        textReplaced = textAll.substring(0, currentPosition) + output + textAll.substring(insertPosition);
-                        position = currentPosition + output.length() - 1;
+                } else if (e.getClickCount() == 2) {
+                    if (ComparatorUtils.equals((String) listModel.getElementAt(index), doublePressContent)) {
+                        doubleClickActuator(doublePressContent);
                     }
-                    formulaTextArea.setText(textReplaced);
-                    formulaTextArea.requestFocusInWindow();
-                    formulaTextArea.setCaretPosition(position);
-                    insertPosition = position;
-                    ifHasBeenWriten = 1;
-                    listModel.removeAllElements();
-                } else if (e.getClickCount() == 1) {
-                    refreshDescriptionTextArea(currentLineContent);
-
-                    formulaTextArea.requestFocusInWindow();
-                    fixFunctionNameList();
                 }
             }
         }
+
+        private void singleClickActuator(String currentLineContent) {
+            refreshDescriptionTextArea(currentLineContent);
+            formulaTextArea.requestFocusInWindow();
+            fixFunctionNameList();
+        }
+
+        private void doubleClickActuator(String currentLineContent) {
+            if (ifHasBeenWriten == 0) {
+                formulaTextArea.setForeground(Color.black);
+                formulaTextArea.setText("");
+            }
+            formulaTextArea.setForeground(Color.black);
+            currentPosition = formulaTextArea.getCaretPosition();
+            String output = currentLineContent + "()";
+            String textAll = formulaTextArea.getText();
+            String textReplaced;
+            int position = 0;
+            if (insertPosition <= currentPosition) {
+                textReplaced = textAll.substring(0, insertPosition) + output + textAll.substring(currentPosition);
+                position = insertPosition + output.length() - 1;
+            } else {
+                textReplaced = textAll.substring(0, currentPosition) + output + textAll.substring(insertPosition);
+                position = currentPosition + output.length() - 1;
+            }
+            formulaTextArea.setText(textReplaced);
+            formulaTextArea.requestFocusInWindow();
+            formulaTextArea.setCaretPosition(position);
+            insertPosition = position;
+            ifHasBeenWriten = 1;
+            listModel.removeAllElements();
+        }
     }
 
     @Override