fix: formula diagnose

Author: fit2cloudwxx

frontend/packages/web/src/components/business/crm-formula-editor/diagnose/diagnose-rules/index.ts

@@ -2,7 +2,7 @@ import { useI18n } from '@lib/shared/hooks/useI18n';
 
 import { FormulaErrorCode } from '../../config';
 import { DiagnoseRule } from '../../types';
-import { isIllegalFunctionCall, isValueEnd, isValueStart } from './utils';
+import { isIllegalFunctionCall, isInsideFunctionArgs, isValueEnd, isValueStart } from './utils';
 
 const { t } = useI18n();
 
@@ -125,20 +125,43 @@ const commaPositionRule: DiagnoseRule = {
   },
 };
 
+export const illegalCommaRule: DiagnoseRule = {
+  name: 'illegal-comma',
+
+  check(ctx) {
+    const { cur, index, tokens } = ctx;
+    if (!cur) return;
+    const inFunctionArgs = isInsideFunctionArgs(tokens, index);
+    if (cur.type === 'comma' && !inFunctionArgs) {
+      ctx.push({
+        type: 'error',
+        code: FormulaErrorCode.SYNTAX_ERROR,
+        message: t('formulaEditor.diagnostics.missingOperatorUsedAsSeparator'),
+        highlight: {
+          tokenRange: [index, index],
+        },
+      });
+    }
+  },
+};
+
 // 相邻规则
 const adjacentValueRule: DiagnoseRule = {
   name: 'adjacent-value',
 
   check(ctx) {
-    const { prev, cur, index } = ctx;
+    const { prev, cur, index, tokens } = ctx;
     if (!prev || !cur) return;
     //  illegal-function-call 处理
     if (isIllegalFunctionCall(prev, cur)) return;
     if (isValueEnd(prev) && isValueStart(cur)) {
+      const inFunctionArgs = isInsideFunctionArgs(tokens, index);
       ctx.push({
         type: 'error',
         code: FormulaErrorCode.SYNTAX_ERROR,
-        message: t('formulaEditor.diagnostics.missingOperator'),
+        message: inFunctionArgs
+          ? t('formulaEditor.diagnostics.missingSeparator')
+          : t('formulaEditor.diagnostics.missingOperator'),
         highlight: {
           tokenRange: [index - 1, index],
         },
@@ -233,7 +256,8 @@ const RULES: DiagnoseRule[] = [
   leadingOperatorRule, // 放在最前面
   duplicateOperatorRule, // 连续操作符
   illegalTextRule, //  非法字符
-  illegalCommaCharRule, // 非法逗号字符
+  illegalCommaRule, // 非法逗号
+  illegalCommaCharRule, // 非法字符
   duplicateCommaRule, // 连续逗号
   commaPositionRule, // 逗号位置
   adjacentValueRule, // 相邻值

frontend/packages/web/src/components/business/crm-formula-editor/diagnose/diagnose-rules/utils.ts

@@ -55,3 +55,24 @@ export function isValueStart(token?: Token): boolean {
 export function isIllegalFunctionCall(prev?: Token, cur?: Token): boolean {
   return prev?.type === 'paren' && prev.value === ')' && cur?.type === 'paren' && cur.value === '(';
 }
+
+// 是否在函数参数内
+export function isInsideFunctionArgs(tokens: any[], index: number): boolean {
+  let depth = 0;
+
+  for (let i = index - 1; i >= 0; i--) {
+    const t = tokens[i];
+
+    if (t.type === 'paren' && t.value === ')') {
+      depth++;
+    } else if (t.type === 'paren' && t.value === '(') {
+      if (depth === 0) {
+        // 看左边是不是 function
+        return tokens[i - 1]?.type === 'function';
+      }
+      depth--;
+    }
+  }
+
+  return false;
+}

frontend/packages/web/src/components/business/crm-formula-editor/locale/en-US.ts

@@ -23,4 +23,5 @@ export default {
   'formulaEditor.diagnostics.missingOperator': 'Missing operator',
   'formulaEditor.diagnostics.invalidArgOfDAYS':
     'The {index}th parameter type error, parameter must be of number or date type',
+  'c': 'Commas cannot be used between fields, please use operators',
 };

frontend/packages/web/src/components/business/crm-formula-editor/locale/zh-CN.ts

@@ -21,4 +21,5 @@ export default {
   'formulaEditor.diagnostics.invalidFunctionCall': '非法的函数调用：表达式不能被再次调用',
   'formulaEditor.diagnostics.missingOperator': '缺少运算符',
   'formulaEditor.diagnostics.invalidArgOfDAYS': '第{index}个参数类型错误，必须为数字或日期类型',
+  'formulaEditor.diagnostics.missingOperatorUsedAsSeparator': '字段之间不能使用逗号，请使用运算符',
 };