From a40557eb9fa4ae2997fed0bb43c04f4a3fd29368 Mon Sep 17 00:00:00 2001
From: richie <richie@fanruan.com>
Date: Mon, 23 Nov 2020 14:56:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9jdk11=E7=9A=84=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin.xml                                                 | 3 ++-
 .../plugin/design/formula/ui/GroupFormulaPane.java         | 4 ++--
 .../formula/ui/GroupFormulaPaneWhenReserveFormula.java     | 7 ++++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/plugin.xml b/plugin.xml
index d3ed429..9601160 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</version>
+    <version>4.9.3</version>
     <env-version>10.0</env-version>
     <jartime>2019-10-20</jartime>
     <vendor>richie</vendor>
     <description><![CDATA[可以在公式中直接使用JavaScript脚本，进行更灵活的计算。]]></description>
     <change-notes><![CDATA[
+        [2020-11-23]兼容jdk11。<br/>
         [2020-07-15]修复搜索函数时无序的问题。<br/>
         [2019-12-25]仅支持10.0版本。<br/>
         [2019-10-31]修复参数无法实时计算的问题。<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 ab50be8..63a1f1a 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
@@ -142,9 +142,9 @@ public class GroupFormulaPane extends BasicPane implements UIFormula, OperateLis
         calculateButton.addActionListener(calculateActionListener);
 
         JPanel checkBoxPane = GUICoreKit.createFlowPane();
-        checkBoxPane.setPreferredSize(new Dimension(450, 30));
+        checkBoxPane.setPreferredSize(new Dimension(440, 30));
         checkBoxAndButtonPane.add(checkBoxPane, BorderLayout.WEST);
-        checkBoxAndButtonPane.add(GUICoreKit.createFlowPane(checkValidButton, calculateButton), BorderLayout.EAST);
+        checkBoxAndButtonPane.add(GUICoreKit.createFlowPane(checkValidButton, calculateButton), BorderLayout.CENTER);
         extendCheckBoxPane(checkBoxPane);
         variableTreeAndDescriptionArea = new VariableTreeAndDescriptionArea();
         this.add(variableTreeAndDescriptionArea, BorderLayout.SOUTH);
diff --git a/src/main/java/com/fr/solution/plugin/design/formula/ui/GroupFormulaPaneWhenReserveFormula.java b/src/main/java/com/fr/solution/plugin/design/formula/ui/GroupFormulaPaneWhenReserveFormula.java
index b11452e..9c63fa0 100644
--- a/src/main/java/com/fr/solution/plugin/design/formula/ui/GroupFormulaPaneWhenReserveFormula.java
+++ b/src/main/java/com/fr/solution/plugin/design/formula/ui/GroupFormulaPaneWhenReserveFormula.java
@@ -1,6 +1,7 @@
 package com.fr.solution.plugin.design.formula.ui;
 
 import com.fanruan.api.design.ui.component.UICheckBox;
+import com.fanruan.api.design.util.GUICoreKit;
 import com.fr.base.BaseFormula;
 import com.fr.design.formula.VariableResolver;
 import com.fr.solution.plugin.design.formula.compat.DesignToolkit;
@@ -36,8 +37,8 @@ public class GroupFormulaPaneWhenReserveFormula extends GroupFormulaPane {
         reserveCheckBox4Write = new UICheckBox(DesignToolkit.getLocText("Plugin-Design_Basic_Write_Save_Formula"));
         reserveCheckBox4Write.setSelected(false);
 
-        checkBoxPane.add(reserveCheckBox4Result, BorderLayout.CENTER);
-        checkBoxPane.add(reserveCheckBox4Write, BorderLayout.SOUTH);
+        checkBoxPane.add(reserveCheckBox4Result);
+        checkBoxPane.add(reserveCheckBox4Write);
     }
 
     @Override
@@ -49,7 +50,7 @@ public class GroupFormulaPaneWhenReserveFormula extends GroupFormulaPane {
 
     @Override
     public BaseFormula update() {
-        BaseFormula formula =  super.update();
+        BaseFormula formula = super.update();
         if (formula != null) {
             formula.setReserveInResult(this.reserveCheckBox4Result.isSelected());
             formula.setReserveOnWriteOrAnaly(this.reserveCheckBox4Write.isSelected());