Merge branch 'fix/data-view-embed' into 'main_dev'

fix: 修复大屏内嵌组态,公开大屏未携带公开的大屏token

See merge request yunteng/thingskit-scada!190

@@ -11,7 +11,8 @@ import { MessageEnum } from '@/enums/messageEnum'
 
 
 export function useContentData() {
 export function useContentData() {
   const contentDataStore = useContentDataStoreWithOut()
   const contentDataStore = useContentDataStoreWithOut()
-  const { mode, publicId, configurationId, userId } = useParseParams()
+  const params = useParseParams()
+  const { mode, publicId, configurationId, userId } = params
   const userStore = useUserStoreWithOut()
   const userStore = useUserStoreWithOut()
   const { createMessage } = useMessage()
   const { createMessage } = useMessage()
 
 

@@ -8,6 +8,7 @@ interface HashParams {
   platform?: PlatformEnum
   platform?: PlatformEnum
   publicId?: string
   publicId?: string
   userId?: string
   userId?: string
+  parentPageIsPublic?: boolean
 }
 }
 
 
 export function useParseParams(): HashParams {
 export function useParseParams(): HashParams {

@@ -52,6 +52,6 @@ export function isDesignMode(): boolean {
 }
 }
 
 
 export function isShareMode(): boolean {
 export function isShareMode(): boolean {
-  const { mode } = useParseParams()
-  return mode === PageModeEnum.SHARE
+  const { mode, parentPageIsPublic } = useParseParams()
+  return mode === PageModeEnum.SHARE || !!parentPageIsPublic
 }
 }