From 9381d26599482d1a122edcbee56078a87e3dfa22 Mon Sep 17 00:00:00 2001
From: richie <richie@fanruan.com>
Date: Fri, 11 Dec 2020 15:59:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=B9=E7=AA=97=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                                                   | 3 ++-
 plugin.xml                                                     | 3 ++-
 .../fr/solution/plugin/design/formula/ui/GroupFormulaPane.java | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 89632b2..cf26a5f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,7 +25,8 @@ ext {
 
 group = 'com.fr.plugin'
 version = '10.0'
-sourceCompatibility = '8'
+sourceCompatibility = 8
+targetCompatibility = 8
 
 sourceSets {
     main {
diff --git a/plugin.xml b/plugin.xml
index 9601160..383c461 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -4,12 +4,13 @@
     <id>com.fr.solution.plugin.design.formula.script.v10</id>
     <name><![CDATA[增强公式编辑器]]></name>
     <active>yes</active>
-    <version>4.9.3</version>
+    <version>4.9.4</version>
     <env-version>10.0</env-version>
     <jartime>2019-10-20</jartime>
     <vendor>richie</vendor>
     <description><![CDATA[可以在公式中直接使用JavaScript脚本，进行更灵活的计算。]]></description>
     <change-notes><![CDATA[
+        [2020-12-11]修复有时候显示结果的弹框不在最前面的问题。<br/>
         [2020-11-23]兼容jdk11。<br/>
         [2020-07-15]修复搜索函数时无序的问题。<br/>
         [2019-12-25]仅支持10.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 63a1f1a..8270cce 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
@@ -334,7 +334,7 @@ public class GroupFormulaPane extends BasicPane implements UIFormula, OperateLis
             }
             BaseFormula formula = GroupFormulaPane.this.update();
             String message = calculate(formula, formulaPane.analyze4Parameters(calculator), calculator);
-            JOptionPane.showMessageDialog(DesignKit.getDesignerFrame(), message);
+            JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(GroupFormulaPane.this), message);
         }
     };