From 16d59975f9e3087b4e5b345f326b6dbff408e3ca Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 3 Jun 2024 12:58:37 +0800
Subject: [PATCH 01/81] =?UTF-8?q?fix:=20=E8=A1=8C=E5=88=97=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=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 141bb393aa..448c319f8e 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 141bb393aaf0e4cc519295f00d6900529af93b68
+Subproject commit 448c319f8e519be5f4b47663258136bcb6fc3faa

From aa31cc9ec84197b20c4d97ffc3e1f5d63f32db61 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 3 Jun 2024 14:18:50 +0800
Subject: [PATCH 02/81] =?UTF-8?q?fix(=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6)?=
 =?UTF-8?q?:=20=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E8=AE=BE=E7=BD=AE=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=80=BC=E5=88=87=E6=8D=A2=E6=89=8B=E5=8A=A8=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC=E7=BD=AE=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom-component/v-query/Component.vue    |  2 +-
 .../v-query/QueryConditionConfiguration.vue   | 45 +++++++++++++++----
 .../src/custom-component/v-query/Select.vue   | 10 +++--
 3 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/core/core-frontend/src/custom-component/v-query/Component.vue b/core/core-frontend/src/custom-component/v-query/Component.vue
index 7271cb437d..82c6a6f0ce 100644
--- a/core/core-frontend/src/custom-component/v-query/Component.vue
+++ b/core/core-frontend/src/custom-component/v-query/Component.vue
@@ -389,7 +389,7 @@ const autoStyle = computed(() => {
 </script>
 
 <template>
-  <div class="v-query-container" :style="autoStyle">
+  <div class="v-query-container" :style="autoStyle" @keydown.stop @keyup.stop>
     <p v-if="customStyle.titleShow" class="title" :style="titleStyle">
       {{ customStyle.title }}
     </p>
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 d7f8c1392b..57ed61c35b 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -501,7 +501,6 @@ const validate = () => {
       const isMultiple = +ele.displayType === 7 || ele.multiple
       ele.selectValue = isMultiple ? [] : undefined
       ele.defaultValue = isMultiple ? [] : undefined
-      return false
     }
 
     if (ele.displayType === '1') {
@@ -587,7 +586,7 @@ const validate = () => {
       return false
     }
 
-    if (ele.optionValueSource === 2 && !ele.valueSource?.length) {
+    if (ele.optionValueSource === 2 && !ele.valueSource?.filter(ele => !!ele).length) {
       ElMessage.error('手工输入-选项值不能为空')
       return true
     }
@@ -687,6 +686,19 @@ const setConditionOut = () => {
   init(conditions.value[conditions.value.length - 1].id)
 }
 
+const setActiveSelectTab = (arr, id) => {
+  let activelist = 'dimensionList'
+  arr.some((ele, index) => {
+    if ((ele || []).some(itx => itx.id === id)) {
+      activelist = ['dimensionList', 'quotaList', 'parameterList'][index]
+      return true
+    }
+    return false
+  })
+
+  return activelist
+}
+
 const init = (queryId: string) => {
   if (!datasetTree.value.length) {
     initDataset()
@@ -725,7 +737,12 @@ const init = (queryId: string) => {
       fields.value = datasetFieldList.value
         .map(ele => {
           if (!datasetMap[ele.tableId]) return null
-          return { ...datasetMap[ele.tableId], componentId: ele.id }
+          const activeCom = datasetMap[ele.tableId].fields || {}
+          const activelist = setActiveSelectTab(
+            [activeCom.dimensionList, activeCom.quotaList, activeCom.parameterList],
+            curComponent.value.checkedFieldsMap[ele.id]
+          )
+          return { ...datasetMap[ele.tableId], componentId: ele.id, activelist }
         })
         .filter(ele => !!ele)
     })
@@ -813,6 +830,13 @@ const handleCondition = item => {
     idMap.includes(ele)
   )
   if (!!fields.value?.length) {
+    fields.value.forEach(ele => {
+      const activeCom = ele.fields
+      ele.activelist = setActiveSelectTab(
+        [activeCom.dimensionList, activeCom.quotaList, activeCom.parameterList],
+        curComponent.value.checkedFieldsMap[ele.componentId]
+      )
+    })
     handleCheckedFieldsChange(curComponent.value.checkedFields)
   }
   multipleChange(curComponent.value.multiple)
@@ -1337,7 +1361,7 @@ defineExpose({
                   value="1"
                 />
                 <el-option
-                  :disabled="!['1', '7'].includes(curComponent.displayType)"
+                  :disabled="!['1', '7'].includes(curComponent.displayType) || isTimeParameter"
                   label="时间范围"
                   value="7"
                 />
@@ -1544,11 +1568,7 @@ defineExpose({
                       </el-icon>
                     </template>
                     <el-option
-                      v-for="ele in curComponent.dataset.fields.filter(
-                        ele =>
-                          ele.deType === +curComponent.displayType ||
-                          ([3, 4].includes(ele.deType) && +curComponent.displayType === 2)
-                      )"
+                      v-for="ele in curComponent.dataset.fields"
                       :key="ele.id"
                       :label="ele.name"
                       :value="ele.id"
@@ -1603,6 +1623,13 @@ defineExpose({
                       <div :key="index" v-for="(_, index) in valueSource" class="select-item">
                         <el-input
                           maxlength="20"
+                          v-if="curComponent.displayType === '2'"
+                          @blur="weightlessness"
+                          v-model.number="valueSource[index]"
+                        ></el-input>
+                        <el-input
+                          maxlength="20"
+                          v-else
                           @blur="weightlessness"
                           v-model="valueSource[index]"
                         ></el-input>
diff --git a/core/core-frontend/src/custom-component/v-query/Select.vue b/core/core-frontend/src/custom-component/v-query/Select.vue
index 77ee7ecb1e..4cea917edd 100644
--- a/core/core-frontend/src/custom-component/v-query/Select.vue
+++ b/core/core-frontend/src/custom-component/v-query/Select.vue
@@ -334,15 +334,19 @@ watch(
 
 watch(
   () => config.value.optionValueSource,
-  val => {
-    debounceOptions(val)
+  (valNew, newOld) => {
+    if ([valNew, newOld].includes(2)) {
+      selectValue.value = Array.isArray(selectValue.value) ? [] : undefined
+      config.value.selectValue = cloneDeep(selectValue.value)
+      config.value.defaultValue = cloneDeep(selectValue.value)
+    }
+    debounceOptions(valNew)
   }
 )
 
 watch(
   [() => config.value.checkedFields, () => config.value.checkedFieldsMap],
   () => {
-    if (!props.isConfig) return
     debounceOptions(config.value.optionValueSource)
   },
   {

From a0b4a458f2d3c08093075c59be7ee630d983cc8c Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 3 Jun 2024 14:57:53 +0800
Subject: [PATCH 03/81] =?UTF-8?q?fix(X-Pack):=20=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E5=AF=BC=E6=8E=A5=E6=94=B6=E4=BA=BA=E3=80=81?=
 =?UTF-8?q?=E9=82=AE=E4=BB=B6=E3=80=81=E9=A3=9E=E4=B9=A6=E7=BE=A4=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E5=90=8C=E6=97=B6=E4=B8=BA=E7=A9=BA?=
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 448c319f8e..1edc0e30b8 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 448c319f8e519be5f4b47663258136bcb6fc3faa
+Subproject commit 1edc0e30b8e8c4f3045cd2b5ff6b90598d833b7e

From a4d797895387872e68fdc35df0e2a3a8c53141e8 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 3 Jun 2024 15:43:15 +0800
Subject: [PATCH 04/81] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F)?=
 =?UTF-8?q?:=20=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8=E5=90=8E=E7=BB=84=E4=BB=B6=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=9C=89=E5=8F=98=E5=8C=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/utils/canvasUtils.ts          |  2 +-
 .../src/views/data-visualization/index.vue           | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/core/core-frontend/src/utils/canvasUtils.ts b/core/core-frontend/src/utils/canvasUtils.ts
index a59498aa2f..d1ff7e2468 100644
--- a/core/core-frontend/src/utils/canvasUtils.ts
+++ b/core/core-frontend/src/utils/canvasUtils.ts
@@ -152,7 +152,7 @@ export function initCanvasDataPrepare(dvId, busiFlag, callBack) {
   })
 }
 
-export function initCanvasData(dvId, busiFlag, callBack) {
+export async function initCanvasData(dvId, busiFlag, callBack) {
   initCanvasDataPrepare(
     dvId,
     busiFlag,
diff --git a/core/core-frontend/src/views/data-visualization/index.vue b/core/core-frontend/src/views/data-visualization/index.vue
index fc3775cbda..2f58c0be5f 100644
--- a/core/core-frontend/src/views/data-visualization/index.vue
+++ b/core/core-frontend/src/views/data-visualization/index.vue
@@ -79,7 +79,7 @@ const dvLayout = ref(null)
 const canvasCenterRef = ref(null)
 const state = reactive({
   datasetTree: [],
-  scaleHistory: 100,
+  scaleHistory: null,
   canvasId: 'canvas-main',
   canvasInitStatus: false,
   sourcePid: null,
@@ -204,10 +204,10 @@ const doUseCache = flag => {
   }
 }
 
-const initLocalCanvasData = () => {
+const initLocalCanvasData = async () => {
   const { opt, sourcePid, resourceId } = state
   const busiFlg = opt === 'copy' ? 'dataV-copy' : 'dataV'
-  initCanvasData(resourceId, busiFlg, function () {
+  await initCanvasData(resourceId, busiFlg, function () {
     state.canvasInitStatus = true
     // afterInit
     nextTick(() => {
@@ -238,7 +238,9 @@ watch(
   () => editMode.value,
   val => {
     if (val === 'edit') {
-      canvasStyleData.value.scale = state.scaleHistory
+      if (state.scaleHistory) {
+        canvasStyleData.value.scale = state.scaleHistory
+      }
       initScroll()
     } else {
       previewScaleChange()
@@ -288,7 +290,7 @@ onMounted(async () => {
     if (canvasCache) {
       canvasCacheOutRef.value?.dialogInit({ canvasType: 'dataV', resourceId: dvId })
     } else {
-      initLocalCanvasData()
+      await initLocalCanvasData()
     }
   } else if (opt && opt === 'create') {
     state.canvasInitStatus = false

From 24e0ffe23547fadd8021fbf55273155ce31bc09d Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 3 Jun 2024 16:20:51 +0800
Subject: [PATCH 05/81] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E6=BA=90):=20?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=95=B0=E6=8D=AE=E6=BA=90=EF=BC=8C=E6=98=8E?=
 =?UTF-8?q?=E6=96=87=E6=98=BE=E7=A4=BA=E5=AF=86=E7=A0=81=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=EF=BC=8C=E5=86=8D=E6=AC=A1=E8=BF=9B=E5=85=A5?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=95=B0=E6=8D=AE=E7=95=8C=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E4=BB=8D=E7=84=B6=E6=98=AF=E6=98=8E=E6=96=87?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/visualized/data/dataset/ExportExcel.vue     | 8 ++++----
 .../src/views/visualized/data/datasource/form/index.vue   | 8 +++++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue b/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue
index cf28672629..33f5139ec7 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue
@@ -348,7 +348,7 @@ defineExpose({
       <el-tab-pane v-for="tab in tabList" :key="tab.name" :label="tab.label" :name="tab.name" />
     </el-tabs>
     <el-button
-      v-show="activeName === 'SUCCESS' && multipleSelection.length === 0"
+      v-if="activeName === 'SUCCESS' && multipleSelection.length === 0"
       secondary
       @click="downLoadAll"
     >
@@ -358,15 +358,15 @@ defineExpose({
       {{ $t('data_export.download_all') }}
     </el-button>
     <el-button
-      v-show="activeName === 'SUCCESS' && multipleSelection.length !== 0"
+      v-if="activeName === 'SUCCESS' && multipleSelection.length !== 0"
       secondary
       @click="downLoadAll"
       ><template #icon> <Icon name="de-delete"></Icon> </template>{{ $t('data_export.download') }}
     </el-button>
-    <el-button v-show="multipleSelection.length === 0" secondary @click="delAll"
+    <el-button v-if="multipleSelection.length === 0" secondary @click="delAll"
       ><template #icon> <Icon name="de-delete"></Icon> </template>{{ $t('data_export.del_all') }}
     </el-button>
-    <el-button v-show="multipleSelection.length !== 0" secondary @click="delAll"
+    <el-button v-if="multipleSelection.length !== 0" secondary @click="delAll"
       ><template #icon> <Icon name="de-delete"></Icon> </template>{{ $t('commons.delete') }}
     </el-button>
     <div class="table-container" :class="!tableData.length && 'hidden-bottom'">
diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/index.vue b/core/core-frontend/src/views/visualized/data/datasource/form/index.vue
index 7b5e7db117..4f6bd7cf52 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/form/index.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/index.vue
@@ -73,8 +73,8 @@ const selectDsType = (type: string) => {
   currentDsType.value = type
   activeStep.value = 1
   activeApiStep.value = 1
-  detail.value.initForm(type)
   nextTick(() => {
+    detail.value.initForm(type)
     if (!dsTree.value) return
     currentTypeList.value
       .map(ele => ele.dbList)
@@ -493,7 +493,9 @@ const init = (nodeInfo: Form | Param, id?: string, res?: object) => {
           excel.value.appendReplaceExcel(res)
         })
       }
-      detail.value.clearForm()
+      nextTick(() => {
+        detail.value.clearForm()
+      })
     })
   }
 }
@@ -653,7 +655,7 @@ defineExpose({
             :form="form"
             :editDs="editDs"
             :active-step="activeApiStep"
-            v-show="activeStep !== 0 && currentDsType && currentDsType !== 'Excel'"
+            v-if="activeStep !== 0 && currentDsType && currentDsType !== 'Excel' && visible"
           ></editor-detail>
           <template v-if="activeStep !== 0 && currentDsType == 'Excel'">
             <excel-detail :editDs="editDs" ref="excel" :param="form2"></excel-detail>

From 12592658496a32992a6ca3a3a3fae64ccc860146 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 3 Jun 2024 16:25:29 +0800
Subject: [PATCH 06/81] =?UTF-8?q?fix(X-Pack):=20=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E5=AF=BC=E7=AB=8B=E5=8D=B3=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=81=B6=E5=B0=94=E6=97=A0=E5=93=8D=E5=BA=94?=
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 1edc0e30b8..a757c13fbe 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 1edc0e30b8e8c4f3045cd2b5ff6b90598d833b7e
+Subproject commit a757c13fbe173935936d7a0b575a8801c79def21

From 030781e4b6038407580ad1c3c59a9a9bf23e7546 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Mon, 3 Jun 2024 16:49:57 +0800
Subject: [PATCH 07/81] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=89=B9=E9=87=8F=E7=BC=96=E8=BE=91=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E7=BC=A9=E6=94=BE=E6=8C=89=E9=92=AE=E6=97=A0=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../editor/editor-style/components/BasicStyleSelector.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue
index 392a5e099c..a331eb2a7d 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue
@@ -560,7 +560,7 @@ onMounted(() => {
         :effect="themes"
         v-model="state.basicStyleForm.showZoom"
         :predefine="predefineColors"
-        @change="changeBasicStyle('zoomShow')"
+        @change="changeBasicStyle('showZoom')"
       >
         {{ t('chart.show_zoom') }}
       </el-checkbox>

From 463c015dc8c49500c2ce06bdfabb6c72e5740b09 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 3 Jun 2024 17:15:19 +0800
Subject: [PATCH 08/81] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86=E3=80=81?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90):=20=E6=95=B0=E6=8D=AE=E9=9B=86?=
 =?UTF-8?q?=E3=80=81=E6=95=B0=E6=8D=AE=E6=BA=90=E5=88=97=E8=A1=A8=E7=9A=84?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=88=87=E6=8D=A2=E9=A1=B5=E9=9D=A2=E5=90=8E?=
 =?UTF-8?q?=E4=BC=9A=E5=8F=98=E5=8C=96=20#10023?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/visualized/data/dataset/index.vue   | 13 +++++++++++++
 .../views/visualized/data/datasource/index.vue    | 15 ++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/core/core-frontend/src/views/visualized/data/dataset/index.vue b/core/core-frontend/src/views/visualized/data/dataset/index.vue
index 08d42c6066..eb7842987c 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/index.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/index.vue
@@ -35,7 +35,9 @@ import type { TabPaneName } from 'element-plus-secondary'
 import { timestampFormatDate } from './form/util'
 import { interactiveStoreWithOut } from '@/store/modules/interactive'
 import { XpackComponent } from '@/components/plugin'
+import { useCache } from '@/hooks/web/useCache'
 const interactiveStore = interactiveStoreWithOut()
+const { wsCache } = useCache()
 interface Field {
   fieldShortName: string
   name: string
@@ -86,6 +88,7 @@ let originResourceTree = []
 const sortTypeChange = sortType => {
   state.datasetTree = treeSort(originResourceTree, sortType)
   state.curSortType = sortType
+  wsCache.set('TreeSort-dataset', state.curSortType)
 }
 
 const resourceCreate = (pid, name) => {
@@ -211,10 +214,12 @@ const getData = () => {
         rootManage.value = nodeData[0]['weight'] >= 7
         state.datasetTree = nodeData[0]['children'] || []
         originResourceTree = cloneDeep(unref(state.datasetTree))
+        sortTypeChange(state.curSortType)
         return
       }
       state.datasetTree = nodeData
       originResourceTree = cloneDeep(unref(state.datasetTree))
+      sortTypeChange(state.curSortType)
     })
     .finally(() => {
       dtLoading.value = false
@@ -252,6 +257,7 @@ const dfsDatasetTree = (ds, id) => {
 
 onBeforeMount(() => {
   nodeInfo.id = (route.params.id as string) || ''
+  loadInit()
   getData()
 })
 
@@ -471,6 +477,13 @@ const sortList = [
   }
 ]
 
+const loadInit = () => {
+  const historyTreeSort = wsCache.get('TreeSort-dataset')
+  if (historyTreeSort) {
+    state.curSortType = historyTreeSort
+  }
+}
+
 const sortTypeTip = computed(() => {
   return sortList.find(ele => ele.value === state.curSortType).name
 })
diff --git a/core/core-frontend/src/views/visualized/data/datasource/index.vue b/core/core-frontend/src/views/visualized/data/datasource/index.vue
index 0b73b41847..9330f2efcb 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/index.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/index.vue
@@ -42,6 +42,7 @@ import { useMoveLine } from '@/hooks/web/useMoveLine'
 import { cloneDeep } from 'lodash-es'
 import { interactiveStoreWithOut } from '@/store/modules/interactive'
 import treeSort from '@/utils/treeSortUtils'
+import { useCache } from '@/hooks/web/useCache'
 const route = useRoute()
 const interactiveStore = interactiveStoreWithOut()
 interface Field {
@@ -51,7 +52,7 @@ interface Field {
   originName: string
   deType: number
 }
-
+const { wsCache } = useCache()
 const { t } = useI18n()
 const router = useRouter()
 const appStore = useAppStoreWithOut()
@@ -165,6 +166,7 @@ let originResourceTree = []
 const sortTypeChange = sortType => {
   state.datasourceTree = treeSort(originResourceTree, sortType)
   state.curSortType = sortType
+  wsCache.set('TreeSort-datasource', state.curSortType)
 }
 const handleSizeChange = pageSize => {
   state.paginationConfig.currentPage = 1
@@ -391,10 +393,12 @@ const listDs = () => {
         rootManage.value = nodeData[0]['weight'] >= 7
         state.datasourceTree = nodeData[0]['children'] || []
         originResourceTree = cloneDeep(unref(state.datasourceTree))
+        sortTypeChange(state.curSortType)
         return
       }
       originResourceTree = cloneDeep(unref(state.datasourceTree))
       state.datasourceTree = nodeData
+      sortTypeChange(state.curSortType)
     })
     .finally(() => {
       mounted.value = true
@@ -693,8 +697,17 @@ const defaultProps = {
   children: 'children',
   label: 'name'
 }
+
+const loadInit = () => {
+  const historyTreeSort = wsCache.get('TreeSort-datasource')
+  if (historyTreeSort) {
+    state.curSortType = historyTreeSort
+  }
+}
+
 onMounted(() => {
   nodeInfo.id = (route.params.id as string) || ''
+  loadInit()
   listDs()
   const { opt } = router.currentRoute.value.query
   if (opt && opt === 'create') {

From 151e3aef43a53f9310f52fc5a583adc472db6dc4 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Mon, 3 Jun 2024 18:02:21 +0800
Subject: [PATCH 09/81] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=A4=9A=E7=B3=BB=E5=88=97=E6=A0=87=E7=AD=BE=E5=92=8C?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=AD=97=E4=BD=93=E5=A4=A7=E5=B0=8F=E6=9C=AA?=
 =?UTF-8?q?=E9=80=82=E5=BA=94=E7=BC=A9=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/utils/canvasStyle.ts | 30 ++++++++++++++++-----
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/core/core-frontend/src/utils/canvasStyle.ts b/core/core-frontend/src/utils/canvasStyle.ts
index 7b5b7b0896..92942dbf59 100644
--- a/core/core-frontend/src/utils/canvasStyle.ts
+++ b/core/core-frontend/src/utils/canvasStyle.ts
@@ -125,8 +125,14 @@ export const customAttrTrans = {
     'wordSizeRange',
     'wordSpacing'
   ],
-  label: ['fontSize'],
-  tooltip: ['fontSize'],
+  label: {
+    fontSize: '',
+    seriesLabelFormatter: ['fontSize']
+  },
+  tooltip: {
+    fontSize: '',
+    seriesTooltipFormatter: ['fontSize']
+  },
   indicator: ['fontSize', 'suffixFontSize'],
   indicatorName: ['fontSize', 'nameValueSpacing']
 }
@@ -296,15 +302,25 @@ export function recursionTransObj(template, infoObj, scale, terminal) {
     // 如果是数组 进行赋值计算
     if (template[templateKey] instanceof Array) {
       template[templateKey].forEach(templateProp => {
-        if (infoObj[templateKey] && infoObj[templateKey][templateProp]) {
+        if (
+          infoObj[templateKey] &&
+          (infoObj[templateKey][templateProp] || infoObj[templateKey].length)
+        ) {
           // 移动端特殊属性值设置
           if (terminal === 'mobile' && mobileSpecialProps[templateProp] !== undefined) {
             infoObj[templateKey][templateProp] = mobileSpecialProps[templateProp]
           } else {
-            infoObj[templateKey][templateProp] = getScaleValue(
-              infoObj[templateKey][templateProp],
-              scale
-            )
+            // 数组依次设置
+            if (infoObj[templateKey] instanceof Array) {
+              infoObj[templateKey].forEach(v => {
+                v[templateProp] = getScaleValue(v[templateProp], scale)
+              })
+            } else {
+              infoObj[templateKey][templateProp] = getScaleValue(
+                infoObj[templateKey][templateProp],
+                scale
+              )
+            }
           }
         }
       })

From 014cd2adf022cdd6f5d4d622822afd35de56834f Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 3 Jun 2024 18:06:32 +0800
Subject: [PATCH 10/81] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F)?=
 =?UTF-8?q?:=20=E4=BF=AE=E5=A4=8D=E5=A4=9A=E9=80=89=E5=9B=BE=E5=B1=82?=
 =?UTF-8?q?=EF=BC=8C=E7=BB=84=E5=90=88=E7=A7=BB=E5=8A=A8=E4=B9=8B=E5=90=8E?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E8=BF=94=E5=9B=9E=EF=BC=8C=E5=A4=9A=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E5=9B=BE=E5=B1=82=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/data-visualization/DvToolbar.vue   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/core-frontend/src/components/data-visualization/DvToolbar.vue b/core/core-frontend/src/components/data-visualization/DvToolbar.vue
index 40dceb75cb..ee8b0a78f0 100644
--- a/core/core-frontend/src/components/data-visualization/DvToolbar.vue
+++ b/core/core-frontend/src/components/data-visualization/DvToolbar.vue
@@ -93,10 +93,13 @@ const saveCanvasWithCheck = () => {
 const saveResource = () => {
   wsCache.delete('DE-DV-CATCH-' + dvInfo.value.id)
   if (styleChangeTimes.value > 0) {
-    snapshotStore.resetStyleChangeTimes()
-    canvasSave(() => {
-      ElMessage.success('保存成功')
-      window.history.pushState({}, '', `#/dvCanvas?dvId=${dvInfo.value.id}`)
+    eventBus.emit('hideArea-canvas-main')
+    nextTick(() => {
+      snapshotStore.resetStyleChangeTimes()
+      canvasSave(() => {
+        ElMessage.success('保存成功')
+        window.history.pushState({}, '', `#/dvCanvas?dvId=${dvInfo.value.id}`)
+      })
     })
   }
 }

From 90bddd454a62b20c1c11bab650be710c0058e258 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 3 Jun 2024 18:15:51 +0800
Subject: [PATCH 11/81] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F)?=
 =?UTF-8?q?:=20=E6=96=B0=E5=BB=BA=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F-?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B7=91=E9=A9=AC=E7=81=AF=EF=BC=8C=E9=BC=A0?=
 =?UTF-8?q?=E6=A0=87=E7=84=A6=E7=82=B9=E4=BB=8E=E8=BE=93=E5=85=A5=E6=A1=86?=
 =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=88=B0=E8=BE=93=E5=85=A5=E6=A1=86=E5=A4=96?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=A1=AE=E5=AE=9A=EF=BC=8C=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E6=A1=86=E5=86=85=E5=AD=98=E5=9C=A8&nbsp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/custom-component/scroll-text/Component.vue            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/core-frontend/src/custom-component/scroll-text/Component.vue b/core/core-frontend/src/custom-component/scroll-text/Component.vue
index 3e7dd1b6ee..c15a17f90c 100644
--- a/core/core-frontend/src/custom-component/scroll-text/Component.vue
+++ b/core/core-frontend/src/custom-component/scroll-text/Component.vue
@@ -81,14 +81,14 @@ const clearStyle = e => {
 }
 
 const handleBlur = e => {
-  element.value.propValue = e.target.innerHTML || '&nbsp;'
+  element.value.propValue = e.target.innerHTML || ''
   const html = e.target.innerHTML
   if (html !== '') {
     element.value.propValue = e.target.innerHTML
   } else {
     element.value.propValue = ''
     nextTick(function () {
-      element.value.propValue = '&nbsp;'
+      element.value.propValue = ''
     })
   }
   canEdit.value = false

From 4df576843a8f0cf4990b95c77a4644d5d86f003e Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Mon, 3 Jun 2024 18:29:54 +0800
Subject: [PATCH 12/81] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E4=BB=AA=E8=A1=A8=E7=9B=98=E5=92=8C=E6=B0=B4=E6=B3=A2?=
 =?UTF-8?q?=E5=9B=BE=E9=98=88=E5=80=BC=E5=8C=BA=E9=97=B4=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../editor/editor-senior/components/Threshold.vue          | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/Threshold.vue b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/Threshold.vue
index 91157a90b7..2047acb07b 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/Threshold.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/Threshold.vue
@@ -64,10 +64,15 @@ const changeThreshold = () => {
 const changeSplitThreshold = (threshold: string) => {
   // check input
   if (threshold) {
+    const regex = /^(\d+)(,\d+)*$/
+    if (!regex.test(threshold)) {
+      ElMessage.error(t('chart.gauge_threshold_format_error'))
+      return
+    }
     const arr = threshold.split(',')
     for (let i = 0; i < arr.length; i++) {
       const ele = arr[i]
-      if (parseFloat(ele).toString() === 'NaN' || parseFloat(ele) <= 0 || parseFloat(ele) >= 100) {
+      if (parseFloat(ele) <= 0 || parseFloat(ele) >= 100) {
         ElMessage.error(t('chart.gauge_threshold_format_error'))
         return
       }

From dbd731c8ad244b39e48a873582f07c2a179ae800 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 3 Jun 2024 18:30:52 +0800
Subject: [PATCH 13/81] =?UTF-8?q?fix(X-Pack):=20=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E6=9F=A5=E8=AF=A2=E9=A3=9E=E4=B9=A6=E7=BE=A4?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5?=
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 1edc0e30b8..e66bdc3a8d 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 1edc0e30b8e8c4f3045cd2b5ff6b90598d833b7e
+Subproject commit e66bdc3a8d18a29287be512a7c929f1f1659cf0f

From 8d924c9507554a57f4fd831ad1837c2b6119a970 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Mon, 3 Jun 2024 19:03:43 +0800
Subject: [PATCH 14/81] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E8=A1=A8=E6=A0=BC=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AE=BD?=
 =?UTF-8?q?=E5=BA=A6=E4=B8=8B=E9=92=BB=E5=90=8E=E4=B8=8B=E9=92=BB=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=AE=BD=E5=BA=A6=E6=94=B9=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/components/js/panel/common/common_table.ts | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts b/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts
index a6acb65fe1..205e7095a5 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts
@@ -325,6 +325,18 @@ export function getStyle(chart: Chart): Style {
             p[n.fieldId] = n
             return p
           }, {}) || {}
+        // 下钻字段使用入口字段的宽度
+        if (chart.drill) {
+          const { xAxis } = parseJson(chart)
+          const curDrillField = chart.drillFields[chart.drillFilters.length]
+          const drillEnterFieldIndex = xAxis.findIndex(
+            item => item.id === chart.drillFilters[0].fieldId
+          )
+          const drillEnterField = xAxis[drillEnterFieldIndex]
+          fieldMap[curDrillField.dataeaseName] = {
+            width: fieldMap[drillEnterField.dataeaseName]?.width
+          }
+        }
         style.colCfg.width = node => {
           const width = node.spreadsheet.container.cfg.el.offsetWidth
           if (!basicStyle.tableFieldWidth?.length) {

From ca3e8aaea75a4662abc07710cb6506ca8f4c6344 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 3 Jun 2024 19:24:31 +0800
Subject: [PATCH 15/81] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E5=8F=98=E9=87=8F=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datasource/provider/CalciteProvider.java  | 41 ++++++++++++++--
 .../datasource/server/DatasourceServer.java   | 19 ++++++--
 .../manage/ExportCenterManage.java            |  9 ++++
 .../job/schedule/CheckDsStatusJob.java        |  2 +-
 .../main/resources/db/desktop/V2.7__ddl.sql   | 21 +++++++++
 .../main/resources/db/migration/V2.7__ddl.sql |  3 ++
 core/core-frontend/src/api/datasource.ts      |  2 +
 .../visualization/UserViewEnlarge.vue         |  2 +-
 .../src/views/chart/components/js/util.ts     |  1 -
 .../visualized/data/dataset/ExportExcel.vue   |  3 +-
 .../visualized/data/datasource/index.vue      | 47 +++++++++++++++++--
 .../io/dataease/api/ds/DatasourceApi.java     |  5 ++
 .../api/exportCenter/vo/ExportTaskDTO.java    |  2 +
 .../variable/dto/SysVariableValueItem.java    |  1 -
 14 files changed, 140 insertions(+), 18 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java b/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java
index 980c4b75c9..75bb0b0f63 100644
--- a/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java
+++ b/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java
@@ -117,9 +117,9 @@ public class CalciteProvider {
         tableDesc.setDatasourceId(datasourceRequest.getDatasource().getId());
         tableDesc.setType("db");
         tableDesc.setTableName(resultSet.getString(1));
-        if(resultSet.getMetaData().getColumnCount() > 1){
+        if (resultSet.getMetaData().getColumnCount() > 1) {
             tableDesc.setName(resultSet.getString(2));
-        }else {
+        } else {
             tableDesc.setName(resultSet.getString(1));
         }
         return tableDesc;
@@ -316,10 +316,40 @@ public class CalciteProvider {
         return list;
     }
 
+    public void hidePW(DatasourceDTO datasourceDTO) {
+        DatasourceConfiguration configuration = null;
+        DatasourceType datasourceType = DatasourceType.valueOf(datasourceDTO.getType());
+        switch (datasourceType) {
+            case mysql:
+            case mongo:
+            case mariadb:
+            case TiDB:
+            case StarRocks:
+            case doris:
+                configuration = JsonUtil.parseObject(datasourceDTO.getConfiguration(), Mysql.class);
+                if (StringUtils.isNotEmpty(configuration.getUrlType()) && configuration.getUrlType().equalsIgnoreCase("jdbcUrl")) {
+                    if (configuration.getJdbcUrl().contains("password=")) {
+                        String[] params = configuration.getJdbcUrl().split("\\?")[1].split("&");
+                        String pd = "";
+                        for (int i = 0; i < params.length; i++) {
+                            if (params[i].contains("password=")) {
+                                pd = params[i];
+                            }
+                        }
+                        configuration.setJdbcUrl(configuration.getJdbcUrl().replace(pd, "password=******"));
+                        datasourceDTO.setConfiguration(JsonUtil.toJSONString(configuration).toString());
+                    }
+                }
+                break;
+            default:
+                break;
+        }
+    }
+
     private String getTableFiledSql(DatasourceRequest datasourceRequest) {
         String sql = "";
         DatasourceConfiguration configuration = null;
-        String database="";
+        String database = "";
         DatasourceType datasourceType = DatasourceType.valueOf(datasourceRequest.getDatasource().getType());
         switch (datasourceType) {
             case mysql:
@@ -440,7 +470,8 @@ public class CalciteProvider {
         return sql;
     }
 
-    private TableField getTableFieldDesc(DatasourceRequest datasourceRequest, ResultSet resultSet) throws SQLException {
+    private TableField getTableFieldDesc(DatasourceRequest datasourceRequest, ResultSet resultSet) throws
+            SQLException {
         TableField tableField = new TableField();
         tableField.setOriginName(resultSet.getString(1));
         tableField.setType(resultSet.getString(2).toUpperCase());
@@ -809,7 +840,7 @@ public class CalciteProvider {
                         "                               AND ep.class = 1  \n" +
                         "                               AND ep.name = 'MS_Description'\n" +
                         "where sc.name ='DS_SCHEMA'"
-                        .replace("DS_SCHEMA", configuration.getSchema()));
+                                .replace("DS_SCHEMA", configuration.getSchema()));
                 tableSqls.add("SELECT   \n" +
                         "    t.name AS TableName,  \n" +
                         "    ep.value AS TableDescription  \n" +
diff --git a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java
index bd37f22672..bbc252b61e 100644
--- a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java
+++ b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java
@@ -488,12 +488,20 @@ public class DatasourceServer implements DatasourceApi {
         return calciteProvider.getSchema(datasourceRequest);
     }
 
+    @Override
+    public DatasourceDTO hidePw(Long datasourceId) throws DEException {
+        return getDatasourceDTOById(datasourceId, true);
+    }
 
     @Override
     public DatasourceDTO get(Long datasourceId) throws DEException {
+        return getDatasourceDTOById(datasourceId, false);
+    }
+
+    private DatasourceDTO getDatasourceDTOById(Long datasourceId, boolean hidePw) throws DEException {
         DatasourceDTO datasourceDTO = new DatasourceDTO();
         CoreDatasource datasource = datasourceMapper.selectById(datasourceId);
-        if(datasource == null){
+        if (datasource == null) {
             DEException.throwException("不存在的数据源！");
         }
         BeanUtils.copyBean(datasourceDTO, datasource);
@@ -547,15 +555,18 @@ public class DatasourceServer implements DatasourceApi {
             if (task != null) {
                 datasourceDTO.setLastSyncTime(task.getStartTime());
             }
+        } else {
+            if (hidePw) {
+                calciteProvider.hidePW(datasourceDTO);
+            }
+
         }
         if (datasourceDTO.getType().equalsIgnoreCase(DatasourceConfiguration.DatasourceType.Excel.toString())) {
             datasourceDTO.setFileName(ExcelUtils.getFileName(datasource));
             datasourceDTO.setSize(ExcelUtils.getSize(datasource));
         }
         datasourceDTO.setConfiguration(new String(Base64.getEncoder().encode(datasourceDTO.getConfiguration().getBytes())));
-
         datasourceDTO.setCreator(coreUserManage.getUserName(Long.valueOf(datasourceDTO.getCreateBy())));
-
         return datasourceDTO;
     }
 
@@ -750,7 +761,7 @@ public class DatasourceServer implements DatasourceApi {
             datasourceRequest.setDsList(Map.of(datasourceSchemaDTO.getId(), datasourceSchemaDTO));
             datasourceRequest.setQuery(TableUtils.tableName2Sql(datasourceSchemaDTO, tableName) + " LIMIT 0 OFFSET 0");
             datasourceRequest.setTable(tableName);
-            List<TableField> tableFields = (List<TableField>) calciteProvider.fetchTableField(datasourceRequest) ;
+            List<TableField> tableFields = (List<TableField>) calciteProvider.fetchTableField(datasourceRequest);
             return tableFields.stream().filter(tableField -> {
                 return !tableField.getOriginName().equalsIgnoreCase("dataease_uuid");
             }).collect(Collectors.toList());
diff --git a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java
index 744f79da9e..3a9aa8ebff 100644
--- a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java
+++ b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java
@@ -183,12 +183,21 @@ public class ExportCenterManage {
             if (status.equalsIgnoreCase(exportTaskDTO.getExportStatus())) {
                 setExportFromAbsName(exportTaskDTO);
             }
+            if (status.equalsIgnoreCase(exportTaskDTO.getExportStatus())) {
+                setOrgName(exportTaskDTO);
+            }
             result.add(exportTaskDTO);
         });
 
         return result;
     }
 
+    private void setOrgName(ExportTaskDTO exportTaskDTO) {
+        if (exportTaskDTO.getExportFromType().equalsIgnoreCase("chart")) {
+            exportTaskDTO.setOrgName(dataVisualizationServer.getAbsPath(exportTaskDTO.getExportFrom()));
+        }
+    }
+
     private void setExportFromAbsName(ExportTaskDTO exportTaskDTO) {
         if (exportTaskDTO.getExportFromType().equalsIgnoreCase("chart")) {
             exportTaskDTO.setExportFromName(dataVisualizationServer.getAbsPath(exportTaskDTO.getExportFrom()));
diff --git a/core/core-backend/src/main/java/io/dataease/job/schedule/CheckDsStatusJob.java b/core/core-backend/src/main/java/io/dataease/job/schedule/CheckDsStatusJob.java
index 54cbd97a2e..cf3c0e087b 100644
--- a/core/core-backend/src/main/java/io/dataease/job/schedule/CheckDsStatusJob.java
+++ b/core/core-backend/src/main/java/io/dataease/job/schedule/CheckDsStatusJob.java
@@ -10,9 +10,9 @@ import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.springframework.stereotype.Component;
 
+
 @Component
 public class CheckDsStatusJob implements Job {
-
     @Resource
     private DatasourceServer datasourceServer;
 
diff --git a/core/core-backend/src/main/resources/db/desktop/V2.7__ddl.sql b/core/core-backend/src/main/resources/db/desktop/V2.7__ddl.sql
index 81f0a52efc..a792416b03 100644
--- a/core/core-backend/src/main/resources/db/desktop/V2.7__ddl.sql
+++ b/core/core-backend/src/main/resources/db/desktop/V2.7__ddl.sql
@@ -13,3 +13,24 @@ CREATE TABLE `core_sys_startup_job`
 BEGIN;
 INSERT INTO `core_sys_startup_job` VALUES ('chartFilterMerge', 'chartFilterMerge', 'ready');
 COMMIT;
+
+
+DROP TABLE IF EXISTS "core_export_task";
+CREATE TABLE "core_export_task"
+(
+    "id"                  VARCHAR(255) NOT NULL,
+    "user_id"             BIGINT(20)   NOT NULL,
+    "file_name"           VARCHAR(2048) DEFAULT NULL,
+    "file_size"           DOUBLE        DEFAULT NULL,
+    "file_size_unit"      VARCHAR(255)  DEFAULT NULL,
+    "export_from"         VARCHAR(255)  DEFAULT NULL,
+    "export_status"       VARCHAR(255)  DEFAULT NULL,
+    "export_from_type"    VARCHAR(255)  DEFAULT NULL,
+    "export_time"         BIGINT(20)    DEFAULT NULL,
+    "export_progress"     VARCHAR(255)  DEFAULT NULL,
+    "export_machine_name" VARCHAR(512)  DEFAULT NULL,
+    "params"              CLOB          NOT NULL COMMENT '过滤参数',
+    PRIMARY KEY ("id")
+) COMMENT='导出任务表';
+
+UPDATE `QRTZ_JOB_DETAILS` SET `JOB_CLASS_NAME` = 'io.dataease.job.schedule.CheckDsStatusJob' WHERE (`SCHED_NAME` = 'deSyncJob') and (`JOB_NAME` = 'Datasource') and (`JOB_GROUP` = 'check_status');
diff --git a/core/core-backend/src/main/resources/db/migration/V2.7__ddl.sql b/core/core-backend/src/main/resources/db/migration/V2.7__ddl.sql
index 6b9223fe5e..ecd9e924ff 100644
--- a/core/core-backend/src/main/resources/db/migration/V2.7__ddl.sql
+++ b/core/core-backend/src/main/resources/db/migration/V2.7__ddl.sql
@@ -52,3 +52,6 @@ CREATE TABLE `xpack_platform_token`
     PRIMARY KEY (`id`)
 );
 
+
+
+UPDATE `QRTZ_JOB_DETAILS` SET `JOB_CLASS_NAME` = 'io.dataease.job.schedule.CheckDsStatusJob' WHERE (`SCHED_NAME` = 'deSyncJob') and (`JOB_NAME` = 'Datasource') and (`JOB_GROUP` = 'check_status');
diff --git a/core/core-frontend/src/api/datasource.ts b/core/core-frontend/src/api/datasource.ts
index ef14354ba6..93f8186344 100644
--- a/core/core-frontend/src/api/datasource.ts
+++ b/core/core-frontend/src/api/datasource.ts
@@ -147,6 +147,8 @@ export const deleteById = (id: number) => request.get({ url: '/datasource/delete
 
 export const getById = (id: number) => request.get({ url: '/datasource/get/' + id })
 
+export const getHidePwById = (id: number) => request.get({ url: '/datasource/hidePw/' + id })
+
 export const uploadFile = async (data): Promise<IResponse> => {
   return request
     .post({
diff --git a/core/core-frontend/src/components/visualization/UserViewEnlarge.vue b/core/core-frontend/src/components/visualization/UserViewEnlarge.vue
index cd549446cd..3578f29692 100644
--- a/core/core-frontend/src/components/visualization/UserViewEnlarge.vue
+++ b/core/core-frontend/src/components/visualization/UserViewEnlarge.vue
@@ -204,8 +204,8 @@ const downloadViewDetails = () => {
   exportLoading.value = true
   exportExcelDownload(chart, () => {
     openMessageLoading(exportData)
-    exportLoading.value = false
   })
+  exportLoading.value = false
 }
 
 const exportData = () => {
diff --git a/core/core-frontend/src/views/chart/components/js/util.ts b/core/core-frontend/src/views/chart/components/js/util.ts
index 4c5fe2928b..9c64b79e1a 100644
--- a/core/core-frontend/src/views/chart/components/js/util.ts
+++ b/core/core-frontend/src/views/chart/components/js/util.ts
@@ -475,7 +475,6 @@ export const exportExcelDownload = (chart, callBack?) => {
         document.body.appendChild(link)
         link.click()
         document.body.removeChild(link)
-        callBack('success')
       } else {
         callBack && callBack(res)
       }
diff --git a/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue b/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue
index cf28672629..24da79ecdb 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue
@@ -65,8 +65,6 @@ const handleClick = tab => {
   } else {
     description.value = t('data_export.no_task')
   }
-
-  tableData.value = []
   drawerLoading.value = true
   exportTasks(activeName.value)
     .then(res => {
@@ -192,6 +190,7 @@ const callbackExport = () => {
 const downLoadAll = () => {
   if (multipleSelection.value.length === 0) {
     tableData.value.forEach(item => {
+      console.log(item.id)
       downloadFile(item.id)
         .then(res => {
           const blob = new Blob([res], { type: 'application/vnd.ms-excel' })
diff --git a/core/core-frontend/src/views/visualized/data/datasource/index.vue b/core/core-frontend/src/views/visualized/data/datasource/index.vue
index 0b73b41847..5a806a186f 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/index.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/index.vue
@@ -8,7 +8,7 @@ import ArrowSide from '@/views/common/DeResourceArrow.vue'
 import { HandleMore } from '@/components/handle-more'
 import { Icon } from '@/components/icon-custom'
 import { fieldType } from '@/utils/attr'
-import { listSyncRecord, uploadFile } from '@/api/datasource'
+import { getHidePwById, listSyncRecord, uploadFile } from '@/api/datasource'
 import CreatDsGroup from './form/CreatDsGroup.vue'
 import type { Tree } from '../dataset/form/CreatDsGroup.vue'
 import { previewData, getById } from '@/api/datasource'
@@ -455,7 +455,7 @@ const handleNodeClick = data => {
     dsListTree.value.setCurrentKey(null)
     return
   }
-  return getById(data.id).then(res => {
+  return getHidePwById(data.id).then(res => {
     let {
       name,
       createBy,
@@ -571,7 +571,48 @@ const editDatasource = (editType?: number) => {
   if (nodeInfo.type === 'Excel') {
     nodeInfo.editType = editType
   }
-  datasourceEditor.value.init(nodeInfo)
+  return getById(nodeInfo.id).then(res => {
+    let {
+      name,
+      createBy,
+      id,
+      createTime,
+      creator,
+      type,
+      pid,
+      configuration,
+      syncSetting,
+      apiConfigurationStr,
+      fileName,
+      size,
+      description,
+      lastSyncTime
+    } = res.data
+    if (configuration) {
+      configuration = JSON.parse(Base64.decode(configuration))
+    }
+    if (apiConfigurationStr) {
+      apiConfigurationStr = JSON.parse(Base64.decode(apiConfigurationStr))
+    }
+    let datasource = reactive<Node>(cloneDeep(defaultInfo))
+    Object.assign(datasource, {
+      name,
+      pid,
+      description,
+      fileName,
+      size,
+      createTime,
+      creator,
+      createBy,
+      id,
+      type,
+      configuration,
+      syncSetting,
+      apiConfiguration: apiConfigurationStr,
+      lastSyncTime
+    })
+    datasourceEditor.value.init(datasource)
+  })
 }
 
 const handleEdit = async data => {
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/ds/DatasourceApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/ds/DatasourceApi.java
index f0a6f5b0d6..d2e45c3141 100644
--- a/sdk/api/api-base/src/main/java/io/dataease/api/ds/DatasourceApi.java
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/ds/DatasourceApi.java
@@ -71,6 +71,11 @@ public interface DatasourceApi {
     @GetMapping("/get/{datasourceId}")
     DatasourceDTO get(@PathVariable("datasourceId") Long datasourceId) throws DEException;
 
+    @DePermit({"#p0+':read'"})
+    @GetMapping("/hidePw/{datasourceId}")
+    DatasourceDTO hidePw(@PathVariable("datasourceId") Long datasourceId) throws DEException;
+
+
     @PostMapping("/getTableField")
     List<TableField> getTableField(@RequestBody Map<String, String> req) throws DEException;
 
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/exportCenter/vo/ExportTaskDTO.java b/sdk/api/api-base/src/main/java/io/dataease/api/exportCenter/vo/ExportTaskDTO.java
index 145aee4c19..1b5fda860b 100644
--- a/sdk/api/api-base/src/main/java/io/dataease/api/exportCenter/vo/ExportTaskDTO.java
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/exportCenter/vo/ExportTaskDTO.java
@@ -30,4 +30,6 @@ public class ExportTaskDTO  {
     private String exportMachineName;
 
     private String exportFromName;
+
+    private String orgName;
 }
diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/variable/dto/SysVariableValueItem.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/variable/dto/SysVariableValueItem.java
index e0d53a845b..2bf18eb150 100644
--- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/variable/dto/SysVariableValueItem.java
+++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/variable/dto/SysVariableValueItem.java
@@ -8,7 +8,6 @@ import java.util.List;
 
 @Data
 public class SysVariableValueItem {
-    @JsonSerialize(using = ToStringSerializer.class)
     private String variableValue;
     @JsonSerialize(using = ToStringSerializer.class)
     private String variableValue2;

From a366d8d39cb5374619f31c2767319cef336a63f6 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 3 Jun 2024 19:30:27 +0800
Subject: [PATCH 16/81] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E5=8F=98=E9=87=8F=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
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 e66bdc3a8d..ed175c6663 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit e66bdc3a8d18a29287be512a7c929f1f1659cf0f
+Subproject commit ed175c6663b4d2b5b24179a4dc76a3af9b8a0ba2

From 8d909a8b3003a4de0cd1171a988a91babf3f33df Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 4 Jun 2024 09:41:23 +0800
Subject: [PATCH 17/81] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E8=A7=86=E9=A2=91=E7=BB=84=E4=BB=B6=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=E8=A7=86=E9=A2=91=E7=BB=84=E4=BB=B6=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E5=9C=A8IOS=E4=B8=8A=E6=92=AD=E6=94=BE=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/package.json               |  3 ++-
 .../src/custom-component/component-list.ts    | 27 +++++++++----------
 .../custom-component/de-video/Component.vue   |  6 ++---
 .../custom-component/de-video/VideoLinks.vue  |  2 +-
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/core/core-frontend/package.json b/core/core-frontend/package.json
index 71aeda025a..43ca839c9b 100644
--- a/core/core-frontend/package.json
+++ b/core/core-frontend/package.json
@@ -20,6 +20,7 @@
     "@codemirror/lang-sql": "^6.4.0",
     "@npkg/tinymce-plugins": "^0.0.7",
     "@tinymce/tinymce-vue": "^5.1.0",
+    "@videojs-player/vue": "^1.0.0",
     "@vueuse/core": "^9.13.0",
     "ace-builds": "^1.15.3",
     "axios": "^1.3.3",
@@ -45,6 +46,7 @@
     "snowflake-id": "^1.1.0",
     "tinymce": "^5.8.2",
     "vant": "^4.8.3",
+    "video.js": "^8.12.0",
     "vue": "^3.3.4",
     "vue-clipboard3": "^2.0.0",
     "vue-codemirror": "^6.1.1",
@@ -53,7 +55,6 @@
     "vue-types": "^5.0.2",
     "vue-uuid": "^3.0.0",
     "vue3-ace-editor": "^2.2.2",
-    "vue3-video-play": "^1.3.2",
     "vuedraggable": "^4.1.0",
     "web-storage-cache": "^1.1.1",
     "xss": "^1.0.14"
diff --git a/core/core-frontend/src/custom-component/component-list.ts b/core/core-frontend/src/custom-component/component-list.ts
index 8b6e3a5e4d..f4183e92eb 100644
--- a/core/core-frontend/src/custom-component/component-list.ts
+++ b/core/core-frontend/src/custom-component/component-list.ts
@@ -26,21 +26,20 @@ export const VIDEO_LINKS_DE2 = {
   videoType: 'web',
   poster: null,
   web: {
-    width: '100%', //播放器宽度
-    height: '100%', //播放器高度
-    color: '#409eff', //主题色
-    title: '', //视频名称
     src: null, //视频源
-    muted: false, //静音
-    webFullScreen: false,
-    speedRate: ['0.75', '1.0', '1.25', '1.5', '2.0'], //播放倍速
-    autoPlay: true, //自动播放
-    loop: false, //循环播放
-    mirror: false, //镜像画面
-    lightOff: false, //关灯模式
-    volume: 0.3, //默认音量大小
-    control: true, //是否显示控制
-    controlBtns: ['audioTrack', 'quality', 'volume', 'fullScreen'] //显示所有按钮,
+    autoplay: true, // 如果true,浏览器准备好时开始回放。
+    muted: true, // 默认情况下将会消除任何音频。
+    loop: true, // 导致视频一结束就重新开始。
+    preload: 'auto', // 建议浏览器在<video>加载元素后是否应该开始下载视频数据。auto浏览器选择最佳行为,立即开始加载视频（如果浏览器支持）
+    language: 'zh-CN',
+    fluid: true, // 当true时，Video.js player将拥有流体大小。换句话说，它将按比例缩放以适应其容器。
+    notSupportedMessage: '此视频暂无法播放，请稍后再试', // 允许覆盖Video.js无法播放媒体源时显示的默认信息。
+    controls: true,
+    controlBar: {
+      timeDivider: true,
+      remainingTimeDisplay: false,
+      fullscreenToggle: true // 全屏按钮
+    }
   },
   rtmp: {
     sources: [
diff --git a/core/core-frontend/src/custom-component/de-video/Component.vue b/core/core-frontend/src/custom-component/de-video/Component.vue
index 6e76cf6137..02d95f0c0d 100644
--- a/core/core-frontend/src/custom-component/de-video/Component.vue
+++ b/core/core-frontend/src/custom-component/de-video/Component.vue
@@ -1,7 +1,7 @@
 <template>
   <el-row ref="mainPlayer">
     <div v-if="element.videoLinks[element.videoLinks.videoType].src" class="player">
-      <video-play v-bind="playerOptions" />
+      <VideoPlayer :src="playerOptions.src" :options="playerOptions" />
     </div>
     <div v-else class="info-class">
       <span>{{ t('visualization.video_add_tips') }}</span>
@@ -10,8 +10,8 @@
 </template>
 
 <script setup lang="ts">
-import { videoPlay } from 'vue3-video-play/lib/index' // 引入组件
-import 'vue3-video-play/dist/style.css' // 引入css
+import { VideoPlayer } from '@videojs-player/vue'
+import 'video.js/dist/video-js.css'
 import { computed, nextTick, reactive, toRefs, watch, onMounted, ref } from 'vue'
 import { useEmitt } from '@/hooks/web/useEmitt'
 import { useI18n } from '@/hooks/web/useI18n'
diff --git a/core/core-frontend/src/custom-component/de-video/VideoLinks.vue b/core/core-frontend/src/custom-component/de-video/VideoLinks.vue
index bf8e805aa3..70c83c0d5a 100644
--- a/core/core-frontend/src/custom-component/de-video/VideoLinks.vue
+++ b/core/core-frontend/src/custom-component/de-video/VideoLinks.vue
@@ -5,7 +5,7 @@
         <el-switch
           :effect="themes"
           @change="onChange"
-          v-model="state.linkInfoTemp[state.linkInfoTemp.videoType].autoPlay"
+          v-model="state.linkInfoTemp[state.linkInfoTemp.videoType].autoplay"
           size="mini"
         />
       </el-form-item>

From 01ce1f612caf0b947c3f1fdbf3c439fbc7519e18 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Tue, 4 Jun 2024 09:53:20 +0800
Subject: [PATCH 18/81] =?UTF-8?q?fix(=E5=B5=8C=E5=85=A5=E5=BC=8F):=20?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/store/modules/interactive.ts       | 2 ++
 core/core-frontend/src/views/data-visualization/index.vue | 2 +-
 core/core-frontend/src/views/template-market/index.vue    | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/core-frontend/src/store/modules/interactive.ts b/core/core-frontend/src/store/modules/interactive.ts
index 40d7392e98..9b28b3a56b 100644
--- a/core/core-frontend/src/store/modules/interactive.ts
+++ b/core/core-frontend/src/store/modules/interactive.ts
@@ -69,6 +69,8 @@ export const interactiveStore = defineStore('interactive', {
       const method = apiMap[flag]
       const res = await method(param)
       this.data[flag] = convertInteractive(res)
+      console.log('this.data[flag]', this.data[flag], flag, this, res, busiFlagMap, param)
+
       if (flag === 0) {
         wsCache.set('panel-weight', convertLocalStorage(this.data[flag]))
       }
diff --git a/core/core-frontend/src/views/data-visualization/index.vue b/core/core-frontend/src/views/data-visualization/index.vue
index 2f58c0be5f..80ed02760b 100644
--- a/core/core-frontend/src/views/data-visualization/index.vue
+++ b/core/core-frontend/src/views/data-visualization/index.vue
@@ -305,7 +305,7 @@ onMounted(async () => {
     }
     let deTemplateData
     if (createType === 'template') {
-      const templateParamsApply = JSON.parse(decodeURIComponent(Base64.decode(templateParams + '')))
+      const templateParamsApply = JSON.parse(Base64.decode(decodeURIComponent(templateParams + '')))
       await decompressionPre(templateParamsApply, result => {
         deTemplateData = result
       })
diff --git a/core/core-frontend/src/views/template-market/index.vue b/core/core-frontend/src/views/template-market/index.vue
index aa921bb8b7..1642b8742b 100644
--- a/core/core-frontend/src/views/template-market/index.vue
+++ b/core/core-frontend/src/views/template-market/index.vue
@@ -282,6 +282,8 @@ const state = reactive({
 
 const createAuth = computed(() => {
   const authMap = interactiveStore.getData
+  console.log('authMap', authMap)
+
   return {
     PANEL: authMap['0'].menuAuth && authMap['0'].anyManage,
     SCREEN: authMap['1'].menuAuth && authMap['1'].anyManage

From 091b6579e5369bcf96f6edadf93774303b090310 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Tue, 4 Jun 2024 10:02:11 +0800
Subject: [PATCH 19/81] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/visualized/data/dataset/form/index.vue          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/index.vue b/core/core-frontend/src/views/visualized/data/dataset/form/index.vue
index ab7d0da59e..a9e57978a6 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/form/index.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/form/index.vue
@@ -1327,10 +1327,10 @@ const getDsIconName = data => {
             </el-icon>
             <span class="label">自定义SQL</span>
           </div>
-          <template v-for="ele in state.tableData" :key="ele.name">
+          <template v-for="ele in state.tableData" :key="ele.tableName">
             <div
               class="list-item_primary"
-              :title="ele.name"
+              :title="ele.tableName"
               @dragstart="$event => dragstart($event, ele)"
               @dragend="maskShow = false"
               :draggable="true"

From bfa0d131f330f0362e31cdbbad971c9d8f933cf1 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 4 Jun 2024 10:22:31 +0800
Subject: [PATCH 20/81] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E6=89=93=E5=8C=85=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/package.json         | 2 +-
 core/core-frontend/src/style/index.less | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/core-frontend/package.json b/core/core-frontend/package.json
index 43ca839c9b..fd2bce3be7 100644
--- a/core/core-frontend/package.json
+++ b/core/core-frontend/package.json
@@ -46,7 +46,7 @@
     "snowflake-id": "^1.1.0",
     "tinymce": "^5.8.2",
     "vant": "^4.8.3",
-    "video.js": "^8.12.0",
+    "video.js": "^7.21.6",
     "vue": "^3.3.4",
     "vue-clipboard3": "^2.0.0",
     "vue-codemirror": "^6.1.1",
diff --git a/core/core-frontend/src/style/index.less b/core/core-frontend/src/style/index.less
index 82cb97a7c9..7bc2f8a6cc 100644
--- a/core/core-frontend/src/style/index.less
+++ b/core/core-frontend/src/style/index.less
@@ -409,3 +409,8 @@ strong {
   align-items: center;
   justify-content: center
 }
+
+.vjs-big-play-button {
+  top: calc(50% - 22px) !important;
+  left: calc(50% - 40px) !important;
+}

From 2051674c85093365ef2ea7828ad6c1c3abfe4e86 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 4 Jun 2024 10:35:42 +0800
Subject: [PATCH 21/81] =?UTF-8?q?refactor:=20=E4=BF=AE=E5=A4=8Dai=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E6=9C=AC=E5=9C=B0=E8=AE=B0=E5=BD=95=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/layout/components/Header.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/core-frontend/src/layout/components/Header.vue b/core/core-frontend/src/layout/components/Header.vue
index edeb8cf4ad..ca2f16c6ac 100644
--- a/core/core-frontend/src/layout/components/Header.vue
+++ b/core/core-frontend/src/layout/components/Header.vue
@@ -22,7 +22,8 @@ import AiTips from '@/layout/components/AiTips.vue'
 const appearanceStore = useAppearanceStoreWithOut()
 const { push } = useRouter()
 const route = useRoute()
-
+import { useCache } from '@/hooks/web/useCache'
+const { wsCache } = useCache('localStorage')
 const aiBaseUrl = ref(null)
 const handleIconClick = () => {
   if (route.path === '/workbranch/index') return
@@ -65,7 +66,7 @@ const navigateBg = computed(() => appearanceStore.getNavigateBg)
 const navigate = computed(() => appearanceStore.getNavigate)
 
 const initAiBase = async () => {
-  const aiTipsCheck = localStorage.getItem('DE-AI-TIPS-CHECK')
+  const aiTipsCheck = wsCache.get('DE-AI-TIPS-CHECK')
   if (aiTipsCheck === 'CHECKED') {
     showOverlay.value = false
   } else {
@@ -80,7 +81,7 @@ const initAiBase = async () => {
 }
 
 const aiTipsConfirm = () => {
-  localStorage.setItem('DE-AI-TIPS-CHECK', 'CHECKED')
+  wsCache.set('DE-AI-TIPS-CHECK', 'CHECKED')
   showOverlay.value = false
 }
 onMounted(() => {

From 4f3b09d3792dc34e1bcd96a6b29c3e369f9a46ef Mon Sep 17 00:00:00 2001
From: jianneng-fit2cloud <jianneng.pan@fit2cloud.com>
Date: Tue, 4 Jun 2024 10:54:18 +0800
Subject: [PATCH 22/81] =?UTF-8?q?style(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E8=BD=B4=E7=BA=BF=E7=BD=91=E6=A0=BC=E7=BA=BF=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B9=EF=BC=8C=E5=AE=BD=E5=BA=A6=E6=95=B0=E5=AD=97=E6=A1=86?=
 =?UTF-8?q?=E7=9A=84=E9=95=BF=E5=BA=A6=E6=94=B9=E6=88=9070px,=E9=81=BF?=
 =?UTF-8?q?=E5=85=8D=E4=B8=8E=E6=BB=9A=E5=8A=A8=E6=9D=A1=E9=87=8D=E5=8F=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../editor/editor-style/components/DualYAxisSelectorInner.vue   | 2 +-
 .../components/editor/editor-style/components/XAxisSelector.vue | 2 +-
 .../components/editor/editor-style/components/YAxisSelector.vue | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/DualYAxisSelectorInner.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/DualYAxisSelectorInner.vue
index e3508f9d1a..a950e0d2a3 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/DualYAxisSelectorInner.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/DualYAxisSelectorInner.vue
@@ -309,7 +309,7 @@ onMounted(() => {
         <el-form-item class="form-item" :class="'form-item-' + themes" style="padding-left: 4px">
           <el-input-number
             :disabled="!state.axisForm.splitLine.show"
-            style="width: 74px"
+            style="width: 70px"
             :effect="props.themes"
             v-model="state.axisForm.splitLine.lineStyle.width"
             :min="1"
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/XAxisSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/XAxisSelector.vue
index c6b361e35f..bd357bd5e2 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/XAxisSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/XAxisSelector.vue
@@ -335,7 +335,7 @@ onMounted(() => {
         <el-form-item class="form-item" :class="'form-item-' + themes" style="padding-left: 4px">
           <el-input-number
             :disabled="!state.axisForm.splitLine.show"
-            style="width: 74px"
+            style="width: 70px"
             :effect="props.themes"
             v-model="state.axisForm.splitLine.lineStyle.width"
             :min="1"
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/YAxisSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/YAxisSelector.vue
index 62c7fdfe0e..d0f77ed3fe 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/YAxisSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/YAxisSelector.vue
@@ -317,7 +317,7 @@ onMounted(() => {
         <el-form-item class="form-item" :class="'form-item-' + themes" style="padding-left: 4px">
           <el-input-number
             :disabled="!state.axisForm.splitLine.show"
-            style="width: 74px"
+            style="width: 70px"
             :effect="props.themes"
             v-model="state.axisForm.splitLine.lineStyle.width"
             :min="1"

From 230804d95090d20b2ba7ce99219e1ce31f2ee3bf Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Tue, 4 Jun 2024 11:04:25 +0800
Subject: [PATCH 23/81] =?UTF-8?q?refactor:=20=E8=BF=87=E6=BB=A4=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8B=E6=8B=89=E9=80=89=E9=A1=B9=E5=80=BC=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataset/manage/DatasetDataManage.java     | 37 ++++++++-----------
 .../dataease/engine/trans/Order2SQLObj.java   |  6 +--
 2 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java
index d70a50a101..68924c114e 100644
--- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java
+++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java
@@ -1,7 +1,6 @@
 package io.dataease.dataset.manage;
 
 import io.dataease.api.chart.dto.ChartExtFilterDTO;
-import io.dataease.api.chart.dto.ChartViewDTO;
 import io.dataease.api.chart.dto.ColumnPermissionItem;
 import io.dataease.api.chart.dto.DeSortField;
 import io.dataease.api.chart.request.ChartExtRequest;
@@ -204,7 +203,7 @@ public class DatasetDataManage {
         Table2SQLObj.table2sqlobj(sqlMeta, null, "(" + sql + ")", crossDs);
         Field2SQLObj.field2sqlObj(sqlMeta, fields, fields, crossDs, dsMap);
         WhereTree2Str.transFilterTrees(sqlMeta, rowPermissionsTree, fields, crossDs, dsMap);
-        Order2SQLObj.getOrders(sqlMeta, fields, datasetGroupInfoDTO.getSortFields(), crossDs, dsMap);
+        Order2SQLObj.getOrders(sqlMeta, datasetGroupInfoDTO.getSortFields(), fields, crossDs, dsMap);
         String querySQL;
         if (start == null || count == null) {
             querySQL = SQLProvider.createQuerySQL(sqlMeta, false, needOrder, false);
@@ -425,13 +424,9 @@ public class DatasetDataManage {
             }
             List<DatasetTableFieldDTO> allFields = new ArrayList<>();
             // 根据图表计算字段，获取数据集
-            Long datasetGroupId;
-            if (field.getDatasetGroupId() == null && field.getChartId() != null) {
-                ChartViewDTO chart = chartViewManege.getChart(field.getChartId());
-                datasetGroupId = chart.getTableId();
+            Long datasetGroupId = field.getDatasetGroupId();
+            if (field.getChartId() != null) {
                 allFields.addAll(datasetTableFieldManage.getChartCalcFields(field.getChartId()));
-            } else {
-                datasetGroupId = field.getDatasetGroupId();
             }
             DatasetGroupInfoDTO datasetGroupInfoDTO = datasetGroupManage.get(datasetGroupId, null);
 
@@ -471,9 +466,9 @@ public class DatasetDataManage {
                 rowPermissionsTree = permissionManage.getRowPermissionsTree(datasetGroupInfoDTO.getId(), user.getUserId());
             }
 
-            Field2SQLObj.field2sqlObj(sqlMeta, fields, datasetGroupInfoDTO.getAllFields(), crossDs, dsMap);
-            WhereTree2Str.transFilterTrees(sqlMeta, rowPermissionsTree, fields, crossDs, dsMap);
-            Order2SQLObj.getOrders(sqlMeta, fields, datasetGroupInfoDTO.getSortFields(), crossDs, dsMap);
+            Field2SQLObj.field2sqlObj(sqlMeta, fields, allFields, crossDs, dsMap);
+            WhereTree2Str.transFilterTrees(sqlMeta, rowPermissionsTree, allFields, crossDs, dsMap);
+            Order2SQLObj.getOrders(sqlMeta, datasetGroupInfoDTO.getSortFields(), allFields, crossDs, dsMap);
             String querySQL = SQLProvider.createQuerySQLWithLimit(sqlMeta, false, needOrder, true, 0, 1000);
             querySQL = SqlUtils.rebuildSQL(querySQL, sqlMeta, crossDs, dsMap);
             logger.info("calcite data enum sql: " + querySQL);
@@ -539,20 +534,18 @@ public class DatasetDataManage {
             }
         }
 
+        List<DatasetTableFieldDTO> allFields = new ArrayList<>();
+
         for (Long id : ids) {
             DatasetTableFieldDTO field = datasetTableFieldManage.selectById(id);
             if (field == null) {
                 DEException.throwException(Translator.get("i18n_no_field"));
             }
-            List<DatasetTableFieldDTO> allFields = new ArrayList<>();
+
             // 根据图表计算字段，获取数据集
-            Long datasetGroupId;
-            if (field.getDatasetGroupId() == null && field.getChartId() != null) {
-                ChartViewDTO chart = chartViewManege.getChart(field.getChartId());
-                datasetGroupId = chart.getTableId();
+            Long datasetGroupId = field.getDatasetGroupId();
+            if (field.getChartId() != null) {
                 allFields.addAll(datasetTableFieldManage.getChartCalcFields(field.getChartId()));
-            } else {
-                datasetGroupId = field.getDatasetGroupId();
             }
             datasetGroupInfoDTO = datasetGroupManage.get(datasetGroupId, null);
 
@@ -687,10 +680,10 @@ public class DatasetDataManage {
             sortDistinct = false;
         }
 
-        Field2SQLObj.field2sqlObj(sqlMeta, fields, datasetGroupInfoDTO.getAllFields(), crossDs, dsMap);
-        ExtWhere2Str.extWhere2sqlOjb(sqlMeta, extFilterList, datasetGroupInfoDTO.getAllFields(), crossDs, dsMap);
-        WhereTree2Str.transFilterTrees(sqlMeta, rowPermissionsTree, fields, crossDs, dsMap);
-        Order2SQLObj.getOrders(sqlMeta, fields, datasetGroupInfoDTO.getSortFields(), crossDs, dsMap);
+        Field2SQLObj.field2sqlObj(sqlMeta, fields, allFields, crossDs, dsMap);
+        ExtWhere2Str.extWhere2sqlOjb(sqlMeta, extFilterList, allFields, crossDs, dsMap);
+        WhereTree2Str.transFilterTrees(sqlMeta, rowPermissionsTree, allFields, crossDs, dsMap);
+        Order2SQLObj.getOrders(sqlMeta, datasetGroupInfoDTO.getSortFields(), allFields, crossDs, dsMap);
         String querySQL = SQLProvider.createQuerySQLWithLimit(sqlMeta, false, needOrder, sortDistinct && ids.size() == 1, 0, 1000);
         querySQL = SqlUtils.rebuildSQL(querySQL, sqlMeta, crossDs, dsMap);
         logger.info("calcite data enum sql: " + querySQL);
diff --git a/core/core-backend/src/main/java/io/dataease/engine/trans/Order2SQLObj.java b/core/core-backend/src/main/java/io/dataease/engine/trans/Order2SQLObj.java
index 5798d270be..54d6d4ab23 100644
--- a/core/core-backend/src/main/java/io/dataease/engine/trans/Order2SQLObj.java
+++ b/core/core-backend/src/main/java/io/dataease/engine/trans/Order2SQLObj.java
@@ -22,17 +22,17 @@ import java.util.Objects;
  */
 public class Order2SQLObj {
 
-    public static void getOrders(SQLMeta meta, List<DatasetTableFieldDTO> fields, List<DeSortField> sortFields, boolean isCross, Map<Long, DatasourceSchemaDTO> dsMap) {
+    public static void getOrders(SQLMeta meta, List<DeSortField> sortFields, List<DatasetTableFieldDTO> originFields, boolean isCross, Map<Long, DatasourceSchemaDTO> dsMap) {
         SQLObj tableObj = meta.getTable();
         List<SQLObj> xOrders = meta.getXOrders() == null ? new ArrayList<>() : meta.getXOrders();
         if (ObjectUtils.isEmpty(tableObj)) {
             return;
         }
         if (ObjectUtils.isNotEmpty(sortFields)) {
-            int step = fields.size();
+            int step = originFields.size();
             for (int i = step; i < (step + sortFields.size()); i++) {
                 DeSortField deSortField = sortFields.get(i - step);
-                SQLObj order = buildSortField(deSortField, tableObj, i, fields, isCross, dsMap);
+                SQLObj order = buildSortField(deSortField, tableObj, i, originFields, isCross, dsMap);
                 xOrders.add(order);
             }
             meta.setXOrders(xOrders);

From 624d11c72230b643323904bb851476abd8ebfec4 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 4 Jun 2024 12:07:29 +0800
Subject: [PATCH 24/81] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E8=81=94?=
 =?UTF-8?q?=E5=8A=A8=E8=AE=BE=E7=BD=AE=EF=BC=8C=E8=81=94=E5=8A=A8=E6=BA=90?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=8F=AA=E5=85=81=E8=AE=B8=E6=98=AF=E7=BB=B4?=
 =?UTF-8?q?=E5=BA=A6=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/visualization/LinkageSet.vue     | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/core/core-frontend/src/components/visualization/LinkageSet.vue b/core/core-frontend/src/components/visualization/LinkageSet.vue
index 580082b7f2..fd11819906 100644
--- a/core/core-frontend/src/components/visualization/LinkageSet.vue
+++ b/core/core-frontend/src/components/visualization/LinkageSet.vue
@@ -371,14 +371,9 @@ const linkageFieldAdaptor = async data => {
       if (state.curLinkageViewInfo.tableId === targetChartDetails.tableId) {
         const curCheckAllAxisStr =
           JSON.stringify(state.curLinkageViewInfo.xAxis) +
-          JSON.stringify(state.curLinkageViewInfo.xAxisExt) +
-          JSON.stringify(state.curLinkageViewInfo.yAxis) +
-          JSON.stringify(state.curLinkageViewInfo.yAxisExt)
+          JSON.stringify(state.curLinkageViewInfo.xAxisExt)
         const targetCheckAllAxisStr =
-          JSON.stringify(targetChartDetails.xAxis) +
-          JSON.stringify(targetChartDetails.xAxisExt) +
-          JSON.stringify(targetChartDetails.yAxis) +
-          JSON.stringify(targetChartDetails.yAxisExt)
+          JSON.stringify(targetChartDetails.xAxis) + JSON.stringify(targetChartDetails.xAxisExt)
         state.sourceLinkageInfo.targetViewFields.forEach(item => {
           if (curCheckAllAxisStr.includes(item.id) && targetCheckAllAxisStr.includes(item.id)) {
             addLinkageField(item.id, item.id)
@@ -395,9 +390,7 @@ const sourceLinkageInfoFilter = computed(() => {
   if (state.sourceLinkageInfo.targetViewFields) {
     const curCheckAllAxisStr =
       JSON.stringify(state.curLinkageViewInfo.xAxis) +
-      JSON.stringify(state.curLinkageViewInfo.xAxisExt) +
-      JSON.stringify(state.curLinkageViewInfo.yAxis) +
-      JSON.stringify(state.curLinkageViewInfo.yAxisExt)
+      JSON.stringify(state.curLinkageViewInfo.xAxisExt)
     return state.sourceLinkageInfo.targetViewFields.filter(item =>
       curCheckAllAxisStr.includes(item.id)
     )

From d313db41902e0fca6755bd4bff3588aa1ee29e1d Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Tue, 4 Jun 2024 14:09:42 +0800
Subject: [PATCH 25/81] =?UTF-8?q?fix(=E5=B5=8C=E5=85=A5=E5=BC=8F):=20?=
 =?UTF-8?q?=E5=B5=8C=E5=85=A5=E5=BC=8F=E6=9D=83=E9=99=90=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/store/modules/interactive.ts        | 2 --
 .../template-market/component/TemplateMarketV2Item.vue     | 7 ++++++-
 core/core-frontend/src/views/template-market/index.vue     | 6 ++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/core/core-frontend/src/store/modules/interactive.ts b/core/core-frontend/src/store/modules/interactive.ts
index 9b28b3a56b..40d7392e98 100644
--- a/core/core-frontend/src/store/modules/interactive.ts
+++ b/core/core-frontend/src/store/modules/interactive.ts
@@ -69,8 +69,6 @@ export const interactiveStore = defineStore('interactive', {
       const method = apiMap[flag]
       const res = await method(param)
       this.data[flag] = convertInteractive(res)
-      console.log('this.data[flag]', this.data[flag], flag, this, res, busiFlagMap, param)
-
       if (flag === 0) {
         wsCache.set('panel-weight', convertLocalStorage(this.data[flag]))
       }
diff --git a/core/core-frontend/src/views/template-market/component/TemplateMarketV2Item.vue b/core/core-frontend/src/views/template-market/component/TemplateMarketV2Item.vue
index 1cebaee031..c5b560ab10 100644
--- a/core/core-frontend/src/views/template-market/component/TemplateMarketV2Item.vue
+++ b/core/core-frontend/src/views/template-market/component/TemplateMarketV2Item.vue
@@ -23,7 +23,7 @@
 
 <script setup lang="ts">
 import { useI18n } from '@/hooks/web/useI18n'
-import { computed } from 'vue'
+import { computed, onMounted } from 'vue'
 import { imgUrlTrans } from '@/utils/imgUtils'
 const { t } = useI18n()
 
@@ -56,6 +56,11 @@ const props = defineProps({
   }
 })
 
+onMounted(() => {
+  console.log('template', props.template)
+  console.log('createAuth', props.createAuth)
+})
+
 const classBackground = computed(() => {
   return {
     width: props.width + 'px',
diff --git a/core/core-frontend/src/views/template-market/index.vue b/core/core-frontend/src/views/template-market/index.vue
index 1642b8742b..20769d4de1 100644
--- a/core/core-frontend/src/views/template-market/index.vue
+++ b/core/core-frontend/src/views/template-market/index.vue
@@ -282,11 +282,9 @@ const state = reactive({
 
 const createAuth = computed(() => {
   const authMap = interactiveStore.getData
-  console.log('authMap', authMap)
-
   return {
-    PANEL: authMap['0'].menuAuth && authMap['0'].anyManage,
-    SCREEN: authMap['1'].menuAuth && authMap['1'].anyManage
+    PANEL: authMap['0']?.menuAuth && authMap['0']?.anyManage,
+    SCREEN: authMap['1']?.menuAuth && authMap['1']?.anyManage
   }
 })
 

From 8f816214ffa6e10717d59998980edde86f23e7eb Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 4 Jun 2024 15:09:03 +0800
Subject: [PATCH 26/81] =?UTF-8?q?perf(X-Pack):=20=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E9=A3=9E=E4=B9=A6=E7=BE=A4=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 de-xpack                                                       | 2 +-
 sdk/common/src/main/java/io/dataease/constant/MessageEnum.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/de-xpack b/de-xpack
index ed175c6663..5653ec40d5 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit ed175c6663b4d2b5b24179a4dc76a3af9b8a0ba2
+Subproject commit 5653ec40d54d78c825f7a3fd4760b2b71098d45f
diff --git a/sdk/common/src/main/java/io/dataease/constant/MessageEnum.java b/sdk/common/src/main/java/io/dataease/constant/MessageEnum.java
index 8b11ef3706..bed5e24fe6 100644
--- a/sdk/common/src/main/java/io/dataease/constant/MessageEnum.java
+++ b/sdk/common/src/main/java/io/dataease/constant/MessageEnum.java
@@ -4,7 +4,7 @@ import java.util.Arrays;
 
 public enum MessageEnum {
 
-    INNER(0), EMAIL(1), WECOM(2), DINGTALK(3), LARK(4), LARKSUITE(5);
+    INNER(0), EMAIL(1), WECOM(2), DINGTALK(3), LARK(4), LARKSUITE(5), LARKGROUP(6);
     private Integer flag;
 
     public Integer getFlag() {

From d5aa69e30e222371affd343ca429c4a0dacd2b7c Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Tue, 4 Jun 2024 15:19:34 +0800
Subject: [PATCH 27/81] =?UTF-8?q?fix(=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6)?=
 =?UTF-8?q?:=20=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E8=BE=83=E9=95=BF=E5=B9=B6=E5=90=8C=E6=97=B6=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=BA=E5=BF=85=E5=A1=AB=E9=A1=B9=E6=97=B6=EF=BC=8C=E5=BF=85?=
 =?UTF-8?q?=E5=A1=AB=E9=A1=B9=E6=A0=87=E8=AE=B0=E3=80=8C*=E3=80=8D?=
 =?UTF-8?q?=E8=A2=AB=E9=81=AE=E6=8C=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/custom-component/v-query/Component.vue     | 14 +++++++-------
 .../component/TemplateMarketV2Item.vue             |  7 +------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/core/core-frontend/src/custom-component/v-query/Component.vue b/core/core-frontend/src/custom-component/v-query/Component.vue
index 82c6a6f0ce..bb2a635898 100644
--- a/core/core-frontend/src/custom-component/v-query/Component.vue
+++ b/core/core-frontend/src/custom-component/v-query/Component.vue
@@ -423,8 +423,8 @@ const autoStyle = computed(() => {
                   <el-tooltip effect="dark" :content="ele.name" placement="top">
                     {{ ele.name }}
                   </el-tooltip>
-                  <span v-if="ele.required" class="required">*</span>
                 </div>
+                <span v-if="ele.required" class="required">*</span>
               </div>
               <div
                 class="label-wrapper-tooltip"
@@ -573,13 +573,13 @@ const autoStyle = computed(() => {
           font-style: normal;
           font-weight: 400;
           line-height: 22px;
+        }
 
-          .required {
-            font-size: 14px;
-            color: #f54a45;
-            margin-left: 3px;
-            line-height: 22px;
-          }
+        .required {
+          font-size: 14px;
+          color: #f54a45;
+          margin-left: 3px;
+          line-height: 22px;
         }
         .label-wrapper-tooltip {
           align-items: center;
diff --git a/core/core-frontend/src/views/template-market/component/TemplateMarketV2Item.vue b/core/core-frontend/src/views/template-market/component/TemplateMarketV2Item.vue
index c5b560ab10..1cebaee031 100644
--- a/core/core-frontend/src/views/template-market/component/TemplateMarketV2Item.vue
+++ b/core/core-frontend/src/views/template-market/component/TemplateMarketV2Item.vue
@@ -23,7 +23,7 @@
 
 <script setup lang="ts">
 import { useI18n } from '@/hooks/web/useI18n'
-import { computed, onMounted } from 'vue'
+import { computed } from 'vue'
 import { imgUrlTrans } from '@/utils/imgUtils'
 const { t } = useI18n()
 
@@ -56,11 +56,6 @@ const props = defineProps({
   }
 })
 
-onMounted(() => {
-  console.log('template', props.template)
-  console.log('createAuth', props.createAuth)
-})
-
 const classBackground = computed(() => {
   return {
     width: props.width + 'px',

From dab153631d67b3feac2e7dff285d52d8baf4d020 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 4 Jun 2024 15:41:17 +0800
Subject: [PATCH 28/81] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E5=8F=98=E9=87=8F=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/ExportCenterManage.java            | 19 ++++++++++++++++
 core/core-frontend/src/locales/zh-CN.ts       |  1 +
 .../system/parameter/basic/BasicEdit.vue      | 22 +++++++++++++++++++
 .../datasource/form/ApiHttpRequestDraw.vue    |  2 +-
 .../variable/dto/SysVariableDto.java          |  2 ++
 5 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java
index 3a9aa8ebff..daa2fa27af 100644
--- a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java
+++ b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java
@@ -12,10 +12,12 @@ import io.dataease.engine.constant.DeTypeConstants;
 import io.dataease.exception.DEException;
 import io.dataease.exportCenter.dao.auto.entity.CoreExportTask;
 import io.dataease.exportCenter.dao.auto.mapper.CoreExportTaskMapper;
+import io.dataease.system.manage.SysParameterManage;
 import io.dataease.utils.*;
 import io.dataease.visualization.server.DataVisualizationServer;
 import io.dataease.websocket.WsMessage;
 import io.dataease.websocket.WsService;
+import io.dataease.xpack.base.log.dao.auto.entity.XpackLog;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
@@ -50,6 +52,8 @@ public class ExportCenterManage {
     private CoreChartViewMapper coreChartViewMapper;
     @Autowired
     private WsService wsService;
+    @Resource
+    private  SysParameterManage sysParameterManage;
 
     @Value("${export.dataset.limit:100000}")
     private int limit;
@@ -417,6 +421,21 @@ public class ExportCenterManage {
 
     private static final String LOG_RETENTION = "30";
 
+    public void cleanLog() {
+        String key = "basic.exportFileLiveTime";
+        String val = sysParameterManage.singleVal(key);
+        if (StringUtils.isBlank(val)) {
+            DEException.throwException("未获取到文件保留时间");
+        }
+        QueryWrapper<CoreExportTask> queryWrapper = new QueryWrapper<>();
+        long expTime = Long.parseLong(val) * 24L * 3600L * 1000L;
+        long threshold = System.currentTimeMillis() - expTime;
+        queryWrapper.lt("export_time", threshold);
+        exportTaskMapper.selectList(queryWrapper).forEach(coreExportTask -> {
+            delete(coreExportTask.getId());
+        });
+
+    }
 
 }
 
diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts
index bc0bcaf73f..7c7d0630ba 100644
--- a/core/core-frontend/src/locales/zh-CN.ts
+++ b/core/core-frontend/src/locales/zh-CN.ts
@@ -2222,6 +2222,7 @@ export default {
     dsExecuteTime: '数据源检测频率',
     frontTimeOut: '请求超时时间（秒）',
     logLiveTime: '操作日志保留时间（天）',
+    exportFileLiveTime: '后台导出文件保留时间（天）',
     platformOid: '第三方平台用户组织',
     platformRid: '第三方平台用户角色',
     pwdStrategy: '开启密码策略',
diff --git a/core/core-frontend/src/views/system/parameter/basic/BasicEdit.vue b/core/core-frontend/src/views/system/parameter/basic/BasicEdit.vue
index 84685254d4..d41d46e646 100644
--- a/core/core-frontend/src/views/system/parameter/basic/BasicEdit.vue
+++ b/core/core-frontend/src/views/system/parameter/basic/BasicEdit.vue
@@ -125,6 +125,15 @@ const edit = (list, orgOptions, roleOptions) => {
         }
       ]
     }
+    if (pkey === 'basic.exportFileLiveTime') {
+      rule[pkey.split('.')[1]] = [
+        {
+          required: true,
+          message: t('common.require'),
+          trigger: ['blur', 'change']
+        }
+      ]
+    }
     item['label'] = `setting_${pkey}`
     item['pkey'] = pkey.split('.')[1]
     let pval = item.pval
@@ -301,6 +310,19 @@ defineExpose({
             />
           </el-select>
         </div>
+        <div v-else-if="item.pkey === 'exportFileLiveTime'">
+          <el-input-number
+            v-model="state.form[item.pkey]"
+            autocomplete="off"
+            step-strictly
+            class="text-left edit-all-line"
+            :min="1"
+            :max="4000"
+            :placeholder="t('common.inputText')"
+            controls-position="right"
+            type="number"
+          />
+        </div>
         <v-else />
       </el-form-item>
     </el-form>
diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/ApiHttpRequestDraw.vue b/core/core-frontend/src/views/visualized/data/datasource/form/ApiHttpRequestDraw.vue
index ab4e66effd..de0a804dc9 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/form/ApiHttpRequestDraw.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/ApiHttpRequestDraw.vue
@@ -458,7 +458,7 @@ defineExpose({
         </div>
         <el-form-item :label="$t('datasource.query_timeout')" prop="apiQueryTimeout">
           <el-input v-model="apiItem.apiQueryTimeout" autocomplete="off" type="number" :min="0">
-            <template v-slot:append>{{ $t('panel.second') }}</template>
+            <template v-slot:append>{{ $t('chart.second') }}</template>
           </el-input>
         </el-form-item>
         <div class="title-form_primary request-info">
diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/variable/dto/SysVariableDto.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/variable/dto/SysVariableDto.java
index 6aea6da2f7..506e077dde 100644
--- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/variable/dto/SysVariableDto.java
+++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/variable/dto/SysVariableDto.java
@@ -10,7 +10,9 @@ public class SysVariableDto {
     private Long id;
     private String type;
     private String name;
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long min;
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long max;
     private String startTime;
     private String endTime;

From a203e2a058761855eceaa723554a98a21ccc05d7 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 4 Jun 2024 15:43:08 +0800
Subject: [PATCH 29/81] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E5=8F=98=E9=87=8F=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
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 5653ec40d5..46a6d69d47 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 5653ec40d54d78c825f7a3fd4760b2b71098d45f
+Subproject commit 46a6d69d471d88a06eb18c98db574eb154b8acc6

From b1573c4c5370d620fa6aeee1bf0f8fabfd5c63da Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Tue, 4 Jun 2024 15:53:42 +0800
Subject: [PATCH 30/81] =?UTF-8?q?fix(=E5=B5=8C=E5=85=A5=E5=BC=8F):=20ifram?=
 =?UTF-8?q?e=E5=B5=8C=E5=85=A5=E5=BC=8F=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/views/common/DeResourceTree.vue | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/core/core-frontend/src/views/common/DeResourceTree.vue b/core/core-frontend/src/views/common/DeResourceTree.vue
index 5562947855..704b27c0b1 100644
--- a/core/core-frontend/src/views/common/DeResourceTree.vue
+++ b/core/core-frontend/src/views/common/DeResourceTree.vue
@@ -106,6 +106,7 @@ const dvSvgType = computed(() =>
 )
 
 const isDataEaseBi = computed(() => appStore.getIsDataEaseBi)
+const isIframe = computed(() => appStore.getIsIframe)
 
 const resourceTypeList = computed(() => {
   const list = [
@@ -368,6 +369,14 @@ const resourceEdit = resourceId => {
     )
     return
   }
+
+  if (isIframe.value) {
+    router.push({
+      path: curCanvasType.value === 'dataV' ? 'dvCanvas' : 'dashboard',
+      query: curCanvasType.value === 'dataV' ? { dvId: resourceId } : { resourceId }
+    })
+    return
+  }
   const newWindow = window.open(baseUrl + resourceId, '_blank')
   initOpenHandler(newWindow)
 }

From 51e026118a887408c9db9c79f2d7c514336ea9df Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 4 Jun 2024 16:48:52 +0800
Subject: [PATCH 31/81] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F)?=
 =?UTF-8?q?:=20=E4=BF=AE=E5=A4=8D=E5=A4=9A=E9=80=89command=E9=94=AE?=
 =?UTF-8?q?=E5=8F=AF=E8=83=BD=E4=B8=8D=E5=87=86=E7=A1=AE=E9=80=A0=E6=88=90?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E9=80=89=E6=8B=A9=E4=B8=8D=E5=87=86=E7=A1=AE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RealTimeComponentList.vue                 | 473 ------------------
 core/core-frontend/src/utils/DeShortcutKey.ts |   2 +-
 2 files changed, 1 insertion(+), 474 deletions(-)
 delete mode 100644 core/core-frontend/src/components/data-visualization/RealTimeComponentList.vue

diff --git a/core/core-frontend/src/components/data-visualization/RealTimeComponentList.vue b/core/core-frontend/src/components/data-visualization/RealTimeComponentList.vue
deleted file mode 100644
index 54b85c0df7..0000000000
--- a/core/core-frontend/src/components/data-visualization/RealTimeComponentList.vue
+++ /dev/null
@@ -1,473 +0,0 @@
-<script lang="ts" setup>
-import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
-import { snapshotStoreWithOut } from '@/store/modules/data-visualization/snapshot'
-import { layerStoreWithOut } from '@/store/modules/data-visualization/layer'
-import { storeToRefs } from 'pinia'
-import { ElIcon, ElRow } from 'element-plus-secondary'
-import Icon from '../icon-custom/src/Icon.vue'
-import { nextTick, ref } from 'vue'
-import draggable from 'vuedraggable'
-import { lockStoreWithOut } from '@/store/modules/data-visualization/lock'
-import ContextMenuAsideDetails from '@/components/data-visualization/canvas/ContextMenuAsideDetails.vue'
-import ComposeShow from '@/components/data-visualization/canvas/ComposeShow.vue'
-import { composeStoreWithOut } from '@/store/modules/data-visualization/compose'
-const dropdownMore = ref(null)
-const lockStore = lockStoreWithOut()
-
-const dvMainStore = dvMainStoreWithOut()
-const snapshotStore = snapshotStoreWithOut()
-const layerStore = layerStoreWithOut()
-const composeStore = composeStoreWithOut()
-
-const { areaData, isCtrlOrCmdDown, isShiftDown, laterIndex } = storeToRefs(composeStore)
-
-const { componentData, curComponent, canvasViewInfo } = storeToRefs(dvMainStore)
-const getComponent = index => {
-  return componentData.value[componentData.value.length - 1 - index]
-}
-const transformIndex = index => {
-  return componentData.value.length - 1 - index
-}
-const areaDataPush = component => {
-  if (component && !component.isLock && component.isShow) {
-    areaData.value.components.push(component)
-  }
-}
-// shift 选择算法逻辑
-// 1.记录上次点击的laterIndex（初始状态laterIndex=0）;
-// 2.获取当前index curClickIndex;
-// 3.比较laterIndex 和 curClickIndex之间的大小;
-// 4.将[laterIndex,curClickIndex] 或者 [curClickIndex,laterIndex]区域的图层加入areaData.value.components(已包含的不再重复加入);
-const shiftDataPush = curClickIndex => {
-  const areaDataIdArray = areaData.value.components.map(com => com.id)
-  let indexBegin, indexEnd
-  const laterIndexTrans = laterIndex.value === null ? componentData.value.length : laterIndex.value
-  if (laterIndexTrans < curClickIndex) {
-    indexBegin = laterIndexTrans
-    indexEnd = curClickIndex
-  } else {
-    indexBegin = curClickIndex
-    indexEnd = laterIndexTrans
-  }
-  const shiftAreaComponents = componentData.value
-    .slice(indexBegin, indexEnd + 1)
-    .filter(
-      component => !areaDataIdArray.includes(component.id) && !component.isLock && component.isShow
-    )
-  areaData.value.components.push(...shiftAreaComponents)
-  dvMainStore.setCurComponent({ component: null, index: null })
-}
-
-const onClick = (e, index) => {
-  // 初始化点击是 laterIndex=0
-  if (!curComponent.value) {
-    composeStore.setLaterIndex(null)
-  }
-  // ctrl or command 按下时 鼠标点击为选择需要组合的组件(取消需要组合的组件在ComposeShow组件中)
-  if (isCtrlOrCmdDown.value && !areaData.value.components.includes(componentData.value[index])) {
-    areaDataPush(componentData.value[index])
-    if (curComponent.value && curComponent.value.id !== componentData.value[index].id) {
-      areaDataPush(curComponent.value)
-    }
-    dvMainStore.setCurComponent({ component: null, index: null })
-    e.stopPropagation()
-    composeStore.setLaterIndex(index)
-    return
-  }
-  //shift操作逻辑
-  if (isShiftDown.value) {
-    shiftDataPush(index)
-    return
-  }
-
-  //其他情况点击清理选择区域
-  areaData.value.components.splice(0, areaData.value.components.length)
-  setCurComponent(index)
-  composeStore.setLaterIndex(index)
-}
-const setCurComponent = index => {
-  dvMainStore.setCurComponent({ component: componentData.value[index], index })
-}
-
-let nameEdit = ref(false)
-let editComponentId = ref('')
-let inputName = ref('')
-let nameInput = ref(null)
-let curEditComponent = null
-const editComponentName = item => {
-  curEditComponent = curComponent.value
-  editComponentId.value = `#component-label-${item.id}`
-  nameEdit.value = true
-  inputName.value = item.name
-  nextTick(() => {
-    nameInput.value.focus()
-  })
-}
-const closeEditComponentName = () => {
-  nameEdit.value = false
-  if (!inputName.value || !inputName.value.trim()) {
-    return
-  }
-  if (inputName.value.trim() === curEditComponent.name) {
-    return
-  }
-  curEditComponent.name = inputName.value
-  inputName.value = ''
-  curEditComponent = null
-}
-
-const lock = () => {
-  setTimeout(() => {
-    lockStore.lock()
-    snapshotStore.recordSnapshotCache('realTime-lock')
-  })
-}
-
-const unlock = () => {
-  setTimeout(() => {
-    lockStore.unlock()
-    snapshotStore.recordSnapshotCache('realTime-unlock')
-  })
-}
-
-const hideComponent = () => {
-  setTimeout(() => {
-    layerStore.hideComponent()
-    snapshotStore.recordSnapshotCache('realTime-hideComponent')
-  })
-}
-
-const showComponent = () => {
-  setTimeout(() => {
-    layerStore.showComponent()
-    snapshotStore.recordSnapshotCache()
-  })
-}
-
-const dragOnEnd = ({ oldIndex, newIndex }) => {
-  const source = componentData.value[newIndex]
-  const comLength = componentData.value.length
-  // 还原数组
-  componentData.value.splice(newIndex, 1)
-  componentData.value.splice(oldIndex, 0, source)
-  const target = componentData.value[comLength - 1 - oldIndex]
-  // 反向移动数组
-  componentData.value.splice(comLength - 1 - oldIndex, 1)
-  componentData.value.splice(comLength - 1 - newIndex, 0, target)
-  dvMainStore.setCurComponent({ component: target, index: transformIndex(comLength - oldIndex) })
-}
-
-const getIconName = item => {
-  if (item.component === 'UserView') {
-    const viewInfo = canvasViewInfo.value[item.id]
-    return `${viewInfo.type}-origin`
-  } else {
-    return item.icon
-  }
-}
-
-const menuAsideClose = (param, index) => {
-  const iconDom = document.getElementById('close-button')
-  if (iconDom) {
-    iconDom.click()
-  }
-  if (param.opt === 'rename') {
-    setTimeout(() => {
-      editComponentName(getComponent(index))
-    }, 200)
-  }
-}
-
-const handleContextMenu = e => {
-  e.preventDefault()
-  // 获取鼠标点击位置
-  const x = e.clientX
-  const y = e.clientY
-  const customContextMenu = document.createElement('div')
-  customContextMenu.style.position = 'fixed'
-  customContextMenu.style.left = x + 'px'
-  customContextMenu.style.top = y + 'px'
-
-  // 将自定义菜单添加到页面
-  document.body.appendChild(customContextMenu)
-
-  // 为自定义菜单添加事件监听器，例如，点击菜单项后执行的操作
-  customContextMenu.addEventListener('click', () => {
-    // 在这里执行菜单项点击后的操作
-    // 例如，关闭菜单
-    document.body.removeChild(customContextMenu)
-  })
-}
-</script>
-
-<template>
-  <!--为了保持图层视觉上的一致性 这里进行数组的倒序排列 相应的展示和移动按照倒序处理-->
-  <div class="real-time-component-list">
-    <button hidden="true" id="close-button"></button>
-    <el-row class="list-wrap">
-      <div class="list-container" @contextmenu="handleContextMenu">
-        <draggable
-          @end="dragOnEnd"
-          :list="componentData"
-          animation="100"
-          class="drag-list"
-          item-key="id"
-        >
-          <template #item="{ index }">
-            <div
-              :title="getComponent(index)?.name"
-              class="component-item"
-              :class="{
-                'container-item-not-show': !getComponent(index)?.isShow,
-                activated:
-                  (curComponent && curComponent?.id === getComponent(index)?.id) ||
-                  areaData.components.includes(getComponent(index))
-              }"
-              @click="onClick($event, transformIndex(index))"
-            >
-              <el-icon class="component-icon">
-                <Icon :name="getIconName(getComponent(index))"></Icon>
-              </el-icon>
-              <span
-                :id="`component-label-${getComponent(index)?.id}`"
-                class="component-label"
-                @dblclick="editComponentName(getComponent(index))"
-              >
-                {{ getComponent(index)?.name }}
-              </span>
-              <div
-                v-show="!nameEdit || (nameEdit && curComponent?.id !== getComponent(index)?.id)"
-                class="icon-container"
-                :class="{
-                  'icon-container-lock': getComponent(index)?.isLock && getComponent(index)?.isShow,
-                  'icon-container-show': !getComponent(index)?.isShow
-                }"
-              >
-                <el-icon
-                  class="component-base component-icon-display"
-                  v-show="!getComponent(index).isShow"
-                  @click="showComponent"
-                >
-                  <Icon name="dv-eye-close" class="opt-icon"></Icon>
-                </el-icon>
-                <el-icon
-                  class="component-base"
-                  v-show="getComponent(index)?.isShow"
-                  @click="hideComponent"
-                >
-                  <Icon name="dv-show" class="opt-icon"></Icon>
-                </el-icon>
-                <el-icon v-show="!getComponent(index)?.isLock" class="component-base" @click="lock">
-                  <Icon class="opt-icon" name="dv-unlock"></Icon>
-                </el-icon>
-                <el-icon
-                  class="component-base component-icon-display"
-                  v-show="getComponent(index)?.isLock"
-                  @click="unlock"
-                >
-                  <Icon name="dv-lock" class="opt-icon"></Icon>
-                </el-icon>
-                <el-dropdown
-                  ref="dropdownMore"
-                  trigger="click"
-                  placement="bottom-start"
-                  effect="dark"
-                  :hide-timeout="0"
-                >
-                  <span :class="'dropdownMore-' + index" @click="onClick(transformIndex(index))">
-                    <el-icon class="component-base">
-                      <Icon name="dv-more" class="opt-icon"></Icon>
-                    </el-icon>
-                  </span>
-                  <template #dropdown>
-                    <context-menu-aside-details
-                      :element="getComponent(index)"
-                      @close="menuAsideClose($event, index)"
-                    ></context-menu-aside-details>
-                  </template>
-                </el-dropdown>
-              </div>
-              <el-dropdown
-                class="compose-dropdown"
-                trigger="contextmenu"
-                placement="bottom-start"
-                effect="dark"
-                :hide-timeout="0"
-              >
-                <compose-show
-                  :show-border="false"
-                  :element-index="transformIndex(index)"
-                  :element="getComponent(index)"
-                ></compose-show>
-                <template #dropdown>
-                  <context-menu-aside-details
-                    :element="getComponent(index)"
-                    @close="menuAsideClose($event, index)"
-                  ></context-menu-aside-details>
-                </template>
-              </el-dropdown>
-            </div>
-          </template>
-        </draggable>
-        <el-row style="width: 100%; height: 150px"></el-row>
-      </div>
-    </el-row>
-    <Teleport v-if="editComponentId && nameEdit" :to="editComponentId">
-      <input
-        @keydown.stop
-        @keyup.stop
-        ref="nameInput"
-        v-model="inputName"
-        @blur="closeEditComponentName"
-      />
-    </Teleport>
-  </div>
-</template>
-
-<style lang="less" scoped>
-.real-time-component-list {
-  white-space: nowrap;
-  .list-wrap {
-    max-height: calc(100% - @component-toolbar-height);
-    overflow-y: auto;
-    width: 100%;
-    .list-container {
-      width: 100%;
-      .component-item {
-        position: relative;
-        height: 30px;
-        width: 100%;
-        cursor: grab;
-        color: @dv-canvas-main-font-color;
-        display: flex;
-        align-items: center;
-        justify-content: flex-start;
-        font-size: 12px;
-        padding: 0 2px 0 22px;
-        user-select: none;
-
-        .component-icon {
-          color: #a6a6a6;
-          font-size: 14px;
-        }
-        .component-label {
-          color: #ebebeb;
-        }
-
-        > span.component-label {
-          font-size: 12px;
-          margin-left: 10px;
-          position: relative;
-          min-width: 65px;
-          white-space: nowrap;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          input {
-            position: absolute;
-            left: 0;
-            width: 100%;
-            background-color: white;
-            outline: none;
-            border: none;
-            border-radius: 2px;
-            padding: 0 4px;
-            height: 100%;
-          }
-        }
-
-        &:active {
-          cursor: grabbing;
-        }
-
-        &:hover {
-          background-color: rgba(235, 235, 235, 0.1);
-
-          .icon-container {
-            .component-base {
-              opacity: 1;
-            }
-            width: 70px !important;
-          }
-        }
-
-        .icon-container {
-          .component-base {
-            opacity: 0;
-          }
-          width: 0px;
-          display: flex;
-          justify-content: flex-end;
-          align-items: center;
-          flex-grow: 1;
-          cursor: none;
-          i {
-            font-size: 16px;
-            cursor: pointer;
-          }
-        }
-      }
-      .activated {
-        background-color: var(--ed-color-primary-1a, rgba(51, 112, 255, 0.1)) !important;
-        :deep(.component-icon) {
-          color: var(--ed-color-primary);
-        }
-        :deep(.component-label) {
-          color: var(--ed-color-primary);
-        }
-      }
-    }
-  }
-}
-
-.real-time-component-list :deep(.ed-popper) {
-  background: #303133 !important;
-}
-
-.component-base {
-  cursor: pointer;
-  height: 22px !important;
-  width: 22px !important;
-  border-radius: 4px;
-  padding: 0 4px;
-
-  .opt-icon {
-    font-size: 14px;
-  }
-
-  &:hover {
-    background: rgba(235, 235, 235, 0.1);
-  }
-
-  &:active {
-    background: rgba(235, 235, 235, 0.1);
-  }
-}
-
-.component-icon-display {
-  opacity: 1 !important;
-}
-
-.icon-container-show {
-  width: 70px !important;
-}
-
-.icon-container-lock {
-  width: 45px !important;
-}
-
-.container-item-not-show {
-  color: #5f5f5f !important;
-  :deep(.component-icon) {
-    color: #5f5f5f !important;
-  }
-  :deep(.component-label) {
-    color: #5f5f5f !important;
-  }
-}
-</style>
-
-<style lang="less">
-.compose-dropdown {
-  position: initial !important;
-}
-</style>
diff --git a/core/core-frontend/src/utils/DeShortcutKey.ts b/core/core-frontend/src/utils/DeShortcutKey.ts
index fae894ba77..f48c7c2746 100644
--- a/core/core-frontend/src/utils/DeShortcutKey.ts
+++ b/core/core-frontend/src/utils/DeShortcutKey.ts
@@ -101,7 +101,7 @@ let isShiftDown = false
 // 全局监听按键操作并执行相应命令
 export function listenGlobalKeyDown() {
   window.onkeydown = e => {
-    if (!isInEditor.value || editMode.value === 'preview' || checkDialog()) return
+    if (editMode.value === 'preview' || checkDialog()) return
     const { keyCode } = e
     if (positionMoveKey[keyCode] && curComponent.value) {
       positionMoveKey[keyCode](keyCode)

From 71dc40f6d8452e3b1c1be580c492abc1d52e0691 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 4 Jun 2024 16:54:28 +0800
Subject: [PATCH 32/81] =?UTF-8?q?perf(X-Pack):=20=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E9=80=89=E6=8B=A9=E8=A7=86=E5=9B=BE=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=94=B9=E4=B8=BA=E4=B8=8B=E6=8B=89=E6=A1=86?=
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 5653ec40d5..5324cf9693 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 5653ec40d54d78c825f7a3fd4760b2b71098d45f
+Subproject commit 5324cf9693d802bb50a951e1ce5f8806ec3efd19

From bea05e032f52c5e97d78c8fa9ef4f392f91f5fe1 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Tue, 4 Jun 2024 16:57:29 +0800
Subject: [PATCH 33/81] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E5=A4=9A?=
 =?UTF-8?q?=E4=BD=99import=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/exportCenter/manage/ExportCenterManage.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java
index daa2fa27af..26a8587f20 100644
--- a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java
+++ b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java
@@ -17,7 +17,6 @@ import io.dataease.utils.*;
 import io.dataease.visualization.server.DataVisualizationServer;
 import io.dataease.websocket.WsMessage;
 import io.dataease.websocket.WsService;
-import io.dataease.xpack.base.log.dao.auto.entity.XpackLog;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;

From d7f7b81baa5dae60b375a5b3147bac5404a88e3d Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 4 Jun 2024 17:15:25 +0800
Subject: [PATCH 34/81] =?UTF-8?q?fix(X-Pack):=20=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E5=88=A0=E9=99=A4=E6=97=A5=E5=BF=97=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E9=AA=8C=E8=AF=81?=
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 5324cf9693..7fe3af9a4a 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 5324cf9693d802bb50a951e1ce5f8806ec3efd19
+Subproject commit 7fe3af9a4ade89e862055805dfa8be15cd98ddb9

From 1c668122c4462b711ccc3119744e0a44d971d93e Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Tue, 4 Jun 2024 17:24:38 +0800
Subject: [PATCH 35/81] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=9C=B0=E5=9B=BE=E5=AF=BC=E5=87=BA=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E6=97=B6=E7=BC=A9=E6=94=BE=E6=8C=89=E9=92=AE=E6=9C=AA=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=20#10058?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/js/panel/common/common_antv.ts | 51 +++++++++++++------
 1 file changed, 36 insertions(+), 15 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/js/panel/common/common_antv.ts b/core/core-frontend/src/views/chart/components/js/panel/common/common_antv.ts
index 510086322b..f563b01184 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/common/common_antv.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/common/common_antv.ts
@@ -24,9 +24,10 @@ import {
 import substitute from '@antv/util/esm/substitute'
 import type { Plot as L7Plot, PlotOptions } from '@antv/l7plot/dist/esm'
 import { Zoom } from '@antv/l7'
-import { createL7Icon } from '@antv/l7-component/es/utils/icon'
 import { DOM } from '@antv/l7-utils'
 import { Scene } from '@antv/l7-scene'
+import { type IZoomControlOption } from '@antv/l7-component'
+import { PositionType } from '@antv/l7-core'
 
 export function getPadding(chart: Chart): number[] {
   if (chart.drill) {
@@ -828,7 +829,8 @@ export function configL7Label(chart: Chart): false | LabelOptions {
     visible: label.show,
     style: {
       fill: label.color,
-      fontSize: label.fontSize
+      fontSize: label.fontSize,
+      fontWeight: 'bold'
     }
   }
 }
@@ -970,7 +972,13 @@ export function configL7Legend(chart: Chart): LegendOptions | false {
     }
   }
 }
-class CustomZoom extends Zoom {
+const ZOOM_IN_BTN =
+  '<svg t="1717484429999" fill="${fill}" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9332" width="14px" height="14px"><path d="M47.653 439.326c-24.501 0-44.368 19.881-44.368 44.4v56.548c0 24.492 19.862 44.4 44.368 44.4h928.694c24.501 0 44.368-19.881 44.368-44.4v-56.548c0-24.497-19.862-44.4-44.368-44.4H47.653z" p-id="9333"></path><path d="M586.326 47.653c0-24.501-19.881-44.368-44.4-44.368h-56.548c-24.492 0-44.4 19.862-44.4 44.368v928.694c0 24.501 19.881 44.368 44.4 44.368h56.548c24.497 0 44.4-19.862 44.4-44.368V47.653z" p-id="9334"></path></svg>'
+const RESET_BTN =
+  '<svg t="1717487786436" fill="${fill}" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="18361" width="14px" height="14px"><path d="M127.594667 503.274667a383.573333 383.573333 0 0 1 112.426666-263.04 380.864 380.864 0 0 1 122.24-82.474667 382.421333 382.421333 0 0 1 149.632-30.165333c51.946667 0 102.250667 10.176 149.504 30.165333a381.610667 381.610667 0 0 1 122.133334 82.474667 385.152 385.152 0 0 1 31.082666 35.093333l-67.285333 52.501333a8.96 8.96 0 0 0 3.349333 15.765334l196.352 48.042666a8.96 8.96 0 0 0 11.050667-8.597333l0.896-202.154667c0-7.466667-8.597333-11.733333-14.421333-7.04l-63.018667 49.28C795.605333 113.173333 661.973333 42.666667 511.786667 42.666667 255.786667 42.666667 47.488 247.829333 42.666667 502.826667a8.96 8.96 0 0 0 8.96 9.173333h67.029333c4.906667 0 8.832-3.925333 8.96-8.725333z m844.8 8.725333h-67.050667a8.917333 8.917333 0 0 0-8.96 8.704 381.76 381.76 0 0 1-30.037333 140.8 382.336 382.336 0 0 1-82.346667 122.24 382.656 382.656 0 0 1-271.893333 112.64 382.421333 382.421333 0 0 1-271.765334-112.64 385.152 385.152 0 0 1-31.061333-35.072l67.264-52.522667a8.96 8.96 0 0 0-3.349333-15.765333l-196.330667-48.042667a8.96 8.96 0 0 0-11.050667 8.597334l-0.789333 202.261333c0 7.488 8.597333 11.733333 14.421333 7.04l63.018667-49.28C228.394667 910.826667 362.026667 981.333333 512.213333 981.333333 768.341333 981.333333 976.512 776.042667 981.333333 521.173333a8.96 8.96 0 0 0-8.96-9.173333z" p-id="18362"></path></svg>'
+const ZOOM_OUT_BTN =
+  '<svg t="1717486240292" fill="${fill}" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="13641" width="14px" height="14px"><path d="M935 423.3H89C40.2 423.3 0.3 463.2 0.3 512c0 48.8 39.9 88.7 88.7 88.7h846c48.8 0 88.7-39.9 88.7-88.7 0-48.8-39.9-88.7-88.7-88.7z" p-id="13642"></path></svg>'
+export class CustomZoom extends Zoom {
   resetButtonGroup(container) {
     DOM.clearChildren(container)
     this['zoomInButton'] = this['createButton'](
@@ -980,9 +988,8 @@ class CustomZoom extends Zoom {
       container,
       this.zoomIn
     )
-    const resetBtnIconText = createL7Icon('l7-icon-round')
     this['zoomResetButton'] = this['createButton'](
-      resetBtnIconText,
+      this.controlOption['resetText'],
       'Reset',
       'l7-button-control',
       container,
@@ -1008,15 +1015,7 @@ class CustomZoom extends Zoom {
       container,
       this.zoomOut
     )
-    const { buttonColor, buttonBackground } = this.controlOption as any
-    if (buttonColor) {
-      const elements = [
-        this.controlOption.zoomInText,
-        this.controlOption.zoomOutText,
-        resetBtnIconText
-      ] as HTMLElement[]
-      setStyle(elements, 'fill', buttonColor)
-    }
+    const { buttonBackground } = this.controlOption as any
     const elements = [this['zoomResetButton'], this['zoomInButton'], this['zoomOutButton']]
     if (buttonBackground) {
       setStyle(elements, 'background', buttonBackground)
@@ -1024,6 +1023,28 @@ class CustomZoom extends Zoom {
     setStyle(elements, 'border-bottom', 'none')
     this['updateDisabled']()
   }
+  public getDefault(option: Partial<IZoomControlOption>) {
+    const { buttonColor } = option as any
+    let zoomInText = ZOOM_IN_BTN
+    let zoomOutText = ZOOM_OUT_BTN
+    let resetText = RESET_BTN
+    if (buttonColor) {
+      zoomInText = zoomInText.replace('${fill}', buttonColor)
+      zoomOutText = zoomOutText.replace('${fill}', buttonColor)
+      resetText = resetText.replace('${fill}', buttonColor)
+    }
+    return {
+      ...option,
+      position: PositionType.BOTTOMRIGHT,
+      name: 'zoom',
+      zoomInText,
+      zoomInTitle: 'Zoom in',
+      zoomOutText,
+      zoomOutTitle: 'Zoom out',
+      resetText,
+      showZoom: false
+    } as IZoomControlOption
+  }
 }
 export function configL7Zoom(chart: Chart, plot: L7Plot<PlotOptions> | Scene) {
   const { basicStyle } = parseJson(chart.customAttr)
@@ -1034,7 +1055,7 @@ export function configL7Zoom(chart: Chart, plot: L7Plot<PlotOptions> | Scene) {
     return
   }
   const plotScene = plot instanceof Scene ? plot : plot.scene
-  plotScene.once('loaded', () => {
+  plot.once('loaded', () => {
     const zoomOptions = {
       initZoom: plotScene.getZoom(),
       center: plotScene.getCenter(),

From fc8d2ad675bb51d84ca5012e28437171f6416666 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 4 Jun 2024 17:31:34 +0800
Subject: [PATCH 36/81] =?UTF-8?q?style(X-Pack):=20=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A-=E4=BB=BB=E5=8A=A1=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E6=93=8D=E4=BD=9C=E5=8C=BA=E5=9F=9F=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
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 7fe3af9a4a..9afdcb94d8 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 7fe3af9a4ade89e862055805dfa8be15cd98ddb9
+Subproject commit 9afdcb94d80d3dc9567547e1a71462cd6ff68062

From 6503617c226dc3d69ebf6291da34e0fd89286f19 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 4 Jun 2024 18:14:06 +0800
Subject: [PATCH 37/81] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F)?=
 =?UTF-8?q?:=20=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E5=A4=9A=E9=80=89?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E9=80=89=E4=B8=AD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/data-visualization/canvas/CanvasCore.vue  | 5 +++++
 .../src/components/data-visualization/canvas/ComposeShow.vue | 2 +-
 .../src/components/data-visualization/canvas/Shape.vue       | 1 -
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue b/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue
index 7d48537771..800f5a30c1 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue
@@ -1380,6 +1380,11 @@ const groupAreaClickChange = async () => {
     groupAreaCom.style.top = areaData.value.style.top
     groupAreaCom.style.width = areaData.value.style.width
     groupAreaCom.style.height = areaData.value.style.height
+    dvMainStore.setClickComponentStatus(true)
+    dvMainStore.setCurComponent({
+      component: groupAreaCom,
+      index: dvMainStore.componentData.length - 1
+    })
   } else if (groupAreaCom) {
     groupAreaHis.forEach(ele => {
       dvMainStore.deleteComponentById(ele.id)
diff --git a/core/core-frontend/src/components/data-visualization/canvas/ComposeShow.vue b/core/core-frontend/src/components/data-visualization/canvas/ComposeShow.vue
index 2004f9f1e1..0b1041a12e 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/ComposeShow.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/ComposeShow.vue
@@ -37,7 +37,7 @@ const handleMouseDown = e => {
     return
   }
   const index = areaData.value.components.findIndex(component => component === props.element)
-  if (index != -1) {
+  if (index != -1 && props.element.component !== 'GroupArea') {
     areaData.value.components.splice(index, 1)
     e.stopPropagation()
   }
diff --git a/core/core-frontend/src/components/data-visualization/canvas/Shape.vue b/core/core-frontend/src/components/data-visualization/canvas/Shape.vue
index a8559c8291..b34d2bc013 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/Shape.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/Shape.vue
@@ -424,7 +424,6 @@ const handleInnerMouseDownOnShape = e => {
     if (curComponent.value && curComponent.value.id !== element.value.id) {
       areaDataPush(curComponent.value)
     }
-    dvMainStore.setCurComponent({ component: null, index: null })
     e.stopPropagation()
     return
   }

From 3ebcd4ccd6b51bcb33ca2a13bb016c3947a9cc3f Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 4 Jun 2024 18:31:23 +0800
Subject: [PATCH 38/81] =?UTF-8?q?refactor(=E6=95=B0=E6=8D=AE=E5=A4=A7?=
 =?UTF-8?q?=E5=B1=8F):=20=E6=B7=BB=E5=8A=A0=E7=BC=BA=E5=A4=B1=E7=9A=84?=
 =?UTF-8?q?=E5=9B=BE=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/assets/svg/bar-range-origin.svg              |  7 +++++++
 .../src/assets/svg/bidirectional-bar-origin.svg      | 11 +++++++++++
 core/core-frontend/src/assets/svg/icon_search.svg    |  1 +
 .../src/assets/svg/progress-bar-origin.svg           | 11 +++++++++++
 .../core-frontend/src/assets/svg/quadrant-origin.svg | 12 ++++++++++++
 .../src/custom-component/component-list.ts           |  2 +-
 6 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 core/core-frontend/src/assets/svg/bar-range-origin.svg
 create mode 100644 core/core-frontend/src/assets/svg/bidirectional-bar-origin.svg
 create mode 100644 core/core-frontend/src/assets/svg/icon_search.svg
 create mode 100644 core/core-frontend/src/assets/svg/progress-bar-origin.svg
 create mode 100644 core/core-frontend/src/assets/svg/quadrant-origin.svg

diff --git a/core/core-frontend/src/assets/svg/bar-range-origin.svg b/core/core-frontend/src/assets/svg/bar-range-origin.svg
new file mode 100644
index 0000000000..26ef1d75e9
--- /dev/null
+++ b/core/core-frontend/src/assets/svg/bar-range-origin.svg
@@ -0,0 +1,7 @@
+<svg width="80" height="56" viewBox="0 0 80 56"  xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7 2.00391V53.0016V54.0016H4V2.00391H7Z" />
+<path d="M17.5 50C17.2239 50 17 49.7761 17 49.5V42.5C17 42.2239 17.2239 42 17.5 42H52.5C52.7761 42 53 42.2239 53 42.5V49.5C53 49.7761 52.7761 50 52.5 50H17.5Z" />
+<path d="M48.5 38C48.2239 38 48 37.7761 48 37.5V30.5C48 30.2239 48.2239 30 48.5 30H71.5C71.7761 30 72 30.2239 72 30.5V37.5C72 37.7761 71.7761 38 71.5 38H48.5Z" />
+<path d="M28.5 26C28.2239 26 28 25.7761 28 25.5V18.5C28 18.2239 28.2239 18 28.5 18H47.5C47.7761 18 48 18.2239 48 18.5V25.5C48 25.7761 47.7761 26 47.5 26H28.5Z" />
+<path d="M9.5 14C9.22386 14 9 13.7761 9 13.5V6.5C9 6.22386 9.22386 6 9.5 6L48.5 6C48.7761 6 49 6.22386 49 6.5V13.5C49 13.7761 48.7761 14 48.5 14L9.5 14Z" />
+</svg>
diff --git a/core/core-frontend/src/assets/svg/bidirectional-bar-origin.svg b/core/core-frontend/src/assets/svg/bidirectional-bar-origin.svg
new file mode 100644
index 0000000000..122c82ea47
--- /dev/null
+++ b/core/core-frontend/src/assets/svg/bidirectional-bar-origin.svg
@@ -0,0 +1,11 @@
+<svg width="80" height="56" viewBox="0 0 80 56" xmlns="http://www.w3.org/2000/svg">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M41 2.00391V53.0016V54.0016H38V2.00391H41Z" />
+  <path d="M4.5 50C4.22386 50 4 49.7761 4 49.5L4 42.5C4 42.2239 4.22386 42 4.5 42H35.5C35.7761 42 36 42.2239 36 42.5V49.5C36 49.7761 35.7761 50 35.5 50H4.5Z" />
+  <path d="M12.5 38C12.2239 38 12 37.7761 12 37.5V30.5C12 30.2239 12.2239 30 12.5 30H35.5C35.7761 30 36 30.2239 36 30.5V37.5C36 37.7761 35.7761 38 35.5 38H12.5Z" />
+  <path d="M43.5 14C43.2239 14 43 13.7761 43 13.5V6.5C43 6.22386 43.2239 6 43.5 6L71.5 6C71.7761 6 72 6.22386 72 6.5V13.5C72 13.7761 71.7761 14 71.5 14L43.5 14Z" />
+  <path d="M43.5 26C43.2239 26 43 25.7761 43 25.5V18.5C43 18.2239 43.2239 18 43.5 18H62.5C62.7761 18 63 18.2239 63 18.5V25.5C63 25.7761 62.7761 26 62.5 26H43.5Z" />
+  <path d="M43.5 38C43.2239 38 43 37.7761 43 37.5V30.5C43 30.2239 43.2239 30 43.5 30H57.5C57.7761 30 58 30.2239 58 30.5V37.5C58 37.7761 57.7761 38 57.5 38H43.5Z" />
+  <path d="M43.5 50C43.2239 50 43 49.7761 43 49.5V42.5C43 42.2239 43.2239 42 43.5 42H75.5C75.7761 42 76 42.2239 76 42.5V49.5C76 49.7761 75.7761 50 75.5 50H43.5Z" />
+  <path d="M16.5 26C16.2239 26 16 25.7761 16 25.5V18.5C16 18.2239 16.2239 18 16.5 18H35.5C35.7761 18 36 18.2239 36 18.5V25.5C36 25.7761 35.7761 26 35.5 26H16.5Z" />
+  <path d="M8.5 14C8.22386 14 8 13.7761 8 13.5V6.5C8 6.22386 8.22386 6 8.5 6L35.5 6C35.7761 6 36 6.22386 36 6.5V13.5C36 13.7761 35.7761 14 35.5 14L8.5 14Z" />
+</svg>
diff --git a/core/core-frontend/src/assets/svg/icon_search.svg b/core/core-frontend/src/assets/svg/icon_search.svg
new file mode 100644
index 0000000000..fa50c16739
--- /dev/null
+++ b/core/core-frontend/src/assets/svg/icon_search.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1717496887274" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4257" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M376.5 70c41.4 0 81.5 8.1 119.3 24.1 36.5 15.4 69.3 37.5 97.4 65.7 28.2 28.2 50.3 61 65.7 97.4 16 37.7 24.1 77.9 24.1 119.3s-8.1 81.5-24.1 119.3c-15.4 36.5-37.5 69.3-65.7 97.4-28.2 28.2-61 50.3-97.4 65.7-37.7 16-77.9 24.1-119.3 24.1s-81.5-8.1-119.3-24.1c-36.5-15.4-69.3-37.5-97.4-65.7s-50.3-61-65.7-97.4C78.1 458 70 417.9 70 376.5s8.1-81.5 24.1-119.3c15.4-36.5 37.5-69.3 65.7-97.4 28.2-28.2 61-50.3 97.4-65.7C295 78.1 335.1 70 376.5 70m0-70C168.6 0 0 168.6 0 376.5S168.6 753 376.5 753 753 584.4 753 376.5 584.4 0 376.5 0z" p-id="4258"></path><path d="M274.5 136.1c8.8-8.8 18-17 27.5-24.6-37.3 13.6-72.2 35.3-102.1 65.2-109.7 109.7-109.7 287.7 0 397.4 33.2 33.2 72.6 56.3 114.4 69.4-13.9-10.1-27.2-21.5-39.8-34.1-130.7-130.7-130.7-342.6 0-473.3zM998.3 998.3c-34.2 34.2-90.2 34.2-124.5 0L622.2 746.6c-34.2-34.2-34.2-90.2 0-124.5 34.2-34.2 90.2-34.2 124.5 0l251.7 251.7c34.2 34.3 34.2 90.3-0.1 124.5z" p-id="4259"></path></svg>
\ No newline at end of file
diff --git a/core/core-frontend/src/assets/svg/progress-bar-origin.svg b/core/core-frontend/src/assets/svg/progress-bar-origin.svg
new file mode 100644
index 0000000000..7b6131949b
--- /dev/null
+++ b/core/core-frontend/src/assets/svg/progress-bar-origin.svg
@@ -0,0 +1,11 @@
+<svg width="80" height="56" viewBox="0 0 80 56" xmlns="http://www.w3.org/2000/svg">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M7 2.00391V53.0016V54.0016H4V2.00391H7Z" />
+  <path d="M9.5 14C9.22386 14 9 13.7761 9 13.5V6.5C9 6.22386 9.22386 6 9.5 6L71.5 6C71.7761 6 72 6.22386 72 6.5V13.5C72 13.7761 71.7761 14 71.5 14L9.5 14Z" />
+  <path d="M9.5 26C9.22386 26 9 25.7761 9 25.5V18.5C9 18.2239 9.22386 18 9.5 18H71.5C71.7761 18 72 18.2239 72 18.5V25.5C72 25.7761 71.7761 26 71.5 26L9.5 26Z" />
+  <path d="M9.5 38C9.22386 38 9 37.7761 9 37.5V30.5C9 30.2239 9.22386 30 9.5 30H71.5C71.7761 30 72 30.2239 72 30.5V37.5C72 37.7761 71.7761 38 71.5 38H9.5Z" />
+  <path d="M9.5 50C9.22386 50 9 49.7761 9 49.5V42.5C9 42.2239 9.22386 42 9.5 42H71.5C71.7761 42 72 42.2239 72 42.5V49.5C72 49.7761 71.7761 50 71.5 50H9.5Z" />
+  <path d="M9.5 14C9.22386 14 9 13.7761 9 13.5V6.5C9 6.22386 9.22386 6 9.5 6L59.5 6C59.7761 6 60 6.22386 60 6.5V13.5C60 13.7761 59.7761 14 59.5 14L9.5 14Z" />
+  <path d="M9.5 26C9.22386 26 9 25.7761 9 25.5V18.5C9 18.2239 9.22386 18 9.5 18H46.5C46.7761 18 47 18.2239 47 18.5V25.5C47 25.7761 46.7761 26 46.5 26H9.5Z" />
+  <path d="M9.5 38C9.22386 38 9 37.7761 9 37.5V30.5C9 30.2239 9.22386 30 9.5 30H37.5C37.7761 30 38 30.2239 38 30.5V37.5C38 37.7761 37.7761 38 37.5 38H9.5Z" />
+  <path d="M9.5 50C9.22386 50 9 49.7761 9 49.5V42.5C9 42.2239 9.22386 42 9.5 42H21.5C21.7761 42 22 42.2239 22 42.5V49.5C22 49.7761 21.7761 50 21.5 50H9.5Z" />
+</svg>
diff --git a/core/core-frontend/src/assets/svg/quadrant-origin.svg b/core/core-frontend/src/assets/svg/quadrant-origin.svg
new file mode 100644
index 0000000000..b79493cba8
--- /dev/null
+++ b/core/core-frontend/src/assets/svg/quadrant-origin.svg
@@ -0,0 +1,12 @@
+<svg width="88" height="64" viewBox="0 0 88 64" xmlns="http://www.w3.org/2000/svg">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M9 30.002H80L80 33.002H8V30.002H9Z"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M28.0417 6H31L31 58H28V6H28.0417Z"/>
+  <path d="M57.666 22C58.0616 22 58.4483 21.8827 58.7772 21.6629C59.1061 21.4432 59.3624 21.1308 59.5138 20.7654C59.6651 20.3999 59.7048 19.9978 59.6276 19.6098C59.5504 19.2219 59.3599 18.8655 59.0802 18.5858C58.8005 18.3061 58.4442 18.1156 58.0562 18.0384C57.6682 17.9613 57.2661 18.0009 56.9006 18.1522C56.5352 18.3036 56.2228 18.56 56.0031 18.8889C55.7833 19.2178 55.666 19.6044 55.666 20C55.666 20.5304 55.8767 21.0391 56.2518 21.4142C56.6269 21.7893 57.1356 22 57.666 22Z" />
+  <path d="M46.4432 46.9969C46.1143 47.2167 45.7276 47.334 45.332 47.334C44.8016 47.334 44.2929 47.1233 43.9178 46.7482C43.5427 46.3731 43.332 45.8644 43.332 45.334C43.332 44.9384 43.4493 44.5517 43.6691 44.2228C43.8889 43.8939 44.2012 43.6376 44.5667 43.4862C44.9321 43.3349 45.3342 43.2952 45.7222 43.3724C46.1102 43.4496 46.4665 43.6401 46.7462 43.9198C47.0259 44.1995 47.2164 44.5558 47.2936 44.9438C47.3708 45.3318 47.3312 45.7339 47.1798 46.0994C47.0284 46.4648 46.7721 46.7772 46.4432 46.9969Z" />
+  <path d="M18.7772 48.9969C18.4483 49.2167 18.0616 49.334 17.666 49.334C17.1356 49.334 16.6269 49.1233 16.2518 48.7482C15.8767 48.3731 15.666 47.8644 15.666 47.334C15.666 46.9384 15.7833 46.5517 16.0031 46.2228C16.2228 45.8939 16.5352 45.6376 16.9006 45.4862C17.2661 45.3349 17.6682 45.2952 18.0562 45.3724C18.4442 45.4496 18.8005 45.6401 19.0802 45.9198C19.3599 46.1995 19.5504 46.5558 19.6276 46.9438C19.7048 47.3318 19.6651 47.7339 19.5138 48.0994C19.3624 48.4648 19.1061 48.7772 18.7772 48.9969Z" />
+  <path d="M44.5543 19.9938C43.8965 20.4334 43.1232 20.668 42.332 20.668C41.2712 20.668 40.2537 20.2465 39.5036 19.4964C38.7535 18.7463 38.332 17.7288 38.332 16.668C38.332 15.8768 38.5666 15.1035 39.0062 14.4457C39.4457 13.7879 40.0704 13.2752 40.8013 12.9725C41.5322 12.6697 42.3365 12.5905 43.1124 12.7448C43.8883 12.8992 44.601 13.2801 45.1605 13.8395C45.7199 14.399 46.1008 15.1117 46.2552 15.8876C46.4095 16.6635 46.3303 17.4678 46.0275 18.1987C45.7248 18.9296 45.2121 19.5543 44.5543 19.9938Z" />
+  <path d="M62.221 49.3272C61.5632 49.7667 60.7898 50.0013 59.9987 50.0013C58.9378 50.0013 57.9204 49.5799 57.1703 48.8297C56.4201 48.0796 55.9987 47.0622 55.9987 46.0013C55.9987 45.2102 56.2333 44.4368 56.6728 43.779C57.1123 43.1212 57.7371 42.6085 58.468 42.3058C59.1989 42.003 60.0031 41.9238 60.7791 42.0782C61.555 42.2325 62.2677 42.6135 62.8271 43.1729C63.3865 43.7323 63.7675 44.445 63.9218 45.2209C64.0762 45.9969 63.997 46.8011 63.6942 47.532C63.3915 48.2629 62.8788 48.8877 62.221 49.3272Z" />
+  <path d="M20.5543 21.6605C19.8965 22.1 19.1232 22.3346 18.332 22.3346C17.2712 22.3346 16.2538 21.9132 15.5036 21.1631C14.7535 20.4129 14.332 19.3955 14.332 18.3346C14.332 17.5435 14.5666 16.7702 15.0062 16.1124C15.4457 15.4546 16.0704 14.9419 16.8013 14.6391C17.5322 14.3364 18.3365 14.2572 19.1124 14.4115C19.8883 14.5658 20.601 14.9468 21.1605 15.5062C21.7199 16.0656 22.1008 16.7784 22.2552 17.5543C22.4095 18.3302 22.3303 19.1345 22.0275 19.8654C21.7248 20.5963 21.2121 21.221 20.5543 21.6605Z" />
+  <path d="M68.666 16C69.4571 16 70.2305 15.7654 70.8883 15.3259C71.5461 14.8864 72.0588 14.2616 72.3615 13.5307C72.6643 12.7998 72.7435 11.9956 72.5892 11.2196C72.4348 10.4437 72.0539 9.73099 71.4944 9.17158C70.935 8.61217 70.2223 8.2312 69.4464 8.07686C68.6705 7.92252 67.8662 8.00173 67.1353 8.30448C66.4044 8.60723 65.7797 9.11993 65.3401 9.77772C64.9006 10.4355 64.666 11.2089 64.666 12C64.666 13.0609 65.0874 14.0783 65.8376 14.8284C66.5877 15.5786 67.6052 16 68.666 16Z" />
+  <path d="M16 43C16.7911 43 17.5645 42.7654 18.2223 42.3259C18.8801 41.8864 19.3928 41.2616 19.6955 40.5307C19.9983 39.7998 20.0775 38.9956 19.9231 38.2196C19.7688 37.4437 19.3878 36.731 18.8284 36.1716C18.269 35.6122 17.5563 35.2312 16.7804 35.0769C16.0044 34.9225 15.2002 35.0017 14.4693 35.3045C13.7384 35.6072 13.1136 36.1199 12.6741 36.7777C12.2346 37.4355 12 38.2089 12 39C12 40.0609 12.4214 41.0783 13.1716 41.8284C13.9217 42.5786 14.9391 43 16 43Z" />
+</svg>
diff --git a/core/core-frontend/src/custom-component/component-list.ts b/core/core-frontend/src/custom-component/component-list.ts
index f4183e92eb..051bfd9ba0 100644
--- a/core/core-frontend/src/custom-component/component-list.ts
+++ b/core/core-frontend/src/custom-component/component-list.ts
@@ -208,7 +208,7 @@ const list = [
     name: '查询',
     label: '查询',
     propValue: '',
-    icon: 'other_text',
+    icon: 'icon_search',
     innerType: 'VQuery',
     isHang: false,
     x: 1,

From a6b3d808c557968aab4eba6fc8873b3461823e57 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Tue, 4 Jun 2024 18:37:57 +0800
Subject: [PATCH 39/81] =?UTF-8?q?fix(=E5=B5=8C=E5=85=A5=E5=BC=8F):=20?=
 =?UTF-8?q?=E5=B5=8C=E5=85=A5=E5=BC=8Fiframe=E5=B1=80=E9=83=A8=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/utils/ParseUrl.ts      | 17 ++++++++++++++
 .../views/chart/components/views/index.vue    |  9 ++++++++
 .../src/views/common/DeResourceTree.vue       | 23 +++++++++++++++----
 .../src/views/template-market/index.vue       |  8 +++++++
 4 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100644 core/core-frontend/src/utils/ParseUrl.ts

diff --git a/core/core-frontend/src/utils/ParseUrl.ts b/core/core-frontend/src/utils/ParseUrl.ts
new file mode 100644
index 0000000000..e2cd698eff
--- /dev/null
+++ b/core/core-frontend/src/utils/ParseUrl.ts
@@ -0,0 +1,17 @@
+function parseUrl(url) {
+  const [pathname, params] = url.split('?')
+  const [_, path] = pathname.split('#/')
+  return {
+    path,
+    query: params
+      .split('&')
+      .map(ele => ele.split('='))
+      .reduce((pre, next) => {
+        const [key, value] = next
+        pre[key] = value
+        return pre
+      }, {})
+  }
+}
+
+export { parseUrl }
diff --git a/core/core-frontend/src/views/chart/components/views/index.vue b/core/core-frontend/src/views/chart/components/views/index.vue
index 89ff4ef33a..31ccfc5c83 100644
--- a/core/core-frontend/src/views/chart/components/views/index.vue
+++ b/core/core-frontend/src/views/chart/components/views/index.vue
@@ -3,6 +3,7 @@ import { useI18n } from '@/hooks/web/useI18n'
 import ChartComponentG2Plot from './components/ChartComponentG2Plot.vue'
 import DeIndicator from '@/custom-component/indicator/DeIndicator.vue'
 import { useAppStoreWithOut } from '@/store/modules/app'
+import router from '@/router'
 import { useEmbedded } from '@/store/modules/embedded'
 import { XpackComponent } from '@/components/plugin'
 import {
@@ -29,6 +30,7 @@ import DrillPath from '@/views/chart/components/views/components/DrillPath.vue'
 import { ElIcon, ElInput, ElMessage } from 'element-plus-secondary'
 import { useFilter } from '@/hooks/web/useFilter'
 import { useCache } from '@/hooks/web/useCache'
+import { parseUrl } from '@/utils/ParseUrl'
 
 import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
 import { cloneDeep } from 'lodash-es'
@@ -50,6 +52,7 @@ const dvMainStore = dvMainStoreWithOut()
 let innerRefreshTimer = null
 const appStore = useAppStoreWithOut()
 const isDataEaseBi = computed(() => appStore.getIsDataEaseBi)
+const isIframe = computed(() => appStore.getIsIframe)
 
 const emit = defineEmits(['onPointClick'])
 
@@ -388,6 +391,7 @@ const jumpClick = param => {
     param.sourceFieldId = dimension.id
     let embeddedBaseUrl = ''
     const divSelf = isDataEaseBi.value && jumpInfo.jumpType === '_self'
+    const iframeSelf = isIframe.value && jumpInfo.jumpType === '_self'
     if (isDataEaseBi.value) {
       embeddedBaseUrl = embeddedStore.baseUrl
     }
@@ -416,6 +420,11 @@ const jumpClick = param => {
             divEmbedded('Preview')
             return
           }
+
+          if (iframeSelf) {
+            router.push(parseUrl(url))
+            return
+          }
           windowsJump(url, jumpInfo.jumpType)
         }
       } else {
diff --git a/core/core-frontend/src/views/common/DeResourceTree.vue b/core/core-frontend/src/views/common/DeResourceTree.vue
index 704b27c0b1..d14853fd9b 100644
--- a/core/core-frontend/src/views/common/DeResourceTree.vue
+++ b/core/core-frontend/src/views/common/DeResourceTree.vue
@@ -16,6 +16,7 @@ import { interactiveStoreWithOut } from '@/store/modules/interactive'
 const interactiveStore = interactiveStoreWithOut()
 import router from '@/router'
 import { useI18n } from '@/hooks/web/useI18n'
+import { parseUrl } from '@/utils/ParseUrl'
 import _ from 'lodash'
 import DeResourceCreateOptV2 from '@/views/common/DeResourceCreateOptV2.vue'
 import { useCache } from '@/hooks/web/useCache'
@@ -301,6 +302,11 @@ const operation = (cmd: string, data: BusiTreeNode, nodeType: string) => {
         return
       }
 
+      if (isIframe.value) {
+        router.push(parseUrl(baseUrl))
+        return
+      }
+
       const newWindow = window.open(baseUrl, '_blank')
       initOpenHandler(newWindow)
     })
@@ -332,6 +338,11 @@ const addOperation = (
       )
       return
     }
+
+    if (isIframe.value) {
+      router.push(parseUrl(data?.id ? baseUrl + `&pid=${data.id}` : baseUrl))
+      return
+    }
     if (data?.id) {
       newWindow = window.open(baseUrl + `&pid=${data.id}`, '_blank')
     } else {
@@ -371,10 +382,7 @@ const resourceEdit = resourceId => {
   }
 
   if (isIframe.value) {
-    router.push({
-      path: curCanvasType.value === 'dataV' ? 'dvCanvas' : 'dashboard',
-      query: curCanvasType.value === 'dataV' ? { dvId: resourceId } : { resourceId }
-    })
+    router.push(parseUrl(baseUrl + resourceId))
     return
   }
   const newWindow = window.open(baseUrl + resourceId, '_blank')
@@ -406,6 +414,13 @@ const resourceCreateFinish = templateData => {
     )
     return
   }
+
+  if (isIframe.value) {
+    router.push(
+      parseUrl(state.templateCreatePid ? baseUrl + `&pid=${state.templateCreatePid}` : baseUrl)
+    )
+    return
+  }
   if (state.templateCreatePid) {
     newWindow = window.open(baseUrl + `&pid=${state.templateCreatePid}`, '_blank')
   } else {
diff --git a/core/core-frontend/src/views/template-market/index.vue b/core/core-frontend/src/views/template-market/index.vue
index 20769d4de1..d3527f2a99 100644
--- a/core/core-frontend/src/views/template-market/index.vue
+++ b/core/core-frontend/src/views/template-market/index.vue
@@ -169,7 +169,9 @@ import { nextTick, reactive, watch, onMounted, ref, computed } from 'vue'
 import { useI18n } from '@/hooks/web/useI18n'
 import { ElMessage } from 'element-plus-secondary'
 import { useCache } from '@/hooks/web/useCache'
+import router from '@/router'
 import MarketPreviewV2 from '@/views/template-market/component/MarketPreviewV2.vue'
+import { parseUrl } from '@/utils/ParseUrl'
 import { imgUrlTrans } from '@/utils/imgUtils'
 import CategoryTemplateV2 from '@/views/template-market/component/CategoryTemplateV2.vue'
 import { interactiveStoreWithOut } from '@/store/modules/interactive'
@@ -192,6 +194,7 @@ const close = () => {
 
 const title = computed(() => (state.curPosition === 'branch' ? '模板中心' : '使用模板新建'))
 const isDataEaseBi = computed(() => appStore.getIsDataEaseBi)
+const isIframe = computed(() => appStore.getIsIframe)
 const state = reactive({
   initReady: true,
   curPosition: 'branch',
@@ -454,6 +457,11 @@ const apply = template => {
     )
     return
   }
+
+  if (isIframe.value) {
+    router.push(parseUrl(state.pid ? baseUrl + `&pid=${state.pid}` : baseUrl))
+    return
+  }
   if (state.pid) {
     newWindow = window.open(baseUrl + `&pid=${state.pid}`, '_blank')
   } else {

From db500753a64c0231a80ba0626c95d001c805bc1f Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 4 Jun 2024 18:41:14 +0800
Subject: [PATCH 40/81] =?UTF-8?q?fix(X-Pack):=20=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E5=AF=BC=E5=87=BA=E7=9A=84=E8=A7=86=E5=9B=BE?=
 =?UTF-8?q?=E5=9C=A8=E9=A3=9E=E4=B9=A6=E4=B8=AD=E6=97=A0=E6=B3=95=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 de-xpack                                                       | 2 +-
 sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/de-xpack b/de-xpack
index 9afdcb94d8..a4639696f0 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 9afdcb94d80d3dc9567547e1a71462cd6ff68062
+Subproject commit a4639696f004bff2ec6358831b204d3f34ee8763
diff --git a/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java b/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java
index b1ec7d6e6a..dcceb3419f 100644
--- a/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java
+++ b/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java
@@ -65,6 +65,7 @@ public class WhitelistUtils {
                 || StringUtils.startsWithAny(requestURI, "/xpackComponent/content/")
                 || StringUtils.startsWithAny(requestURI, "/geo/")
                 || StringUtils.startsWithAny(requestURI, "/websocket")
-                || StringUtils.startsWithAny(requestURI, "/map/");
+                || StringUtils.startsWithAny(requestURI, "/map/")
+                || StringUtils.startsWithAny(requestURI, "/communicate/down/");
     }
 }

From a4fcfc80059445f9f6760f389adac41ec32ac9e4 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 4 Jun 2024 19:05:07 +0800
Subject: [PATCH 41/81] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E5=8F=98=E9=87=8F=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/chart/manage/ChartDataManage.java    |  2 +-
 .../dataease/dataset/manage/DatasetGroupManage.java  |  4 ++++
 .../factory/DeWebSocketHandlerDecorator.java         | 12 ++++++++----
 .../views/visualized/data/dataset/ExportExcel.vue    |  1 -
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java
index d37ef830d2..974e2a1b0b 100644
--- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java
+++ b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java
@@ -175,7 +175,7 @@ public class ChartDataManage {
         FilterTreeObj fieldCustomFilter = view.getCustomFilter();
         List<ChartViewFieldDTO> drill = new ArrayList<>(view.getDrillFields());
 
-        DatasetGroupInfoDTO table = datasetGroupManage.get(view.getTableId(), null);
+        DatasetGroupInfoDTO table = datasetGroupManage.getDatasetGroupInfoDTO(view.getTableId(), null);
         if (table == null) {
             DEException.throwException(ResultCode.DATA_IS_WRONG.code(), Translator.get("i18n_no_ds"));
         }
diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java
index 75a63d969e..daecbe6449 100644
--- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java
+++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java
@@ -371,6 +371,10 @@ public class DatasetGroupManage {
         return dto;
     }
 
+    public DatasetGroupInfoDTO getDatasetGroupInfoDTO(Long id, String type) throws Exception {
+        return get(id, type);
+    }
+
     public DatasetGroupInfoDTO get(Long id, String type) throws Exception {
         CoreDatasetGroup coreDatasetGroup = coreDatasetGroupMapper.selectById(id);
         if (coreDatasetGroup == null) {
diff --git a/core/core-backend/src/main/java/io/dataease/websocket/factory/DeWebSocketHandlerDecorator.java b/core/core-backend/src/main/java/io/dataease/websocket/factory/DeWebSocketHandlerDecorator.java
index bb3f8f4f4d..68526a6256 100644
--- a/core/core-backend/src/main/java/io/dataease/websocket/factory/DeWebSocketHandlerDecorator.java
+++ b/core/core-backend/src/main/java/io/dataease/websocket/factory/DeWebSocketHandlerDecorator.java
@@ -20,8 +20,10 @@ public class DeWebSocketHandlerDecorator extends WebSocketHandlerDecorator {
     public void afterConnectionEstablished(WebSocketSession session) throws Exception {
         Optional.ofNullable(session.getPrincipal()).ifPresent(principal -> {
             String name = principal.getName();
-            Long userId = Long.parseLong(name);
-            WsUtil.onLine(userId);
+            if(name != null){
+                Long userId = Long.parseLong(name);
+                WsUtil.onLine(userId);
+            }
         });
         super.afterConnectionEstablished(session);
     }
@@ -30,8 +32,10 @@ public class DeWebSocketHandlerDecorator extends WebSocketHandlerDecorator {
     public void afterConnectionClosed(WebSocketSession session, CloseStatus closeStatus) throws Exception {
         Optional.ofNullable(session.getPrincipal()).ifPresent(principal -> {
             String name = principal.getName();
-            Long userId = Long.parseLong(name);
-            WsUtil.offLine(userId);
+            if(name != null){
+                Long userId = Long.parseLong(name);
+                WsUtil.offLine(userId);
+            }
         });
 
         super.afterConnectionClosed(session, closeStatus);
diff --git a/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue b/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue
index 97186d51a0..fef42fd26e 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue
@@ -190,7 +190,6 @@ const callbackExport = () => {
 const downLoadAll = () => {
   if (multipleSelection.value.length === 0) {
     tableData.value.forEach(item => {
-      console.log(item.id)
       downloadFile(item.id)
         .then(res => {
           const blob = new Blob([res], { type: 'application/vnd.ms-excel' })

From 4a975f10c4dbfc6641dee24ac7bcbaaf2be5ea02 Mon Sep 17 00:00:00 2001
From: jianneng-fit2cloud <jianneng.pan@fit2cloud.com>
Date: Tue, 4 Jun 2024 19:07:47 +0800
Subject: [PATCH 42/81] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8-=E5=AF=B9=E7=A7=B0?=
 =?UTF-8?q?=E6=9D=A1=E5=BD=A2=E5=9B=BE):=20=E4=BF=AE=E5=A4=8D=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E6=98=BE=E7=A4=BA=E4=BD=8D=E7=BD=AE=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E5=8F=8A=E6=97=A0=E6=B3=95=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../editor-style/components/LabelSelector.vue | 34 +++++++++++++++-
 .../js/panel/charts/bar/bidirectional-bar.ts  | 40 ++++++++++++++++++-
 2 files changed, 70 insertions(+), 4 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 72ebce865e..5cd8005491 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
@@ -220,7 +220,37 @@ const isBarRangeTime = computed<boolean>(() => {
   }
   return false
 })
+watch(
+  () => props.chart.customAttr.basicStyle.layout,
+  () => {
+    const layout = props.chart.customAttr.basicStyle.layout
+    if (layout === 'horizontal') {
+      if (state?.labelForm?.position === 'top') {
+        state.labelForm.position = 'right'
+      }
+      if (state?.labelForm?.position === 'bottom') {
+        state.labelForm.position = 'left'
+      }
+    }
+    if (layout === 'vertical') {
+      if (state?.labelForm?.position === 'left') {
+        state.labelForm.position = 'bottom'
+      }
+      if (state?.labelForm?.position === 'right') {
+        state.labelForm.position = 'top'
+      }
+    }
+    changeLabelAttr('position')
+  },
+  { deep: true }
+)
 
+const isBarBidirectionalAndVertical = computed(() => {
+  if (props.chart.type !== 'bidirectional-bar') {
+    return true
+  }
+  return props.chart.customAttr.basicStyle.layout === 'vertical'
+})
 onMounted(() => {
   init()
 })
@@ -298,7 +328,7 @@ onMounted(() => {
       </el-select>
     </el-form-item>
     <el-form-item
-      v-if="showProperty('hPosition')"
+      v-if="showProperty('hPosition') && !isBarBidirectionalAndVertical"
       :label="t('chart.label_position')"
       class="form-item"
       :class="'form-item-' + themes"
@@ -319,7 +349,7 @@ onMounted(() => {
       </el-select>
     </el-form-item>
     <el-form-item
-      v-if="showProperty('vPosition')"
+      v-if="showProperty('vPosition') && isBarBidirectionalAndVertical"
       :label="t('chart.label_position')"
       class="form-item"
       :class="'form-item-' + themes"
diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/bar/bidirectional-bar.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/bar/bidirectional-bar.ts
index 0a9c5cc4b0..f5ce555ec9 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/charts/bar/bidirectional-bar.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/charts/bar/bidirectional-bar.ts
@@ -87,7 +87,7 @@ export class BidirectionalHorizontalBar extends G2PlotChartView<
     ],
     'legend-selector': ['icon', 'orient', 'fontSize', 'color', 'hPosition', 'vPosition'],
     'function-cfg': ['emptyDataStrategy'],
-    'label-selector': ['hPosition', 'seriesLabelFormatter'],
+    'label-selector': ['hPosition', 'vPosition', 'seriesLabelFormatter'],
     'tooltip-selector': ['fontSize', 'color', 'backgroundColor', 'seriesTooltipFormatter', 'show']
   }
 
@@ -386,6 +386,7 @@ export class BidirectionalHorizontalBar extends G2PlotChartView<
       ...chart.customAttr.label,
       position: 'right'
     }
+    chart.customAttr.basicStyle.layout = 'horizontal'
     return chart
   }
 
@@ -399,6 +400,7 @@ export class BidirectionalHorizontalBar extends G2PlotChartView<
       return pre
     }, {})
     let customAttr: DeepPartial<ChartAttr>
+    const layoutHorizontal = options.layout === 'horizontal'
     if (chart.customAttr) {
       customAttr = parseJson(chart.customAttr)
       // label
@@ -434,7 +436,33 @@ export class BidirectionalHorizontalBar extends G2PlotChartView<
               } else {
                 res = valueFormatter(value, l.labelFormatter)
               }
-              return res
+              const group = new G2PlotChartView.engine.Group({})
+              const isValue = param['series-field-key'] === 'value'
+              const textAlign = isValue && layoutHorizontal ? 'end' : 'start'
+              const isMiddle = label.position === 'middle'
+              group.addShape({
+                type: 'text',
+                attrs: {
+                  x:
+                    isValue && layoutHorizontal && !isMiddle
+                      ? -6
+                      : !isValue && layoutHorizontal && !isMiddle
+                      ? 6
+                      : 0,
+                  y:
+                    isValue && !layoutHorizontal && !isMiddle
+                      ? -8
+                      : !isValue && !layoutHorizontal && !isMiddle
+                      ? 8
+                      : 0,
+                  text: res,
+                  textAlign: label.position === 'middle' ? 'start' : textAlign,
+                  textBaseline: 'top',
+                  fontSize: labelCfg.fontSize,
+                  fill: labelCfg.color
+                }
+              })
+              return group
             }
           }
         } else {
@@ -442,6 +470,14 @@ export class BidirectionalHorizontalBar extends G2PlotChartView<
         }
       }
     }
+    if (!layoutHorizontal) {
+      if (label.position === 'left') {
+        label.position = 'bottom'
+      }
+      if (label.position === 'right') {
+        label.position = 'top'
+      }
+    }
     return { ...options, label }
   }
 

From f5279fa93f1a299599638cff09f4ab28cef3233b Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 4 Jun 2024 19:08:59 +0800
Subject: [PATCH 43/81] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E5=8F=98=E9=87=8F=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
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 a4639696f0..528b54e27d 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit a4639696f004bff2ec6358831b204d3f34ee8763
+Subproject commit 528b54e27d9532e8c818e1ac70ce8e4a7dfbdc84

From c0d84fe024a753508fa17346f34b1f66128674bd Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 4 Jun 2024 21:09:10 +0800
Subject: [PATCH 44/81] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E5=85=AC?=
 =?UTF-8?q?=E5=85=B1=E9=93=BE=E6=8E=A5iframe=E5=B5=8C=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/share/manage/XpackShareManage.java | 14 +++++++++-----
 .../src/views/share/link/IframeError.vue           |  9 +++++++++
 .../src/views/share/link/ShareProxy.ts             |  5 ++++-
 core/core-frontend/src/views/share/link/index.vue  | 11 ++++++++++-
 .../share/request/XpackShareProxyRequest.java      |  1 +
 .../api/xpack/share/vo/XpackShareProxyVO.java      |  1 +
 6 files changed, 34 insertions(+), 7 deletions(-)
 create mode 100644 core/core-frontend/src/views/share/link/IframeError.vue

diff --git a/core/core-backend/src/main/java/io/dataease/share/manage/XpackShareManage.java b/core/core-backend/src/main/java/io/dataease/share/manage/XpackShareManage.java
index 5a0584d040..5a809c11a7 100644
--- a/core/core-backend/src/main/java/io/dataease/share/manage/XpackShareManage.java
+++ b/core/core-backend/src/main/java/io/dataease/share/manage/XpackShareManage.java
@@ -14,12 +14,13 @@ import io.dataease.constant.AuthConstant;
 import io.dataease.constant.BusiResourceEnum;
 import io.dataease.exception.DEException;
 import io.dataease.license.config.XpackInteract;
-import io.dataease.share.dao.auto.mapper.XpackShareMapper;
-import io.dataease.utils.*;
+import io.dataease.license.utils.LicenseUtil;
 import io.dataease.share.dao.auto.entity.XpackShare;
+import io.dataease.share.dao.auto.mapper.XpackShareMapper;
 import io.dataease.share.dao.ext.mapper.XpackShareExtMapper;
 import io.dataease.share.dao.ext.po.XpackSharePO;
 import io.dataease.share.util.LinkTokenUtil;
+import io.dataease.utils.*;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.collections4.CollectionUtils;
@@ -125,7 +126,6 @@ public class XpackShareManage {
     }
 
 
-
     public IPage<XpackSharePO> querySharePage(int goPage, int pageSize, VisualizationWorkbranchQueryRequest request) {
         Long uid = AuthUtils.getUser().getUserId();
         QueryWrapper<Object> queryWrapper = new QueryWrapper<>();
@@ -174,7 +174,7 @@ public class XpackShareManage {
         return pos.stream().map(po ->
                 new XpackShareGridVO(
                         po.getShareId(), po.getResourceId(), po.getName(), po.getCreator().toString(),
-                        po.getTime(), po.getExp(), 9,po.getExtFlag(),po.getType())).toList();
+                        po.getTime(), po.getExp(), 9, po.getExtFlag(), po.getType())).toList();
     }
 
     private XpackShareManage proxy() {
@@ -182,6 +182,10 @@ public class XpackShareManage {
     }
 
     public XpackShareProxyVO proxyInfo(XpackShareProxyRequest request) {
+        boolean inIframeError = request.isInIframe() && !LicenseUtil.licenseValid();
+        if (inIframeError) {
+            return new XpackShareProxyVO();
+        }
         QueryWrapper<XpackShare> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("uuid", request.getUuid());
         XpackShare xpackShare = xpackShareMapper.selectOne(queryWrapper);
@@ -192,7 +196,7 @@ public class XpackShareManage {
         response.addHeader(AuthConstant.LINK_TOKEN_KEY, linkToken);
         Integer type = xpackShare.getType();
         String typeText = (ObjectUtils.isNotEmpty(type) && type == 1) ? "dashboard" : "dataV";
-        return new XpackShareProxyVO(xpackShare.getResourceId(), xpackShare.getCreator(), linkExp(xpackShare), pwdValid(xpackShare, request.getCiphertext()), typeText);
+        return new XpackShareProxyVO(xpackShare.getResourceId(), xpackShare.getCreator(), linkExp(xpackShare), pwdValid(xpackShare, request.getCiphertext()), typeText, inIframeError);
     }
 
     private boolean linkExp(XpackShare xpackShare) {
diff --git a/core/core-frontend/src/views/share/link/IframeError.vue b/core/core-frontend/src/views/share/link/IframeError.vue
new file mode 100644
index 0000000000..dc6373fc89
--- /dev/null
+++ b/core/core-frontend/src/views/share/link/IframeError.vue
@@ -0,0 +1,9 @@
+<script lang="ts" setup>
+import EmptyBackground from '@/components/empty-background/src/EmptyBackground.vue'
+</script>
+<template>
+  <EmptyBackground
+    img-type="noneWhite"
+    description="仅嵌入式版和企业版支持iframe方式内嵌公共链接"
+  />
+</template>
diff --git a/core/core-frontend/src/views/share/link/ShareProxy.ts b/core/core-frontend/src/views/share/link/ShareProxy.ts
index cc7461ee56..bb5041b201 100644
--- a/core/core-frontend/src/views/share/link/ShareProxy.ts
+++ b/core/core-frontend/src/views/share/link/ShareProxy.ts
@@ -1,5 +1,6 @@
 import request from '@/config/axios'
 import { useCache } from '@/hooks/web/useCache'
+import { isInIframe } from '@/utils/utils'
 const { wsCache } = useCache()
 export interface ProxyInfo {
   resourceId: string
@@ -7,6 +8,7 @@ export interface ProxyInfo {
   exp?: boolean
   pwdValid?: boolean
   type: string
+  inIframeError: boolean
 }
 class ShareProxy {
   uuid: string
@@ -28,7 +30,8 @@ class ShareProxy {
     }
     const uuid = this.uuid
     const url = '/share/proxyInfo'
-    const param = { uuid, ciphertext: null }
+    const inIframe = isInIframe()
+    const param = { uuid, ciphertext: null, inIframe }
     const ciphertext = wsCache.get(`link-${uuid}`)
     if (ciphertext) {
       param['ciphertext'] = ciphertext
diff --git a/core/core-frontend/src/views/share/link/index.vue b/core/core-frontend/src/views/share/link/index.vue
index 598474a3b2..57b591e575 100644
--- a/core/core-frontend/src/views/share/link/index.vue
+++ b/core/core-frontend/src/views/share/link/index.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="link-container" v-loading="loading">
-    <LinkError v-if="!loading && !linkExist" />
+    <IframeError v-if="!loading && iframeError" />
+    <LinkError v-else-if="!loading && !linkExist" />
     <Exp v-else-if="!loading && linkExp" />
     <PwdTips v-else-if="!loading && !pwdValid" />
     <PreviewCanvas
@@ -18,13 +19,21 @@ import { ProxyInfo, shareProxy } from './ShareProxy'
 import Exp from './exp.vue'
 import LinkError from './error.vue'
 import PwdTips from './pwd.vue'
+import IframeError from './IframeError.vue'
 const pcanvas = ref(null)
+const iframeError = ref(true)
 const linkExist = ref(false)
 const loading = ref(true)
 const linkExp = ref(false)
 const pwdValid = ref(false)
 onMounted(async () => {
   const proxyInfo = (await shareProxy.loadProxy()) as ProxyInfo
+  if (proxyInfo?.inIframeError) {
+    loading.value = false
+    iframeError.value = true
+    return
+  }
+  iframeError.value = false
   if (!proxyInfo?.resourceId) {
     loading.value = false
     return
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/request/XpackShareProxyRequest.java b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/request/XpackShareProxyRequest.java
index a020efef98..4d9d821db0 100644
--- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/request/XpackShareProxyRequest.java
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/request/XpackShareProxyRequest.java
@@ -19,4 +19,5 @@ public class XpackShareProxyRequest implements Serializable {
     private String uuid;
     @Schema(description = "密钥", requiredMode = Schema.RequiredMode.REQUIRED)
     private String ciphertext;
+    private boolean inIframe;
 }
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/vo/XpackShareProxyVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/vo/XpackShareProxyVO.java
index 6ec53bc77b..238670fba9 100644
--- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/vo/XpackShareProxyVO.java
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/vo/XpackShareProxyVO.java
@@ -31,4 +31,5 @@ public class XpackShareProxyVO implements Serializable {
     private boolean pwdValid;
     @Schema(description = "类型")
     private String type;
+    private boolean inIframeError = true;
 }

From b6a3e3864df565283ac3712d6d78afd90acb1284 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 4 Jun 2024 23:47:55 +0800
Subject: [PATCH 45/81] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B5=81=E5=AA=92=E4=BD=93=E6=92=AD=E6=94=BE?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E7=BC=96=E8=BE=91=E6=97=B6=E5=88=9D?=
 =?UTF-8?q?=E6=AC=A1=E8=AE=BE=E7=BD=AE=E7=9B=B4=E6=92=AD=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=8F=8A=E6=97=B6=E6=92=AD=E6=94=BE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom-component/de-stream-media/Component.vue  | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/core/core-frontend/src/custom-component/de-stream-media/Component.vue b/core/core-frontend/src/custom-component/de-stream-media/Component.vue
index 6f07352b06..f9fec2997d 100644
--- a/core/core-frontend/src/custom-component/de-stream-media/Component.vue
+++ b/core/core-frontend/src/custom-component/de-stream-media/Component.vue
@@ -21,7 +21,7 @@
 <script lang="ts" setup>
 import flvjs from 'flv.js'
 import '@/style/custom-theme.css'
-import { onMounted, reactive, toRefs, getCurrentInstance } from 'vue'
+import { onMounted, reactive, toRefs, getCurrentInstance, watch, nextTick } from 'vue'
 import { useEmitt } from '@/hooks/web/useEmitt'
 import { useI18n } from '@/hooks/web/useI18n'
 const { t } = useI18n()
@@ -75,6 +75,17 @@ onMounted(() => {
   initOption()
 })
 
+watch(
+  () => element.value.streamMediaLinks,
+  () => {
+    destroyPlayer()
+    nextTick(() => {
+      state.pOption = element.value.streamMediaLinks[element.value.streamMediaLinks.videoType]
+      initOption()
+    })
+  }
+)
+
 const initOption = () => {
   if (flvjs.isSupported() && state.pOption.url) {
     destroyPlayer()

From e495e971fc9f2e98a7f9e9d369c1a01e479017f8 Mon Sep 17 00:00:00 2001
From: jianneng-fit2cloud <jianneng.pan@fit2cloud.com>
Date: Wed, 5 Jun 2024 09:55:39 +0800
Subject: [PATCH 46/81] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=B0=B4=E5=B9=B3=E6=9D=A1=E5=BD=A2=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E4=BD=8D=E7=BD=AE=E9=85=8D=E7=BD=AE=E9=A1=B9=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../editor-style/components/LabelSelector.vue | 28 +++++++++++++------
 1 file changed, 20 insertions(+), 8 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 5cd8005491..88e3149e1e 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
@@ -220,6 +220,24 @@ const isBarRangeTime = computed<boolean>(() => {
   }
   return false
 })
+const showPositionH = computed(() => {
+  if (showProperty('hPosition')) {
+    if (props.chart.type !== 'bidirectional-bar') {
+      return true
+    }
+    return props.chart.customAttr.basicStyle.layout === 'horizontal'
+  }
+  return false
+})
+const showPositionV = computed(() => {
+  if (showProperty('vPosition')) {
+    if (props.chart.type !== 'bidirectional-bar') {
+      return true
+    }
+    return props.chart.customAttr.basicStyle.layout === 'vertical'
+  }
+  return false
+})
 watch(
   () => props.chart.customAttr.basicStyle.layout,
   () => {
@@ -245,12 +263,6 @@ watch(
   { deep: true }
 )
 
-const isBarBidirectionalAndVertical = computed(() => {
-  if (props.chart.type !== 'bidirectional-bar') {
-    return true
-  }
-  return props.chart.customAttr.basicStyle.layout === 'vertical'
-})
 onMounted(() => {
   init()
 })
@@ -328,7 +340,7 @@ onMounted(() => {
       </el-select>
     </el-form-item>
     <el-form-item
-      v-if="showProperty('hPosition') && !isBarBidirectionalAndVertical"
+      v-if="showPositionH"
       :label="t('chart.label_position')"
       class="form-item"
       :class="'form-item-' + themes"
@@ -349,7 +361,7 @@ onMounted(() => {
       </el-select>
     </el-form-item>
     <el-form-item
-      v-if="showProperty('vPosition') && isBarBidirectionalAndVertical"
+      v-if="showPositionV"
       :label="t('chart.label_position')"
       class="form-item"
       :class="'form-item-' + themes"

From ecd2d779923d7150aded58a341e12aa4769ad0b7 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 5 Jun 2024 11:05:15 +0800
Subject: [PATCH 47/81] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=BF=AB=E9=80=9F?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=9B=BE=E6=A0=87=E5=AF=BC=E8=87=B4=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE=EF=BC=8C=E4=B8=94=E9=80=80?=
 =?UTF-8?q?=E5=87=BA=E4=B8=8D=E4=BF=9D=E5=AD=98=E5=9C=A8=E6=AD=A4=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E4=BE=9D=E7=84=B6=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/utils/canvasUtils.ts   | 42 +++++++++++++++++
 .../src/views/dashboard/MobileConfigPanel.vue |  7 ++-
 .../src/views/share/link/mobile.vue           | 47 ++++++++++++++++---
 3 files changed, 89 insertions(+), 7 deletions(-)

diff --git a/core/core-frontend/src/utils/canvasUtils.ts b/core/core-frontend/src/utils/canvasUtils.ts
index d21ae7b72e..c1b41bddeb 100644
--- a/core/core-frontend/src/utils/canvasUtils.ts
+++ b/core/core-frontend/src/utils/canvasUtils.ts
@@ -174,6 +174,48 @@ export async function initCanvasData(dvId, busiFlag, callBack) {
   )
 }
 
+export async function backCanvasData(dvId, busiFlag, callBack) {
+  initCanvasDataPrepare(dvId, busiFlag, function ({ canvasDataResult, canvasStyleResult }) {
+    const componentDataCopy = canvasDataResult.filter(ele => !!ele.inMobile)
+    const componentDataId = componentDataCopy.map(ele => ele.id)
+    componentData.value.forEach(ele => {
+      ele.inMobile = componentDataId.includes(ele.id)
+      if (ele.inMobile) {
+        const { mx, my, mSizeX, mSizeY } = componentDataCopy.find(itx => itx.id === ele.id)
+        ele.mx = mx
+        ele.my = my
+        ele.mSizeX = mSizeX
+        ele.mSizeY = mSizeY
+        if (ele.component === 'DeTabs') {
+          ele.propValue.forEach(tabItem => {
+            tabItem.componentData.forEach(tabComponent => {
+              tabComponent.mx = tabComponent.mx
+              tabComponent.my = tabComponent.my
+              tabComponent.mSizeX = tabComponent.mSizeX
+              tabComponent.mSizeY = tabComponent.mSizeY
+            })
+          })
+        }
+      }
+    })
+    dvMainStore.setComponentData(componentData.value)
+    const canvasStyleDataCopy = cloneDeep(canvasStyleData.value)
+    if (!canvasStyleDataCopy.mobileSetting) {
+      canvasStyleDataCopy.mobileSetting = {
+        backgroundColorSelect: false,
+        background: '',
+        color: '#ffffff',
+        backgroundImageEnable: false,
+        customSetting: false
+      }
+    } else {
+      canvasStyleDataCopy.mobileSetting = canvasStyleResult.mobileSetting
+    }
+    dvMainStore.setCanvasStyle(canvasStyleDataCopy)
+    callBack()
+  })
+}
+
 export function initCanvasDataMobile(dvId, busiFlag, callBack) {
   initCanvasDataPrepare(
     dvId,
diff --git a/core/core-frontend/src/views/dashboard/MobileConfigPanel.vue b/core/core-frontend/src/views/dashboard/MobileConfigPanel.vue
index a34c45b8f8..b971fb7471 100644
--- a/core/core-frontend/src/views/dashboard/MobileConfigPanel.vue
+++ b/core/core-frontend/src/views/dashboard/MobileConfigPanel.vue
@@ -8,6 +8,7 @@ import { useEmbedded } from '@/store/modules/embedded'
 import { canvasSave } from '@/utils/canvasUtils'
 import { useEmitt } from '@/hooks/web/useEmitt'
 import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
+import { backCanvasData } from '@/utils/canvasUtils'
 import { storeToRefs } from 'pinia'
 import { debounce } from 'lodash-es'
 import mobileHeader from '@/assets/img/mobile-header.png'
@@ -175,6 +176,7 @@ onBeforeUnmount(() => {
 })
 
 const addToMobile = com => {
+  if (mobileLoading.value) return
   com.inMobile = true
   changeTimes.value++
   mobileStatusChange('addToMobile', JSON.parse(JSON.stringify(unref(com))))
@@ -194,7 +196,10 @@ const handleBack = () => {
     showClose: false
   }).then(() => {
     setTimeout(() => {
-      mobileStatusChange('mobilePatch', undefined)
+      backCanvasData(dvInfo.value.id, 'dashboard', () => {
+        changeTimes.value = 0
+        emits('pcMode')
+      })
     }, 100)
   })
 }
diff --git a/core/core-frontend/src/views/share/link/mobile.vue b/core/core-frontend/src/views/share/link/mobile.vue
index d039fcbb3b..d30cfde54e 100644
--- a/core/core-frontend/src/views/share/link/mobile.vue
+++ b/core/core-frontend/src/views/share/link/mobile.vue
@@ -1,23 +1,33 @@
 <template>
-  <div class="mobile-link-container" v-loading="loading">
+  <div
+    :class="curType === 'dashboard' ? 'mobile-link-container' : 'link-container'"
+    v-loading="loading"
+  >
     <LinkError v-if="!loading && !linkExist" />
     <Exp v-else-if="!loading && linkExp" />
     <PwdTips v-else-if="!loading && !pwdValid" />
     <de-preview
       ref="dashboardPreview"
-      v-else-if="state.canvasStylePreview && dataInitState"
+      v-else-if="state.canvasStylePreview && dataInitState && curType === 'dashboard'"
       :component-data="state.canvasDataPreview"
       :canvas-style-data="state.canvasStylePreview"
       :canvas-view-info="state.canvasViewInfoPreview"
       :dv-info="state.dvInfo"
       :cur-gap="state.curPreviewGap"
     ></de-preview>
+    <PreviewCanvas
+      v-else-if="curType !== 'dashboard'"
+      :class="{ 'hidden-link': loading }"
+      ref="pcanvas"
+      public-link-status="true"
+    />
   </div>
 </template>
 <script lang="ts" setup>
 import { onMounted, nextTick, ref, reactive } from 'vue'
 import { initCanvasDataMobile } from '@/utils/canvasUtils'
 import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
+import PreviewCanvas from '@/views/data-visualization/PreviewCanvas.vue'
 import DePreview from '@/components/data-visualization/canvas/DePreview.vue'
 import { ProxyInfo, shareProxy } from './ShareProxy'
 import Exp from './exp.vue'
@@ -71,9 +81,14 @@ const loadCanvasData = (dvId, weight?) => {
     }
   )
 }
+
+const curType = ref('')
+const pcanvas = ref(null)
+
 onMounted(async () => {
-  dvMainStore.setMobileInPc(true)
   const proxyInfo = (await shareProxy.loadProxy()) as ProxyInfo
+  curType.value = proxyInfo.type || 'dashboard'
+  dvMainStore.setMobileInPc(curType.value === 'dashboard')
   if (!proxyInfo?.resourceId) {
     loading.value = false
     return
@@ -82,9 +97,17 @@ onMounted(async () => {
   linkExp.value = !!proxyInfo.exp
   pwdValid.value = !!proxyInfo.pwdValid
   nextTick(() => {
-    loadCanvasData(proxyInfo.resourceId, proxyInfo.type)
-    dvMainStore.setPublicLinkStatus(true)
-    loading.value = false
+    if (curType.value === 'dashboard') {
+      loadCanvasData(proxyInfo.resourceId, proxyInfo.type)
+      dvMainStore.setPublicLinkStatus(true)
+      loading.value = false
+    } else {
+      const method = pcanvas?.value?.loadCanvasDataAsync
+      if (method) {
+        method(proxyInfo.resourceId, proxyInfo.type, null)
+      }
+      loading.value = false
+    }
   })
 })
 </script>
@@ -96,3 +119,15 @@ onMounted(async () => {
   position: relative;
 }
 </style>
+<style lang="less" scoped>
+.link-container {
+  position: absolute !important;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+}
+.hidden-link {
+  display: none !important;
+}
+</style>

From 0c85db200265a1c52f4c4e50b17386592557a499 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Wed, 5 Jun 2024 11:05:17 +0800
Subject: [PATCH 48/81] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=E6=95=B0=E6=8D=AE=E9=9B=86=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/dataset/manage/DatasetTableFieldManage.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetTableFieldManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetTableFieldManage.java
index 7903adf912..9ae1ba7faa 100644
--- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetTableFieldManage.java
+++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetTableFieldManage.java
@@ -156,6 +156,7 @@ public class DatasetTableFieldManage {
         QueryWrapper<CoreDatasetTableField> wrapper = new QueryWrapper<>();
         wrapper.eq("dataset_group_id", id);
         wrapper.eq("checked", true);
+        wrapper.isNull("chart_id");
         return transDTO(coreDatasetTableFieldMapper.selectList(wrapper));
     }
 

From 9885088c39f4580f907c9eb72771145074edfe6e Mon Sep 17 00:00:00 2001
From: xuwei-fit2cloud <wei@fit2cloud.com>
Date: Wed, 5 Jun 2024 11:19:27 +0800
Subject: [PATCH 49/81] =?UTF-8?q?refactor:=20uuidgen=E6=94=B9=E4=B8=BAuran?=
 =?UTF-8?q?dom=20#9945?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 installer/dectl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installer/dectl b/installer/dectl
index e822d921e6..4fe811cf43 100644
--- a/installer/dectl
+++ b/installer/dectl
@@ -67,7 +67,7 @@ function _check_apisix_init() {
 function _prepare_apisix() {
    if [[ -z $DE_APISIX_KEY ]];then
       need_init_apisix=true
-      DE_APISIX_KEY=$(uuidgen | sed 's/-//g')
+      DE_APISIX_KEY=$(head -c 32 /dev/urandom | base64)
       export DE_APISIX_KEY=$DE_APISIX_KEY
       cd $DE_RUNNING_BASE
       env | grep DE_ >.env

From 3ba3ed27e47a4fcea27286e1e62ecd3aad6bd35f Mon Sep 17 00:00:00 2001
From: ulleo <ulleo.wang@gmail.com>
Date: Wed, 5 Jun 2024 11:25:10 +0800
Subject: [PATCH 50/81] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E4=BB=8E=E5=AF=B9=E7=A7=B0=E6=9D=A1=E5=BD=A2=E5=9B=BE?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E4=B8=BA=E6=9F=B1=E7=BA=BF=E7=BB=84=E5=90=88?=
 =?UTF-8?q?=E7=BB=84=E5=90=8E=EF=BC=8C=E5=8F=B3=E8=BD=B4=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/panel/charts/others/chart-mix.ts       | 88 ++++++++++---------
 1 file changed, 47 insertions(+), 41 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/others/chart-mix.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/others/chart-mix.ts
index c69513fc4a..18c5a45910 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/charts/others/chart-mix.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/charts/others/chart-mix.ts
@@ -246,57 +246,63 @@ export class ColumnLineMix extends G2PlotChartView<DualAxesOptions, DualAxes> {
       ...options
     }
 
+    tempOption.yAxis = {}
     if (!yAxis) {
       //左右轴都要隐藏
-      tempOption.yAxis = {
-        value: false,
-        valueExt: false
-      }
+      tempOption.yAxis.value = false
     } else {
-      tempOption.yAxis = {
-        value: undefined,
-        valueExt: undefined
+      tempOption.yAxis.value = undefined
+      yAxis.position = 'left'
+
+      const yAxisTmp = parseJson(chart.customStyle).yAxis
+      if (yAxis.label) {
+        yAxis.label.style.textAlign = 'end'
+        yAxis.label.formatter = value => {
+          return valueFormatter(value, yAxisTmp.axisLabelFormatter)
+        }
+      }
+      const axisValue = yAxisTmp.axisValue
+      if (!axisValue?.auto) {
+        tempOption.yAxis.value = {
+          ...yAxis,
+          min: axisValue.min,
+          max: axisValue.max,
+          minLimit: axisValue.min,
+          maxLimit: axisValue.max,
+          tickCount: axisValue.splitCount
+        }
+      } else {
+        tempOption.yAxis.value = yAxis
       }
     }
 
-    const yAxisTmp = parseJson(chart.customStyle).yAxis
-    if (yAxis.label) {
-      yAxis.label.formatter = value => {
-        return valueFormatter(value, yAxisTmp.axisLabelFormatter)
-      }
-    }
-    const axisValue = yAxisTmp.axisValue
-    if (!axisValue?.auto) {
-      tempOption.yAxis.value = {
-        ...yAxis,
-        min: axisValue.min,
-        max: axisValue.max,
-        minLimit: axisValue.min,
-        maxLimit: axisValue.max,
-        tickCount: axisValue.splitCount
-      }
+    if (!yAxisExt) {
+      //左右轴都要隐藏
+      tempOption.yAxis.valueExt = false
     } else {
-      tempOption.yAxis.value = yAxis
-    }
+      tempOption.yAxis.valueExt = undefined
+      yAxisExt.position = 'right'
 
-    const yAxisExtTmp = parseJson(chart.customStyle).yAxisExt
-    if (yAxisExt.label) {
-      yAxisExt.label.formatter = value => {
-        return valueFormatter(value, yAxisExtTmp.axisLabelFormatter)
+      const yAxisExtTmp = parseJson(chart.customStyle).yAxisExt
+      if (yAxisExt.label) {
+        yAxisExt.label.style.textAlign = 'start'
+        yAxisExt.label.formatter = value => {
+          return valueFormatter(value, yAxisExtTmp.axisLabelFormatter)
+        }
       }
-    }
-    const axisExtValue = yAxisExtTmp.axisValue
-    if (!axisExtValue?.auto) {
-      tempOption.yAxis.valueExt = {
-        ...yAxisExt,
-        min: axisExtValue.min,
-        max: axisExtValue.max,
-        minLimit: axisExtValue.min,
-        maxLimit: axisExtValue.max,
-        tickCount: axisExtValue.splitCount
+      const axisExtValue = yAxisExtTmp.axisValue
+      if (!axisExtValue?.auto) {
+        tempOption.yAxis.valueExt = {
+          ...yAxisExt,
+          min: axisExtValue.min,
+          max: axisExtValue.max,
+          minLimit: axisExtValue.min,
+          maxLimit: axisExtValue.max,
+          tickCount: axisExtValue.splitCount
+        }
+      } else {
+        tempOption.yAxis.valueExt = yAxisExt
       }
-    } else {
-      tempOption.yAxis.valueExt = yAxisExt
     }
 
     return tempOption

From 915241a8c49cd7090644595612caa5d030db5546 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 5 Jun 2024 11:28:55 +0800
Subject: [PATCH 51/81] =?UTF-8?q?fix(xpack):=20xpack=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/plugin/src/index.vue       | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/core/core-frontend/src/components/plugin/src/index.vue b/core/core-frontend/src/components/plugin/src/index.vue
index 6197cca108..a22df5391c 100644
--- a/core/core-frontend/src/components/plugin/src/index.vue
+++ b/core/core-frontend/src/components/plugin/src/index.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import noLic from './nolic.vue'
-import { ref, useAttrs, onMounted } from 'vue'
+import { ref, useAttrs, onMounted, watch } from 'vue'
 import { execute, randomKey, formatArray } from './convert'
 import { load, loadDistributed, xpackModelApi } from '@/api/plugin'
 import { useCache } from '@/hooks/web/useCache'
@@ -8,7 +8,6 @@ import { i18n } from '@/plugins/vue-i18n'
 import * as Vue from 'vue'
 import axios from 'axios'
 import * as Pinia from 'pinia'
-import * as vueI18n from 'vue-i18n'
 import * as vueRouter from 'vue-router'
 import { useEmitt } from '@/hooks/web/useEmitt'
 
@@ -99,10 +98,9 @@ onMounted(async () => {
     window['Vue'] = Vue
     window['Axios'] = axios
     window['Pinia'] = Pinia
-    window['vueI18n'] = vueI18n
     window['vueRouter'] = vueRouter
     window['MittAll'] = useEmitt().emitter.all
-    window['i18n'] = i18n
+    window['I18n'] = i18n
     if (window['DEXPack']) {
       const xpack = await window['DEXPack'].mapping[attrs.jsname]
       plugin.value = xpack.default
@@ -118,6 +116,16 @@ onMounted(async () => {
   }
 })
 
+watch(
+  () => attrs.jsname,
+  () => {
+    if (window['DEXPack']) {
+      const xpack = window['DEXPack'].mapping[attrs.jsname]
+      plugin.value = xpack.default
+    }
+  }
+)
+
 const emits = defineEmits(['loadFail'])
 defineExpose({
   invokeMethod
@@ -125,7 +133,13 @@ defineExpose({
 </script>
 
 <template>
-  <component ref="pluginProxy" :is="plugin" v-loading="loading" v-bind="attrs"></component>
+  <component
+    :class="attrs.jsname"
+    ref="pluginProxy"
+    :is="plugin"
+    v-loading="loading"
+    v-bind="attrs"
+  ></component>
 </template>
 
 <style lang="less" scoped></style>

From 7236817ad6553e773d53c9d7d441c09df1531da9 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 5 Jun 2024 11:30:57 +0800
Subject: [PATCH 52/81] =?UTF-8?q?perf:=20websocket=E6=9C=AA=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E7=8A=B6=E6=80=81=E7=A6=81=E6=AD=A2=E9=87=8D=E8=BF=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/websocket/index.ts | 2 +-
 de-xpack                                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/core-frontend/src/websocket/index.ts b/core/core-frontend/src/websocket/index.ts
index 3c7229a81f..46d427b626 100644
--- a/core/core-frontend/src/websocket/index.ts
+++ b/core/core-frontend/src/websocket/index.ts
@@ -22,7 +22,7 @@ export default {
       }
     ]
     function isLoginStatus() {
-      return wsCache.get('user.token')
+      return wsCache.get('user.token') && wsCache.get('user.uid')
     }
 
     function connection() {
diff --git a/de-xpack b/de-xpack
index 528b54e27d..ff5fe709c3 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 528b54e27d9532e8c818e1ac70ce8e4a7dfbdc84
+Subproject commit ff5fe709c3cdb815c70d2b90a89c5b4fc3b105e3

From 143a1c3022d91b8199d4462273239549e7991e0b Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 5 Jun 2024 11:40:56 +0800
Subject: [PATCH 53/81] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF?=
 =?UTF-8?q?=E3=80=81=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E6=B5=81=E5=AA=92=E4=BD=93=E7=9B=B4=E6=92=AD=EF=BC=8C?=
 =?UTF-8?q?=E9=98=B2=E6=AD=A2=E9=A2=91=E7=B9=81=E5=88=87=E6=8D=A2=E7=9B=B4?=
 =?UTF-8?q?=E6=92=AD=E9=93=BE=E6=8E=A5=E9=80=A0=E6=88=90=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=92=AD=E6=94=BE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/custom-component/component-list.ts    |  4 +-
 .../de-stream-media/Component.vue             | 49 ++++++++-----------
 2 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/core/core-frontend/src/custom-component/component-list.ts b/core/core-frontend/src/custom-component/component-list.ts
index 051bfd9ba0..911f774e25 100644
--- a/core/core-frontend/src/custom-component/component-list.ts
+++ b/core/core-frontend/src/custom-component/component-list.ts
@@ -16,8 +16,8 @@ export const STREAMMEDIALINKS = {
     isLive: false,
     cors: true, // 允许跨域
     loop: true,
-    autoplay: false
-    // url: null // 网络动画视频
+    autoplay: false,
+    url: null // 网络动画视频
   }
 }
 
diff --git a/core/core-frontend/src/custom-component/de-stream-media/Component.vue b/core/core-frontend/src/custom-component/de-stream-media/Component.vue
index f9fec2997d..6b11c4bde4 100644
--- a/core/core-frontend/src/custom-component/de-stream-media/Component.vue
+++ b/core/core-frontend/src/custom-component/de-stream-media/Component.vue
@@ -75,37 +75,30 @@ onMounted(() => {
   initOption()
 })
 
-watch(
-  () => element.value.streamMediaLinks,
-  () => {
-    destroyPlayer()
-    nextTick(() => {
-      state.pOption = element.value.streamMediaLinks[element.value.streamMediaLinks.videoType]
-      initOption()
-    })
-  }
-)
-
 const initOption = () => {
-  if (flvjs.isSupported() && state.pOption.url) {
-    destroyPlayer()
-    const video = currentInstance.proxy.$refs['player-' + element.value.id]
-    if (video) {
-      try {
-        state.flvPlayer = flvjs.createPlayer(state.pOption, {
-          enableWorker: false, // 不启用分离线程
-          enableStashBuffer: false, // 关闭IO隐藏缓冲区
-          isLive: state.pOption.isLive,
-          lazyLoad: false
-        })
-        state.flvPlayer.attachMediaElement(video)
-        state.flvPlayer.load()
-        state.flvPlayer.play()
-      } catch (error) {
-        console.error('flvjs err ignore', error)
+  state.pOption = element.value.streamMediaLinks[element.value.streamMediaLinks.videoType]
+  delete state.pOption.segments
+  nextTick(() => {
+    if (flvjs.isSupported() && state.pOption.url) {
+      destroyPlayer()
+      const video = currentInstance.proxy.$refs['player-' + element.value.id]
+      if (video) {
+        try {
+          state.flvPlayer = flvjs.createPlayer(state.pOption, {
+            enableWorker: false, // 不启用分离线程
+            enableStashBuffer: false, // 关闭IO隐藏缓冲区
+            isLive: state.pOption.isLive,
+            lazyLoad: false
+          })
+          state.flvPlayer.attachMediaElement(video)
+          state.flvPlayer.load()
+          state.flvPlayer.play()
+        } catch (error) {
+          console.error('flvjs err ignore', error)
+        }
       }
     }
-  }
+  })
 }
 
 const destroyPlayer = () => {

From 5ecb1b003c84170fa216c6776e6d0d035d2a7a65 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 5 Jun 2024 13:53:19 +0800
Subject: [PATCH 54/81] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E5=AF=BC=E5=87=BA=E8=B7=9F=E9=9A=8F=E4=BB=AA?=
 =?UTF-8?q?=E8=A1=A8=E6=9D=BF=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/visualization/UserViewEnlarge.vue  | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/core/core-frontend/src/components/visualization/UserViewEnlarge.vue b/core/core-frontend/src/components/visualization/UserViewEnlarge.vue
index ba1f3095c1..27fa3f921b 100644
--- a/core/core-frontend/src/components/visualization/UserViewEnlarge.vue
+++ b/core/core-frontend/src/components/visualization/UserViewEnlarge.vue
@@ -8,7 +8,12 @@
     trigger="click"
   >
     <div class="export-button">
-      <el-select v-if="optType === 'enlarge'" v-model="pixel" class="pixel-select" size="small">
+      <el-select
+        v-if="optType === 'enlarge' && dvInfo.weight > 3"
+        v-model="pixel"
+        class="pixel-select"
+        size="small"
+      >
         <el-option-group v-for="group in pixelOptions" :key="group.label" :label="group.label">
           <el-option
             v-for="item in group.options"
@@ -21,7 +26,7 @@
 
       <el-button
         class="m-button"
-        v-if="optType === 'enlarge'"
+        v-if="optType === 'enlarge' && dvInfo.weight > 3"
         link
         icon="Download"
         size="middle"
@@ -31,7 +36,7 @@
       </el-button>
       <el-button
         class="m-button"
-        v-if="optType === 'details'"
+        v-if="optType === 'details' && dvInfo.weight > 3"
         link
         icon="Download"
         size="middle"

From 7055cd218913ebe1a637be77f0c10e9fde7981a0 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 5 Jun 2024 14:09:50 +0800
Subject: [PATCH 55/81] =?UTF-8?q?fix(xpack):=20=E8=B7=AF=E7=94=B1=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/plugin/src/index.vue       | 26 +++++++------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/core/core-frontend/src/components/plugin/src/index.vue b/core/core-frontend/src/components/plugin/src/index.vue
index a22df5391c..fe3f091f28 100644
--- a/core/core-frontend/src/components/plugin/src/index.vue
+++ b/core/core-frontend/src/components/plugin/src/index.vue
@@ -94,17 +94,19 @@ onMounted(async () => {
   } else {
     distributed = wsCache.get(key)
   }
+  console.log('distributed', distributed, attrs, window['DEXPack'])
+
   if (distributed) {
-    window['Vue'] = Vue
-    window['Axios'] = axios
-    window['Pinia'] = Pinia
-    window['vueRouter'] = vueRouter
-    window['MittAll'] = useEmitt().emitter.all
-    window['I18n'] = i18n
     if (window['DEXPack']) {
       const xpack = await window['DEXPack'].mapping[attrs.jsname]
       plugin.value = xpack.default
     } else {
+      window['Vue'] = Vue
+      window['Axios'] = axios
+      window['Pinia'] = Pinia
+      window['vueRouter'] = vueRouter
+      window['MittAll'] = useEmitt().emitter.all
+      window['I18n'] = i18n
       loadDistributed().then(async res => {
         new Function(res.data)()
         const xpack = await window['DEXPack'].mapping[attrs.jsname]
@@ -116,16 +118,6 @@ onMounted(async () => {
   }
 })
 
-watch(
-  () => attrs.jsname,
-  () => {
-    if (window['DEXPack']) {
-      const xpack = window['DEXPack'].mapping[attrs.jsname]
-      plugin.value = xpack.default
-    }
-  }
-)
-
 const emits = defineEmits(['loadFail'])
 defineExpose({
   invokeMethod
@@ -134,7 +126,7 @@ defineExpose({
 
 <template>
   <component
-    :class="attrs.jsname"
+    :key="attrs.jsname"
     ref="pluginProxy"
     :is="plugin"
     v-loading="loading"

From ca1c34482176662b05bfc14a63488d19d4374fa7 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 5 Jun 2024 14:56:57 +0800
Subject: [PATCH 56/81] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=8B=E6=9C=BA=E5=B8=83=E5=B1=80=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/custom-component/de-stream-media/Component.vue   | 6 +++++-
 .../src/views/dashboard/MobileConfigPanel.vue            | 9 ++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/core/core-frontend/src/custom-component/de-stream-media/Component.vue b/core/core-frontend/src/custom-component/de-stream-media/Component.vue
index 6b11c4bde4..390c6903bb 100644
--- a/core/core-frontend/src/custom-component/de-stream-media/Component.vue
+++ b/core/core-frontend/src/custom-component/de-stream-media/Component.vue
@@ -21,7 +21,7 @@
 <script lang="ts" setup>
 import flvjs from 'flv.js'
 import '@/style/custom-theme.css'
-import { onMounted, reactive, toRefs, getCurrentInstance, watch, nextTick } from 'vue'
+import { onMounted, reactive, toRefs, getCurrentInstance, nextTick, onBeforeUnmount } from 'vue'
 import { useEmitt } from '@/hooks/web/useEmitt'
 import { useI18n } from '@/hooks/web/useI18n'
 const { t } = useI18n()
@@ -109,6 +109,10 @@ const destroyPlayer = () => {
     state.flvPlayer = null
   }
 }
+
+onBeforeUnmount(() => {
+  destroyPlayer()
+})
 </script>
 
 <style lang="less" scoped>
diff --git a/core/core-frontend/src/views/dashboard/MobileConfigPanel.vue b/core/core-frontend/src/views/dashboard/MobileConfigPanel.vue
index a34c45b8f8..503ac8aacb 100644
--- a/core/core-frontend/src/views/dashboard/MobileConfigPanel.vue
+++ b/core/core-frontend/src/views/dashboard/MobileConfigPanel.vue
@@ -274,7 +274,11 @@ const save = () => {
                 :scale="80"
               />
             </div>
-            <div class="mobile-com-mask" @click="addToMobile(item)"></div>
+            <div class="mobile-com-mask" @click="addToMobile(item)">
+              <span v-show="item.component === 'DeStreamMedia'" style="color: #909399"
+                >IOS可能无法显示</span
+              >
+            </div>
             <div class="pc-select-to-mobile" @click="addToMobile(item)" v-if="!mobileLoading"></div>
           </div>
         </template>
@@ -506,6 +510,9 @@ const save = () => {
       left: 0;
       z-index: 10;
       cursor: pointer;
+      display: flex;
+      align-items: center;
+      justify-content: center;
     }
 
     .pc-select-to-mobile {

From a6ca97f67038e23428acd9cf42ad2de11f793d32 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Wed, 5 Jun 2024 15:06:00 +0800
Subject: [PATCH 57/81] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E5=8F=98=E9=87=8F=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datasource/provider/CalciteProvider.java  | 64 +++++++++++++++++++
 .../main/resources/db/desktop/V2.7__ddl.sql   | 30 ++++-----
 2 files changed, 79 insertions(+), 15 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java b/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java
index 75bb0b0f63..947ec1c0cd 100644
--- a/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java
+++ b/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java
@@ -341,6 +341,70 @@ public class CalciteProvider {
                     }
                 }
                 break;
+            case pg:
+                configuration = JsonUtil.parseObject(datasourceDTO.getConfiguration(), Pg.class);
+                if (StringUtils.isNotEmpty(configuration.getUrlType()) && configuration.getUrlType().equalsIgnoreCase("jdbcUrl")) {
+                    if (configuration.getJdbcUrl().contains("password=")) {
+                        String[] params = configuration.getJdbcUrl().split("\\?")[1].split("&");
+                        String pd = "";
+                        for (int i = 0; i < params.length; i++) {
+                            if (params[i].contains("password=")) {
+                                pd = params[i];
+                            }
+                        }
+                        configuration.setJdbcUrl(configuration.getJdbcUrl().replace(pd, "password=******"));
+                        datasourceDTO.setConfiguration(JsonUtil.toJSONString(configuration).toString());
+                    }
+                }
+                break;
+            case redshift:
+                configuration = JsonUtil.parseObject(datasourceDTO.getConfiguration(), Redshift.class);
+                if (StringUtils.isNotEmpty(configuration.getUrlType()) && configuration.getUrlType().equalsIgnoreCase("jdbcUrl")) {
+                    if (configuration.getJdbcUrl().contains("password=")) {
+                        String[] params = configuration.getJdbcUrl().split("\\?")[1].split("&");
+                        String pd = "";
+                        for (int i = 0; i < params.length; i++) {
+                            if (params[i].contains("password=")) {
+                                pd = params[i];
+                            }
+                        }
+                        configuration.setJdbcUrl(configuration.getJdbcUrl().replace(pd, "password=******"));
+                        datasourceDTO.setConfiguration(JsonUtil.toJSONString(configuration).toString());
+                    }
+                }
+                break;
+            case ck:
+                configuration = JsonUtil.parseObject(datasourceDTO.getConfiguration(), CK.class);
+                if (StringUtils.isNotEmpty(configuration.getUrlType()) && configuration.getUrlType().equalsIgnoreCase("jdbcUrl")) {
+                    if (configuration.getJdbcUrl().contains("password=")) {
+                        String[] params = configuration.getJdbcUrl().split("\\?")[1].split("&");
+                        String pd = "";
+                        for (int i = 0; i < params.length; i++) {
+                            if (params[i].contains("password=")) {
+                                pd = params[i];
+                            }
+                        }
+                        configuration.setJdbcUrl(configuration.getJdbcUrl().replace(pd, "password=******"));
+                        datasourceDTO.setConfiguration(JsonUtil.toJSONString(configuration).toString());
+                    }
+                }
+                break;
+            case impala:
+                configuration = JsonUtil.parseObject(datasourceDTO.getConfiguration(), Impala.class);
+                if (StringUtils.isNotEmpty(configuration.getUrlType()) && configuration.getUrlType().equalsIgnoreCase("jdbcUrl")) {
+                    if (configuration.getJdbcUrl().contains("password=")) {
+                        String[] params = configuration.getJdbcUrl().split(";")[1].split("&");
+                        String pd = "";
+                        for (int i = 0; i < params.length; i++) {
+                            if (params[i].contains("password=")) {
+                                pd = params[i];
+                            }
+                        }
+                        configuration.setJdbcUrl(configuration.getJdbcUrl().replace(pd, "password=******"));
+                        datasourceDTO.setConfiguration(JsonUtil.toJSONString(configuration).toString());
+                    }
+                }
+                break;
             default:
                 break;
         }
diff --git a/core/core-backend/src/main/resources/db/desktop/V2.7__ddl.sql b/core/core-backend/src/main/resources/db/desktop/V2.7__ddl.sql
index a792416b03..6de7b516c6 100644
--- a/core/core-backend/src/main/resources/db/desktop/V2.7__ddl.sql
+++ b/core/core-backend/src/main/resources/db/desktop/V2.7__ddl.sql
@@ -15,22 +15,22 @@ INSERT INTO `core_sys_startup_job` VALUES ('chartFilterMerge', 'chartFilterMerge
 COMMIT;
 
 
-DROP TABLE IF EXISTS "core_export_task";
-CREATE TABLE "core_export_task"
+DROP TABLE IF EXISTS `core_export_task`;
+CREATE TABLE `core_export_task`
 (
-    "id"                  VARCHAR(255) NOT NULL,
-    "user_id"             BIGINT(20)   NOT NULL,
-    "file_name"           VARCHAR(2048) DEFAULT NULL,
-    "file_size"           DOUBLE        DEFAULT NULL,
-    "file_size_unit"      VARCHAR(255)  DEFAULT NULL,
-    "export_from"         VARCHAR(255)  DEFAULT NULL,
-    "export_status"       VARCHAR(255)  DEFAULT NULL,
-    "export_from_type"    VARCHAR(255)  DEFAULT NULL,
-    "export_time"         BIGINT(20)    DEFAULT NULL,
-    "export_progress"     VARCHAR(255)  DEFAULT NULL,
-    "export_machine_name" VARCHAR(512)  DEFAULT NULL,
-    "params"              CLOB          NOT NULL COMMENT '过滤参数',
-    PRIMARY KEY ("id")
+    `id`                  VARCHAR(255) NOT NULL,
+    `user_id`             BIGINT(20)   NOT NULL,
+    `file_name`           VARCHAR(2048) DEFAULT NULL,
+    `file_size`           DOUBLE        DEFAULT NULL,
+    `file_size_unit`      VARCHAR(255)  DEFAULT NULL,
+    `export_from`         VARCHAR(255)  DEFAULT NULL,
+    `export_status`       VARCHAR(255)  DEFAULT NULL,
+    `export_from_type`    VARCHAR(255)  DEFAULT NULL,
+    `export_time`         BIGINT(20)    DEFAULT NULL,
+    `export_progress`     VARCHAR(255)  DEFAULT NULL,
+    `export_machine_name` VARCHAR(512)  DEFAULT NULL,
+    `params`              longtext      NOT NULL COMMENT '过滤参数',
+    PRIMARY KEY (`id`)
 ) COMMENT='导出任务表';
 
 UPDATE `QRTZ_JOB_DETAILS` SET `JOB_CLASS_NAME` = 'io.dataease.job.schedule.CheckDsStatusJob' WHERE (`SCHED_NAME` = 'deSyncJob') and (`JOB_NAME` = 'Datasource') and (`JOB_GROUP` = 'check_status');

From adcb7708f0b5d2ed7754c4e65882aa8795be251d Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Wed, 5 Jun 2024 15:10:46 +0800
Subject: [PATCH 58/81] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E5=8F=98=E9=87=8F=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
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 ff5fe709c3..7fb5e68fb8 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit ff5fe709c3cdb815c70d2b90a89c5b4fc3b105e3
+Subproject commit 7fb5e68fb8b38b46209593848d072247f410e62e

From 48768527f98da3d401174d64f760da3c9d04ca73 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 5 Jun 2024 15:30:11 +0800
Subject: [PATCH 59/81] =?UTF-8?q?fix(xpack):=20=E8=B7=AF=E7=94=B1=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/components/plugin/src/index.vue | 2 --
 core/core-frontend/src/layout/components/Main.vue      | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/core/core-frontend/src/components/plugin/src/index.vue b/core/core-frontend/src/components/plugin/src/index.vue
index fe3f091f28..2959cd3396 100644
--- a/core/core-frontend/src/components/plugin/src/index.vue
+++ b/core/core-frontend/src/components/plugin/src/index.vue
@@ -94,8 +94,6 @@ onMounted(async () => {
   } else {
     distributed = wsCache.get(key)
   }
-  console.log('distributed', distributed, attrs, window['DEXPack'])
-
   if (distributed) {
     if (window['DEXPack']) {
       const xpack = await window['DEXPack'].mapping[attrs.jsname]
diff --git a/core/core-frontend/src/layout/components/Main.vue b/core/core-frontend/src/layout/components/Main.vue
index f0d1dc33f9..b76fd2b112 100644
--- a/core/core-frontend/src/layout/components/Main.vue
+++ b/core/core-frontend/src/layout/components/Main.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup>
 import { ElMain } from 'element-plus-secondary'
+import { useRoute } from 'vue-router'
+const route = useRoute()
 </script>
 
 <template>
   <el-main>
-    <RouterView />
+    <RouterView :key="route.path" />
   </el-main>
 </template>
-
-<style lang="less" scoped></style>

From c894fa4c2cbbdd0e3e7df980c8a180ef4e438479 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Wed, 5 Jun 2024 16:20:08 +0800
Subject: [PATCH 60/81] =?UTF-8?q?refactor(=E5=9B=BE=E8=A1=A8):=20=E5=9B=BE?=
 =?UTF-8?q?=E8=A1=A8=E9=BB=98=E8=AE=A4=E7=BB=93=E6=9E=9C=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=201000=20=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/chart/components/editor/util/chart.ts             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/core-frontend/src/views/chart/components/editor/util/chart.ts b/core/core-frontend/src/views/chart/components/editor/util/chart.ts
index 527a106908..0d20515662 100644
--- a/core/core-frontend/src/views/chart/components/editor/util/chart.ts
+++ b/core/core-frontend/src/views/chart/components/editor/util/chart.ts
@@ -1449,7 +1449,7 @@ export const BASE_VIEW_CONFIG = {
   type: 'bar',
   render: 'antv',
   resultCount: 1000,
-  resultMode: 'all',
+  resultMode: 'custom',
   refreshViewEnable: false,
   refreshTime: 5,
   refreshUnit: 'minute',

From 38b1d42f40da21864b9f708b6a34ff0d1559c607 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 5 Jun 2024 16:33:22 +0800
Subject: [PATCH 61/81] =?UTF-8?q?perf(X-Pack):=20=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E6=88=AA=E5=9B=BE=E4=BD=BF=E7=94=A8=E4=BC=98?=
 =?UTF-8?q?=E5=85=88=E7=BA=A7=E9=98=9F=E5=88=97=E6=B1=A0?=
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 ff5fe709c3..2e52a59e20 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit ff5fe709c3cdb815c70d2b90a89c5b4fc3b105e3
+Subproject commit 2e52a59e20bf0daf2db445d9774073b59d44409a

From f955cb3e0bcc8601cc86b175ce442acb87aaba38 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Wed, 5 Jun 2024 16:44:54 +0800
Subject: [PATCH 62/81] =?UTF-8?q?refactor(=E5=9B=BE=E8=A1=A8):=20=E9=9D=A2?=
 =?UTF-8?q?=E7=A7=AF=E5=9B=BE=E6=97=A0=E6=95=B0=E6=8D=AE=E4=B8=8D=E6=B8=B2?=
 =?UTF-8?q?=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/js/panel/charts/line/area.ts   | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/line/area.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/line/area.ts
index 5b5c376214..db8088713c 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/charts/line/area.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/charts/line/area.ts
@@ -86,24 +86,25 @@ export class Area extends G2PlotChartView<AreaOptions, G2Area> {
 
   drawChart(drawOptions: G2PlotDrawOptions<G2Area>): G2Area {
     const { chart, container, action } = drawOptions
-    if (chart?.data) {
-      // data
-      const data = cloneDeep(chart.data.data)
-
-      const initOptions: AreaOptions = {
-        ...this.baseOptions,
-        data,
-        appendPadding: getPadding(chart)
-      }
-      // options
-      const options = this.setupOptions(chart, initOptions)
-      // 开始渲染
-      const newChart = new G2Area(container, options)
-
-      newChart.on('point:click', action)
-
-      return newChart
+    if (!chart.data.data?.length) {
+      return
     }
+    // data
+    const data = cloneDeep(chart.data.data)
+
+    const initOptions: AreaOptions = {
+      ...this.baseOptions,
+      data,
+      appendPadding: getPadding(chart)
+    }
+    // options
+    const options = this.setupOptions(chart, initOptions)
+    // 开始渲染
+    const newChart = new G2Area(container, options)
+
+    newChart.on('point:click', action)
+
+    return newChart
   }
 
   protected configLabel(chart: Chart, options: AreaOptions): AreaOptions {

From 541afd66328ce197eaefa70331cceb64175fdb22 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 5 Jun 2024 16:50:52 +0800
Subject: [PATCH 63/81] =?UTF-8?q?perf:=20=E5=AD=90=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8?=
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 7fb5e68fb8..2e52a59e20 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 7fb5e68fb8b38b46209593848d072247f410e62e
+Subproject commit 2e52a59e20bf0daf2db445d9774073b59d44409a

From 0505497b277de58432739af1fe351d8849c252cd Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 5 Jun 2024 17:11:12 +0800
Subject: [PATCH 64/81] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=9D=83=E9=99=90=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/visualization/UserViewEnlarge.vue | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/core/core-frontend/src/components/visualization/UserViewEnlarge.vue b/core/core-frontend/src/components/visualization/UserViewEnlarge.vue
index 75ddd297e4..4aee8547d6 100644
--- a/core/core-frontend/src/components/visualization/UserViewEnlarge.vue
+++ b/core/core-frontend/src/components/visualization/UserViewEnlarge.vue
@@ -9,7 +9,7 @@
   >
     <div class="export-button">
       <el-select
-        v-if="optType === 'enlarge' && dvInfo.weight > 3"
+        v-if="optType === 'enlarge' && authShow"
         v-model="pixel"
         class="pixel-select"
         size="small"
@@ -26,7 +26,7 @@
 
       <el-button
         class="m-button"
-        v-if="optType === 'enlarge' && dvInfo.weight > 3"
+        v-if="optType === 'enlarge' && authShow"
         link
         icon="Download"
         size="middle"
@@ -36,7 +36,7 @@
       </el-button>
       <el-button
         class="m-button"
-        v-if="optType === 'details' && dvInfo.weight > 3"
+        v-if="optType === 'details' && authShow"
         link
         icon="Download"
         size="middle"
@@ -45,7 +45,7 @@
       >
         导出Excel
       </el-button>
-      <el-divider class="close-divider" direction="vertical" />
+      <el-divider class="close-divider" direction="vertical" v-if="authShow" />
     </div>
     <div
       v-loading="downLoading"
@@ -98,7 +98,7 @@ const viewContainer = ref(null)
 const { t } = useI18n()
 const optType = ref(null)
 const chartComponentDetails = ref(null)
-const { dvInfo } = storeToRefs(dvMainStore)
+const { dvInfo, editMode } = storeToRefs(dvMainStore)
 const exportLoading = ref(false)
 const sourceViewType = ref()
 const DETAIL_TABLE_ATTR: DeepPartial<ChartObj> = {
@@ -120,6 +120,8 @@ const DETAIL_TABLE_ATTR: DeepPartial<ChartObj> = {
   }
 }
 
+const authShow = computed(() => editMode.value === 'edit' || dvInfo.value.weight > 3)
+
 const customExport = computed(() => {
   if (downLoading.value) {
     const bashStyle = pixel.value.split(' * ')

From c8edb753eb5714049302c7e89ff6ac3305d6fa20 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 5 Jun 2024 17:36:13 +0800
Subject: [PATCH 65/81] =?UTF-8?q?fix(X-Pack):=20=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E8=A1=A8=E5=8D=95=E9=94=99=E8=AF=AF?=
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 2e52a59e20..f84720ff7c 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 2e52a59e20bf0daf2db445d9774073b59d44409a
+Subproject commit f84720ff7c65134aefd7dc42479cd8c258a0ec65

From ca8803c56c438e0481f601eba7a386fdc7f7bf69 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Wed, 5 Jun 2024 17:42:39 +0800
Subject: [PATCH 66/81] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E5=8F=98=E9=87=8F=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
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 f84720ff7c..422a61670e 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit f84720ff7c65134aefd7dc42479cd8c258a0ec65
+Subproject commit 422a61670e3d7c45233c887f01fefee8191a38f3

From 8f94422481c5304c9b1221c428732385a47d40cb Mon Sep 17 00:00:00 2001
From: fit2cloudrd <reaperww@gmail.com>
Date: Wed, 5 Jun 2024 18:10:26 +0800
Subject: [PATCH 67/81] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=94=B9=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E5=8F=98=E9=87=8F=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 installer/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installer/install.sh b/installer/install.sh
index b10dc43d3f..5b1c199f38 100644
--- a/installer/install.sh
+++ b/installer/install.sh
@@ -53,6 +53,7 @@ function check_and_prepare_env_params() {
    fi
 
    set -a
+   source ${CURRENT_DIR}/install.conf
    if [[ -d $DE_BASE ]] && [[ -f $DE_BASE/dataease2.0/.env ]]; then
       source $DE_BASE/dataease2.0/.env
       INSTALL_TYPE='upgrade'
@@ -64,7 +65,6 @@ function check_and_prepare_env_params() {
       fi
       log_content "升级安装"
    else
-      source ${CURRENT_DIR}/install.conf
       INSTALL_TYPE='install'
       mkdir -p ${DE_BASE}
       log_content "全新安装"

From 8c88667d45f185b7487ddfc2cea46d94a49addc6 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 5 Jun 2024 18:17:28 +0800
Subject: [PATCH 68/81] =?UTF-8?q?fix(=E5=B5=8C=E5=85=A5=E5=BC=8F):=20?=
 =?UTF-8?q?=E5=B5=8C=E5=85=A5=E5=BC=8F=E8=B7=B3=E8=BD=ACbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core-frontend/src/views/chart/components/views/index.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/views/index.vue b/core/core-frontend/src/views/chart/components/views/index.vue
index 31ccfc5c83..15dd7bb8a8 100644
--- a/core/core-frontend/src/views/chart/components/views/index.vue
+++ b/core/core-frontend/src/views/chart/components/views/index.vue
@@ -356,9 +356,6 @@ const windowsJump = (url, jumpType) => {
   try {
     const newWindow = window.open(url, jumpType)
     initOpenHandler(newWindow)
-    if (jumpType === '_self') {
-      location.reload()
-    }
   } catch (e) {
     ElMessage.error(t('visualization.url_check_error') + ':' + url)
   }
@@ -415,6 +412,7 @@ const jumpClick = param => {
             jumpInfo.targetDvId
           }&jumpInfoParam=${encodeURIComponent(Base64.encode(JSON.stringify(param)))}`
           if (divSelf) {
+            embeddedStore.clearState()
             embeddedStore.setDvId(jumpInfo.targetDvId)
             embeddedStore.setJumpInfoParam(encodeURIComponent(Base64.encode(JSON.stringify(param))))
             divEmbedded('Preview')
@@ -435,6 +433,7 @@ const jumpClick = param => {
       let url = setIdValueTrans('id', 'value', jumpInfo.content, colList)
       url = checkAddHttp(url)
       if (divSelf) {
+        embeddedStore.clearState()
         embeddedStore.setOuterUrl(url)
         divEmbedded('Iframe')
         return

From 9505fa85b83b52c5397d496d6a54ba72c3febcb0 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 5 Jun 2024 18:33:16 +0800
Subject: [PATCH 69/81] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE=E9=87=8F?=
 =?UTF-8?q?=E4=B8=8D=E5=87=86=E7=A1=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/chart/server/ChartDataServer.java    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java b/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java
index 4e99e031e6..bc65280bcc 100644
--- a/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java
+++ b/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java
@@ -4,6 +4,7 @@ import io.dataease.api.chart.ChartDataApi;
 import io.dataease.api.chart.dto.ChartViewDTO;
 import io.dataease.api.chart.dto.ViewDetailField;
 import io.dataease.api.chart.request.ChartExcelRequest;
+import io.dataease.chart.constant.ChartConstants;
 import io.dataease.chart.manage.ChartDataManage;
 import io.dataease.constant.AuthConstant;
 import io.dataease.constant.CommonConstants;
@@ -69,7 +70,12 @@ public class ChartDataServer implements ChartDataApi {
         try {
             ChartViewDTO viewDTO = request.getViewInfo();
             viewDTO.setIsExcelExport(true);
-            viewDTO.setResultCount(limit);
+            if(ChartConstants.VIEW_RESULT_MODE.CUSTOM.equals(viewDTO.getResultMode())){
+                Integer limitCount = viewDTO.getResultCount();
+                viewDTO.setResultCount(limitCount>limit?limit:limitCount);
+            }else{
+                viewDTO.setResultCount(limit);
+            }
             ChartViewDTO chartViewInfo = getData(viewDTO);
             List<Object[]> tableRow = (List) chartViewInfo.getData().get("sourceData");
             request.setDetails(tableRow);

From fe0f48d19b186fe8b8ede3721cc331878dfd786d Mon Sep 17 00:00:00 2001
From: fit2cloudrd <reaperww@gmail.com>
Date: Wed, 5 Jun 2024 18:45:40 +0800
Subject: [PATCH 70/81] =?UTF-8?q?refactor:=20=E5=BC=80=E5=90=AF=20APISIX?=
 =?UTF-8?q?=20webSocket=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 installer/dataease/bin/apisix/init.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/installer/dataease/bin/apisix/init.sh b/installer/dataease/bin/apisix/init.sh
index 80ed032960..b9bdbc148a 100644
--- a/installer/dataease/bin/apisix/init.sh
+++ b/installer/dataease/bin/apisix/init.sh
@@ -138,6 +138,7 @@ curl http://127.0.0.1:9180/apisix/admin/routes -X POST -H "X-API-KEY: $DE_APISIX
     ]
   ],
   "upstream_id": "1",
+  "enable_websocket": true,
   "status": 1
 }'
 
@@ -173,4 +174,4 @@ curl http://127.0.0.1:9180/apisix/admin/routes -X POST -H "X-API-KEY: $DE_APISIX
   ],
   "service_id": "10",
   "status": 1
-}'
\ No newline at end of file
+}'

From 1aeccd72caa8b3431da1bb22323874b019dfbe58 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Wed, 5 Jun 2024 19:56:03 +0800
Subject: [PATCH 71/81] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E4=B8=8B=E9=92=BB=E5=AD=97=E6=AE=B5=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E6=97=A0=E6=95=88=E6=9E=9C=20#9933?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/components/ChartComponentG2Plot.vue | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

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 b5b233070c..dea867602a 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
@@ -261,6 +261,29 @@ const trackClick = trackAction => {
   if (state.pointParam.data.dimensionList.length > 1) {
     checkName = state.pointParam.data.dimensionList[0].id
   }
+  // 跳转字段处理
+  let jumpName = state.pointParam.data.name
+  if (state.pointParam.data.dimensionList.length > 1) {
+    const fieldIds = []
+    // 优先下钻字段
+    if (curView.drill) {
+      const curFiled = curView.drillFields[curView.drillFilters.length]
+      fieldIds.push(curFiled.id)
+    }
+    chartData.value?.fields.forEach(field => {
+      if (!fieldIds.includes(field.id)) {
+        fieldIds.push(field.id)
+      }
+    })
+    for (let i = 0; i < fieldIds.length; i++) {
+      const id = fieldIds[i]
+      const sourceInfo = view.value.id + '#' + id
+      if (nowPanelJumpInfo.value[sourceInfo]) {
+        jumpName = id
+        break
+      }
+    }
+  }
   let quotaList = state.pointParam.data.quotaList
   if (curView.type === 'bar-range') {
     quotaList = state.pointParam.data.dimensionList
@@ -276,7 +299,7 @@ const trackClick = trackAction => {
   }
   const jumpParam = {
     option: 'jump',
-    name: checkName,
+    name: jumpName,
     viewId: view.value.id,
     dimensionList: state.pointParam.data.dimensionList,
     quotaList: quotaList

From 4e7753c3080a94ec6ca2935646ef4deca035f770 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Wed, 5 Jun 2024 20:17:26 +0800
Subject: [PATCH 72/81] =?UTF-8?q?refactor(=E5=9B=BE=E8=A1=A8):=20=E5=9B=BE?=
 =?UTF-8?q?=E8=A1=A8=E8=AF=A6=E7=BB=86=E4=BF=A1=E6=81=AF=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/visualization/UserViewEnlarge.vue           | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/core-frontend/src/components/visualization/UserViewEnlarge.vue b/core/core-frontend/src/components/visualization/UserViewEnlarge.vue
index 4aee8547d6..35797c6ce6 100644
--- a/core/core-frontend/src/components/visualization/UserViewEnlarge.vue
+++ b/core/core-frontend/src/components/visualization/UserViewEnlarge.vue
@@ -116,6 +116,9 @@ const DETAIL_TABLE_ATTR: DeepPartial<ChartObj> = {
       tableItemBgColor: '#FFFFFF',
       tableFontColor: '#7C7E81',
       enableTableCrossBG: false
+    },
+    tooltip: {
+      show: false
     }
   }
 }

From c110b6d4789e186fb1d7520861075032ac53b572 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 5 Jun 2024 23:33:49 +0800
Subject: [PATCH 73/81] =?UTF-8?q?perf(X-Pack):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=AE=9A=E6=97=B6=E6=8A=A5=E5=91=8A-=E6=9C=AA=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=82=AE=E4=BB=B6=E6=9C=8D=E5=8A=A1=E5=99=A8=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E4=BF=A1=E6=81=AF?=
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 422a61670e..874b9ad070 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 422a61670e3d7c45233c887f01fefee8191a38f3
+Subproject commit 874b9ad0703eb1fc339a1821860bb7ca78cbaa16

From 35763b99a1ab88a217e3cd6e090e35fddb096cd0 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 5 Jun 2024 23:50:47 +0800
Subject: [PATCH 74/81] =?UTF-8?q?fix(X-Pack):=20=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E4=BF=9D=E5=AD=98=E6=95=B0=E5=AD=97?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=B3=BB=E7=BB=9F=E5=8F=98=E9=87=8F=E6=8A=A5?=
 =?UTF-8?q?=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 874b9ad070..0a18008104 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 874b9ad0703eb1fc339a1821860bb7ca78cbaa16
+Subproject commit 0a18008104a5a3c3cf43fd77c1b6ef03194a5ba4

From a36d67b8ee9d327edf621b4c33ab1d3f4b1da5f8 Mon Sep 17 00:00:00 2001
From: TaoJinlong <jinlong@fit2cloud.com>
Date: Thu, 6 Jun 2024 01:00:18 +0800
Subject: [PATCH 75/81] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E7=B1=BB=E5=9E=8B=E6=94=B9=E5=8F=98?=
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 0a18008104..53654f4d70 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 0a18008104a5a3c3cf43fd77c1b6ef03194a5ba4
+Subproject commit 53654f4d703b81f2b261922419a0d13ce8b0b0c7

From 5df01b4cf5c554bcd022a540174c7a0ef702c2c2 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Thu, 6 Jun 2024 09:55:42 +0800
Subject: [PATCH 76/81] =?UTF-8?q?fix(=E5=B5=8C=E5=85=A5=E5=BC=8F):=20?=
 =?UTF-8?q?=E5=B5=8C=E5=85=A5=E5=BC=8F=E8=B7=B3=E8=BD=AC=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/chart/components/views/index.vue            | 8 ++++++++
 .../src/views/data-visualization/PreviewCanvas.vue        | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/core/core-frontend/src/views/chart/components/views/index.vue b/core/core-frontend/src/views/chart/components/views/index.vue
index 15dd7bb8a8..2a790578a2 100644
--- a/core/core-frontend/src/views/chart/components/views/index.vue
+++ b/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 {
diff --git a/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue b/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue
index 2ff8f9574f..b48d8e7e5a 100644
--- a/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue
+++ b/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) {

From 1e8a307abf7884bdc9b39656a80e5963e80aeebb Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 6 Jun 2024 10:22:04 +0800
Subject: [PATCH 77/81] =?UTF-8?q?fix(X-Pack):=20=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A-=E6=89=8B=E5=8A=A8=E8=A7=A6=E5=8F=91?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2=E6=8E=A5=E5=8F=97=E8=80=85?=
 =?UTF-8?q?=E6=97=A0=E6=95=88?=
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 53654f4d70..e55d5ef12d 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 53654f4d703b81f2b261922419a0d13ce8b0b0c7
+Subproject commit e55d5ef12d98a142487a29b62343332f4884a3a2

From 67f071ad79fb1a2cc5ce67006930387c4b020544 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Thu, 6 Jun 2024 10:47:50 +0800
Subject: [PATCH 78/81] =?UTF-8?q?fix(=E5=B5=8C=E5=85=A5=E5=BC=8F):=20?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC-=E4=BB=AA=E8=A1=A8=E6=9D=BF=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E5=88=B0=E5=8F=A6=E4=B8=80=E4=B8=AA=E4=BB=AA=E8=A1=A8?=
 =?UTF-8?q?=E6=9D=BF=EF=BC=8C=E8=B7=B3=E8=BD=AC=E9=80=BB=E8=BE=91=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/chart/components/views/index.vue  | 17 ++++++++---------
 .../views/data-visualization/PreviewCanvas.vue  |  3 ---
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/views/index.vue b/core/core-frontend/src/views/chart/components/views/index.vue
index 2a790578a2..52443ebec1 100644
--- a/core/core-frontend/src/views/chart/components/views/index.vue
+++ b/core/core-frontend/src/views/chart/components/views/index.vue
@@ -411,18 +411,17 @@ const jumpClick = param => {
           const url = `${embeddedBaseUrl}#/preview?dvId=${
             jumpInfo.targetDvId
           }&jumpInfoParam=${encodeURIComponent(Base64.encode(JSON.stringify(param)))}`
-          if (divSelf) {
+
+          if (isIframe.value || isDataEaseBi.value) {
             embeddedStore.clearState()
+          }
+          if (divSelf) {
             embeddedStore.setDvId(jumpInfo.targetDvId)
             embeddedStore.setJumpInfoParam(encodeURIComponent(Base64.encode(JSON.stringify(param))))
             divEmbedded('Preview')
             return
           }
 
-          if (isIframe.value) {
-            embeddedStore.clearState()
-          }
-
           if (iframeSelf) {
             router.push(parseUrl(url))
             return
@@ -436,16 +435,16 @@ const jumpClick = param => {
       const colList = [...param.dimensionList, ...param.quotaList]
       let url = setIdValueTrans('id', 'value', jumpInfo.content, colList)
       url = checkAddHttp(url)
-      if (divSelf) {
+
+      if (isIframe.value || isDataEaseBi.value) {
         embeddedStore.clearState()
+      }
+      if (divSelf) {
         embeddedStore.setOuterUrl(url)
         divEmbedded('Iframe')
         return
       }
 
-      if (isIframe.value) {
-        embeddedStore.clearState()
-      }
       windowsJump(url, jumpInfo.jumpType)
     }
   } else {
diff --git a/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue b/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue
index b48d8e7e5a..add5e237ce 100644
--- a/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue
+++ b/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue
@@ -73,8 +73,6 @@ const loadCanvasDataAsync = async (dvId, dvType) => {
       ElMessage.error(t('visualization.outer_param_decode_error'))
     }
   }
-  console.log('PreviewCanvas', dvId, jumpParam, attachParam)
-
   initCanvasData(
     dvId,
     dvType,
@@ -108,7 +106,6 @@ 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) {

From 671f033eb04dc7814ef26c294435ff0a97c613bb Mon Sep 17 00:00:00 2001
From: jianneng-fit2cloud <jianneng.pan@fit2cloud.com>
Date: Thu, 6 Jun 2024 11:26:29 +0800
Subject: [PATCH 79/81] =?UTF-8?q?style(=E5=9B=BE=E8=A1=A8-=E5=AF=B9?=
 =?UTF-8?q?=E7=A7=B0=E6=9D=A1=E5=BD=A2=E5=9B=BE):=20=E5=9E=82=E7=9B=B4?=
 =?UTF-8?q?=E6=96=B9=E5=90=91=E6=97=B6=E8=BD=B4=E7=BA=BF=E7=9A=84=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/DualYAxisSelector.vue          |  2 ++
 .../components/DualYAxisSelectorInner.vue     | 25 ++++++++++++++++---
 .../editor-style/components/XAxisSelector.vue | 14 +++++++++--
 .../js/panel/charts/bar/bidirectional-bar.ts  |  3 ++-
 4 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/DualYAxisSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/DualYAxisSelector.vue
index d517d7e56e..8b55883384 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/DualYAxisSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/DualYAxisSelector.vue
@@ -101,6 +101,7 @@ onMounted(() => {
         :themes="themes"
         type="left"
         :chart-type="chart.type"
+        :layout="chart.customAttr.basicStyle.layout"
         @on-change-y-axis-form="changeAxisStyle"
       />
     </el-tab-pane>
@@ -120,6 +121,7 @@ onMounted(() => {
         :themes="themes"
         type="right"
         :chart-type="chart.type"
+        :layout="chart.customAttr.basicStyle.layout"
         @on-change-y-axis-form="changeSubAxisStyle"
       />
     </el-tab-pane>
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/DualYAxisSelectorInner.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/DualYAxisSelectorInner.vue
index a950e0d2a3..c859c97e7e 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/DualYAxisSelectorInner.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/DualYAxisSelectorInner.vue
@@ -14,6 +14,7 @@ const props = withDefaults(
     propertyInner?: Array<string>
     type?: 'left' | 'right'
     chartType?: string
+    layout?: string
   }>(),
   {
     themes: 'dark',
@@ -75,6 +76,14 @@ const init = () => {
 
 const showProperty = prop => props.propertyInner?.includes(prop)
 
+const isBidirectionalBar = computed(() => {
+  return props.chartType === 'bidirectional-bar'
+})
+
+const isVerticalLayout = computed(() => {
+  return props.layout === 'vertical'
+})
+
 onMounted(() => {
   init()
 })
@@ -99,9 +108,19 @@ onMounted(() => {
         size="small"
         @change="changeAxisStyle('position')"
       >
-        <div v-if="chartType === 'bidirectional-bar'">
-          <el-radio :effect="props.themes" label="right">{{ t('chart.text_pos_top') }}</el-radio>
-          <el-radio :effect="props.themes" label="left">{{ t('chart.text_pos_bottom') }}</el-radio>
+        <div v-if="isBidirectionalBar">
+          <div v-if="isVerticalLayout">
+            <el-radio :effect="props.themes" label="left">{{ t('chart.text_pos_left') }}</el-radio>
+            <el-radio :effect="props.themes" label="right">{{
+              t('chart.text_pos_right')
+            }}</el-radio>
+          </div>
+          <div v-else>
+            <el-radio :effect="props.themes" label="right">{{ t('chart.text_pos_top') }}</el-radio>
+            <el-radio :effect="props.themes" label="left">{{
+              t('chart.text_pos_bottom')
+            }}</el-radio>
+          </div>
         </div>
         <div v-else>
           <el-radio :effect="props.themes" label="left">{{ t('chart.text_pos_left') }}</el-radio>
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/XAxisSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/XAxisSelector.vue
index bd357bd5e2..cc8b6151e2 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/XAxisSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/XAxisSelector.vue
@@ -100,6 +100,14 @@ const init = () => {
 
 const showProperty = prop => props.propertyInner?.includes(prop)
 
+const isBidirectionalBar = computed(() => {
+  return props.chart.type === 'bidirectional-bar'
+})
+
+const isHorizontalLayout = computed(() => {
+  return props.chart.customAttr.basicStyle.layout === 'horizontal'
+})
+
 onMounted(() => {
   init()
 })
@@ -124,8 +132,10 @@ onMounted(() => {
         size="small"
         @change="changeAxisStyle('position')"
       >
-        <div v-if="chart.type === 'bidirectional-bar'">
-          <el-radio :effect="props.themes" label="top">{{ t('chart.text_pos_left') }}</el-radio>
+        <div v-if="isBidirectionalBar">
+          <el-radio :effect="props.themes" label="top">{{
+            isHorizontalLayout ? t('chart.text_pos_left') : t('chart.text_pos_top')
+          }}</el-radio>
           <el-radio :effect="props.themes" label="bottom">{{
             t('chart.text_pos_center')
           }}</el-radio>
diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/bar/bidirectional-bar.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/bar/bidirectional-bar.ts
index f5ce555ec9..9da46bd810 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/charts/bar/bidirectional-bar.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/charts/bar/bidirectional-bar.ts
@@ -325,8 +325,9 @@ export class BidirectionalHorizontalBar extends G2PlotChartView<
         valueExt: undefined
       }
     }
+    const layoutHorizontal = options.layout === 'horizontal'
     // 处理横轴标题方向不对
-    if (yAxis && yAxis['title']) {
+    if (yAxis && yAxis['title'] && layoutHorizontal) {
       yAxis['title'].autoRotate = false
     }
     const yAxisTmp = parseJson(chart.customStyle).yAxis

From 678f2a03b56e6d3b377d7b870215c63b911d0537 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 6 Jun 2024 12:15:38 +0800
Subject: [PATCH 80/81] =?UTF-8?q?fix(X-Pack):=20=E5=88=86=E5=B8=83?=
 =?UTF-8?q?=E5=BC=8FX-Pack=E7=99=BB=E5=BD=95=E6=97=A0=E6=B3=95=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/views/login/index.vue | 8 ++++++--
 de-xpack                                     | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/core/core-frontend/src/views/login/index.vue b/core/core-frontend/src/views/login/index.vue
index 83b14b8432..59082c2bb7 100644
--- a/core/core-frontend/src/views/login/index.vue
+++ b/core/core-frontend/src/views/login/index.vue
@@ -117,8 +117,12 @@ const handleLogin = () => {
           if (!xpackLoadFail.value && xpackInvalidPwd.value?.invokeMethod) {
             const param = {
               methodName: 'init',
-              args: () => {
-                duringLogin.value = false
+              args: r => {
+                duringLogin.value = !!r
+                if (r) {
+                  const queryRedirectPath = getCurLocation()
+                  router.push({ path: queryRedirectPath })
+                }
               }
             }
             xpackInvalidPwd?.value.invokeMethod(param)
diff --git a/de-xpack b/de-xpack
index e55d5ef12d..a12eea394d 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit e55d5ef12d98a142487a29b62343332f4884a3a2
+Subproject commit a12eea394d8d5edf2941988819b08676e512a11e

From b6ef3da2c9d67113d2efe92de160bb6269c6066e Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 6 Jun 2024 15:37:15 +0800
Subject: [PATCH 81/81] =?UTF-8?q?fix(X-Pack):=20=E5=88=86=E5=B8=83?=
 =?UTF-8?q?=E5=BC=8FX-Pack=E5=89=8D=E7=AB=AF=E7=88=B6=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E8=B0=83=E7=94=A8=E5=AD=90=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/components/plugin/src/index.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/core-frontend/src/components/plugin/src/index.vue b/core/core-frontend/src/components/plugin/src/index.vue
index 2959cd3396..147e71cbd5 100644
--- a/core/core-frontend/src/components/plugin/src/index.vue
+++ b/core/core-frontend/src/components/plugin/src/index.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import noLic from './nolic.vue'
-import { ref, useAttrs, onMounted, watch } from 'vue'
+import { ref, useAttrs, onMounted } from 'vue'
 import { execute, randomKey, formatArray } from './convert'
 import { load, loadDistributed, xpackModelApi } from '@/api/plugin'
 import { useCache } from '@/hooks/web/useCache'
@@ -81,7 +81,11 @@ const storeCacheProxy = byteArray => {
 }
 const pluginProxy = ref(null)
 const invokeMethod = param => {
-  pluginProxy.value['invokeMethod'](param)
+  if (pluginProxy.value['invokeMethod']) {
+    pluginProxy.value['invokeMethod'](param)
+  } else {
+    pluginProxy.value[param.methodName](param.args)
+  }
 }
 
 onMounted(async () => {