From be397a2513dd297e4f917346d9754a2baddc6ca8 Mon Sep 17 00:00:00 2001
From: jianneng-fit2cloud <jianneng.pan@fit2cloud.com>
Date: Mon, 1 Jul 2024 17:28:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8-=E7=AC=A6=E5=8F=B7?=
 =?UTF-8?q?=E5=9C=B0=E5=9B=BE):=20=E6=89=B9=E9=87=8F=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E6=97=B6=EF=BC=8C=E5=8F=96=E6=B6=88=E7=AC=A6?=
 =?UTF-8?q?=E5=8F=B7=E5=9C=B0=E5=9B=BE=E6=A0=87=E7=AD=BE=E5=92=8C=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84=E5=AD=97=E6=AE=B5=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/editor/editor-style/components/LabelSelector.vue | 2 +-
 .../editor/editor-style/components/TooltipSelector.vue          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/LabelSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/LabelSelector.vue
index 08ce8ef788..458b32cfa4 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/LabelSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/LabelSelector.vue
@@ -349,7 +349,7 @@ onMounted(() => {
         </el-tooltip>
       </el-form-item>
     </el-space>
-    <div v-if="showProperty('showFields')">
+    <div v-if="showProperty('showFields') && !batchOptStatus">
       <el-form-item :label="t('chart.label')" class="form-item" :class="'form-item-' + themes">
         <el-select
           size="small"
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/TooltipSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/TooltipSelector.vue
index b43d04d788..31e1665be0 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/TooltipSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/TooltipSelector.vue
@@ -464,7 +464,7 @@ onMounted(() => {
       </el-form-item>
     </el-space>
 
-    <div v-if="showProperty('showFields')">
+    <div v-if="showProperty('showFields') && !batchOptStatus">
       <el-form-item :label="t('chart.tooltip')" class="form-item" :class="'form-item-' + themes">
         <el-select
           size="small"

From b6c21ac7fd68b1b43bf9cdf0e1434a8a46a98749 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 1 Jul 2024 17:30:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(=E5=B5=8C=E5=85=A5=E5=BC=8F):=20?=
 =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E6=A0=91-iframe=E5=B5=8C=E5=85=A5?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=EF=BC=8C=E4=BB=AA=E8=A1=A8=E6=9D=BF=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E9=A1=B5=E7=9A=84=E5=85=A8=E5=B1=8F=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=97=A0=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/data-visualization/PreviewHead.vue    | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/core/core-frontend/src/views/data-visualization/PreviewHead.vue b/core/core-frontend/src/views/data-visualization/PreviewHead.vue
index fa6c174e1f..e9043b690d 100644
--- a/core/core-frontend/src/views/data-visualization/PreviewHead.vue
+++ b/core/core-frontend/src/views/data-visualization/PreviewHead.vue
@@ -21,17 +21,8 @@ const embeddedStore = useEmbedded()
 const favorited = ref(false)
 const fullScreeRef = ref(null)
 const preview = () => {
-  if (isDataEaseBi.value) {
-    embeddedStore.clearState()
-    if (dvInfo.value.type === 'dataV') {
-      embeddedStore.setDvId(dvInfo.value.id)
-    } else {
-      embeddedStore.setResourceId(dvInfo.value.id)
-    }
-    useEmitt().emitter.emit('changeCurrentComponent', 'Preview')
-    return
-  }
-  const url = '#/preview?dvId=' + dvInfo.value.id
+  const baseUrl = isDataEaseBi.value ? embeddedStore.baseUrl : ''
+  const url = baseUrl + '#/preview?dvId=' + dvInfo.value.id
   const newWindow = window.open(url, '_blank')
   initOpenHandler(newWindow)
 }