From 3467a91b6f84d81247838effc07d26831434fe83 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Fri, 20 Dec 2024 14:19:16 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E5=88=86?=
 =?UTF-8?q?=E4=BA=AB-=E5=88=86=E4=BA=AB=E9=94=99=E8=AF=AF=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../share/manage/XpackShareManage.java         |  1 +
 .../src/views/share/link/index.vue             | 11 +++++------
 .../src/views/share/link/mobile.vue            | 18 +++++++++++++-----
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/share/manage/XpackShareManage.java b/core/core-backend/src/main/java/io/dataease/share/manage/XpackShareManage.java
index efdf9eb049..5cdeb14057 100644
--- a/core/core-backend/src/main/java/io/dataease/share/manage/XpackShareManage.java
+++ b/core/core-backend/src/main/java/io/dataease/share/manage/XpackShareManage.java
@@ -239,6 +239,7 @@ public class XpackShareManage {
         if (!peRequireValid(sharedBase, xpackShare)) {
             XpackShareProxyVO vo = new XpackShareProxyVO();
             vo.setPeRequireValid(false);
+            vo.setInIframeError(false);
             return vo;
         }
         String linkToken = LinkTokenUtil.generate(xpackShare.getCreator(), xpackShare.getResourceId(), xpackShare.getExp(), xpackShare.getPwd(), xpackShare.getOid());
diff --git a/core/core-frontend/src/views/share/link/index.vue b/core/core-frontend/src/views/share/link/index.vue
index c1610fdf0c..232c35ecb8 100644
--- a/core/core-frontend/src/views/share/link/index.vue
+++ b/core/core-frontend/src/views/share/link/index.vue
@@ -3,13 +3,12 @@
     class="link-container"
     v-loading="loading || requestStore.loadingMap[permissionStore.currentPath]"
   >
-    <ErrorTemplate
-      v-if="!loading && (disableError || peRequireError)"
-      :msg="
-        disableError ? '已禁用分享功能，请联系管理员！' : '已设置有效期密码必填，当前链接无效！'
-      "
-    />
+    <ErrorTemplate v-if="!loading && disableError" msg="已禁用分享功能，请联系管理员！" />
     <IframeError v-else-if="!loading && iframeError" />
+    <ErrorTemplate
+      v-else-if="!loading && peRequireError"
+      msg="已设置有效期密码必填，当前链接无效！"
+    />
     <LinkError v-else-if="!loading && !linkExist" />
     <Exp v-else-if="!loading && linkExp" />
     <PwdTips v-else-if="!loading && !pwdValid" />
diff --git a/core/core-frontend/src/views/share/link/mobile.vue b/core/core-frontend/src/views/share/link/mobile.vue
index 54efa2d946..dc74128711 100644
--- a/core/core-frontend/src/views/share/link/mobile.vue
+++ b/core/core-frontend/src/views/share/link/mobile.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="mobile-link-container" v-loading="loading">
+    <ErrorTemplate v-if="!loading && disableError" msg="已禁用分享功能，请联系管理员！" />
+    <IframeError v-else-if="!loading && iframeError" />
     <ErrorTemplate
-      v-if="!loading && (disableError || peRequireError)"
-      :msg="
-        disableError ? '已禁用分享功能，请联系管理员！' : '已设置有效期密码必填，当前链接无效！'
-      "
+      v-else-if="!loading && peRequireError"
+      msg="已设置有效期密码必填，当前链接无效！"
     />
-    <LinkError v-if="!loading && !linkExist" />
+    <LinkError v-else-if="!loading && !linkExist" />
     <Exp v-else-if="!loading && linkExp" />
     <PwdTips v-else-if="!loading && !pwdValid" />
     <TicketError
@@ -29,6 +29,7 @@ import TicketError from './TicketError.vue'
 import { ProxyInfo, shareProxy } from './ShareProxy'
 import Exp from './exp.vue'
 import LinkError from './error.vue'
+import IframeError from './IframeError.vue'
 import PwdTips from './pwd.vue'
 import ErrorTemplate from './ErrorTemplate.vue'
 const disableError = ref(true)
@@ -36,6 +37,7 @@ const peRequireError = ref(true)
 const linkExist = ref(false)
 const loading = ref(true)
 const linkExp = ref(false)
+const iframeError = ref(true)
 const pwdValid = ref(false)
 const dvMainStore = dvMainStoreWithOut()
 const pcanvas = ref(null)
@@ -58,6 +60,12 @@ onMounted(async () => {
     return
   }
   disableError.value = false
+  if (proxyInfo?.inIframeError) {
+    loading.value = false
+    iframeError.value = true
+    return
+  }
+  iframeError.value = false
   if (proxyInfo && !proxyInfo.peRequireValid) {
     loading.value = false
     peRequireError.value = true