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

* commit '68cd7d858fd0bff8e91faaaaf894f96be15b16fa':
  REPORT-62175 && REPORT-63204 1.埋点适配 2.针对sum(1,)等此类公式进行合法性判断

designer-base/src/main/java/com/fr/design/formula/FormulaPane.java

@@ -341,13 +341,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
             @Override
             public void focusGained(FocusEvent e) {
                 // 获得焦点时 安装
-                if (autoCompletion == null && autoCompletionCheck.isSelected()) {
+                installAutoCompletion();
-                    CompletionProvider provider = createCompletionProvider();
-                    autoCompletion = new FormulaPaneAutoCompletion(provider);
-                    autoCompletion.setListCellRenderer(new CompletionCellRenderer());
-                    autoCompletion.install(formulaTextArea);
-                    autoCompletion.installVariableTree(variableTreeAndDescriptionArea);
-                }
             }
 
             @Override
@@ -410,6 +404,16 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
         }
     }
 
+    private void installAutoCompletion() {
+        if (autoCompletion == null && autoCompletionCheck.isSelected()) {
+            CompletionProvider provider = createCompletionProvider();
+            autoCompletion = new FormulaPaneAutoCompletion(provider);
+            autoCompletion.setListCellRenderer(new CompletionCellRenderer());
+            autoCompletion.install(formulaTextArea);
+            autoCompletion.installVariableTree(variableTreeAndDescriptionArea);
+        }
+    }
+
 
     protected void extendCheckBoxPane(JPanel checkBoxPane) {
 
@@ -795,11 +799,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
         }
     };
 
-
+    private void calculateFormula() {
-    private final ActionListener calculateActionListener = new ActionListener() {
-
-        @Override
-        public void actionPerformed(ActionEvent e) {
         String formulaText = formulaTextArea.getText().trim();
         String unSupportFormula = containsUnsupportedSimulationFormulas(formulaText);
         if (unSupportFormula != null) {
@@ -848,6 +848,14 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
             confirmCheckResult(checkResult, messageTips);
         }
     }
+
+
+    private final ActionListener calculateActionListener = new ActionListener() {
+
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            calculateFormula();
+        }
     };
 
     private boolean confirmCheckResult(FormulaCheckResult checkResult, String messageTips) {