Browse Source

Pull request #6837: REPORT-63102 公式编辑器优化,多行函数错误返回值异常

Merge in DESIGN/design from ~HOKY.HE/design-hoky:release/11.0 to release/11.0

* commit 'f356dee37578b8ffbe1838429656d8b6a005cd29':
  REPORT-63102 公式编辑器优化,多行函数错误返回值异常 1.定制一个没有newline的frformulalexer
bugfix/11.0
Hoky.He 3 years ago
parent
commit
b97258a588
  1. 1689
      designer-base/src/main/java/com/fr/design/formula/FRFormulaLexer.java
  2. 4
      designer-base/src/main/java/com/fr/design/formula/FormulaChecker.java

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

File diff suppressed because it is too large Load Diff

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

@ -2,7 +2,6 @@ package com.fr.design.formula;
import com.fr.design.formula.exception.FormulaExceptionTipsProcessor;
import com.fr.design.i18n.Toolkit;
import com.fr.parser.FRLexer;
import com.fr.parser.FRParser;
import com.fr.script.checker.FunctionCheckerDispatcher;
import com.fr.script.checker.result.FormulaCheckResult;
@ -29,7 +28,8 @@ public class FormulaChecker {
}
//过滤一些空格等符号
StringReader in = new StringReader(formulaText);
FRLexer lexer = new FRLexer(in);
//此lexer为公式校验定制
FRFormulaLexer lexer = new FRFormulaLexer(in);
FRParser parser = new FRParser(lexer);
try {

Loading…
Cancel
Save