Merge remote-tracking branch 'origin/feature/x' into feature/x

designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java

@@ -1016,6 +1016,17 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         }
     }
 
+    public byte[] exportData() throws Exception {
+        try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
+            BaseBook target = getTarget();
+            if (target != null) {
+                target.export(outputStream);
+                return outputStream.toByteArray();
+            }
+        }
+        return new byte[0];
+    }
+
     protected boolean export() throws Exception {
         return this.getTarget().export(TemplateResourceManager.getResource().saveTemplate(getEditingFILE()));
 

designer-base/src/main/java/com/fr/design/ui/ModernUIPane.java

@@ -203,6 +203,10 @@ public class ModernUIPane<T> extends BasicPane {
             this.pane = new ModernUIPane<>(browserType);
         }
 
+        public Builder(ModernUIPane<T> pane) {
+            this.pane = pane;
+        }
+
         public Builder<T> prepare(ScriptContextListener contextListener) {
             pane.browser.addScriptContextListener(contextListener);
             return this;

designer-base/src/main/java/com/fr/design/ui/compatible/NewModernUIPane.java

@@ -182,7 +182,7 @@ public class NewModernUIPane<T> extends ModernUIPane<T> {
     public void disposeBrowser() {
 
         if (browser != null) {
-            browser.close();
+            browser.engine().close();
             browser = null;
         }
 
@@ -206,6 +206,10 @@ public class NewModernUIPane<T> extends ModernUIPane<T> {
 
         private NewModernUIPane<T> pane = new NewModernUIPane<>();
 
+        public Builder() {
+            super((ModernUIPane<T>)null);
+        }
+
         public NewModernUIPane.Builder<T> prepare(InjectJsCallback callback) {
             pane.browser.set(InjectJsCallback.class, callback);
             return this;

designer-base/src/main/java/com/fr/design/utils/TemplateUtils.java

@@ -1,7 +1,6 @@
 package com.fr.design.utils;
 
 import com.fr.base.extension.FileExtension;
-import com.fr.base.io.BaseBook;
 import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.file.TemplateTreePane;
 import com.fr.design.i18n.Toolkit;
@@ -17,9 +16,9 @@ import com.fr.stable.CoreConstants;
 import com.fr.stable.ProductConstants;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.server.lock.TplOperator;
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStream;
+
 import javax.swing.SwingWorker;
+import java.io.OutputStream;
 
 /**
  * @author hades
@@ -65,12 +64,7 @@ public class TemplateUtils {
                 if (!needOpen) {
                     // 从当前编辑模板中生成备份文件
                     JTemplate<?, ?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
-                    ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-                    BaseBook target = template.getTarget();
-                    if (target != null) {
-                        target.export(outputStream);
-                        content = outputStream.toByteArray();
-                    }
+                    content = template.exportData();
                 } else {
                     content = WorkContext.getWorkResource().readFully(oldPath);
                 }

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

@@ -25,7 +25,7 @@ public class VanChartBackgroundPaneWithThemeStyle extends VanChartBackgroundPane
             }
         });
         paneList.add(new NullBackgroundQuickPane());
-        paneList.add(new ColorBackgroundQuickPane());
+        paneList.add(new ColorBackgroundQuickPane(true));
         paneList.add(new ImageBackgroundQuickPane(false));
         paneList.add(new VanChartGradientPane());
     }