Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~lanlan/design into release/10.0

designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java

@@ -39,6 +39,10 @@ import com.fr.van.chart.designer.style.VanChartStylePane;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
 import java.awt.Component;
@@ -47,10 +51,6 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 数据点提示内容界面，含有通用设置、富文本编辑器、自定义JS界面
@@ -411,10 +411,12 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
                 updateTooltipFormat(richTextTooltipContent, temporary);
 
                 SwingUtilities.getWindowAncestor(richEditorPane).setVisible(false);
+                VanChartRichEditorPane.checkDispose();
             }
 
             public void doCancel() {
                 SwingUtilities.getWindowAncestor(richEditorPane).setVisible(false);
+                VanChartRichEditorPane.checkDispose();
             }
         });
 

designer-chart/src/main/java/com/fr/van/chart/designer/component/richText/VanChartRichEditorPane.java

@@ -48,6 +48,8 @@ public class VanChartRichEditorPane {
     private static Browser browser;
     private static List<String> fieldNames;
 
+    private static final boolean USE_LIGHT_WEIGHT = SystemUtils.IS_OS_WINDOWS_10;
+
     public static List<String> getFieldNames() {
         return fieldNames;
     }
@@ -154,7 +156,7 @@ public class VanChartRichEditorPane {
     }
 
     public static ModernUIPane<VanChartRichEditorModel> initPane(VanChartRichEditorModel model) {
-        BrowserType type = SystemUtils.IS_OS_WINDOWS_10 ? BrowserType.LIGHTWEIGHT : BrowserType.HEAVYWEIGHT;
+        BrowserType type = USE_LIGHT_WEIGHT ? BrowserType.LIGHTWEIGHT : BrowserType.HEAVYWEIGHT;
         return new ModernUIPane.Builder<VanChartRichEditorModel>(type)
                 .prepare(new ScriptContextAdapter() {
                     public void onScriptContextCreated(ScriptContextEvent event) {
@@ -232,4 +234,11 @@ public class VanChartRichEditorPane {
 
         return "!(function () { window.transformI18n && window.transformI18n('" + language + "' || 'zh_CN'); }());";
     }
+
+    public static void checkDispose() {
+        if (USE_LIGHT_WEIGHT) {
+            browser.dispose();
+            richEditorPane = null;
+        }
+    }
 }