diff --git a/core/backend/src/main/java/io/dataease/controller/IndexController.java b/core/backend/src/main/java/io/dataease/controller/IndexController.java index baae2b4468..4c867e4779 100644 --- a/core/backend/src/main/java/io/dataease/controller/IndexController.java +++ b/core/backend/src/main/java/io/dataease/controller/IndexController.java @@ -67,6 +67,10 @@ public class IndexController { if (StringUtils.isNotEmpty(attachParams)) { url = url + "&attachParams=" + attachParams; } + String fromLink = request.getParameter("fromLink"); + if (StringUtils.isNotEmpty(fromLink)) { + url = url + "&fromLink=" + fromLink; + } response.sendRedirect(url); } catch (IOException e) { LogUtil.error(e.getMessage()); diff --git a/core/frontend/public/link.html b/core/frontend/public/link.html index 38887b0b69..2bdb7b338c 100644 --- a/core/frontend/public/link.html +++ b/core/frontend/public/link.html @@ -33,6 +33,7 @@ const user = getQueryVariable('user') const terminal = getQueryVariable('terminal') const attachParams = getQueryVariable('attachParams') + const fromLink = getQueryVariable('fromLink') const baseUrl = window.location.pathname.replace('link.html', '') let url = baseUrl + "#/delink?link=" + encodeURIComponent(link) if (terminal) { @@ -44,6 +45,9 @@ if (attachParams) { url += '&attachParams=' + encodeURIComponent(attachParams) } + if (fromLink) { + url += '&fromLink=' + fromLink + } window.location.href = url diff --git a/core/frontend/src/components/canvas/components/editor/CanvasOptBar.vue b/core/frontend/src/components/canvas/components/editor/CanvasOptBar.vue index 6f305174fb..2b991acc10 100644 --- a/core/frontend/src/components/canvas/components/editor/CanvasOptBar.vue +++ b/core/frontend/src/components/canvas/components/editor/CanvasOptBar.vue @@ -12,7 +12,7 @@ >