Browse Source

bug修复

pull/4/head
richie 5 years ago
parent
commit
248e34b8a1
  1. 3
      plugin.xml
  2. 15
      src/main/java/com/fr/solution/plugin/design/formula/ui/GroupFormulaPane.java

3
plugin.xml

@ -4,12 +4,13 @@
<id>com.fr.solution.plugin.design.formula.script</id>
<name><![CDATA[增强公式编辑器]]></name>
<active>yes</active>
<version>4.5</version>
<version>4.6</version>
<env-version>9.0~10.0</env-version>
<jartime>2017-10-20</jartime>
<vendor>richie</vendor>
<description><![CDATA[可以在公式中直接使用JavaScript脚本,进行更灵活的计算。]]></description>
<change-notes><![CDATA[
[2019-10-31]修复参数无法实时计算的问题。<br/>
[2019-05-23]脚本公式可以正确的校验公式的合法性。<br/>
[2019-03-21]一个国际化问题。<br/>
[2019-03-19]修复在9.0中无法打开的问题。<br/>

15
src/main/java/com/fr/solution/plugin/design/formula/ui/GroupFormulaPane.java

@ -342,7 +342,7 @@ public class GroupFormulaPane extends BasicPane implements UIFormula, OperateLis
}
}).setVisible(true);
}
calculator.pushNameSpace(ParameterKit.createParameterMapNameSpace(parameterMap));
calculator.pushNameSpace(ParameterKit.createParameterMapNameSpace(realMap(parameterMap)));
String message;
try {
Object result = formula.evalValue(calculator);
@ -353,6 +353,19 @@ public class GroupFormulaPane extends BasicPane implements UIFormula, OperateLis
return message;
}
private Map<String, Object> realMap(Map<String, Object> source) {
Map<String, Object> map = new HashMap<String, Object>();
for (Map.Entry<String, Object> entry : source.entrySet()) {
String name = entry.getKey();
if (name.startsWith("$")) {
map.put(name.substring(1), entry.getValue());
} else {
map.put(name, entry.getValue());
}
}
return map;
}
public class VariableTreeAndDescriptionArea extends JPanel {
private JTree variablesTree;

Loading…
Cancel
Save