From b57c77aa5c36630bf18456cfa0c2b8d46075cf01 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 2 Jul 2024 11:54:27 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E5=88=86?=
 =?UTF-8?q?=E4=BA=AB=E9=93=BE=E6=8E=A5ticket=E8=AE=BE=E7=BD=AE=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5=E6=B2=A1=E6=9C=89=E5=AE=9E=E6=97=B6=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/share/share/ShareHandler.vue    |  3 +--
 .../src/views/share/share/ShareTicket.vue     | 23 +++++++++++++++----
 .../src/views/share/share/ShareVisualHead.vue |  1 -
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/core/core-frontend/src/views/share/share/ShareHandler.vue b/core/core-frontend/src/views/share/share/ShareHandler.vue
index 10283cdf62..7ef01e432c 100644
--- a/core/core-frontend/src/views/share/share/ShareHandler.vue
+++ b/core/core-frontend/src/views/share/share/ShareHandler.vue
@@ -42,7 +42,7 @@
             :disabled="!linkCustom"
             @blur="finishEditUuid"
           >
-            <template #prefix>
+            <template v-if="!linkCustom" #prefix>
               {{ formatLinkBase() }}
             </template>
           </el-input>
@@ -122,7 +122,6 @@
     </div>
     <div v-if="shareEnable && showTicket" class="share-ticket-container">
       <share-ticket
-        :link-url="linkAddr"
         :uuid="state.detailInfo.uuid"
         :resource-id="props.resourceId"
         :ticket-require="state.detailInfo.ticketRequire"
diff --git a/core/core-frontend/src/views/share/share/ShareTicket.vue b/core/core-frontend/src/views/share/share/ShareTicket.vue
index 22dc519f92..ae850b71b9 100644
--- a/core/core-frontend/src/views/share/share/ShareTicket.vue
+++ b/core/core-frontend/src/views/share/share/ShareTicket.vue
@@ -156,11 +156,14 @@ import { useI18n } from '@/hooks/web/useI18n'
 import request from '@/config/axios'
 import { ElMessage, ElMessageBox } from 'element-plus-secondary'
 import useClipboard from 'vue-clipboard3'
+import { useEmbedded } from '@/store/modules/embedded'
+import { SHARE_BASE } from './option'
+
+const embeddedStore = useEmbedded()
 const { toClipboard } = useClipboard()
 const { t } = useI18n()
 const props = defineProps({
-  linkUrl: propTypes.string.def(null),
-  uuid: propTypes.string.def(null),
+  uuid: propTypes.string.def(''),
   resourceId: propTypes.string.def(null),
   ticketRequire: propTypes.bool
 })
@@ -234,9 +237,21 @@ const addRow = () => {
     state.tableData.splice(0, 0, row)
   })
 }
-
+const formatLinkAddr = () => {
+  return formatLinkBase() + props.uuid
+}
+const formatLinkBase = () => {
+  let prefix = '/'
+  if (embeddedStore.baseUrl) {
+    prefix = embeddedStore.baseUrl + '#'
+  } else {
+    const href = window.location.href
+    prefix = href.substring(0, href.indexOf('#') + 1)
+  }
+  return prefix + SHARE_BASE
+}
 const copyTicket = async ticket => {
-  const url = `${props.linkUrl}?ticket=${ticket}`
+  const url = `${formatLinkAddr()}?ticket=${ticket}`
   try {
     await toClipboard(url)
     ElMessage.success(t('common.copy_success'))
diff --git a/core/core-frontend/src/views/share/share/ShareVisualHead.vue b/core/core-frontend/src/views/share/share/ShareVisualHead.vue
index 050e073c1a..bfb2b72ccd 100644
--- a/core/core-frontend/src/views/share/share/ShareVisualHead.vue
+++ b/core/core-frontend/src/views/share/share/ShareVisualHead.vue
@@ -123,7 +123,6 @@
     </div>
     <div v-if="shareEnable && showTicket" class="share-ticket-container">
       <share-ticket
-        :link-url="linkAddr"
         :uuid="state.detailInfo.uuid"
         :resource-id="props.resourceId"
         :ticket-require="state.detailInfo.ticketRequire"