Browse Source

Merge pull request #1121 in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0

* commit 'b3355f517a425ec0a345c4254f0b6380e12de746':
  REPORT-21408 sumprecise 函数问题 公式需要变蓝, 改第三方库
feature/big-screen
Harrison 5 years ago
parent
commit
5b6afe698d
  1. 3657
      designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/FormulaTokenMaker.java
  2. 8
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/FormulaTokenMaker.flex

3657
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/FormulaTokenMaker.java

File diff suppressed because it is too large Load Diff

8
designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/FormulaTokenMaker.flex

@ -578,7 +578,13 @@ FunctionNames = "ABS"|
"YEAR"| "YEAR"|
"year"| "year"|
"YEARDELTA"| "YEARDELTA"|
"yeardelta" "yeardelta"|
"SUMPRECISE"|
"sumprecise"|
"QUERY"|
"query"|
"WEBIMAGE"|
"webimage"
%state MLC %state MLC

Loading…
Cancel
Save