Browse Source

Pull request #5619: REPORT-57992 公式编辑优化:实时计算GREPARRAY模拟计算值与预览不一致

Merge in DESIGN/design from ~HOKY.HE/design-hoky:feature/x to feature/x

* commit 'aa7d1f196c6be411ded65b71d57e780c1d897af0':
  REPORT-57992 公式编辑优化:实时计算GREPARRAY模拟计算值与预览不一致 1.忘记写ends
research/11.0
Hoky.He 3 years ago
parent
commit
711ac0b358
  1. 2
      designer-base/src/main/java/com/fr/design/formula/FormulaPane.java

2
designer-base/src/main/java/com/fr/design/formula/FormulaPane.java

@ -814,7 +814,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
}).setVisible(true); }).setVisible(true);
//过滤出数组参数,如:[1,2] //过滤出数组参数,如:[1,2]
for (Map.Entry<String, Object> entry : parameterMap.entrySet()) { for (Map.Entry<String, Object> entry : parameterMap.entrySet()) {
if (entry.getValue().toString().startsWith("[") && entry.getValue().toString().startsWith("]")) { if (entry.getValue().toString().startsWith("[") && entry.getValue().toString().endsWith("]")) {
Expression parse = calculator.parse(entry.getValue()); Expression parse = calculator.parse(entry.getValue());
ArrayExpression arrayExpression = (ArrayExpression) parse.getConditionalExpression(); ArrayExpression arrayExpression = (ArrayExpression) parse.getConditionalExpression();
FArray<Node> fArray = new FArray<>(arrayExpression.getArrays()); FArray<Node> fArray = new FArray<>(arrayExpression.getArrays());

Loading…
Cancel
Save