Browse Source

Pull request #8522: REPORT-69213 函数在公式编辑器内不标蓝显示

Merge in DESIGN/design from ~PENGDA/design:release/11.0 to release/11.0

* commit '357274a6906ac54e947f5131c1b904ee870f690a':
  REPORT-69213 函数在公式编辑器内不标蓝显示
  REPORT-69213 函数在公式编辑器内不标蓝显示
bugfix/11.0
pengda 3 years ago
parent
commit
6f303756e8
  1. 5603
      designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/FormulaTokenMaker.java
  2. 20
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/FormulaTokenMaker.flex

5603
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

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

@ -590,7 +590,25 @@ FunctionNames = "ABS"|
"COUNTIFS"| "COUNTIFS"|
"countifs"| "countifs"|
"SUMIFS"| "SUMIFS"|
"sumifs" "sumifs"|
"ENDOFMONTH"|
"endofmonth"|
"NUMTOZH"|
"numtozh"|
"MIDCHAR"|
"midchar"|
"ISWORKDAY"|
"isworkday"|
"ENBYSTRNUM"|
"enbystrnum"|
"TEXTGETNUM"|
"textgetnum"|
"GETCHARNUM"|
"getcharnum"|
"GCD"|
"gcd"|
"LCM"|
"lcm"
%state MLC %state MLC

Loading…
Cancel
Save