From d03220af1c5e0589dce8a268040be98e52f292d9 Mon Sep 17 00:00:00 2001 From: "Bruce.Deng" Date: Mon, 27 Nov 2023 18:55:12 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-108718=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E5=81=B6=E7=8E=B0=E5=BC=82=E5=B8=B8=E5=BC=B9=E7=AA=97can=20not?= =?UTF-8?q?=20acceptnewurl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/deeplink/DeepLinkCore.java | 16 ++++++++++++++++ .../java/com/fr/design/utils/DesignUtils.java | 3 +-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/deeplink/DeepLinkCore.java b/designer-base/src/main/java/com/fr/design/deeplink/DeepLinkCore.java index c9b80ebf7..d4e7ce34a 100644 --- a/designer-base/src/main/java/com/fr/design/deeplink/DeepLinkCore.java +++ b/designer-base/src/main/java/com/fr/design/deeplink/DeepLinkCore.java @@ -167,6 +167,22 @@ public class DeepLinkCore { markPendingURLConsumed(); } + /** + * 符合条件的url才处理 + * + * @param url 接收到的url + * @return true:处理; false:不处理 + */ + public boolean accept(String url) { + UrlBean urlBean = UrlBean.create(url); + for (DeepLink deepLink: deepLinkList) { + if (deepLink.accept(urlBean.getUrl(), urlBean.getHost(), urlBean.getPath(), urlBean.getParams())) { + return true; + } + } + return false; + } + private void performDeepLinks(String url, String host, String path, Map params) { SwingUtilities.invokeLater(new Runnable() { @Override diff --git a/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java b/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java index bfba512a2..fb8e419fb 100644 --- a/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java +++ b/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java @@ -27,7 +27,6 @@ import com.fr.stable.StableUtils; import com.fr.stable.StringUtils; import com.fr.stable.bridge.ObjectHolder; import com.fr.stable.os.OperatingSystem; -import com.fr.stable.plugin.ExtraDesignClassManagerProvider; import com.fr.start.ServerStarter; import com.fr.start.common.DesignerStartupContext; import com.fr.start.common.DesignerStartupUtil; @@ -238,7 +237,7 @@ public class DesignUtils { DesignerContext.getDesignerFrame().openTemplate(new FileFILE(f)); } }); - } else { + } else if (DeepLinkCore.getInstance().accept(line)) { String url = line; UIUtil.invokeLaterIfNeeded(new Runnable() { @Override