Pull request #1: Release/11.0

Merge in ~HOKY.HE/design-hoky from release/11.0 to final/11.0 * commit 'f6247b4f040f91488de70c20ccae7f7362321018': REPORT-60163 公式编辑器优化2.0 1.优化错误提示 2.修改埋点逻辑 REPORT-63192 【组件可更新提醒】组件复用-设计器端生成组件弹窗的类型改为必填
3 years ago · 0aa8d2dc39
5 changed files with 117 additions and 51 deletions
--- a/designer-base/src/main/java/com/fr/design/formula/FormulaPane.java
+++ b/designer-base/src/main/java/com/fr/design/formula/FormulaPane.java
@ -341,8 +341,10 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
            @Override
            public void focusGained(FocusEvent e) {
                // 获得焦点时 安装
+                if (autoCompletion == null && autoCompletionCheck.isSelected()) {
                    installAutoCompletion();
                }
+            }

            @Override
            public void focusLost(FocusEvent e) {
@ -405,14 +407,12 @@ 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) {
--- a/designer-base/src/main/java/com/fr/design/formula/exception/function/MismatchedCharFunction.java
+++ b/designer-base/src/main/java/com/fr/design/formula/exception/function/MismatchedCharFunction.java
@ -35,10 +35,6 @@ public class MismatchedCharFunction implements Function<Exception, FormulaCheckR
            case 1:
                sb.append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Expecting") + ": ");
                appendCharName(sb, charException.expecting);
-                sb.append(FormulaCheckConstants.COMMON)
-                        .append(FormulaCheckConstants.BLANK)
-                        .append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Found"));
-                appendCharName(sb, charException.foundChar);
                break;
            case 2:
                sb.append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Expecting_Anything") + ": ")
@ -58,8 +54,6 @@ public class MismatchedCharFunction implements Function<Exception, FormulaCheckR
                appendCharName(sb, charException.expecting);
                sb.append("..");
                appendCharName(sb, charException.upper);
-                sb.append(", ").append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Found"));
-                appendCharName(sb, charException.foundChar);
                break;
            case 5:
            case 6:
@ -71,9 +65,6 @@ public class MismatchedCharFunction implements Function<Exception, FormulaCheckR
                for (int i = 0; i < elems.length; ++i) {
                    appendCharName(sb, elems[i]);
                }
-
-                sb.append("), ").append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Found"));
-                appendCharName(sb, charException.foundChar);
                break;
            default:
                sb.append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Mismatched_Char"));
--- a/designer-base/src/main/java/com/fr/design/formula/exception/function/MismatchedTokenFunction.java
+++ b/designer-base/src/main/java/com/fr/design/formula/exception/function/MismatchedTokenFunction.java
@ -40,11 +40,7 @@ public class MismatchedTokenFunction implements Function<Exception, FormulaCheck
        switch (exception.mismatchType) {
            case 1:
                sb.append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Expecting") + ": ")
-                        .append(tokenName(exception.expecting, exception))
-                        .append(", ")
-                        .append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Found"))
-                        .append(FormulaCheckConstants.BLANK + FormulaCheckConstants.SINGLE_QUOTES)
-                        .append(tokenText).append("'");
+                        .append(tokenName(exception.expecting, exception));
                break;
            case 2:
                sb.append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Expecting_Anything") + ": ")
@ -59,9 +55,7 @@ public class MismatchedTokenFunction implements Function<Exception, FormulaCheck
                        .append(": ")
                        .append(tokenName(exception.expecting, exception))
                        .append("..")
-                        .append(tokenName(exception.upper, exception))
-                        .append(", ").append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Found"))
-                        .append("'").append(tokenText).append("'");
+                        .append(tokenName(exception.upper, exception));
                break;
            case 4:
                sb.append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Expecting") + ": ")
@ -71,12 +65,7 @@ public class MismatchedTokenFunction implements Function<Exception, FormulaCheck
                        .append(": ")
                        .append(tokenName(exception.expecting, exception))
                        .append("..")
-                        .append(tokenName(exception.upper, exception))
-                        .append(",").
-                        append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Found"))
-                        .append(" '")
-                        .append(tokenText)
-                        .append("'");
+                        .append(tokenName(exception.upper, exception));
                break;
            case 5:
            case 6:
@ -90,11 +79,6 @@ public class MismatchedTokenFunction implements Function<Exception, FormulaCheck
                    sb.append(tokenName(elms[i], exception));
                }

-                sb.append("),")
-                        .append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Found"))
-                        .append("'")
-                        .append(tokenText)
-                        .append("'");
                break;
            default:
                sb.append(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Mismatched_Token"));
@ -108,24 +92,10 @@ public class MismatchedTokenFunction implements Function<Exception, FormulaCheck
            return "<Set of tokens>";
        } else {
            String[] tokenNames = (String[]) getFieldValue(exception, "tokenNames");
-            return tokenType >= 0 && tokenType < tokenNames.length ? translateToken(tokenNames[tokenType]) : "<" + tokenType + ">";
+            return tokenType >= 0 && tokenType < tokenNames.length ? TranslateTokenUtils.translateToken(tokenNames[tokenType]) : "<" + tokenType + ">";
        }
    }

-    private String translateToken(String token) {
-        switch (token) {
-            case ("RPAREN"):
-                return ")";
-            case ("LPAREN"):
-                return "(";
-            case ("COMMA"):
-                return ",";
-            case ("COLON"):
-                return ":";
-            default:
-                return token;
-        }
-    }

    private Object getFieldValue(Object object, String fieldName) {
        try {
--- a/designer-base/src/main/java/com/fr/design/formula/exception/function/TranslateTokenUtils.java
+++ b/designer-base/src/main/java/com/fr/design/formula/exception/function/TranslateTokenUtils.java
@ -0,0 +1,96 @@
+package com.fr.design.formula.exception.function;
+
+import com.fr.design.i18n.Toolkit;
+
+/**
+ * @author Hoky
+ * @date 2021/11/30
+ */
+public class TranslateTokenUtils {
+    public static String translateToken(String token) {
+        switch (token) {
+            case ("RPAREN"):
+                return ")";
+            case ("LPAREN"):
+                return "(";
+            case ("COMMA"):
+                return ",";
+            case ("COLON"):
+                return ":";
+            case ("EOF"):
+                return Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Mismatched_EOF");
+            case ("DOT"):
+                return ".";
+            case ("FLOT_NUM"):
+                return Toolkit.i18nText("Fine-Design_Basic_Formula_Float_Number");
+            case ("LOR"):
+                return "||";
+            case ("LAND"):
+                return "&&";
+            case ("EQUAL"):
+                return "=";
+            case ("EQUAL2"):
+                return "=";
+            case ("NOT_EQUAL"):
+                return "!=";
+            case ("NOT_EQUAL2"):
+                return "!=";
+            case ("GE"):
+                return ">=";
+            case ("LE"):
+                return "<=";
+            case ("LT"):
+                return "<";
+            case ("PLUS"):
+                return "+";
+            case ("MINUS"):
+                return "-";
+            case ("STAR"):
+                return "*";
+            case ("DIV"):
+                return "/";
+            case ("MOD"):
+                return "%";
+            case ("POWER"):
+                return "^";
+            case ("LNOT"):
+                return "!";
+            case ("WAVE"):
+                return "~";
+            case ("LBRACK"):
+                return "[";
+            case ("SEMI"):
+                return ";";
+            case ("RBRACK"):
+                return "]";
+            case ("LCURLY"):
+                return "{";
+            case ("RCURLY"):
+                return "}";
+            case ("DCOLON"):
+                return ";";
+            case ("INT_NUM"):
+                return Toolkit.i18nText("Fine-Design_Basic_Formula_Integer");
+            case ("CR_ADRESS"):
+                return "\n";
+            case ("SHARP"):
+                return "#";
+            case ("AT"):
+                return "@";
+            case ("QUESTION"):
+                return "?";
+            case ("BOR"):
+                return "||";
+            case ("BAND"):
+                return "&&";
+            case ("Char"):
+                return Toolkit.i18nText("Fine-Design_Basic_Formula_Character");
+            case ("DIGIT"):
+                return Toolkit.i18nText("Fine-Design_Basic_Formula_Digital");
+            case ("XDIGIT"):
+                return Toolkit.i18nText("Fine-Design_Basic_Formula_Hexadecimal_Digital");
+            default:
+                return token;
+        }
+    }
+}
--- a/designer-realize/src/main/java/com/fr/design/share/ui/generate/ShareMainPane.java
+++ b/designer-realize/src/main/java/com/fr/design/share/ui/generate/ShareMainPane.java
@ -409,6 +409,15 @@ public class ShareMainPane extends JPanel {
                    childClassify.clearBoxItems();
                    childClassify.refreshBoxItems(children);
                }
+
+                notifyRequiredSettingChanged(new ChangeEvent(parentClassify));
+            }
+        });
+
+        childClassify.addItemListener(new ItemListener() {
+            @Override
+            public void itemStateChanged(ItemEvent e) {
+                notifyRequiredSettingChanged(new ChangeEvent(parentClassify));
            }
        });