From e065b2b79af6405ce3791c7d4b004c8a3c89ba7b Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 1 Apr 2024 13:52:58 +0800
Subject: [PATCH 1/6] =?UTF-8?q?fix:=20iframe=E5=B5=8C=E5=85=A5=E5=BC=8F?=
 =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E6=A0=91=E6=97=A0=E6=B3=95=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E6=96=B0=E9=A1=B5=E9=9D=A2=E9=A2=84=E8=A7=88=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/dashboard/DbToolbar.vue    | 16 +++++++++++++++-
 core/core-frontend/src/permission.ts          |  2 +-
 .../data-visualization/PreviewCanvas.vue      | 12 ++++++++++--
 .../views/data-visualization/PreviewHead.vue  | 19 +++++++++++++++++--
 4 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/core/core-frontend/src/components/dashboard/DbToolbar.vue b/core/core-frontend/src/components/dashboard/DbToolbar.vue
index 40a7d2f7de..6ff00cc466 100644
--- a/core/core-frontend/src/components/dashboard/DbToolbar.vue
+++ b/core/core-frontend/src/components/dashboard/DbToolbar.vue
@@ -25,6 +25,7 @@ import { copyStoreWithOut } from '@/store/modules/data-visualization/copy'
 import TabsGroup from '@/custom-component/component-group/TabsGroup.vue'
 import DeResourceGroupOpt from '@/views/common/DeResourceGroupOpt.vue'
 import OuterParamsSet from '@/components/visualization/OuterParamsSet.vue'
+import { XpackComponent } from '@/components/plugin'
 const { t } = useI18n()
 const dvMainStore = dvMainStoreWithOut()
 const snapshotStore = snapshotStoreWithOut()
@@ -102,7 +103,8 @@ const previewOuter = () => {
   }
   canvasSave(() => {
     const url = '#/preview?dvId=' + dvInfo.value.id
-    window.open(url, '_blank')
+    const newWindow = window.open(url, '_blank')
+    initOpenHandler(newWindow)
   })
 }
 
@@ -323,6 +325,17 @@ const onDvNameChange = () => {
 }
 const appStore = useAppStoreWithOut()
 const isDataEaseBi = computed(() => appStore.getIsDataEaseBi)
+
+const openHandler = ref(null)
+const initOpenHandler = newWindow => {
+  if (openHandler?.value) {
+    const pm = {
+      methodName: 'initOpenHandler',
+      args: newWindow
+    }
+    openHandler.value.invokeMethod(pm)
+  }
+}
 </script>
 
 <template>
@@ -574,6 +587,7 @@ const isDataEaseBi = computed(() => appStore.getIsDataEaseBi)
     />
     <outer-params-set ref="outerParamsSetRef"> </outer-params-set>
   </div>
+  <XpackComponent ref="openHandler" jsname="L2NvbXBvbmVudC9lbWJlZGRlZC1pZnJhbWUvT3BlbkhhbmRsZXI=" />
 </template>
 
 <style lang="less" scoped>
diff --git a/core/core-frontend/src/permission.ts b/core/core-frontend/src/permission.ts
index 9140b459cf..9c0e6cfffd 100644
--- a/core/core-frontend/src/permission.ts
+++ b/core/core-frontend/src/permission.ts
@@ -23,7 +23,7 @@ const { start, done } = useNProgress()
 const { loadStart, loadDone } = usePageLoading()
 
 const whiteList = ['/login', '/de-link', '/chart-view'] // 不重定向白名单
-const embeddedWindowWhiteList = ['/dvCanvas', '/dashboard']
+const embeddedWindowWhiteList = ['/dvCanvas', '/dashboard', '/preview']
 const embeddedRouteWhiteList = ['/dataset-embedded', '/dataset-form', '/dataset-embedded-form']
 router.beforeEach(async (to, from, next) => {
   start()
diff --git a/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue b/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue
index 57d8a973e1..3a48d0d067 100644
--- a/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue
+++ b/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue
@@ -9,6 +9,7 @@ import { Base64 } from 'js-base64'
 import { getOuterParamsInfo } from '@/api/visualization/outerParams'
 import { ElMessage } from 'element-plus-secondary'
 import { useI18n } from '@/hooks/web/useI18n'
+import { XpackComponent } from '@/components/plugin'
 const dvMainStore = dvMainStoreWithOut()
 const { t } = useI18n()
 const state = reactive({
@@ -92,8 +93,10 @@ const loadCanvasDataAsync = async (dvId, dvType) => {
     }
   )
 }
-
-onMounted(() => {
+let p = null
+const XpackLoaded = () => p(true)
+onMounted(async () => {
+  await new Promise(r => (p = r))
   const { dvId, dvType } = router.currentRoute.value.query
   if (dvId) {
     loadCanvasDataAsync(dvId, dvType)
@@ -118,6 +121,11 @@ defineExpose({
       :cur-gap="state.curPreviewGap"
     ></de-preview>
   </div>
+  <XpackComponent
+    jsname="L2NvbXBvbmVudC9lbWJlZGRlZC1pZnJhbWUvTmV3V2luZG93SGFuZGxlcg=="
+    @loaded="XpackLoaded"
+    @load-fail="XpackLoaded"
+  />
 </template>
 
 <style lang="less">
diff --git a/core/core-frontend/src/views/data-visualization/PreviewHead.vue b/core/core-frontend/src/views/data-visualization/PreviewHead.vue
index b0e14312a7..94771b6d78 100644
--- a/core/core-frontend/src/views/data-visualization/PreviewHead.vue
+++ b/core/core-frontend/src/views/data-visualization/PreviewHead.vue
@@ -7,6 +7,7 @@ import DvDetailInfo from '@/views/common/DvDetailInfo.vue'
 import { storeApi, storeStatusApi } from '@/api/visualization/dataVisualization'
 import { ref, watch, computed } from 'vue'
 import ShareVisualHead from '@/views/share/share/ShareVisualHead.vue'
+import { XpackComponent } from '@/components/plugin'
 const dvMainStore = dvMainStoreWithOut()
 const appStore = useAppStoreWithOut()
 const { dvInfo } = storeToRefs(dvMainStore)
@@ -16,7 +17,8 @@ const { t } = useI18n()
 const favorited = ref(false)
 const preview = () => {
   const url = '#/preview?dvId=' + dvInfo.value.id
-  window.open(url, '_blank')
+  const newWindow = window.open(url, '_blank')
+  initOpenHandler(newWindow)
 }
 const isDataEaseBi = computed(() => appStore.getIsDataEaseBi)
 
@@ -33,7 +35,8 @@ const downloadAsAppTemplate = downloadType => {
 
 const dvEdit = () => {
   const baseUrl = dvInfo.value.type === 'dataV' ? '#/dvCanvas?dvId=' : '#/dashboard?resourceId='
-  window.open(baseUrl + dvInfo.value.id, '_blank')
+  const newWindow = window.open(baseUrl + dvInfo.value.id, '_blank')
+  initOpenHandler(newWindow)
 }
 
 const executeStore = () => {
@@ -58,6 +61,17 @@ watch(
     storeQuery()
   }
 )
+
+const openHandler = ref(null)
+const initOpenHandler = newWindow => {
+  if (openHandler?.value) {
+    const pm = {
+      methodName: 'initOpenHandler',
+      args: newWindow
+    }
+    openHandler.value.invokeMethod(pm)
+  }
+}
 </script>
 
 <template>
@@ -147,6 +161,7 @@ watch(
       </el-dropdown>
     </div>
   </div>
+  <XpackComponent ref="openHandler" jsname="L2NvbXBvbmVudC9lbWJlZGRlZC1pZnJhbWUvT3BlbkhhbmRsZXI=" />
 </template>
 
 <style lang="less">

From 52dda35493c2876b75184a486f1d94f6982f8e8d Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 1 Apr 2024 16:33:28 +0800
Subject: [PATCH 2/6] =?UTF-8?q?fix(X-Pack):=20=E5=88=A0=E9=99=A4=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=89=E6=96=B9=E5=B9=B3=E5=8F=B0=E7=94=A8=E6=88=B7=E5=90=8E?=
 =?UTF-8?q?=E5=86=8D=E6=AC=A1=E7=99=BB=E5=BD=95=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 de-xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/de-xpack b/de-xpack
index 299cd62872..fac4316528 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 299cd6287249a793abd799f39c40b45d01eb2336
+Subproject commit fac43165280525519002d8aed6882ce691169280

From c3308edebc550728bec9abf9242200a5714ce6f5 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 1 Apr 2024 16:54:57 +0800
Subject: [PATCH 3/6] =?UTF-8?q?fix(=E6=99=BA=E8=83=BD=E5=8A=A9=E6=89=8B):?=
 =?UTF-8?q?=20=E5=8D=A1=E7=89=87=E7=9A=84=E6=8A=95=E5=BD=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/layout/components/AiComponent.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/core-frontend/src/layout/components/AiComponent.vue b/core/core-frontend/src/layout/components/AiComponent.vue
index 04b240c7d7..7d7937dafc 100644
--- a/core/core-frontend/src/layout/components/AiComponent.vue
+++ b/core/core-frontend/src/layout/components/AiComponent.vue
@@ -62,5 +62,6 @@ onMounted(() => {
   height: 50%;
   min-height: 450px;
   max-height: 600px;
+  box-shadow: 0px 6px 24px 0px #1f232914;
 }
 </style>

From 406d24680697989dbf498fa33e1cee80867eaa68 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 1 Apr 2024 16:55:30 +0800
Subject: [PATCH 4/6] =?UTF-8?q?fix(=E5=B7=A5=E4=BD=9C=E5=8F=B0):=20hover?=
 =?UTF-8?q?=E8=A1=8C=E6=97=B6=20=E9=BC=A0=E6=A0=87=E5=BA=94=E8=AF=A5?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=BA=20=E6=8A=93=E6=89=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/views/share/share/ShareGrid.vue    | 4 ++++
 core/core-frontend/src/views/workbranch/ShortcutTable.vue | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/core/core-frontend/src/views/share/share/ShareGrid.vue b/core/core-frontend/src/views/share/share/ShareGrid.vue
index 1729e041bf..b01fd82c8f 100644
--- a/core/core-frontend/src/views/share/share/ShareGrid.vue
+++ b/core/core-frontend/src/views/share/share/ShareGrid.vue
@@ -225,6 +225,10 @@ watch(
   margin-top: 16px;
   height: calc(100% - 110px);
 
+  :deep(.ed-table__row):hover {
+    cursor: pointer;
+  }
+
   .name-content {
     display: flex;
     align-items: center;
diff --git a/core/core-frontend/src/views/workbranch/ShortcutTable.vue b/core/core-frontend/src/views/workbranch/ShortcutTable.vue
index 543ee1f115..e459f8b840 100644
--- a/core/core-frontend/src/views/workbranch/ShortcutTable.vue
+++ b/core/core-frontend/src/views/workbranch/ShortcutTable.vue
@@ -432,6 +432,10 @@ const getEmptyDesc = (): string => {
     margin-top: 16px;
     height: calc(100% - 110px);
 
+    :deep(.ed-table__row):hover {
+      cursor: pointer;
+    }
+
     .name-content {
       display: flex;
       align-items: center;

From a2971cc42ba9340c3bcf9194be4f16f1a98f4a2d Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 1 Apr 2024 16:56:10 +0800
Subject: [PATCH 5/6] =?UTF-8?q?fix(=E6=99=BA=E8=83=BD=E5=8A=A9=E6=89=8B):?=
 =?UTF-8?q?=20=E5=9B=BE=E6=A0=87=E5=8F=B3=E4=BE=A7=E9=97=B4=E8=B7=9D?=
 =?UTF-8?q?=E4=B8=BA20px?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/layout/components/Header.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/core-frontend/src/layout/components/Header.vue b/core/core-frontend/src/layout/components/Header.vue
index f05f7b2cba..8d66874dfa 100644
--- a/core/core-frontend/src/layout/components/Header.vue
+++ b/core/core-frontend/src/layout/components/Header.vue
@@ -96,7 +96,7 @@ onMounted(() => {
     </el-menu>
     <div class="operate-setting" v-if="!desktop">
       <XpackComponent jsname="c3dpdGNoZXI=" />
-      <el-icon class="ai-icon" v-if="aiBaseUrl">
+      <el-icon style="margin: 0 10px" class="ai-icon" v-if="aiBaseUrl">
         <Icon name="dv-ai" @click="handleAiClick" />
       </el-icon>
       <ToolboxCfg v-if="showToolbox" />

From 893633001c38667bc99b30332df8b37d1b3746c6 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 1 Apr 2024 16:56:34 +0800
Subject: [PATCH 6/6] =?UTF-8?q?fix(=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6):?=
 =?UTF-8?q?=20=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E7=9A=84=E8=AE=BE=E7=BD=AE=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E8=8C=83=E5=9B=B4=E4=BC=9A=E7=95=99=E5=9C=A8=E4=BB=AA=E8=A1=A8?=
 =?UTF-8?q?=E6=9D=BF=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v-query/QueryConditionConfiguration.vue   | 33 ++++++++++++++++---
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
index ce58aa0b50..867ed78df4 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -498,6 +498,7 @@ const handleBeforeClose = () => {
   inputCom.value?.mult?.handleClickOutside?.()
   handleDialogClick()
   dialogVisible.value = false
+  visiblePopover.value = false
 }
 
 const confirmClick = () => {
@@ -1408,12 +1409,34 @@ defineExpose({
           </div>
           <div class="list-item" v-if="+curComponent.displayType === 0">
             <div class="label">
-              <el-checkbox v-model="curComponent.showEmpty" label="选项值包含空数据" />
+              <el-tooltip
+                effect="dark"
+                content="绑定参数后，不支持传空数据"
+                :disabled="!curComponent.parametersCheck"
+                placement="top"
+              >
+                <el-checkbox
+                  :disabled="curComponent.parametersCheck"
+                  v-model="curComponent.showEmpty"
+                  label="选项值包含空数据"
+                />
+              </el-tooltip>
             </div>
           </div>
           <div class="list-item">
             <div class="label">
-              <el-checkbox v-model="curComponent.parametersCheck" label="绑定参数" />
+              <el-tooltip
+                effect="dark"
+                content="空数据不支持传参数"
+                :disabled="!curComponent.showEmpty"
+                placement="top"
+              >
+                <el-checkbox
+                  :disabled="curComponent.showEmpty"
+                  v-model="curComponent.parametersCheck"
+                  label="绑定参数"
+                />
+              </el-tooltip>
             </div>
             <template v-if="curComponent.parametersCheck">
               <div v-if="curComponent.displayType !== '7'" class="parameters">
@@ -1701,8 +1724,10 @@ defineExpose({
     border-radius: 4px;
     border: 1px solid #dee0e3;
     display: flex;
-    .ed-checkbox__label:hover {
-      color: #1f2329;
+    .ed-checkbox:not(.is-disabled) {
+      .ed-checkbox__label:hover {
+        color: #1f2329;
+      }
     }
     .query-condition-list {
       height: 100%;