From 248e34b8a12fdce3d854253321cc90825267e755 Mon Sep 17 00:00:00 2001
From: richie <richie@fanruan.com>
Date: Thu, 31 Oct 2019 19:25:37 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin.xml                                        |  3 ++-
 .../design/formula/ui/GroupFormulaPane.java       | 15 ++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/plugin.xml b/plugin.xml
index 1af9e50..9e4ad4d 100644
--- a/plugin.xml
+++ b/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/>
diff --git a/src/main/java/com/fr/solution/plugin/design/formula/ui/GroupFormulaPane.java b/src/main/java/com/fr/solution/plugin/design/formula/ui/GroupFormulaPane.java
index f0b45b1..fe90b8c 100644
--- a/src/main/java/com/fr/solution/plugin/design/formula/ui/GroupFormulaPane.java
+++ b/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;