From c601cee7c3a3ec845eb8054469729127e2d05b3f Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 1 Nov 2023 17:28:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=B5=8C=E5=85=A5=E5=BC=8F=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/components/editor/editor-senior/Senior.vue      | 8 ++++++--
 .../components/views/components/ChartComponentG2Plot.vue  | 5 ++++-
 .../components/views/components/ChartComponentS2.vue      | 6 +++++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/editor/editor-senior/Senior.vue b/core/core-frontend/src/views/chart/components/editor/editor-senior/Senior.vue
index eac2f1b597..2a3bf7f9c1 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-senior/Senior.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-senior/Senior.vue
@@ -5,7 +5,7 @@ import ScrollCfg from '@/views/chart/components/editor/editor-senior/components/
 import AssistLine from '@/views/chart/components/editor/editor-senior/components/AssistLine.vue'
 import Threshold from '@/views/chart/components/editor/editor-senior/components/Threshold.vue'
 import CollapseSwitchItem from '@/components/collapse-switch-item/src/CollapseSwitchItem.vue'
-import { computed, PropType, ref, toRefs, watch } from 'vue'
+import { computed, PropType, ref, toRefs, watch, onMounted } from 'vue'
 import LinkJumpSet from '@/components/visualization/LinkJumpSet.vue'
 import LinkageSet from '@/components/visualization/LinkageSet.vue'
 import { canvasSave } from '@/utils/canvasUtils'
@@ -172,6 +172,10 @@ const linkageActiveChange = () => {
     dvMainStore.setNowPanelTrackInfo(rsp.data)
   })
 }
+const isDataEaseBi = ref(false)
+onMounted(() => {
+  isDataEaseBi.value = !!window.DataEaseBi
+})
 </script>
 
 <template>
@@ -298,7 +302,7 @@ const linkageActiveChange = () => {
             </div>
           </collapse-switch-item>
           <collapse-switch-item
-            v-if="showProperties('jump-set')"
+            v-if="showProperties('jump-set') && !isDataEaseBi"
             :themes="themes"
             name="jumpSet"
             :title="'跳转设置'"
diff --git a/core/core-frontend/src/views/chart/components/views/components/ChartComponentG2Plot.vue b/core/core-frontend/src/views/chart/components/views/components/ChartComponentG2Plot.vue
index 62d83a8883..9ffa3d652e 100644
--- a/core/core-frontend/src/views/chart/components/views/components/ChartComponentG2Plot.vue
+++ b/core/core-frontend/src/views/chart/components/views/components/ChartComponentG2Plot.vue
@@ -131,6 +131,7 @@ const renderG2Plot = (chart, chartView: G2PlotChartView<any, any>) => {
 
 const dynamicAreaId = ref('')
 const country = ref('')
+const isDataEaseBi = ref(false)
 let mapTimer
 const renderL7Plot = (chart, chartView: L7PlotChartView<any, any>) => {
   const map = parseJson(chart.customAttr).map
@@ -205,6 +206,7 @@ const trackClick = trackAction => {
       dvMainStore.addViewTrackFilter(linkageParam)
       break
     case 'jump':
+      if (isDataEaseBi.value) return
       emit('onJumpClick', jumpParam)
       break
     default:
@@ -227,7 +229,7 @@ const trackMenu = computed(() => {
         jumpCount++
       }
     })
-    jumpCount && view.value?.jumpActive && trackMenuInfo.push('jump')
+    jumpCount && view.value?.jumpActive && !isDataEaseBi.value && trackMenuInfo.push('jump')
     linkageCount && view.value?.linkageActive && trackMenuInfo.push('linkage')
     view.value.drillFields.length && trackMenuInfo.push('drill')
   }
@@ -242,6 +244,7 @@ defineExpose({
 let resizeObserver
 const TOLERANCE = 0.01
 onMounted(() => {
+  isDataEaseBi.value = !!window.DataEaseBi
   const containerDom = document.getElementById(containerId)
   const { offsetWidth, offsetHeight } = containerDom
   const preSize = [offsetWidth, offsetHeight]
diff --git a/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue b/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue
index 6e0093baf9..59f5ece0fc 100644
--- a/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue
+++ b/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue
@@ -222,6 +222,8 @@ const action = param => {
   }
 }
 
+const isDataEaseBi = ref(false)
+
 const trackClick = trackAction => {
   const param = state.pointParam
   if (!param?.data?.dimensionList) {
@@ -250,6 +252,7 @@ const trackClick = trackAction => {
       dvMainStore.addViewTrackFilter(linkageParam)
       break
     case 'jump':
+      if (isDataEaseBi.value) return
       emit('onJumpClick', jumpParam)
       break
     default:
@@ -273,7 +276,7 @@ const trackMenu = computed(() => {
       jumpCount++
     }
   })
-  jumpCount && view.value?.jumpActive && trackMenuInfo.push('jump')
+  jumpCount && view.value?.jumpActive && !isDataEaseBi.value && trackMenuInfo.push('jump')
   linkageCount && view.value?.linkageActive && trackMenuInfo.push('linkage')
   view.value.drillFields.length && trackMenuInfo.push('drill')
   return trackMenuInfo
@@ -301,6 +304,7 @@ const preSize = [0, 0]
 const TOLERANCE = 1
 let resizeObserver
 onMounted(() => {
+  isDataEaseBi.value = !!window.DataEaseBi
   resizeObserver = new ResizeObserver(([entry] = []) => {
     const [size] = entry.borderBoxSize || []
     // 拖动的时候宽高重新计算，误差范围内不重绘，误差先设置为1

From 605f87cb820021d45e444375cca2003977e4b5c5 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Tue, 7 Nov 2023 15:43:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E9=9B=86=20SQL=20?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=EF=BC=8C=E6=95=B0=E6=8D=AE=E6=AF=94?=
 =?UTF-8?q?=E8=BE=83=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=9C=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/visualized/data/dataset/form/AddSql.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue b/core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue
index 1fe5c04fb4..dd14869d13 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue
@@ -268,7 +268,7 @@ const getSQLPreview = () => {
     sqlVariableDetails: JSON.stringify(state.variables)
   })
     .then(res => {
-      state.plxTableData = res.data.data.map((ele, index) => ({ ...ele, id: index }))
+      state.plxTableData = res.data.data
       state.fields = generateColumns(res.data.fields)
     })
     .finally(() => {