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 @@ com.fr.solution.plugin.design.formula.script.v10 yes - 4.9.3 + 4.9.4 10.0 2019-10-20 richie [2020-11-23]兼容jdk11。
[2020-07-15]修复搜索函数时无序的问题。
[2019-12-25]仅支持10.0版本。
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); } };