CHART-20402 增加几个接口

designer-base/src/main/java/com/fr/design/DesignerEnvManager.java

@@ -1645,7 +1645,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
 
 
     public boolean isOpenDebug() {
-        return openDebug;
+        return true;
     }
 
     public void setOpenDebug(boolean openDebug) {

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

@@ -17,6 +17,7 @@ import com.teamdev.jxbrowser.chromium.events.ScriptContextAdapter;
 import com.teamdev.jxbrowser.chromium.events.ScriptContextEvent;
 import com.teamdev.jxbrowser.chromium.events.ScriptContextListener;
 import com.teamdev.jxbrowser.chromium.swing.BrowserView;
+import com.teamdev.jxbrowser.event.Observer;
 
 import javax.swing.JDialog;
 import javax.swing.SwingUtilities;
@@ -157,6 +158,27 @@ public class ModernUIPane<T> extends BasicPane {
         return null;
     }
 
+    public void disposeBrowser() {
+
+        if(browser != null) {
+            browser.dispose();
+            browser = null;
+        }
+
+    }
+
+    public void clearCache() {
+        if (browser != null) {
+            browser.getCacheStorage().clearCache();
+        }
+    }
+
+    public void executeJavaScript(String javaScript) {
+        if (browser != null) {
+            browser.executeJavaScript(javaScript);
+        }
+    }
+
     public static class Builder<T> implements BuilderDiff<T> {
 
         private ModernUIPane<T> pane;
@@ -293,6 +315,12 @@ public class ModernUIPane<T> extends BasicPane {
             return this;
         }
 
+        @Override
+        public Builder<T> prepareForV7(Class event, Observer listener) {
+            // do nothing
+            return this;
+        }
+
         public ModernUIPane<T> build() {
             return pane;
         }

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

@@ -4,6 +4,7 @@ import com.fr.design.ui.ModernUIPane;
 import com.teamdev.jxbrowser.browser.callback.InjectJsCallback;
 import com.teamdev.jxbrowser.chromium.events.LoadListener;
 import com.teamdev.jxbrowser.chromium.events.ScriptContextListener;
+import com.teamdev.jxbrowser.event.Observer;
 
 /**
  * 封装jxbrwoser v6/v7的构建方式的差异
@@ -20,5 +21,6 @@ public interface BuilderDiff<T> {
 
     ModernUIPane.Builder<T> prepareForV7(InjectJsCallback callback);
 
+    ModernUIPane.Builder<T> prepareForV7(Class event, Observer listener);
 
 }

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

@@ -11,6 +11,17 @@ import com.fr.stable.os.OperatingSystem;
 public class ModernUIPaneFactory {
 
     public static <T> ModernUIPane.Builder<T> modernUIPaneBuilder() {
+
+        if (isV7()) {
+            return new NewModernUIPane.Builder<>();
+        } else {
+            return new ModernUIPane.Builder<>();
+        }
+
+    }
+
+    public static boolean isV7() {
+
         // 7.15的class不存在时 走老版本
         boolean hasJxBrowserV7_15 = true;
         try {
@@ -18,10 +29,8 @@ public class ModernUIPaneFactory {
         } catch (ClassNotFoundException e) {
             hasJxBrowserV7_15 = false;
         }
-        if (OperatingSystem.isWindows() && hasJxBrowserV7_15) {
-            return new NewModernUIPane.Builder<>();
-        } else {
-            return new ModernUIPane.Builder<>();
-        }
+
+        return OperatingSystem.isWindows() && hasJxBrowserV7_15;
+
     }
 }

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

@@ -15,6 +15,7 @@ import com.teamdev.jxbrowser.chromium.events.ScriptContextListener;
 import com.teamdev.jxbrowser.engine.Engine;
 import com.teamdev.jxbrowser.engine.EngineOptions;
 import com.teamdev.jxbrowser.engine.RenderingMode;
+import com.teamdev.jxbrowser.event.Observer;
 import com.teamdev.jxbrowser.js.JsObject;
 import com.teamdev.jxbrowser.net.Scheme;
 import com.teamdev.jxbrowser.view.swing.BrowserView;
@@ -100,7 +101,7 @@ public class NewModernUIPane<T> extends ModernUIPane<T> {
         EngineOptions options;
         if (scheme != null && requestCallback != null) {
             options = EngineOptions.newBuilder(RenderingMode.HARDWARE_ACCELERATED).addSwitch("--disable-google-traffic").addScheme(scheme, requestCallback).build();
-        } else  {
+        } else {
             options = EngineOptions.newBuilder(RenderingMode.HARDWARE_ACCELERATED).addSwitch("--disable-google-traffic").build();
         }
         Engine engine = Engine.newInstance(options);
@@ -161,6 +162,29 @@ public class NewModernUIPane<T> extends ModernUIPane<T> {
         return null;
     }
 
+    public void disposeBrowser() {
+
+        if (browser != null) {
+            browser.close();
+            browser = null;
+        }
+
+    }
+
+    public void clearCache() {
+        if (browser != null) {
+            browser.engine().httpCache().clear();
+        }
+    }
+
+    public void executeJavaScript(String javaScript) {
+        if (browser != null) {
+            browser.mainFrame().ifPresent(frame -> {
+                frame.executeJavaScript(javaScript);
+            });
+        }
+    }
+
     public static class Builder<T> extends ModernUIPane.Builder<T> {
 
         private NewModernUIPane<T> pane = new NewModernUIPane<>();
@@ -191,7 +215,7 @@ public class NewModernUIPane<T> extends ModernUIPane<T> {
         @Override
         public NewModernUIPane.Builder<T> withURL(final String url) {
             pane.scheme = Scheme.of("file");
-            pane.requestCallback =  new NxComplexInterceptRequestCallback(null);
+            pane.requestCallback = new NxComplexInterceptRequestCallback(null);
             pane.browser.navigation().loadUrl(url);
             return this;
         }
@@ -301,6 +325,14 @@ public class NewModernUIPane<T> extends ModernUIPane<T> {
             return prepare(callback);
         }
 
+        @Override
+        public ModernUIPane.Builder<T> prepareForV7(Class event, Observer listener) {
+
+            pane.browser.navigation().on(event, listener);
+
+            return this;
+        }
+
         @Override
         public NewModernUIPane<T> build() {
             return pane;

designer-realize/src/test/java/com/fr/design/mainframe/app/DesignerAppUtilsTest.java

@@ -3,7 +3,6 @@ package com.fr.design.mainframe.app;
 import com.fr.invoke.Reflect;
 import com.fr.plugin.context.PluginMarker;
 import com.fr.plugin.context.PluginMarkerAdapter;
-import com.fr.plugin.engine.remote.PluginRemoteSync;
 import com.fr.stable.TemplateIOErrorContextHolder;
 import com.fr.third.guava.collect.Multimap;
 import org.easymock.EasyMock;
@@ -24,83 +23,6 @@ import java.util.HashSet;
  * Created by vito on 2021/5/31
  */
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({PluginRemoteSync.class})
 public class DesignerAppUtilsTest {
-    @Test
-    public void testDealWithErrorDetailMultiLineAndCache() {
-        TemplateIOErrorContextHolder.registerPluginNameMap(new HashMap<String, String>() {{
-            put("2", "好用的插件");
-        }},new HashSet<>());
-        TemplateIOErrorContextHolder.addNeedEnablePlugin(PluginMarkerAdapter.create("1", "1.0", "1插件"));
-        TemplateIOErrorContextHolder.addNeedInstallPlugin(PluginMarker.create("2", "1.0"));
-        TemplateIOErrorContextHolder.addNeedInstallPlugin(PluginMarker.create("3", "1.0"));
-        String log = DesignerAppUtils.dealWithErrorDetailMultiLineAndCache("template1");
-        Assert.assertTrue(log.contains("1插件"));
-        Assert.assertTrue(log.contains("好用的插件"));
-        Assert.assertTrue(log.contains("3"));
-        Multimap<String, PluginMarkerAdapter> map = DesignerAppUtils.popPluginInfoMap("template1");
-        Assert.assertEquals(3, map.size());
-        Assert.assertNull(DesignerAppUtils.popPluginInfoMap("template1"));
-    }
 
-    @Test
-    public void testInvalidatePlugins() {
-        TemplateIOErrorContextHolder.registerPluginNameMap(new HashMap<String, String>() {{
-            put("2", "好用的插件");
-        }},new HashSet<>());
-        TemplateIOErrorContextHolder.addNeedEnablePlugin(PluginMarkerAdapter.create("1", "1.0", "1插件"));
-        TemplateIOErrorContextHolder.addNeedInstallPlugin(PluginMarker.create("2", "1.0"));
-        TemplateIOErrorContextHolder.addNeedInstallPlugin(PluginMarker.create("3", "1.0"));
-        String log = DesignerAppUtils.dealWithErrorDetailMultiLineAndCache("template1");
-        Assert.assertTrue(log.contains("1插件"));
-        Assert.assertTrue(log.contains("好用的插件"));
-        Assert.assertTrue(log.contains("3"));
-        DesignerAppUtils.invalidatePlugins("template1");
-        Assert.assertNull(DesignerAppUtils.popPluginInfoMap("template1"));
-    }
-
-    @Test
-    public void testRearrange(){
-        // 远程插件模拟注册
-        PluginRemoteSync pluginRemoteSync = EasyMock.createMock(PluginRemoteSync.class);
-        EasyMock.expect(pluginRemoteSync.getPluginRemoteStatusByIdIndex()).andReturn(new HashMap<String, PluginRemoteSync.PluginStatus>(){{
-            put("com.fr.plugin1", Reflect.on(PluginRemoteSync.PluginStatus.class).call("create","com.fr.plugin1","1",true).get());
-            put("com.fr.plugin2", Reflect.on(PluginRemoteSync.PluginStatus.class).call("create","com.fr.plugin2","1",true).get());
-            put("com.fr.plugin3", Reflect.on(PluginRemoteSync.PluginStatus.class).call("create","com.fr.plugin3","1",false).get());
-            put("com.fr.plugin4", Reflect.on(PluginRemoteSync.PluginStatus.class).call("create","com.fr.plugin4","1",false).get());
-        }}).anyTimes();
-        EasyMock.replay(pluginRemoteSync);
-        PowerMock.mockStaticPartial(PluginRemoteSync.class, "getInstance");
-        EasyMock.expect(PluginRemoteSync.getInstance()).andReturn(pluginRemoteSync).anyTimes();
-        PowerMock.replay(PluginRemoteSync.class);
-
-        // 本地插件模拟检查
-        TemplateIOErrorContextHolder.registerPluginNameMap(new HashMap<String, String>() {{
-            put("com.fr.plugin1", "好用的插件1");
-            put("com.fr.plugin2", "好用的插件2");
-            put("com.fr.plugin3", "好用的插件3");
-            put("com.fr.plugin4", "好用的插件4");
-            put("com.fr.plugin5", "好用的插件5");
-        }},new HashSet<>());
-        // unknown
-        TemplateIOErrorContextHolder.addNeedInstallPlugin(PluginMarker.create("com.fr.plugin7", "1"));
-        // disable
-        TemplateIOErrorContextHolder.addNeedEnablePlugin(PluginMarkerAdapter.create("com.fr.plugin5", "1", "plugin5"));
-        TemplateIOErrorContextHolder.addNeedInstallPlugin(PluginMarker.create("com.fr.plugin3", "1"));
-        // not install
-        TemplateIOErrorContextHolder.addNeedInstallPlugin(PluginMarker.create("com.fr.plugin1", "1"));
-        TemplateIOErrorContextHolder.addNeedInstallPlugin(PluginMarker.create("com.fr.plugin4", "1"));
-
-        Multimap<String, PluginMarkerAdapter> pendingPlugins = TemplateIOErrorContextHolder.getPendingPlugin();
-
-        Reflect.on(DesignerAppUtils.class).call("rearrange",pendingPlugins).get();
-        Assert.assertEquals(1,pendingPlugins.get(TemplateIOErrorContextHolder.UNKNOWN_PLUGIN).size());
-        Collection<PluginMarkerAdapter> pluginMarkerAdapters = pendingPlugins.get(TemplateIOErrorContextHolder.DISABLE_PLUGIN);
-        Assert.assertEquals(2, pluginMarkerAdapters.size());
-        pluginMarkerAdapters.contains(PluginMarker.create("com.fr.plugin3", "1"));
-        pluginMarkerAdapters.contains(PluginMarker.create("com.fr.plugin4", "1"));
-        Collection<PluginMarkerAdapter> pluginMarkerAdapters1 = pendingPlugins.get(TemplateIOErrorContextHolder.NOT_INSTALLED_PLUGIN);
-        Assert.assertEquals(1, pluginMarkerAdapters1.size());
-        pluginMarkerAdapters1.contains(PluginMarker.create("com.fr.plugin5","1"));
-    }
 }