Merge pull request #10138 from dataease/dev-v2

merge

core/core-frontend/src/views/chart/components/views/index.vue

@@ -419,6 +419,10 @@ const jumpClick = param => {
             return
           }
 
+          if (isIframe.value) {
+            embeddedStore.clearState()
+          }
+
           if (iframeSelf) {
             router.push(parseUrl(url))
             return
@@ -438,6 +442,10 @@ const jumpClick = param => {
         divEmbedded('Iframe')
         return
       }
+
+      if (isIframe.value) {
+        embeddedStore.clearState()
+      }
       windowsJump(url, jumpInfo.jumpType)
     }
   } else {

core/core-frontend/src/views/data-visualization/PreviewCanvas.vue

@@ -73,6 +73,7 @@ const loadCanvasDataAsync = async (dvId, dvType) => {
       ElMessage.error(t('visualization.outer_param_decode_error'))
     }
   }
+  console.log('PreviewCanvas', dvId, jumpParam, attachParam)
 
   initCanvasData(
     dvId,
@@ -107,6 +108,7 @@ let p = null
 const XpackLoaded = () => p(true)
 onMounted(async () => {
   await new Promise(r => (p = r))
+  console.log('embeddedStore', embeddedStore, router)
   const dvId = embeddedStore.dvId || router.currentRoute.value.query.dvId
   const { dvType, callBackFlag } = router.currentRoute.value.query
   if (dvId) {

de-xpack

@@ -1 +1 @@
-Subproject commit 53654f4d703b81f2b261922419a0d13ce8b0b0c7
+Subproject commit e55d5ef12d98a142487a29b62343332f4884a3a2