From ef5e9206d5c63bd76058ab3417332ecf6421167b Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 20 May 2024 09:53:41 +0800
Subject: [PATCH 01/36] =?UTF-8?q?feat(X-Pack):=20=E7=AC=AC=E4=B8=89?=
 =?UTF-8?q?=E6=96=B9=E5=B9=B3=E5=8F=B0=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=85=8D?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=BF=9B=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/permission.ts         | 4 ++--
 core/core-frontend/src/views/login/index.vue | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/core/core-frontend/src/permission.ts b/core/core-frontend/src/permission.ts
index bee8270353..cc00868bab 100644
--- a/core/core-frontend/src/permission.ts
+++ b/core/core-frontend/src/permission.ts
@@ -7,7 +7,7 @@ import { usePermissionStoreWithOut, pathValid, getFirstAuthMenu } from '@/store/
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 import { getRoleRouters } from '@/api/common'
 import { useCache } from '@/hooks/web/useCache'
-import { isMobile, checkPlatform } from '@/utils/utils'
+import { isMobile, checkPlatform, isLarkPlatform, isPlatformClient } from '@/utils/utils'
 import { interactiveStoreWithOut } from '@/store/modules/interactive'
 import { useAppearanceStoreWithOut } from '@/store/modules/appearance'
 import { useEmbedded } from '@/store/modules/embedded'
@@ -34,7 +34,7 @@ router.beforeEach(async (to, from, next) => {
     loadDone()
     if (to.name === 'link') {
       window.location.href = window.origin + '/mobile.html#' + to.path
-    } else {
+    } else if (!isPlatformClient() && !isLarkPlatform()) {
       window.location.href = window.origin + '/mobile.html#/index'
     }
   }
diff --git a/core/core-frontend/src/views/login/index.vue b/core/core-frontend/src/views/login/index.vue
index d1309ecba0..530c31ec21 100644
--- a/core/core-frontend/src/views/login/index.vue
+++ b/core/core-frontend/src/views/login/index.vue
@@ -256,7 +256,13 @@ onMounted(() => {
       </div>
       <div class="login-form-content" v-loading="loading">
         <div class="login-form-center">
-          <el-form ref="formRef" :model="state.loginForm" :rules="rules" size="default">
+          <el-form
+            ref="formRef"
+            :model="state.loginForm"
+            :rules="rules"
+            size="default"
+            :disabled="preheat"
+          >
             <div class="login-logo">
               <Icon
                 v-if="!loginLogoUrl && axiosFinished"

From 60fda515611c09f41960b05d97447bd941d57167 Mon Sep 17 00:00:00 2001
From: ulleo <ulleo.wang@gmail.com>
Date: Mon, 20 May 2024 14:23:35 +0800
Subject: [PATCH 02/36] =?UTF-8?q?feat(=E5=9B=BE=E8=A1=A8):=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=BD=91=E6=A0=BC=E7=BA=BF=E7=B1=BB=E5=9E=8B=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/data-visualization/dvMain.ts      |  9 +++++++-
 .../editor-style/components/XAxisSelector.vue | 22 +++++++++++++++++++
 .../editor-style/components/YAxisSelector.vue | 22 +++++++++++++++++++
 .../components/js/panel/common/common_antv.ts |  6 +++--
 4 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts
index 20edffc4b9..511d4e20b3 100644
--- a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts
+++ b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts
@@ -362,8 +362,15 @@ export const dvMainStore = defineStore('dataVisualization', {
       }
       //如果当前的组件是UserView 图表，则想canvasView中增加一项 UserView ID 和componentID保持一致
       if (component.component === 'UserView') {
+        const defaultConfig = JSON.parse(JSON.stringify(BASE_VIEW_CONFIG))
+        if (component.innerType === 'bar-range') {
+          defaultConfig.customStyle.xAxis.axisLine.show = false
+          defaultConfig.customStyle.xAxis.splitLine.show = true
+          defaultConfig.customStyle.yAxis.axisLine.show = true
+          defaultConfig.customStyle.yAxis.splitLine.show = false
+        }
         let newView = {
-          ...JSON.parse(JSON.stringify(BASE_VIEW_CONFIG)),
+          ...defaultConfig,
           id: component.id,
           type: component.innerType,
           render: component.render
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 968fbc6ab4..b681691c36 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
@@ -52,6 +52,12 @@ const fontSizeList = computed(() => {
   return arr
 })
 
+const splitLineStyle = [
+  { label: t('chart.line_type_solid'), value: 'solid' },
+  { label: t('chart.line_type_dashed'), value: 'dashed' },
+  { label: t('chart.line_type_dotted'), value: 'dotted' }
+]
+
 const isBarRangeTime = computed<boolean>(() => {
   if (props.chart.type === 'bar-range') {
     const tempYAxis = props.chart.yAxis[0]
@@ -326,6 +332,22 @@ onMounted(() => {
           />
         </el-form-item>
       </div>
+      <el-form-item class="form-item" :class="'form-item-' + themes">
+        <el-select
+          :disabled="!state.axisForm.splitLine.show"
+          style="width: 108px"
+          :effect="props.themes"
+          v-model="state.axisForm.splitLine.lineStyle.style"
+          @change="changeAxisStyle('splitLine.lineStyle')"
+        >
+          <el-option
+            v-for="option in splitLineStyle"
+            :key="option.value"
+            :value="option.value"
+            :label="option.label"
+          ></el-option>
+        </el-select>
+      </el-form-item>
     </div>
     <el-divider class="m-divider" :class="'m-divider--' + themes" />
     <el-form-item
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 ad0df2c5a5..004839728c 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
@@ -52,6 +52,12 @@ const fontSizeList = computed(() => {
   return arr
 })
 
+const splitLineStyle = [
+  { label: t('chart.line_type_solid'), value: 'solid' },
+  { label: t('chart.line_type_dashed'), value: 'dashed' },
+  { label: t('chart.line_type_dotted'), value: 'dotted' }
+]
+
 const changeAxisStyle = prop => {
   if (
     state.axisForm.axisValue.splitCount &&
@@ -303,6 +309,22 @@ onMounted(() => {
           />
         </el-form-item>
       </div>
+      <el-form-item class="form-item" :class="'form-item-' + themes">
+        <el-select
+          :disabled="!state.axisForm.splitLine.show"
+          style="width: 108px"
+          :effect="props.themes"
+          v-model="state.axisForm.splitLine.lineStyle.style"
+          @change="changeAxisStyle('splitLine.lineStyle')"
+        >
+          <el-option
+            v-for="option in splitLineStyle"
+            :key="option.value"
+            :value="option.value"
+            :label="option.label"
+          ></el-option>
+        </el-select>
+      </el-form-item>
     </div>
     <el-divider class="m-divider" :class="'m-divider--' + themes" />
     <el-form-item
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 667875a2a3..c174ca9a86 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
@@ -357,7 +357,8 @@ export function getXAxis(chart: Chart) {
               line: {
                 style: {
                   stroke: a.splitLine.lineStyle.color,
-                  lineWidth: a.splitLine.lineStyle.width
+                  lineWidth: a.splitLine.lineStyle.width,
+                  lineDash: getLineDash(a.splitLine.lineStyle.style)
                 }
               }
             }
@@ -435,7 +436,8 @@ export function getYAxis(chart: Chart) {
         line: {
           style: {
             stroke: yAxis.splitLine.lineStyle.color,
-            lineWidth: yAxis.splitLine.lineStyle.width
+            lineWidth: yAxis.splitLine.lineStyle.width,
+            lineDash: getLineDash(yAxis.splitLine.lineStyle.style)
           }
         }
       }

From 8e0510db508a131652ec000b751947ccaba5e789 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 20 May 2024 16:20:55 +0800
Subject: [PATCH 03/36] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=BB=84=E4=BB=B6=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data-visualization/canvas/CanvasCore.vue  |  1 +
 .../src/custom-component/component-list.ts    |  1 +
 .../independent-hang/ComponentHang.vue        | 45 ++++++++++++++
 .../independent-hang/ComponentHangPopver.vue  | 58 +++++++++++++++++++
 .../editor/editor-style/VQueryChartStyle.vue  | 11 +++-
 .../views/chart/components/editor/index.vue   |  3 +-
 .../dataease/cache/impl/DefaultCacheImpl.java |  4 +-
 7 files changed, 120 insertions(+), 3 deletions(-)
 create mode 100644 core/core-frontend/src/custom-component/independent-hang/ComponentHang.vue
 create mode 100644 core/core-frontend/src/custom-component/independent-hang/ComponentHangPopver.vue

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 2e924cb860..ac6d7162b1 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue
@@ -42,6 +42,7 @@ import PointShadow from '@/components/data-visualization/canvas/PointShadow.vue'
 import DragInfo from '@/components/visualization/common/DragInfo.vue'
 import { activeWatermark } from '@/components/watermark/watermark'
 import { personInfoApi } from '@/api/user'
+import ComponentHangPopver from '@/custom-component/independent-hang/ComponentHangPopver.vue'
 const snapshotStore = snapshotStoreWithOut()
 const dvMainStore = dvMainStoreWithOut()
 const composeStore = composeStoreWithOut()
diff --git a/core/core-frontend/src/custom-component/component-list.ts b/core/core-frontend/src/custom-component/component-list.ts
index 277b7b0fbe..33af3555eb 100644
--- a/core/core-frontend/src/custom-component/component-list.ts
+++ b/core/core-frontend/src/custom-component/component-list.ts
@@ -211,6 +211,7 @@ const list = [
     propValue: '',
     icon: 'other_text',
     innerType: 'VQuery',
+    isHang: false,
     x: 1,
     y: 1,
     sizeX: 72,
diff --git a/core/core-frontend/src/custom-component/independent-hang/ComponentHang.vue b/core/core-frontend/src/custom-component/independent-hang/ComponentHang.vue
new file mode 100644
index 0000000000..e1fe70db71
--- /dev/null
+++ b/core/core-frontend/src/custom-component/independent-hang/ComponentHang.vue
@@ -0,0 +1,45 @@
+<template>
+  <div class="hang-main" @keydown.stop @keyup.stop>
+    <div :key="index" v-for="(config, index) in hangComponentData">
+      <component
+        :is="findComponent(config['component'])"
+        :view="canvasViewInfo[config['id']]"
+        ref="component"
+        class="component"
+        :element="config"
+        :scale="deepScale"
+      />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, toRefs } from 'vue'
+import findComponent from '@/utils/components'
+const props = defineProps({
+  hangComponentData: {
+    type: Object,
+    required: true
+  },
+  canvasViewInfo: {
+    type: Object,
+    required: true
+  },
+  scale: {
+    type: Number,
+    required: false,
+    default: 100
+  }
+})
+
+const { hangComponentData, scale } = toRefs(props)
+const deepScale = computed(() => scale.value / 100)
+</script>
+
+<style lang="less" scoped>
+.hang-main {
+  overflow: auto;
+  width: 100%;
+  height: 300px;
+}
+</style>
diff --git a/core/core-frontend/src/custom-component/independent-hang/ComponentHangPopver.vue b/core/core-frontend/src/custom-component/independent-hang/ComponentHangPopver.vue
new file mode 100644
index 0000000000..f42f75a95f
--- /dev/null
+++ b/core/core-frontend/src/custom-component/independent-hang/ComponentHangPopver.vue
@@ -0,0 +1,58 @@
+<script setup lang="ts">
+import { computed, toRefs } from 'vue'
+import ComponentHang from '@/custom-component/independent-hang/ComponentHang.vue'
+
+const props = defineProps({
+  componentData: {
+    type: Object,
+    required: true
+  },
+  canvasViewInfo: {
+    type: Object,
+    required: true
+  },
+  themes: {
+    type: String,
+    required: true,
+    default: 'dark'
+  }
+})
+
+const { componentData, canvasViewInfo } = toRefs(props)
+
+const hangComponentData = computed(() =>
+  componentData.value.filter(ele => {
+    return ele.component === 'VQuery' && ele.isHang === true
+  })
+)
+</script>
+
+<template>
+  <el-popover
+    width="300"
+    trigger="click"
+    :show-arrow="false"
+    :popper-class="'custom-popover-' + themes"
+  >
+    <template #reference>
+      <div class="reference-position">
+        <el-button style="margin-right: 16px">隐藏按钮</el-button>
+      </div>
+    </template>
+    <div>
+      <component-hang
+        :hang-component-data="hangComponentData"
+        :canvas-view-info="canvasViewInfo"
+        :scale="100"
+      >
+      </component-hang>
+    </div>
+  </el-popover>
+</template>
+<style lang="less" scoped>
+.reference-position {
+  position: absolute;
+  right: 100px;
+  top: 100px;
+}
+</style>
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue
index 08dcd0a708..5934c734f3 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue
@@ -9,6 +9,10 @@ const state = {
 }
 
 const props = defineProps({
+  element: {
+    type: Object,
+    required: true
+  },
   chart: {
     type: Object,
     required: true
@@ -24,7 +28,7 @@ const props = defineProps({
 })
 const predefineColors = COLOR_PANEL
 
-const { chart, commonBackgroundPop } = toRefs(props)
+const { element, chart, commonBackgroundPop } = toRefs(props)
 </script>
 
 <template>
@@ -33,6 +37,11 @@ const { chart, commonBackgroundPop } = toRefs(props)
       <el-collapse v-model="state.styleActiveNames" class="style-collapse">
         <el-collapse-item :effect="themes" name="component" :title="t('visualization.module')">
           <el-form label-position="top">
+            <el-form-item class="form-item margin-bottom-8" :class="'form-item-' + themes">
+              <el-checkbox :effect="themes" v-model="element.isHang" size="small">
+                隐藏组件
+              </el-checkbox>
+            </el-form-item>
             <el-form-item class="form-item margin-bottom-8" :class="'form-item-' + themes">
               <el-checkbox
                 :effect="themes"
diff --git a/core/core-frontend/src/views/chart/components/editor/index.vue b/core/core-frontend/src/views/chart/components/editor/index.vue
index ccfc534389..5e97a167be 100644
--- a/core/core-frontend/src/views/chart/components/editor/index.vue
+++ b/core/core-frontend/src/views/chart/components/editor/index.vue
@@ -1518,9 +1518,10 @@ const drop = (ev: MouseEvent, type = 'xAxis') => {
           </el-row>
 
           <el-row style="height: calc(100vh - 110px); overflow-y: auto">
-            <div class="query-style-tab" v-if="view.type === 'VQuery'">
+            <div class="query-style-tab" v-if="view.type === 'VQuery' && curComponent">
               <div style="padding-top: 1px">
                 <VQueryChartStyle
+                  :element="curComponent"
                   :common-background-pop="curComponent?.commonBackground"
                   :chart="view"
                   :themes="themes"
diff --git a/sdk/common/src/main/java/io/dataease/cache/impl/DefaultCacheImpl.java b/sdk/common/src/main/java/io/dataease/cache/impl/DefaultCacheImpl.java
index 7dcef203cb..e474022fa7 100644
--- a/sdk/common/src/main/java/io/dataease/cache/impl/DefaultCacheImpl.java
+++ b/sdk/common/src/main/java/io/dataease/cache/impl/DefaultCacheImpl.java
@@ -93,7 +93,9 @@ public class DefaultCacheImpl implements DECacheService {
     @Override
     public void keyRemove(String cacheName, String key) {
         Cache<Object, Object> cache = cacheManager.getCache(cacheName);
-        cache.remove(key);
+        if(cache != null){
+            cache.remove(key);
+        }
     }
 
     @PostConstruct

From da82c6fcf6464cbbf3fbf466b18389feac46bc0e Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 20 May 2024 16:37:50 +0800
Subject: [PATCH 04/36] =?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=85=8D=E7=BD=AE=20?=
 =?UTF-8?q?=E2=80=9C=E9=80=89=E6=8B=A9=E6=95=B0=E6=8D=AE=E9=9B=86=E2=80=9D?=
 =?UTF-8?q?=20=E4=B8=94=E9=85=8D=E7=BD=AE=E5=8F=82=E6=95=B0=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E7=AD=9B=E9=80=89=E6=9F=A5=E8=AF=A2=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9=E5=80=BC=E4=BC=9A=E8=A2=AB=E4=B8=A4=E4=B8=AA?=
 =?UTF-8?q?=E5=8D=95=E5=BC=95=E5=8F=B7=E5=8C=85=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/hooks/web/useFilter.ts | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/core/core-frontend/src/hooks/web/useFilter.ts b/core/core-frontend/src/hooks/web/useFilter.ts
index f89d5294bc..35eeee697a 100644
--- a/core/core-frontend/src/hooks/web/useFilter.ts
+++ b/core/core-frontend/src/hooks/web/useFilter.ts
@@ -150,8 +150,7 @@ const getOperator = (
   conditionValueF,
   conditionValueOperatorS,
   conditionValueS,
-  firstLoad,
-  optionValueSource
+  firstLoad
 ) => {
   const valueF = firstLoad ? defaultConditionValueF : conditionValueF
   const valueS = firstLoad ? defaultConditionValueS : conditionValueS
@@ -170,11 +169,7 @@ const getOperator = (
     return valueF === '' ? operatorS : operatorF
   }
 
-  return [1, 7].includes(+displayType)
-    ? 'between'
-    : multiple || optionValueSource === 1
-    ? 'in'
-    : 'eq'
+  return [1, 7].includes(+displayType) ? 'between' : multiple ? 'in' : 'eq'
 }
 
 export const searchQuery = (queryComponentList, filter, curComponentId, firstLoad) => {
@@ -304,8 +299,7 @@ export const searchQuery = (queryComponentList, filter, curComponentId, firstLoa
                 conditionValueF,
                 conditionValueOperatorS,
                 conditionValueS,
-                firstLoad,
-                optionValueSource
+                firstLoad
               )
               if (result?.length) {
                 filter.push({

From 0fe834ce24fdeda4b95d890888463bbead0ee8f5 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 20 May 2024 16:53:33 +0800
Subject: [PATCH 05/36] =?UTF-8?q?feat(=E6=95=B0=E6=8D=AE=E6=BA=90):=20?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=95=B0=E6=8D=AE=E6=BA=90=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E8=BE=93=E5=85=A5jdbcurl=E5=AD=97=E7=AC=A6?=
 =?UTF-8?q?=E4=B8=B2=EF=BC=8C=E8=80=8C=E4=B8=8D=E6=98=AF=E5=BF=85=E9=A1=BB?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5ip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datasource/provider/CalciteProvider.java  |  26 +++-
 .../java/io/dataease/datasource/type/CK.java  |   3 +
 .../java/io/dataease/datasource/type/Db2.java |   3 +
 .../io/dataease/datasource/type/Impala.java   |   3 +
 .../io/dataease/datasource/type/Mongo.java    |   3 +
 .../io/dataease/datasource/type/Mysql.java    |   3 +
 .../io/dataease/datasource/type/Oracle.java   |   3 +
 .../java/io/dataease/datasource/type/Pg.java  |   3 +
 .../io/dataease/datasource/type/Redshift.java |   3 +
 .../dataease/datasource/type/Sqlserver.java   |   3 +
 core/core-frontend/src/locales/zh-CN.ts       |   1 +
 .../data/datasource/form/EditorDetail.vue     | 112 ++++++++++++------
 .../visualized/data/datasource/form/index.vue |   3 +
 .../visualized/data/datasource/form/option.ts |   2 +
 .../visualized/data/datasource/index.vue      |  20 +++-
 .../io/dataease/api/ds/vo/Configuration.java  |   4 +-
 16 files changed, 152 insertions(+), 43 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 d470419222..3dad5cc9bd 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
@@ -39,6 +39,8 @@ import java.math.BigDecimal;
 import java.net.URL;
 import java.sql.*;
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 
@@ -731,6 +733,7 @@ public class CalciteProvider {
         List<String> tableSqls = new ArrayList<>();
         DatasourceConfiguration.DatasourceType datasourceType = DatasourceConfiguration.DatasourceType.valueOf(datasourceRequest.getDatasource().getType());
         DatasourceConfiguration configuration = null;
+        String database = "";
         switch (datasourceType) {
             case mysql:
             case mongo:
@@ -739,7 +742,16 @@ public class CalciteProvider {
             case StarRocks:
             case doris:
                 configuration = JsonUtil.parseObject(datasourceRequest.getDatasource().getConfiguration(), Mysql.class);
-                tableSqls.add(String.format("SELECT TABLE_NAME,TABLE_COMMENT FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = '%s' ;", configuration.getDataBase()));
+                if (configuration.getUrlType().equalsIgnoreCase("")) {
+                    database = configuration.getDataBase();
+                } else {
+                    Pattern WITH_SQL_FRAGMENT = Pattern.compile("jdbc:mysql://(.*):(\\d+)/(.*)");
+                    Matcher matcher = WITH_SQL_FRAGMENT.matcher(configuration.getJdbcUrl());
+                    matcher.find();
+                    String[] databasePrams = matcher.group(3).split("\\?");
+                    database = databasePrams[0];
+                }
+                tableSqls.add(String.format("SELECT TABLE_NAME,TABLE_COMMENT FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = '%s' ;", database));
                 break;
             case oracle:
                 configuration = JsonUtil.parseObject(datasourceRequest.getDatasource().getConfiguration(), Oracle.class);
@@ -781,7 +793,17 @@ public class CalciteProvider {
                 break;
             case ck:
                 configuration = JsonUtil.parseObject(datasourceRequest.getDatasource().getConfiguration(), CK.class);
-                tableSqls.add("SELECT name FROM system.tables where database='DATABASE';".replace("DATABASE", configuration.getDataBase()));
+                if (configuration.getUrlType().equalsIgnoreCase("")) {
+                    database = configuration.getDataBase();
+                } else {
+                    Pattern WITH_SQL_FRAGMENT = Pattern.compile("jdbc:clickhouse://(.*):(\\d+)/(.*)");
+                    Matcher matcher = WITH_SQL_FRAGMENT.matcher(configuration.getJdbcUrl());
+                    matcher.find();
+                    String[] databasePrams = matcher.group(3).split("\\?");
+                    database = databasePrams[0];
+                }
+                tableSqls.add("SELECT name FROM system.tables where database='DATABASE';".replace("DATABASE", database));
+
                 break;
             default:
                 tableSqls.add("show tables");
diff --git a/core/core-backend/src/main/java/io/dataease/datasource/type/CK.java b/core/core-backend/src/main/java/io/dataease/datasource/type/CK.java
index bff89b8014..9604c48d36 100644
--- a/core/core-backend/src/main/java/io/dataease/datasource/type/CK.java
+++ b/core/core-backend/src/main/java/io/dataease/datasource/type/CK.java
@@ -12,6 +12,9 @@ public class CK extends DatasourceConfiguration {
     private String extraParams = "";
 
     public String getJdbc() {
+        if(StringUtils.isNoneEmpty(getUrlType()) && !getUrlType().equalsIgnoreCase("hostName")){
+            return getJdbcUrl();
+        }
         if(StringUtils.isEmpty(extraParams.trim())){
             return "jdbc:clickhouse://HOSTNAME:PORT/DATABASE"
                     .replace("HOSTNAME", getHost().trim())
diff --git a/core/core-backend/src/main/java/io/dataease/datasource/type/Db2.java b/core/core-backend/src/main/java/io/dataease/datasource/type/Db2.java
index 44ba37706d..3b1a9e9b30 100644
--- a/core/core-backend/src/main/java/io/dataease/datasource/type/Db2.java
+++ b/core/core-backend/src/main/java/io/dataease/datasource/type/Db2.java
@@ -12,6 +12,9 @@ public class Db2 extends DatasourceConfiguration {
     private String extraParams = "";
 
     public String getJdbc() {
+        if(StringUtils.isNoneEmpty(getUrlType()) && !getUrlType().equalsIgnoreCase("hostName")){
+            return getJdbcUrl();
+        }
         if(StringUtils.isEmpty(extraParams.trim())){
             if (StringUtils.isEmpty(getSchema())) {
                 return "jdbc:db2://HOSTNAME:PORT/DATABASE"
diff --git a/core/core-backend/src/main/java/io/dataease/datasource/type/Impala.java b/core/core-backend/src/main/java/io/dataease/datasource/type/Impala.java
index 27b4cb9187..a362724b7f 100644
--- a/core/core-backend/src/main/java/io/dataease/datasource/type/Impala.java
+++ b/core/core-backend/src/main/java/io/dataease/datasource/type/Impala.java
@@ -17,6 +17,9 @@ public class Impala extends DatasourceConfiguration {
     private List<String> showTableSqls = Arrays.asList("show tables");
 
     public String getJdbc() {
+        if(StringUtils.isNoneEmpty(getUrlType()) && !getUrlType().equalsIgnoreCase("hostName")){
+            return getJdbcUrl();
+        }
         if(StringUtils.isEmpty(extraParams.trim())){
             return "jdbc:impala://HOSTNAME:PORT/DATABASE"
                     .replace("HOSTNAME", getHost().trim())
diff --git a/core/core-backend/src/main/java/io/dataease/datasource/type/Mongo.java b/core/core-backend/src/main/java/io/dataease/datasource/type/Mongo.java
index 49a0887a4c..a602f761bf 100644
--- a/core/core-backend/src/main/java/io/dataease/datasource/type/Mongo.java
+++ b/core/core-backend/src/main/java/io/dataease/datasource/type/Mongo.java
@@ -17,6 +17,9 @@ public class Mongo extends DatasourceConfiguration {
     private List<String> showTableSqls = Arrays.asList("show tables");
 
     public String getJdbc() {
+        if(StringUtils.isNoneEmpty(getUrlType()) && !getUrlType().equalsIgnoreCase("hostName")){
+            return getJdbcUrl();
+        }
         if (StringUtils.isEmpty(extraParams.trim())) {
             return "jdbc:mysql://HOSTNAME:PORT/DATABASE"
                     .replace("HOSTNAME", getHost().trim())
diff --git a/core/core-backend/src/main/java/io/dataease/datasource/type/Mysql.java b/core/core-backend/src/main/java/io/dataease/datasource/type/Mysql.java
index b6e0e8e6e4..3429d20980 100644
--- a/core/core-backend/src/main/java/io/dataease/datasource/type/Mysql.java
+++ b/core/core-backend/src/main/java/io/dataease/datasource/type/Mysql.java
@@ -19,6 +19,9 @@ public class Mysql extends DatasourceConfiguration {
     private List<String> showTableSqls = Arrays.asList("show tables");
 
     public String getJdbc() {
+        if(StringUtils.isNoneEmpty(getUrlType()) && !getUrlType().equalsIgnoreCase("hostName")){
+            return getJdbcUrl();
+        }
         if (StringUtils.isEmpty(extraParams.trim())) {
             return "jdbc:mysql://HOSTNAME:PORT/DATABASE"
                     .replace("HOSTNAME", getHost().trim())
diff --git a/core/core-backend/src/main/java/io/dataease/datasource/type/Oracle.java b/core/core-backend/src/main/java/io/dataease/datasource/type/Oracle.java
index 13041c9d76..8058e0f37d 100644
--- a/core/core-backend/src/main/java/io/dataease/datasource/type/Oracle.java
+++ b/core/core-backend/src/main/java/io/dataease/datasource/type/Oracle.java
@@ -12,6 +12,9 @@ public class Oracle extends DatasourceConfiguration {
     private String extraParams = "";
 
     public String getJdbc() {
+        if(StringUtils.isNoneEmpty(getUrlType()) && !getUrlType().equalsIgnoreCase("hostName")){
+            return getJdbcUrl();
+        }
         if (StringUtils.isNotEmpty(getConnectionType()) && getConnectionType().equalsIgnoreCase("serviceName")) {
             return "jdbc:oracle:thin:@HOSTNAME:PORT/DATABASE"
                     .replace("HOSTNAME", getHost().trim())
diff --git a/core/core-backend/src/main/java/io/dataease/datasource/type/Pg.java b/core/core-backend/src/main/java/io/dataease/datasource/type/Pg.java
index 7c3e690fc1..9b66bd3a4d 100644
--- a/core/core-backend/src/main/java/io/dataease/datasource/type/Pg.java
+++ b/core/core-backend/src/main/java/io/dataease/datasource/type/Pg.java
@@ -12,6 +12,9 @@ public class Pg extends DatasourceConfiguration {
     private String extraParams = "";
 
     public String getJdbc() {
+        if(StringUtils.isNoneEmpty(getUrlType()) && !getUrlType().equalsIgnoreCase("hostName")){
+            return getJdbcUrl();
+        }
         if(StringUtils.isEmpty(extraParams.trim())){
             if (StringUtils.isEmpty(getSchema())) {
                 return "jdbc:postgresql://HOSTNAME:PORT/DATABASE"
diff --git a/core/core-backend/src/main/java/io/dataease/datasource/type/Redshift.java b/core/core-backend/src/main/java/io/dataease/datasource/type/Redshift.java
index 8c2a37f39e..6d81242106 100644
--- a/core/core-backend/src/main/java/io/dataease/datasource/type/Redshift.java
+++ b/core/core-backend/src/main/java/io/dataease/datasource/type/Redshift.java
@@ -12,6 +12,9 @@ public class Redshift extends DatasourceConfiguration {
     private String extraParams = "";
 
     public String getJdbc() {
+        if(StringUtils.isNoneEmpty(getUrlType()) && !getUrlType().equalsIgnoreCase("hostName")){
+            return getJdbcUrl();
+        }
         return "jdbc:redshift://HOSTNAME:PORT/DATABASE"
                 .replace("HOSTNAME", getHost().trim())
                 .replace("PORT", getPort().toString().trim())
diff --git a/core/core-backend/src/main/java/io/dataease/datasource/type/Sqlserver.java b/core/core-backend/src/main/java/io/dataease/datasource/type/Sqlserver.java
index f14ac32c19..24e5327514 100644
--- a/core/core-backend/src/main/java/io/dataease/datasource/type/Sqlserver.java
+++ b/core/core-backend/src/main/java/io/dataease/datasource/type/Sqlserver.java
@@ -17,6 +17,9 @@ public class Sqlserver extends DatasourceConfiguration {
     private List<String> showTableSqls = Arrays.asList("show tables");
 
     public String getJdbc() {
+        if(StringUtils.isNoneEmpty(getUrlType()) && !getUrlType().equalsIgnoreCase("hostName")){
+            return getJdbcUrl();
+        }
         if (StringUtils.isEmpty(extraParams.trim())) {
             return "jdbc:sqlserver://HOSTNAME:PORT;DatabaseName=DATABASE"
                     .replace("HOSTNAME", getHost().trim())
diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts
index 08cc0e679d..8fbb691753 100644
--- a/core/core-frontend/src/locales/zh-CN.ts
+++ b/core/core-frontend/src/locales/zh-CN.ts
@@ -284,6 +284,7 @@ export default {
     datasource_url: '地址',
     please_input_datasource_url: '请输入 Elasticsearch 地址，如: http://es_host:es_port',
     please_input_data_base: '请输入数据库名称',
+    please_input_jdbc_url: '请输入JDBC 连接',
     please_select_oracle_type: '选择连接类型',
     please_input_user_name: '请输入用户名',
     please_input_password: '请输入密码',
diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue b/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue
index 3b6123fbe8..21bcf77727 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue
@@ -5,7 +5,7 @@ import type { FormInstance, FormRules } from 'element-plus-secondary'
 import EmptyBackground from '@/components/empty-background/src/EmptyBackground.vue'
 import { cloneDeep } from 'lodash-es'
 import ApiHttpRequestDraw from './ApiHttpRequestDraw.vue'
-import { Configuration, ApiConfiguration, SyncSetting } from './index.vue'
+import type { Configuration, ApiConfiguration, SyncSetting } from './option'
 import { Icon } from '@/components/icon-custom'
 import { getSchema } from '@/api/datasource'
 import { Base64 } from 'js-base64'
@@ -102,6 +102,8 @@ const initForm = type => {
   if (type !== 'API') {
     form.value.configuration = {
       dataBase: '',
+      jdbcUrl: '',
+      urlType: 'hostName',
       extraParams: '',
       username: '',
       password: '',
@@ -153,6 +155,13 @@ const authMethodList = [
 ]
 const setRules = () => {
   const configRules = {
+    'configuration.jdbcUrl': [
+      {
+        required: true,
+        message: t('datasource.please_input_jdbc_url'),
+        trigger: 'blur'
+      }
+    ],
     'configuration.dataBase': [
       {
         required: true,
@@ -602,14 +611,41 @@ defineExpose({
           </template>
         </template>
         <template v-if="notapiexcelconfig">
-          <el-form-item :label="t('datasource.host')" prop="configuration.host">
+          <el-form-item label="连接方式" prop="type">
+            <el-radio-group v-model="form.configuration.urlType">
+              <el-radio label="hostName">主机名</el-radio>
+              <el-radio label="jdbcUrl">JDBC 连接</el-radio>
+            </el-radio-group>
+          </el-form-item>
+
+          <el-form-item
+            label="JDBC连接字符串"
+            prop="configuration.jdbcUrl"
+            v-if="form.configuration.urlType === 'jdbcUrl'"
+          >
+            <el-input
+              v-model="form.configuration.jdbcUrl"
+              placeholder="JDBC连接字符串"
+              autocomplete="off"
+            />
+          </el-form-item>
+
+          <el-form-item
+            :label="t('datasource.host')"
+            prop="configuration.host"
+            v-if="form.configuration.urlType !== 'jdbcUrl'"
+          >
             <el-input
               v-model="form.configuration.host"
               :placeholder="t('datasource._ip_address')"
               autocomplete="off"
             />
           </el-form-item>
-          <el-form-item :label="t('datasource.port')" prop="configuration.port">
+          <el-form-item
+            :label="t('datasource.port')"
+            prop="configuration.port"
+            v-if="form.configuration.urlType !== 'jdbcUrl'"
+          >
             <el-input-number
               v-model="form.configuration.port"
               autocomplete="off"
@@ -621,13 +657,49 @@ defineExpose({
               type="number"
             />
           </el-form-item>
-          <el-form-item :label="t('datasource.data_base')" prop="configuration.dataBase">
+          <el-form-item
+            :label="t('datasource.data_base')"
+            prop="configuration.dataBase"
+            v-if="form.configuration.urlType !== 'jdbcUrl'"
+          >
             <el-input
               v-model="form.configuration.dataBase"
               :placeholder="t('datasource.please_input_data_base')"
               autocomplete="off"
             />
           </el-form-item>
+          <el-form-item
+            v-if="['oracle', 'sqlServer', 'pg', 'redshift', 'db2'].includes(form.type)"
+            class="schema-label"
+            :prop="showSchema ? '' : 'configuration.schema'"
+          >
+            <template v-slot:label>
+              <span class="name">{{ t('datasource.schema') }}<i class="required" /></span>
+              <el-button text size="small" @click="getDsSchema()">
+                <template #icon>
+                  <Icon name="icon_add_outlined"></Icon>
+                </template>
+                {{ t('datasource.get_schema') }}
+              </el-button>
+            </template>
+            <el-select
+              v-model="form.configuration.schema"
+              filterable
+              :placeholder="t('common.please_select')"
+              class="de-select"
+              @change="validatorSchema"
+              @blur="validatorSchema"
+            >
+              <el-option v-for="item in schemas" :key="item" :label="item" :value="item" />
+            </el-select>
+          </el-form-item>
+          <el-form-item :label="t('datasource.extra_params')">
+            <el-input
+              :placeholder="t('common.inputText') + t('datasource.extra_params')"
+              v-model="form.configuration.extraParams"
+              autocomplete="off"
+            />
+          </el-form-item>
           <el-form-item
             :label="t('datasource.auth_method')"
             prop="configuration.authMethod"
@@ -687,13 +759,6 @@ defineExpose({
               v-model="form.configuration.password"
             />
           </el-form-item>
-          <el-form-item :label="t('datasource.extra_params')">
-            <el-input
-              :placeholder="t('common.inputText') + t('datasource.extra_params')"
-              v-model="form.configuration.extraParams"
-              autocomplete="off"
-            />
-          </el-form-item>
           <el-form-item
             v-if="form.type == 'oracle'"
             :label="t('datasource.connection_mode')"
@@ -706,31 +771,6 @@ defineExpose({
               {{ t('datasource.oracle_service_name') }}
             </el-radio>
           </el-form-item>
-          <el-form-item
-            v-if="['oracle', 'sqlServer', 'pg', 'redshift', 'db2'].includes(form.type)"
-            class="schema-label"
-            :prop="showSchema ? '' : 'configuration.schema'"
-          >
-            <template v-slot:label>
-              <span class="name">{{ t('datasource.schema') }}<i class="required" /></span>
-              <el-button text size="small" @click="getDsSchema()">
-                <template #icon>
-                  <Icon name="icon_add_outlined"></Icon>
-                </template>
-                {{ t('datasource.get_schema') }}
-              </el-button>
-            </template>
-            <el-select
-              v-model="form.configuration.schema"
-              filterable
-              :placeholder="t('common.please_select')"
-              class="de-select"
-              @change="validatorSchema"
-              @blur="validatorSchema"
-            >
-              <el-option v-for="item in schemas" :key="item" :label="item" :value="item" />
-            </el-select>
-          </el-form-item>
           <span
             v-if="!['es', 'api'].includes(form.type)"
             class="de-expand"
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 d1063980e4..7b5e7db117 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
@@ -465,6 +465,9 @@ const init = (nodeInfo: Form | Param, id?: string, res?: object) => {
       Object.assign(form2, cloneDeep(nodeInfo))
     } else {
       Object.assign(form, cloneDeep(nodeInfo))
+      if (form.hasOwnProperty('configuration') && form.configuration.urlType == undefined) {
+        form.configuration.urlType = 'hostName'
+      }
     }
     pid.value = nodeInfo.pid || '0'
   } else {
diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/option.ts b/core/core-frontend/src/views/visualized/data/datasource/form/option.ts
index a8dbaefffe..182a29c55e 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/form/option.ts
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/option.ts
@@ -122,6 +122,8 @@ export const nameMap = {
 
 export interface Configuration {
   dataBase: string
+  jdbcUrl: string
+  urlType: string
   connectionType: string
   schema: string
   extraParams: string
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 de9cb8b98e..9d3b907904 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/index.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/index.vue
@@ -1122,14 +1122,14 @@ const getMenuList = (val: boolean) => {
                 </el-col>
               </el-row>
               <template v-if="!['Excel', 'API'].includes(nodeInfo.type)">
-                <el-row :gutter="24">
+                <el-row :gutter="24" v-show="nodeInfo.configuration.urlType === 'hostName'">
                   <el-col :span="12">
                     <BaseInfoItem :label="t('datasource.host')">{{
                       nodeInfo.configuration.host
                     }}</BaseInfoItem>
                   </el-col>
                 </el-row>
-                <el-row :gutter="24">
+                <el-row :gutter="24" v-show="nodeInfo.configuration.urlType === 'hostName'">
                   <el-col :span="12">
                     <BaseInfoItem :label="t('datasource.port')">{{
                       nodeInfo.configuration.port
@@ -1141,7 +1141,7 @@ const getMenuList = (val: boolean) => {
                     }}</BaseInfoItem>
                   </el-col>
                 </el-row>
-                <el-row :gutter="24">
+                <el-row :gutter="24" v-show="nodeInfo.configuration.urlType === 'hostName'">
                   <el-col :span="12">
                     <BaseInfoItem :label="t('datasource.user_name')">{{
                       nodeInfo.configuration.username
@@ -1153,6 +1153,20 @@ const getMenuList = (val: boolean) => {
                     }}</BaseInfoItem>
                   </el-col>
                 </el-row>
+                <el-row :gutter="24" v-show="nodeInfo.configuration.urlType !== 'hostName'">
+                  <el-col :span="12">
+                    <BaseInfoItem :label="t('datasource.jdbcUrl')">{{
+                      nodeInfo.configuration.jdbcUrl
+                    }}</BaseInfoItem>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="24" v-show="nodeInfo.configuration.urlType !== 'hostName'">
+                  <el-col :span="12">
+                    <BaseInfoItem :label="t('datasource.user_name')">{{
+                      nodeInfo.configuration.username
+                    }}</BaseInfoItem>
+                  </el-col>
+                </el-row>
                 <span
                   v-if="!['es', 'api'].includes(nodeInfo.type.toLowerCase())"
                   class="de-expand"
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/Configuration.java b/sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/Configuration.java
index f44b16011f..f0cab7a66f 100644
--- a/sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/Configuration.java
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/Configuration.java
@@ -2,8 +2,6 @@ package io.dataease.api.ds.vo;
 
 import lombok.Data;
 
-import java.util.List;
-
 @Data
 public class Configuration {
     private String type;
@@ -17,6 +15,8 @@ public class Configuration {
     private String aliasSuffix = "";
     private String jdbc;
     private String host;
+    private String jdbcUrl;
+    private String urlType;
     private Integer port;
     private String username;
     private String password;

From 32aa6c1c56a0a58032adac91fe2c82f2b7b83773 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 20 May 2024 16:59:38 +0800
Subject: [PATCH 06/36] =?UTF-8?q?refactor(=E6=95=B0=E6=8D=AE=E5=A4=A7?=
 =?UTF-8?q?=E5=B1=8F):=20=E4=BC=98=E5=8C=96=E5=A4=A7=E5=B1=8F=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E4=BF=AE=E6=94=B9=E5=90=8D=E7=A7=B0=E6=97=B6=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=B8=8E=E5=A4=A7=E5=B1=8F=E4=B8=8D=E5=8C=B9=E9=85=8D?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/chart/components/editor/index.vue   | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/editor/index.vue b/core/core-frontend/src/views/chart/components/editor/index.vue
index 5e97a167be..c6c2332292 100644
--- a/core/core-frontend/src/views/chart/components/editor/index.vue
+++ b/core/core-frontend/src/views/chart/components/editor/index.vue
@@ -1512,9 +1512,13 @@ const drop = (ev: MouseEvent, type = 'xAxis') => {
         </div>
         <div v-if="!canvasCollapse.chartAreaCollapse" style="width: 240px" class="view-panel-row">
           <el-row class="editor-title">
-            <span class="name-area" @dblclick="editComponentName" id="component-name">{{
-              view.title
-            }}</span>
+            <span
+              class="name-area"
+              :class="{ 'component-name-dark': themes === 'dark' }"
+              @dblclick="editComponentName"
+              id="component-name"
+              >{{ view.title }}</span
+            >
           </el-row>
 
           <el-row style="height: calc(100vh - 110px); overflow-y: auto">
@@ -2890,6 +2894,7 @@ const drop = (ev: MouseEvent, type = 'xAxis') => {
   <XpackComponent ref="openHandler" jsname="L2NvbXBvbmVudC9lbWJlZGRlZC1pZnJhbWUvT3BlbkhhbmRsZXI=" />
   <Teleport v-if="componentNameEdit" :to="'#component-name'">
     <input
+      :effect="themes"
       width="100%"
       @change="onComponentNameChange"
       ref="componentNameInput"
@@ -4020,4 +4025,19 @@ span {
     height: 100%;
   }
 }
+
+.component-name-dark {
+  input {
+    position: absolute;
+    left: 0;
+    width: 100%;
+    color: @dv-canvas-main-font-color;
+    background-color: #050e21;
+    outline: none;
+    border: 1px solid #295acc;
+    border-radius: 4px;
+    padding: 0 4px;
+    height: 100%;
+  }
+}
 </style>

From 77146b7909e287e3311bd43ae9ba2ededea2ce18 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 20 May 2024 17:03:15 +0800
Subject: [PATCH 07/36] =?UTF-8?q?refactor(=E6=95=B0=E6=8D=AE=E5=A4=A7?=
 =?UTF-8?q?=E5=B1=8F):=20=E5=B1=9E=E6=80=A7=E8=AE=BE=E7=BD=AE=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=E6=A0=87=E9=A2=98=E8=B7=9F=E9=9A=8F=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/views/data-visualization/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/core-frontend/src/views/data-visualization/index.vue b/core/core-frontend/src/views/data-visualization/index.vue
index 93b1ddc04d..86063df759 100644
--- a/core/core-frontend/src/views/data-visualization/index.vue
+++ b/core/core-frontend/src/views/data-visualization/index.vue
@@ -409,7 +409,7 @@ eventBus.on('handleNew', handleNew)
       <div style="width: auto; height: 100%" ref="leftSidebarRef">
         <dv-sidebar
           v-if="commonPropertiesShow"
-          :title="'属性'"
+          :title="curComponent['name']"
           :width="240"
           :side-name="'componentProp'"
           :aside-position="'right'"

From c7491a31576210a60b4982a41c094e8c5742804a Mon Sep 17 00:00:00 2001
From: xuwei-fit2cloud <wei@fit2cloud.com>
Date: Mon, 20 May 2024 17:28:45 +0800
Subject: [PATCH 08/36] =?UTF-8?q?refactor:=20dectl=20=E5=A4=87=E4=BB=BD?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=98=BE=E7=A4=BA=E5=85=A8=E8=B7=AF=E5=BE=84?=
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 845962117a..8bd45401cd 100644
--- a/installer/dectl
+++ b/installer/dectl
@@ -354,7 +354,7 @@ function backup() {
       echo "备份失败"
       exit 1
    else
-      echo "备份成功，备份文件 : $backup_file_name"
+      echo "备份成功，备份文件 : $(pwd)/$backup_file_name"
    fi
 
    if [[ $need_stop == 1 ]];then

From a1bb447088ec8271aea3ceb4220df31b570060d6 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 20 May 2024 17:36:52 +0800
Subject: [PATCH 09/36] =?UTF-8?q?feat(X-Pack):=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=BC=BA=E5=88=B6=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=20#9231?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/layout/index.vue       |  2 ++
 core/core-frontend/src/locales/zh-CN.ts       |  5 ++++-
 core/core-frontend/src/utils/logout.ts        |  6 +++++-
 core/core-frontend/src/views/login/index.vue  | 17 +++++++++++++++
 .../system/parameter/basic/BasicEdit.vue      | 21 ++++++++++++++++++-
 .../system/parameter/basic/BasicInfo.vue      | 17 ++++++++++++++-
 de-xpack                                      |  2 +-
 .../api/permissions/user/api/UserApi.java     |  5 +++++
 .../api/permissions/user/vo/InvalidPwdVO.java | 16 ++++++++++++++
 .../constant/XpackSettingConstants.java       |  2 ++
 .../java/io/dataease/utils/CalendarUtils.java | 16 ++++++++++++++
 .../io/dataease/utils/SystemSettingUtils.java |  2 ++
 12 files changed, 106 insertions(+), 5 deletions(-)
 create mode 100644 sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/InvalidPwdVO.java
 create mode 100644 sdk/common/src/main/java/io/dataease/utils/CalendarUtils.java

diff --git a/core/core-frontend/src/layout/index.vue b/core/core-frontend/src/layout/index.vue
index f0a0a62280..b32de3685c 100644
--- a/core/core-frontend/src/layout/index.vue
+++ b/core/core-frontend/src/layout/index.vue
@@ -8,6 +8,7 @@ import Main from './components/Main.vue'
 import CollapseBar from './components/CollapseBar.vue'
 import { ElContainer } from 'element-plus-secondary'
 import { useRoute } from 'vue-router'
+import { XpackComponent } from '@/components/plugin'
 const route = useRoute()
 const systemMenu = computed(() => route.path.includes('system'))
 const settingMenu = computed(() => route.path.includes('sys-setting'))
@@ -49,6 +50,7 @@ const setCollapse = () => {
       ></Main>
     </el-container>
   </div>
+  <XpackComponent jsname="L2NvbXBvbmVudC9sb2dpbi9Qd2RJbnZhbGlkVGlwcw==" />
 </template>
 
 <style lang="less" scoped>
diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts
index 08cc0e679d..6114bc917b 100644
--- a/core/core-frontend/src/locales/zh-CN.ts
+++ b/core/core-frontend/src/locales/zh-CN.ts
@@ -2180,7 +2180,10 @@ export default {
     frontTimeOut: '请求超时时间（秒）',
     logLiveTime: '操作日志保留时间（天）',
     platformOid: '第三方平台用户组织',
-    platformRid: '第三方平台用户角色'
+    platformRid: '第三方平台用户角色',
+    pwdStrategy: '开启密码策略',
+    dip: '禁用初始密码',
+    pvp: '密码有效期'
   },
   setting_email: {
     title: '邮件设置',
diff --git a/core/core-frontend/src/utils/logout.ts b/core/core-frontend/src/utils/logout.ts
index ddce738b2a..632a1747f6 100644
--- a/core/core-frontend/src/utils/logout.ts
+++ b/core/core-frontend/src/utils/logout.ts
@@ -39,7 +39,11 @@ export const logoutHandler = (justClean?: boolean) => {
 const removeCache = () => {
   const keys = Object.keys(wsCache['storage'])
   keys.forEach(key => {
-    if (key.startsWith('de-plugin-') || key === 'de-platform-client') {
+    if (
+      key.startsWith('de-plugin-') ||
+      key === 'de-platform-client' ||
+      key === 'pwd-validity-period'
+    ) {
       wsCache.delete(key)
     }
   })
diff --git a/core/core-frontend/src/views/login/index.vue b/core/core-frontend/src/views/login/index.vue
index 530c31ec21..83b14b8432 100644
--- a/core/core-frontend/src/views/login/index.vue
+++ b/core/core-frontend/src/views/login/index.vue
@@ -36,6 +36,7 @@ const footContent = ref(null)
 const loginErrorMsg = ref('')
 const xpackLoginHandler = ref()
 const showDempTips = ref(false)
+const xpackInvalidPwd = ref()
 const demoTips = computed(() => {
   if (!showDempTips.value) {
     return ''
@@ -113,6 +114,16 @@ const handleLogin = () => {
           const { token, exp } = res.data
           userStore.setToken(token)
           userStore.setExp(exp)
+          if (!xpackLoadFail.value && xpackInvalidPwd.value?.invokeMethod) {
+            const param = {
+              methodName: 'init',
+              args: () => {
+                duringLogin.value = false
+              }
+            }
+            xpackInvalidPwd?.value.invokeMethod(param)
+            return
+          }
           const queryRedirectPath = getCurLocation()
           router.push({ path: queryRedirectPath })
         })
@@ -135,6 +146,7 @@ const tablePaneList = ref([{ title: '普通登录', name: 'simple' }])
 const xpackLoaded = info => {
   tablePaneList.value.push(info)
 }
+const xpackLoadFail = ref(false)
 
 const loginContainer = ref()
 const loginContainerWidth = ref(0)
@@ -334,6 +346,11 @@ onMounted(() => {
                 jsname="L2NvbXBvbmVudC9sb2dpbi9IYW5kbGVy"
                 @loaded="xpackLoaded"
               />
+              <XpackComponent
+                ref="xpackInvalidPwd"
+                jsname="L2NvbXBvbmVudC9sb2dpbi9JbnZhbGlkUHdk"
+                @load-fail="() => (xpackLoadFail = true)"
+              />
             </div>
 
             <div class="login-msg">
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 2de0221747..84685254d4 100644
--- a/core/core-frontend/src/views/system/parameter/basic/BasicEdit.vue
+++ b/core/core-frontend/src/views/system/parameter/basic/BasicEdit.vue
@@ -12,6 +12,13 @@ const options = [
   { value: 'minute', label: '分钟（执行时间：0秒）' },
   { value: 'hour', label: '小时（执行时间：0分0秒）' }
 ]
+const pvpOptions = [
+  { value: '0', label: '永久' },
+  { value: '1', label: '一年' },
+  { value: '2', label: '半年' },
+  { value: '3', label: '三个月' },
+  { value: '4', label: '一个月' }
+]
 const state = reactive({
   form: reactive({
     dsIntervalTime: '30',
@@ -207,7 +214,9 @@ defineExpose({
       >
         <el-switch
           class="de-basic-switch"
-          v-if="item.pkey === 'autoCreateUser'"
+          v-if="
+            item.pkey === 'autoCreateUser' || item.pkey === 'pwdStrategy' || item.pkey === 'dip'
+          "
           active-value="true"
           inactive-value="false"
           v-model="state.form[item.pkey]"
@@ -282,6 +291,16 @@ defineExpose({
             check-on-click-node
           />
         </div>
+        <div v-else-if="item.pkey === 'pvp'">
+          <el-select v-model="state.form[item.pkey]" class="edit-all-line">
+            <el-option
+              v-for="item in pvpOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </div>
         <v-else />
       </el-form-item>
     </el-form>
diff --git a/core/core-frontend/src/views/system/parameter/basic/BasicInfo.vue b/core/core-frontend/src/views/system/parameter/basic/BasicInfo.vue
index 6d16a75dda..2af5de4c18 100644
--- a/core/core-frontend/src/views/system/parameter/basic/BasicInfo.vue
+++ b/core/core-frontend/src/views/system/parameter/basic/BasicInfo.vue
@@ -22,6 +22,13 @@ import { useI18n } from '@/hooks/web/useI18n'
 const { t } = useI18n()
 const editor = ref()
 const infoTemplate = ref()
+const pvpOptions = [
+  { value: '0', label: '永久' },
+  { value: '1', label: '一年' },
+  { value: '2', label: '半年' },
+  { value: '3', label: '三个月' },
+  { value: '4', label: '一个月' }
+]
 const tooltips = [
   {
     key: 'setting_basic.frontTimeOut',
@@ -59,6 +66,7 @@ const selectedOid = ref('')
 const selectedOName = ref('')
 const selectedRid = ref<string[]>([])
 const selectedRName = ref<string[]>([])
+const selectedPvp = ref('0')
 const search = cb => {
   const url = '/sysParameter/basic/query'
   originData = []
@@ -68,7 +76,11 @@ const search = cb => {
     const data = res.data
     for (let index = 0; index < data.length; index++) {
       const item = data[index]
-      if (item.pkey === 'basic.autoCreateUser') {
+      if (
+        item.pkey === 'basic.autoCreateUser' ||
+        item.pkey === 'basic.dip' ||
+        item.pkey === 'basic.pwdStrategy'
+      ) {
         item.pval = item.pval === 'true' ? '开启' : '未开启'
       } else if (item.pkey === 'basic.platformOid') {
         selectedOid.value = item.pval
@@ -89,6 +101,9 @@ const search = cb => {
           selectedRid.value = []
           item.pval = '普通角色'
         }
+      } else if (item.pkey === 'basic.pvp') {
+        selectedPvp.value = item.pval || '0'
+        item.pval = pvpOptions.filter(cur => cur.value === selectedPvp.value)[0].label
       } else {
         item.pval = item.pval
       }
diff --git a/de-xpack b/de-xpack
index 84ddcd508b..922a07f77e 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 84ddcd508b614bab67e08ca7bdc5e7a37573f59c
+Subproject commit 922a07f77e584f46705d5f02cdef70ed8e4e0f98
diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/api/UserApi.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/api/UserApi.java
index 46c5c40513..993e470c5f 100644
--- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/api/UserApi.java
+++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/api/UserApi.java
@@ -185,4 +185,9 @@ public interface UserApi {
     @Hidden
     @GetMapping("/orgAdmin")
     boolean orgAdmin();
+
+    @Hidden
+    @GetMapping("/invalidPwd")
+    InvalidPwdVO invalidPwd();
+
 }
diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/InvalidPwdVO.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/InvalidPwdVO.java
new file mode 100644
index 0000000000..83b4ec913f
--- /dev/null
+++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/InvalidPwdVO.java
@@ -0,0 +1,16 @@
+package io.dataease.api.permissions.user.vo;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+@Data
+public class InvalidPwdVO implements Serializable {
+    @Serial
+    private static final long serialVersionUID = 3684394012648654165L;
+
+    private boolean invalid;
+
+    private Long validityPeriod;
+}
diff --git a/sdk/common/src/main/java/io/dataease/constant/XpackSettingConstants.java b/sdk/common/src/main/java/io/dataease/constant/XpackSettingConstants.java
index bae89ab159..f47ac333e2 100644
--- a/sdk/common/src/main/java/io/dataease/constant/XpackSettingConstants.java
+++ b/sdk/common/src/main/java/io/dataease/constant/XpackSettingConstants.java
@@ -7,4 +7,6 @@ public class XpackSettingConstants {
     public static final String Front_Time_Out = "basic.frontTimeOut";
     public static final String PLATFORM_OID = "basic.platformOid";
     public static final String PLATFORM_RID = "basic.platformRid";
+    public static final String DIP = "basic.dip";
+    public static final String PVP = "basic.pvp";
 }
diff --git a/sdk/common/src/main/java/io/dataease/utils/CalendarUtils.java b/sdk/common/src/main/java/io/dataease/utils/CalendarUtils.java
new file mode 100644
index 0000000000..8c99af3043
--- /dev/null
+++ b/sdk/common/src/main/java/io/dataease/utils/CalendarUtils.java
@@ -0,0 +1,16 @@
+package io.dataease.utils;
+
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.util.Calendar;
+
+public class CalendarUtils {
+
+    public static Long getTimeAfterMonth(Long time, int months) {
+        if (ObjectUtils.isEmpty(time)) time = System.currentTimeMillis();
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTimeInMillis(time);
+        calendar.add(Calendar.MONTH, months);
+        return calendar.getTimeInMillis();
+    }
+}
diff --git a/sdk/common/src/main/java/io/dataease/utils/SystemSettingUtils.java b/sdk/common/src/main/java/io/dataease/utils/SystemSettingUtils.java
index 74d3002f1f..0f9ee25c7d 100644
--- a/sdk/common/src/main/java/io/dataease/utils/SystemSettingUtils.java
+++ b/sdk/common/src/main/java/io/dataease/utils/SystemSettingUtils.java
@@ -11,6 +11,8 @@ public class SystemSettingUtils {
         List<String> xpackSettingList = List.of(XpackSettingConstants.AUTO_CREATE_USER,
                 XpackSettingConstants.LOG_LIVE_TIME,
                 XpackSettingConstants.PLATFORM_OID,
+                XpackSettingConstants.DIP,
+                XpackSettingConstants.PVP,
                 XpackSettingConstants.PLATFORM_RID);
         return xpackSettingList.contains(pkey);
     }

From b79a71bc87c57c20b772bdc354dd35d62f7d9913 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 20 May 2024 17:47:20 +0800
Subject: [PATCH 10/36] =?UTF-8?q?perf(X-Pack):=20=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E7=AD=96=E7=95=A5flyway?=
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 922a07f77e..d92e14e286 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 922a07f77e584f46705d5f02cdef70ed8e4e0f98
+Subproject commit d92e14e286e9fed723b501323766bf8f2858ca42

From 59722ef7a3d956304342ce56b8220f1a9b5ebdc7 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 20 May 2024 17:57:37 +0800
Subject: [PATCH 11/36] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E6=BA=90):=20?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E8=A1=A8=E5=A4=87=E6=B3=A8=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datasource/provider/CalciteProvider.java  | 26 ++++++++++++++++---
 core/core-frontend/src/locales/zh-CN.ts       |  4 +--
 .../visualized/data/datasource/index.vue      |  4 +--
 3 files changed, 27 insertions(+), 7 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 3dad5cc9bd..bae30ca71d 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,7 +117,7 @@ public class CalciteProvider {
         tableDesc.setDatasourceId(datasourceRequest.getDatasource().getId());
         tableDesc.setType("db");
         tableDesc.setTableName(resultSet.getString(1));
-        tableDesc.setName(resultSet.getString(1));
+        tableDesc.setName(resultSet.getString(2));
         return tableDesc;
     }
 
@@ -315,6 +315,7 @@ public class CalciteProvider {
     private String getTableFiledSql(DatasourceRequest datasourceRequest) {
         String sql = "";
         DatasourceConfiguration configuration = null;
+        String database="";
         DatasourceType datasourceType = DatasourceType.valueOf(datasourceRequest.getDatasource().getType());
         switch (datasourceType) {
             case mysql:
@@ -324,7 +325,16 @@ public class CalciteProvider {
             case StarRocks:
             case doris:
                 configuration = JsonUtil.parseObject(datasourceRequest.getDatasource().getConfiguration(), Mysql.class);
-                sql = String.format("SELECT COLUMN_NAME,DATA_TYPE,COLUMN_COMMENT FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = '%s' AND   TABLE_NAME = '%s'", configuration.getDataBase(), datasourceRequest.getTable());
+                if (configuration.getUrlType().equalsIgnoreCase("")) {
+                    database = configuration.getDataBase();
+                } else {
+                    Pattern WITH_SQL_FRAGMENT = Pattern.compile("jdbc:mysql://(.*):(\\d+)/(.*)");
+                    Matcher matcher = WITH_SQL_FRAGMENT.matcher(configuration.getJdbcUrl());
+                    matcher.find();
+                    String[] databasePrams = matcher.group(3).split("\\?");
+                    database = databasePrams[0];
+                }
+                sql = String.format("SELECT COLUMN_NAME,DATA_TYPE,COLUMN_COMMENT FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = '%s' AND   TABLE_NAME = '%s'", database, datasourceRequest.getTable());
                 break;
             case oracle:
                 configuration = JsonUtil.parseObject(datasourceRequest.getDatasource().getConfiguration(), Oracle.class);
@@ -396,6 +406,16 @@ public class CalciteProvider {
                 break;
             case ck:
                 configuration = JsonUtil.parseObject(datasourceRequest.getDatasource().getConfiguration(), CK.class);
+
+                if (configuration.getUrlType().equalsIgnoreCase("")) {
+                    database = configuration.getDataBase();
+                } else {
+                    Pattern WITH_SQL_FRAGMENT = Pattern.compile("jdbc:clickhouse://(.*):(\\d+)/(.*)");
+                    Matcher matcher = WITH_SQL_FRAGMENT.matcher(configuration.getJdbcUrl());
+                    matcher.find();
+                    String[] databasePrams = matcher.group(3).split("\\?");
+                    database = databasePrams[0];
+                }
                 sql = String.format(" SELECT\n" +
                         "    name,\n" +
                         "    type,\n" +
@@ -404,7 +424,7 @@ public class CalciteProvider {
                         "    system.columns\n" +
                         "WHERE\n" +
                         "    database = '%s'  \n" +
-                        "    AND table = '%s' ", configuration.getDataBase(), datasourceRequest.getTable());
+                        "    AND table = '%s' ", database, datasourceRequest.getTable());
                 break;
             case impala:
                 sql = String.format("DESCRIBE `%s`", datasourceRequest.getTable());
diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts
index 8fbb691753..f9441f04f9 100644
--- a/core/core-frontend/src/locales/zh-CN.ts
+++ b/core/core-frontend/src/locales/zh-CN.ts
@@ -249,7 +249,7 @@ export default {
     remark: '备注',
     column_name: '字段名',
     field_type: '字段类型',
-    field_description: '字段描述',
+    field_description: '字段备注',
     dl: '数据湖',
     other: '其他',
     local_file: '本地文件',
@@ -393,7 +393,7 @@ export default {
     no_data_table: '暂无数据表',
     on_the_left: '请在左侧选择数据源',
     create_dataset: '创建数据集',
-    table_description: '表描述',
+    table_description: '表备注',
     relational_database: '关系型数据库',
     data_warehouse_lake: '数仓/数据湖',
     non_relational_database: '非关系型数据库',
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 9d3b907904..501e0d0cba 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/index.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/index.vue
@@ -91,7 +91,7 @@ const { width, node } = useMoveLine('DATASOURCE')
 
 const dsTableDetail = reactive({
   tableName: '',
-  remark: ''
+  name: ''
 })
 const rootManage = ref(false)
 const nickName = ref('')
@@ -1356,7 +1356,7 @@ const getMenuList = (val: boolean) => {
             {{ t('datasource.table_description') }}
           </p>
           <p class="table-value">
-            {{ dsTableDetail.remark || '-' }}
+            {{ dsTableDetail.name || '-' }}
           </p>
         </el-col>
       </el-row>

From 9a0c0d98b386cfc739b743254fe16f49afe38acb Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 20 May 2024 17:58:02 +0800
Subject: [PATCH 12/36] =?UTF-8?q?perf(X-Pack):=20=E5=AF=BC=E5=85=A5lic?=
 =?UTF-8?q?=E4=B9=8B=E5=90=8E=E8=87=AA=E5=8A=A8=E5=90=8C=E6=AD=A5=E6=B8=B8?=
 =?UTF-8?q?=E7=A6=BB=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/views/about/index.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/core-frontend/src/views/about/index.vue b/core/core-frontend/src/views/about/index.vue
index b9390fa23b..c70ad1b390 100644
--- a/core/core-frontend/src/views/about/index.vue
+++ b/core/core-frontend/src/views/about/index.vue
@@ -127,9 +127,14 @@ const update = (licKey: string) => {
   })
 }
 
+const autoSync = ref(true)
 const checkFree = () => {
   checkFreeApi().then(res => {
     if (res.data) {
+      if (autoSync.value) {
+        syncFree()
+        return
+      }
       // do something
       const title = '存在未同步的资源数据，请谨慎操作！'
       const childrenDomList = [h('strong', null, title)]

From b630421901a95f08658f1f527e880656c0d6d888 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 20 May 2024 18:20:32 +0800
Subject: [PATCH 13/36] =?UTF-8?q?feat(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E9=85=8D=E7=BD=AE=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E9=AB=98=E7=BA=A7=E8=AE=BE=E7=BD=AE=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=99=A8=E9=85=8D=E8=89=B2=E7=AD=89=20#8443?=
 =?UTF-8?q?=20#8435?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/dashboard/DbCanvasAttr.vue |  7 ------
 .../ComponentColorSelector.vue                | 25 +++++++++++++++++++
 .../dashboard-style/SeniorStyleSetting.vue    | 23 ++++++++---------
 .../chart/components/editor/util/chart.ts     |  3 ++-
 .../views/components/ChartComponentS2.vue     | 15 +++++++----
 .../components/views/components/DrillPath.vue | 24 +++++++++++-------
 .../views/chart/components/views/index.vue    | 10 ++++----
 7 files changed, 67 insertions(+), 40 deletions(-)

diff --git a/core/core-frontend/src/components/dashboard/DbCanvasAttr.vue b/core/core-frontend/src/components/dashboard/DbCanvasAttr.vue
index 99eb836e99..426e707421 100644
--- a/core/core-frontend/src/components/dashboard/DbCanvasAttr.vue
+++ b/core/core-frontend/src/components/dashboard/DbCanvasAttr.vue
@@ -146,13 +146,6 @@ const saveSelfSubject = () => {
         >
           <filter-style-simple-selector />
         </el-collapse-item>
-        <el-collapse-item
-          :title="t('visualization.filter_component')"
-          name="filterComponent"
-          class="no-padding no-border-bottom"
-        >
-          <filter-style-simple-selector />
-        </el-collapse-item>
         <el-collapse-item
           title="高级样式设置"
           name="seniorStyleSetting"
diff --git a/core/core-frontend/src/components/dashboard/subject-setting/dashboard-style/ComponentColorSelector.vue b/core/core-frontend/src/components/dashboard/subject-setting/dashboard-style/ComponentColorSelector.vue
index 6a13f9f017..5d57e6451b 100644
--- a/core/core-frontend/src/components/dashboard/subject-setting/dashboard-style/ComponentColorSelector.vue
+++ b/core/core-frontend/src/components/dashboard/subject-setting/dashboard-style/ComponentColorSelector.vue
@@ -158,6 +158,21 @@
                 />
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="分页器配色" class="form-item">
+                <el-color-picker
+                  :trigger-width="colorPickerWidth"
+                  v-model="seniorForm.pagerColor"
+                  size="small"
+                  :predefine="predefineColors"
+                  color-format="rgb"
+                  :effect="themes"
+                  show-alpha
+                  is-custom
+                  @change="changePagerColorChange"
+                />
+              </el-form-item>
+            </el-col>
           </el-row>
         </div>
       </el-collapse-item>
@@ -174,7 +189,10 @@ import eventBus from '@/utils/eventBus'
 import { storeToRefs } from 'pinia'
 import CustomColorStyleSelect from '@/views/chart/components/editor/editor-style/components/CustomColorStyleSelect.vue'
 import elementResizeDetectorMaker from 'element-resize-detector'
+import { snapshotStoreWithOut } from '@/store/modules/data-visualization/snapshot'
 const { t } = useI18n()
+const snapshotStore = snapshotStoreWithOut()
+
 const props = defineProps({
   themes: {
     type: String as PropType<EditorTheme>,
@@ -191,6 +209,9 @@ const colorFormRef = ref(null)
 const colorForm = computed(
   () => canvasStyleData.value.component.chartColor as DeepPartial<ChartAttr>
 )
+
+const seniorForm = computed(() => canvasStyleData.value.component.seniorStyleSetting)
+
 const predefineColors = COLOR_PANEL
 
 const state = reactive({
@@ -215,6 +236,10 @@ const changeColorOption = (modifyName = 'value') => {
   changeColorCase(modifyName)
 }
 
+const changePagerColorChange = () => {
+  snapshotStore.recordSnapshotCache()
+}
+
 const changeColorCase = modifyName => {
   colorForm.value['modifyName'] = modifyName
   emits('onColorChange', colorForm.value)
diff --git a/core/core-frontend/src/components/dashboard/subject-setting/dashboard-style/SeniorStyleSetting.vue b/core/core-frontend/src/components/dashboard/subject-setting/dashboard-style/SeniorStyleSetting.vue
index 58c51044c6..4f65267c48 100644
--- a/core/core-frontend/src/components/dashboard/subject-setting/dashboard-style/SeniorStyleSetting.vue
+++ b/core/core-frontend/src/components/dashboard/subject-setting/dashboard-style/SeniorStyleSetting.vue
@@ -5,22 +5,22 @@
         <el-col :span="12">
           <el-form-item class="form-item" label="联动、钻取、调整的图标颜色">
             <el-color-picker
-              v-model="filterStyle.titleColor"
+              v-model="seniorStyleSetting.linkageIconColor"
               :trigger-width="197"
               is-custom
               :predefine="state.predefineColors"
-              @change="themeChange('titleColor')"
+              @change="themeChange"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item class="form-item" label="钻取层级展示颜色">
             <el-color-picker
-              v-model="filterStyle.labelColor"
+              v-model="seniorStyleSetting.drillLayerColor"
               :trigger-width="197"
               is-custom
               :predefine="state.predefineColors"
-              @change="themeChange('labelColor')"
+              @change="themeChange"
             />
           </el-form-item>
         </el-col>
@@ -35,15 +35,13 @@ import { COLOR_PANEL } from '@/views/chart/components/editor/util/chart'
 import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
 import { useI18n } from '@/hooks/web/useI18n'
 import { cloneDeep } from 'lodash-es'
-import { adaptCurThemeFilterStyleAll } from '@/utils/canvasStyle'
 import { snapshotStoreWithOut } from '@/store/modules/data-visualization/snapshot'
 import eventBus from '@/utils/eventBus'
-import { ElIcon } from 'element-plus-secondary'
 const { t } = useI18n()
 const dvMainStore = dvMainStoreWithOut()
 const snapshotStore = snapshotStoreWithOut()
-const filterStyle = computed<any>(() => {
-  return dvMainStore.canvasStyleData.component.filterStyle
+const seniorStyleSetting = computed<any>(() => {
+  return dvMainStore.canvasStyleData.component.seniorStyleSetting
 })
 
 const state = reactive({
@@ -55,14 +53,13 @@ const state = reactive({
 const initForm = () => {
   // do
 }
-const themeChange = styleKey => {
-  dvMainStore.canvasStyleData.component.filterStyle = cloneDeep(filterStyle.value)
-  adaptCurThemeFilterStyleAll(styleKey)
-  snapshotStore.recordSnapshotCache('filterStyleSimpleSelector-themeChange')
+const themeChange = () => {
+  dvMainStore.canvasStyleData.component.seniorStyleSetting = cloneDeep(seniorStyleSetting.value)
+  snapshotStore.recordSnapshotCache('seniorStyleSettingSimpleSelector-themeChange')
 }
 
 const handleHorizontalChange = (type, horizontal = 'titleLayout') => {
-  filterStyle.value[horizontal] = type
+  seniorStyleSetting.value[horizontal] = type
   themeChange(horizontal)
 }
 
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 4650afe6c9..ac8affe189 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
@@ -158,7 +158,8 @@ export const SENIOR_STYLE_SETTING_LIGHT = {
 
 export const SENIOR_STYLE_SETTING_DARK = {
   linkageIconColor: '#ffffff',
-  drillLayerColor: '#ffffff'
+  drillLayerColor: '#ffffff',
+  pagerColor: '#ffffff'
 }
 
 export const FILTER_COMMON_STYLE_BASE = {
diff --git a/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue b/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue
index a3513e3f6b..6fc89da2db 100644
--- a/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue
+++ b/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue
@@ -29,7 +29,8 @@ import { useEmitt } from '@/hooks/web/useEmitt'
 import { trackBarStyleCheck } from '@/utils/canvasUtils'
 
 const dvMainStore = dvMainStoreWithOut()
-const { nowPanelTrackInfo, nowPanelJumpInfo, mobileInPc } = storeToRefs(dvMainStore)
+const { nowPanelTrackInfo, nowPanelJumpInfo, mobileInPc, canvasStyleData } =
+  storeToRefs(dvMainStore)
 const { emitter } = useEmitt()
 
 const props = defineProps({
@@ -420,6 +421,10 @@ const autoHeightStyle = computed(() => {
     height: 20 * scale.value + 8 + 'px'
   }
 })
+
+const tabStyle = computed(() => [
+  { '--de-pager-color': canvasStyleData.value.component.seniorStyleSetting.pagerColor }
+])
 </script>
 
 <template>
@@ -435,7 +440,7 @@ const autoHeightStyle = computed(() => {
       <div style="position: relative; height: 100%" :id="containerId"></div>
     </div>
     <el-row :style="autoStyle" v-if="showPage && !isError">
-      <div class="table-page-info">
+      <div class="table-page-info" :style="tabStyle">
         <div>共{{ state.pageInfo.total }}条</div>
         <el-pagination
           class="table-page-content"
@@ -474,16 +479,16 @@ const autoHeightStyle = computed(() => {
   height: 20px;
   display: flex;
   width: 100%;
-  color: grey;
+  color: var(--de-pager-color);
   :deep(.table-page-content) {
     button,
     button[disabled] {
-      color: grey;
+      color: var(--de-pager-color);
       background: transparent !important;
     }
     ul li {
       &:not(.is-active) {
-        color: grey;
+        color: var(--de-pager-color);
       }
       background: transparent !important;
     }
diff --git a/core/core-frontend/src/views/chart/components/views/components/DrillPath.vue b/core/core-frontend/src/views/chart/components/views/components/DrillPath.vue
index 54d65a2c07..0da1883ee8 100644
--- a/core/core-frontend/src/views/chart/components/views/components/DrillPath.vue
+++ b/core/core-frontend/src/views/chart/components/views/components/DrillPath.vue
@@ -1,8 +1,10 @@
 <script lang="tsx" setup>
-import { reactive, watch } from 'vue'
+import { computed, reactive, watch } from 'vue'
 import { useI18n } from '@/hooks/web/useI18n'
 import { reverseColor } from '../util/util'
 import { ArrowRight } from '@element-plus/icons-vue'
+import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
+const dvMainStore = dvMainStoreWithOut()
 
 const { t } = useI18n()
 
@@ -24,14 +26,18 @@ const state = reactive({
   textColor: '#bbbfc4'
 })
 
-watch(
-  [() => props.themeStyle?.backgroundColorSelect, () => props.themeStyle?.color],
-  () => {
-    loadThemeStyle()
-  },
-  { deep: true }
+const textColor = computed(
+  () => dvMainStore.canvasStyleData.component.seniorStyleSetting.drillLayerColor
 )
 
+// watch(
+//   [() => props.themeStyle?.backgroundColorSelect, () => props.themeStyle?.color],
+//   () => {
+//     loadThemeStyle()
+//   },
+//   { deep: true }
+// )
+
 const drillJump = index => {
   if (index < props.drillFilters.length) {
     emit('onDrillJump', index)
@@ -67,7 +73,7 @@ const loadThemeStyle = () => {
   <div v-if="props.drillFilters && props.drillFilters.length > 0" class="drill">
     <el-breadcrumb :separator-icon="ArrowRight" class="drill-style">
       <el-breadcrumb-item class="drill-item" @click="drillJump(0)">
-        <span :style="{ color: state.textColor }">{{ t('commons.all') }}</span>
+        <span :style="{ color: textColor }">{{ t('commons.all') }}</span>
       </el-breadcrumb-item>
       <el-breadcrumb-item
         v-for="(filter, index) in props.drillFilters"
@@ -75,7 +81,7 @@ const loadThemeStyle = () => {
         class="drill-item"
         @click="drillJump(index + 1)"
       >
-        <span :style="{ color: state.textColor }">{{ filter.value[0] }}</span>
+        <span :style="{ color: textColor }">{{ filter.value[0] }}</span>
       </el-breadcrumb-item>
     </el-breadcrumb>
   </div>
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 8ac5ee5e41..2a4f42d3cf 100644
--- a/core/core-frontend/src/views/chart/components/views/index.vue
+++ b/core/core-frontend/src/views/chart/components/views/index.vue
@@ -741,11 +741,11 @@ const titleIconStyle = computed(() => {
     flex-wrap: nowrap;
     gap: 8px;
 
-    //color: #646a73;
-    //
-    //&.icons-container__dark {
-    //  color: #a6a6a6;
-    //}
+    color: #646a73;
+
+    &.icons-container__dark {
+      color: #a6a6a6;
+    }
 
     &.is-editing {
       gap: 6px;

From 1f652335cd3d7a3dd3d33139969eb0d260b01114 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 20 May 2024 18:53:09 +0800
Subject: [PATCH 14/36] =?UTF-8?q?feat(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?):=20=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E7=94=BB=E5=B8=83=E9=AB=98=E7=BA=A7=E9=85=8D=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dashboard-style/SeniorStyleSetting.vue    | 39 ++++++++++++++-----
 .../data-visualization/CanvasAttr.vue         |  9 +++++
 2 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/core/core-frontend/src/components/dashboard/subject-setting/dashboard-style/SeniorStyleSetting.vue b/core/core-frontend/src/components/dashboard/subject-setting/dashboard-style/SeniorStyleSetting.vue
index 4f65267c48..30ffe42673 100644
--- a/core/core-frontend/src/components/dashboard/subject-setting/dashboard-style/SeniorStyleSetting.vue
+++ b/core/core-frontend/src/components/dashboard/subject-setting/dashboard-style/SeniorStyleSetting.vue
@@ -2,9 +2,15 @@
   <div style="width: 100%; padding-bottom: 8px">
     <el-form label-position="top" style="width: 100%">
       <div style="width: 100%; padding: 16px 8px 0">
-        <el-col :span="12">
-          <el-form-item class="form-item" label="联动、钻取、调整的图标颜色">
+        <el-col :span="24">
+          <el-form-item
+            :effect="themes"
+            class="form-item"
+            :class="'form-item-' + themes"
+            label="联动、钻取、跳转的图标颜色"
+          >
             <el-color-picker
+              :effect="themes"
               v-model="seniorStyleSetting.linkageIconColor"
               :trigger-width="197"
               is-custom
@@ -13,10 +19,16 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item class="form-item" label="钻取层级展示颜色">
+        <el-col :span="24">
+          <el-form-item
+            :effect="themes"
+            class="form-item"
+            :class="'form-item-' + themes"
+            label="钻取层级展示颜色"
+          >
             <el-color-picker
               v-model="seniorStyleSetting.drillLayerColor"
+              :effect="themes"
               :trigger-width="197"
               is-custom
               :predefine="state.predefineColors"
@@ -44,6 +56,12 @@ const seniorStyleSetting = computed<any>(() => {
   return dvMainStore.canvasStyleData.component.seniorStyleSetting
 })
 
+const props = defineProps({
+  themes: {
+    type: String,
+    default: 'light'
+  }
+})
 const state = reactive({
   fontSize: [],
   isSetting: false,
@@ -58,11 +76,6 @@ const themeChange = () => {
   snapshotStore.recordSnapshotCache('seniorStyleSettingSimpleSelector-themeChange')
 }
 
-const handleHorizontalChange = (type, horizontal = 'titleLayout') => {
-  seniorStyleSetting.value[horizontal] = type
-  themeChange(horizontal)
-}
-
 onMounted(() => {
   eventBus.on('onThemeColorChange', initForm)
 })
@@ -103,4 +116,12 @@ onMounted(() => {
     line-height: 20px;
   }
 }
+.form-item-dark {
+  :deep(.ed-form-item__label) {
+    color: #6a6a6a;
+    font-size: 12px;
+    font-weight: 400;
+    line-height: 20px;
+  }
+}
 </style>
diff --git a/core/core-frontend/src/components/data-visualization/CanvasAttr.vue b/core/core-frontend/src/components/data-visualization/CanvasAttr.vue
index f321fddf5b..fb0c2c3cfd 100644
--- a/core/core-frontend/src/components/data-visualization/CanvasAttr.vue
+++ b/core/core-frontend/src/components/data-visualization/CanvasAttr.vue
@@ -10,6 +10,7 @@ import { useEmitt } from '@/hooks/web/useEmitt'
 import ComponentColorSelector from '@/components/dashboard/subject-setting/dashboard-style/ComponentColorSelector.vue'
 import OverallSetting from '@/components/dashboard/subject-setting/dashboard-style/OverallSetting.vue'
 import CanvasBackground from '@/components/visualization/component-background/CanvasBackground.vue'
+import SeniorStyleSetting from '@/components/dashboard/subject-setting/dashboard-style/SeniorStyleSetting.vue'
 const dvMainStore = dvMainStoreWithOut()
 const snapshotStore = snapshotStoreWithOut()
 const { canvasStyleData, canvasViewInfo } = storeToRefs(dvMainStore)
@@ -102,6 +103,14 @@ onMounted(() => {
       <el-collapse-item effect="dark" title="刷新配置" name="overallSetting">
         <overall-setting themes="dark" />
       </el-collapse-item>
+      <el-collapse-item
+        effect="dark"
+        title="高级样式设置"
+        name="seniorStyleSetting"
+        class="no-padding no-border-bottom"
+      >
+        <senior-style-setting themes="dark"></senior-style-setting>
+      </el-collapse-item>
     </el-collapse>
   </div>
 </template>

From 6ed07df6176bb3e91558aec85a36b9074d054883 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 20 May 2024 18:58:06 +0800
Subject: [PATCH 15/36] =?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=E7=9B=B8=E5=85=B3=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

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

diff --git a/de-xpack b/de-xpack
index d92e14e286..59ce09783d 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit d92e14e286e9fed723b501323766bf8f2858ca42
+Subproject commit 59ce09783daf8fa19176179de63d35cded1ea1f2

From 7945ae25d5d2f421f4a2cf699e01e0c57ebcd723 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 21 May 2024 09:18:15 +0800
Subject: [PATCH 16/36] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=8F=98=E9=87=8F=E5=B1=95=E7=A4=BA=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 59ce09783d..1b0dc5aa81 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 59ce09783daf8fa19176179de63d35cded1ea1f2
+Subproject commit 1b0dc5aa81d419a90bd8bf33b1717f536b9d1e11

From b82750f80fc6c8ac0396e7238020a7cb8860c613 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 21 May 2024 09:18:53 +0800
Subject: [PATCH 17/36] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=8F=98=E9=87=8F=E5=B1=95=E7=A4=BA=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 1b0dc5aa81..ecdf3b19b0 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 1b0dc5aa81d419a90bd8bf33b1717f536b9d1e11
+Subproject commit ecdf3b19b0f5d2d893460cca978ecf549cf86192

From e86ba79b2a0b6a9996d470cd7540c07846ba1e84 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 21 May 2024 10:32:45 +0800
Subject: [PATCH 18/36] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E6=BA=90):=20?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E8=A1=A8=E5=A4=87=E6=B3=A8=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/datasource/provider/CalciteProvider.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 bae30ca71d..78e2fa9625 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
@@ -325,7 +325,7 @@ public class CalciteProvider {
             case StarRocks:
             case doris:
                 configuration = JsonUtil.parseObject(datasourceRequest.getDatasource().getConfiguration(), Mysql.class);
-                if (configuration.getUrlType().equalsIgnoreCase("")) {
+                if (StringUtils.isEmpty(configuration.getUrlType()) || configuration.getUrlType().equalsIgnoreCase("hostName")) {
                     database = configuration.getDataBase();
                 } else {
                     Pattern WITH_SQL_FRAGMENT = Pattern.compile("jdbc:mysql://(.*):(\\d+)/(.*)");
@@ -407,7 +407,7 @@ public class CalciteProvider {
             case ck:
                 configuration = JsonUtil.parseObject(datasourceRequest.getDatasource().getConfiguration(), CK.class);
 
-                if (configuration.getUrlType().equalsIgnoreCase("")) {
+                if (StringUtils.isEmpty(configuration.getUrlType()) || configuration.getUrlType().equalsIgnoreCase("hostName")) {
                     database = configuration.getDataBase();
                 } else {
                     Pattern WITH_SQL_FRAGMENT = Pattern.compile("jdbc:clickhouse://(.*):(\\d+)/(.*)");
@@ -762,7 +762,7 @@ public class CalciteProvider {
             case StarRocks:
             case doris:
                 configuration = JsonUtil.parseObject(datasourceRequest.getDatasource().getConfiguration(), Mysql.class);
-                if (configuration.getUrlType().equalsIgnoreCase("")) {
+                if (StringUtils.isEmpty(configuration.getUrlType()) || configuration.getUrlType().equalsIgnoreCase("hostName")) {
                     database = configuration.getDataBase();
                 } else {
                     Pattern WITH_SQL_FRAGMENT = Pattern.compile("jdbc:mysql://(.*):(\\d+)/(.*)");
@@ -813,7 +813,7 @@ public class CalciteProvider {
                 break;
             case ck:
                 configuration = JsonUtil.parseObject(datasourceRequest.getDatasource().getConfiguration(), CK.class);
-                if (configuration.getUrlType().equalsIgnoreCase("")) {
+                if (StringUtils.isEmpty(configuration.getUrlType()) || configuration.getUrlType().equalsIgnoreCase("hostName")) {
                     database = configuration.getDataBase();
                 } else {
                     Pattern WITH_SQL_FRAGMENT = Pattern.compile("jdbc:clickhouse://(.*):(\\d+)/(.*)");

From e79d696615c9a17fcde4aa602d43ab199a6b18fe Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 21 May 2024 12:16:17 +0800
Subject: [PATCH 19/36] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E6=BA=90):=20?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E8=A1=A8=E5=A4=87=E6=B3=A8=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datasource/provider/CalciteProvider.java  | 62 +++++++++++++++----
 core/core-frontend/src/locales/zh-CN.ts       |  1 +
 .../visualized/data/datasource/index.vue      | 10 +--
 3 files changed, 56 insertions(+), 17 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 78e2fa9625..0964609d9e 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,7 +117,11 @@ public class CalciteProvider {
         tableDesc.setDatasourceId(datasourceRequest.getDatasource().getId());
         tableDesc.setType("db");
         tableDesc.setTableName(resultSet.getString(1));
-        tableDesc.setName(resultSet.getString(2));
+        if(resultSet.getMetaData().getColumnCount() > 1){
+            tableDesc.setName(resultSet.getString(2));
+        }else {
+            tableDesc.setName(resultSet.getString(1));
+        }
         return tableDesc;
     }
 
@@ -778,38 +782,72 @@ public class CalciteProvider {
                 if (StringUtils.isEmpty(configuration.getSchema())) {
                     DEException.throwException(Translator.get("i18n_schema_is_empty"));
                 }
-                tableSqls.add("select table_name, owner, comments from all_tab_comments where owner='" + configuration.getSchema() + "' AND table_type = 'TABLE'");
-                tableSqls.add("select table_name, owner, comments from all_tab_comments where owner='" + configuration.getSchema() + "' AND table_type = 'VIEW'");
+                tableSqls.add("select table_name, comments, owner  from all_tab_comments where owner='" + configuration.getSchema() + "' AND table_type = 'TABLE'");
+                tableSqls.add("select table_name, comments, owner  from all_tab_comments where owner='" + configuration.getSchema() + "' AND table_type = 'VIEW'");
                 break;
             case db2:
                 configuration = JsonUtil.parseObject(datasourceRequest.getDatasource().getConfiguration(), Db2.class);
                 if (StringUtils.isEmpty(configuration.getSchema())) {
                     DEException.throwException(Translator.get("i18n_schema_is_empty"));
                 }
-                tableSqls.add("select TABNAME from syscat.tables  WHERE TABSCHEMA ='DE_SCHEMA' AND \"TYPE\" = 'T'".replace("DE_SCHEMA", configuration.getSchema()));
+                tableSqls.add("select TABNAME, REMARKS from syscat.tables  WHERE TABSCHEMA ='DE_SCHEMA' AND \"TYPE\" = 'T'".replace("DE_SCHEMA", configuration.getSchema()));
                 break;
             case sqlServer:
                 configuration = JsonUtil.parseObject(datasourceRequest.getDatasource().getConfiguration(), Sqlserver.class);
                 if (StringUtils.isEmpty(configuration.getSchema())) {
                     DEException.throwException(Translator.get("i18n_schema_is_empty"));
                 }
-                tableSqls.add("SELECT TABLE_NAME FROM \"DATABASE\".INFORMATION_SCHEMA.VIEWS WHERE  TABLE_SCHEMA = 'DS_SCHEMA' ;"
-                        .replace("DATABASE", configuration.getDataBase())
-                        .replace("DS_SCHEMA", configuration.getSchema()));
-                tableSqls.add("SELECT TABLE_NAME FROM \"DATABASE\".INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE = 'BASE TABLE' AND TABLE_SCHEMA = 'DS_SCHEMA' ;"
-                        .replace("DATABASE", configuration.getDataBase())
+                tableSqls.add("SELECT   \n" +
+                        "    t.name AS TableName,  \n" +
+                        "    ep.value AS TableDescription  \n" +
+                        "FROM   \n" +
+                        "    sys.tables t  \n" +
+                        "LEFT OUTER JOIN   sys.schemas sc ON sc.schema_id =t.schema_id \n" +
+                        "LEFT OUTER JOIN   \n" +
+                        "    sys.extended_properties ep ON t.object_id = ep.major_id   \n" +
+                        "                               AND ep.minor_id = 0   \n" +
+                        "                               AND ep.class = 1  \n" +
+                        "                               AND ep.name = 'MS_Description'\n" +
+                        "where sc.name ='DS_SCHEMA'"
                         .replace("DS_SCHEMA", configuration.getSchema()));
+                tableSqls.add("SELECT   \n" +
+                        "    t.name AS TableName,  \n" +
+                        "    ep.value AS TableDescription  \n" +
+                        "FROM   \n" +
+                        "    sys.views t  \n" +
+                        "LEFT OUTER JOIN   sys.schemas sc ON sc.schema_id =t.schema_id \n" +
+                        "LEFT OUTER JOIN   \n" +
+                        "    sys.extended_properties ep ON t.object_id = ep.major_id   \n" +
+                        "                               AND ep.minor_id = 0   \n" +
+                        "                               AND ep.class = 1  \n" +
+                        "                               AND ep.name = 'MS_Description'\n" +
+                        "where sc.name ='DS_SCHEMA'"
+                                .replace("DS_SCHEMA", configuration.getSchema()));
                 break;
             case pg:
                 configuration = JsonUtil.parseObject(datasourceRequest.getDatasource().getConfiguration(), Pg.class);
                 if (StringUtils.isEmpty(configuration.getSchema())) {
                     DEException.throwException(Translator.get("i18n_schema_is_empty"));
                 }
-                tableSqls.add("SELECT tablename FROM  pg_tables WHERE  schemaname='SCHEMA' ;".replace("SCHEMA", configuration.getSchema()));
+                tableSqls.add("SELECT  \n" +
+                        "    relname AS TableName,  \n" +
+                        "    obj_description(relfilenode::regclass, 'pg_class') AS TableDescription  \n" +
+                        "FROM  \n" +
+                        "    pg_class  \n" +
+                        "WHERE  \n" +
+                        "    relkind = 'r'  \n" +
+                        "    AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = 'SCHEMA') ".replace("SCHEMA", configuration.getSchema()));
                 break;
             case redshift:
                 configuration = JsonUtil.parseObject(datasourceRequest.getDatasource().getConfiguration(), CK.class);
-                tableSqls.add("SELECT tablename FROM  pg_tables WHERE  schemaname='SCHEMA' ;".replace("SCHEMA", configuration.getSchema()));
+                tableSqls.add("SELECT  \n" +
+                        "    relname AS TableName,  \n" +
+                        "    obj_description(relfilenode::regclass, 'pg_class') AS TableDescription  \n" +
+                        "FROM  \n" +
+                        "    pg_class  \n" +
+                        "WHERE  \n" +
+                        "    relkind = 'r'  \n" +
+                        "    AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = 'SCHEMA') ".replace("SCHEMA", configuration.getSchema()));
                 break;
             case ck:
                 configuration = JsonUtil.parseObject(datasourceRequest.getDatasource().getConfiguration(), CK.class);
@@ -822,7 +860,7 @@ public class CalciteProvider {
                     String[] databasePrams = matcher.group(3).split("\\?");
                     database = databasePrams[0];
                 }
-                tableSqls.add("SELECT name FROM system.tables where database='DATABASE';".replace("DATABASE", database));
+                tableSqls.add("SELECT name, comment FROM system.tables where database='DATABASE';".replace("DATABASE", database));
 
                 break;
             default:
diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts
index 9646d060cb..902b0cf0d1 100644
--- a/core/core-frontend/src/locales/zh-CN.ts
+++ b/core/core-frontend/src/locales/zh-CN.ts
@@ -338,6 +338,7 @@ export default {
     extract: '抽取模式',
     all_compute_mode: '直连、抽取模式',
     extra_params: '额外的JDBC连接字符串',
+    jdbcUrl: 'JDBC 连接',
     please_input_dataPath: '请输入 JsonPath 数据路径',
     show_api_data: '查看API数据结构',
     warning: '包含无效数据表',
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 501e0d0cba..c62f2110a1 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/index.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/index.vue
@@ -1122,14 +1122,14 @@ const getMenuList = (val: boolean) => {
                 </el-col>
               </el-row>
               <template v-if="!['Excel', 'API'].includes(nodeInfo.type)">
-                <el-row :gutter="24" v-show="nodeInfo.configuration.urlType === 'hostName'">
+                <el-row :gutter="24" v-show="nodeInfo.configuration.urlType !== 'jdbcUrl'">
                   <el-col :span="12">
                     <BaseInfoItem :label="t('datasource.host')">{{
                       nodeInfo.configuration.host
                     }}</BaseInfoItem>
                   </el-col>
                 </el-row>
-                <el-row :gutter="24" v-show="nodeInfo.configuration.urlType === 'hostName'">
+                <el-row :gutter="24" v-show="nodeInfo.configuration.urlType !== 'jdbcUrl'">
                   <el-col :span="12">
                     <BaseInfoItem :label="t('datasource.port')">{{
                       nodeInfo.configuration.port
@@ -1141,7 +1141,7 @@ const getMenuList = (val: boolean) => {
                     }}</BaseInfoItem>
                   </el-col>
                 </el-row>
-                <el-row :gutter="24" v-show="nodeInfo.configuration.urlType === 'hostName'">
+                <el-row :gutter="24" v-show="nodeInfo.configuration.urlType !== 'jdbcUrl'">
                   <el-col :span="12">
                     <BaseInfoItem :label="t('datasource.user_name')">{{
                       nodeInfo.configuration.username
@@ -1153,14 +1153,14 @@ const getMenuList = (val: boolean) => {
                     }}</BaseInfoItem>
                   </el-col>
                 </el-row>
-                <el-row :gutter="24" v-show="nodeInfo.configuration.urlType !== 'hostName'">
+                <el-row :gutter="24" v-show="nodeInfo.configuration.urlType === 'jdbcUrl'">
                   <el-col :span="12">
                     <BaseInfoItem :label="t('datasource.jdbcUrl')">{{
                       nodeInfo.configuration.jdbcUrl
                     }}</BaseInfoItem>
                   </el-col>
                 </el-row>
-                <el-row :gutter="24" v-show="nodeInfo.configuration.urlType !== 'hostName'">
+                <el-row :gutter="24" v-show="nodeInfo.configuration.urlType === 'jdbcUrl'">
                   <el-col :span="12">
                     <BaseInfoItem :label="t('datasource.user_name')">{{
                       nodeInfo.configuration.username

From 31c1e95e43628825cf24405167ab24f0ee6cef41 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 21 May 2024 15:29:01 +0800
Subject: [PATCH 20/36] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E5=8F=98=E9=87=8F)?=
 =?UTF-8?q?:=20=E8=A1=A8=E5=AD=97=E6=AE=B5=E5=8F=8A=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E5=9D=87=E4=B8=BA=E6=95=B0=E5=80=BC=EF=BC=8C=E4=BD=86=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E8=83=BD=E5=8C=85=E5=90=AB=E6=96=87=E6=9C=AC?=
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 ecdf3b19b0..2960fb1df0 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit ecdf3b19b0f5d2d893460cca978ecf549cf86192
+Subproject commit 2960fb1df000a7136b7dd627040da0b4c0f1cd26

From 6611dcfcd394df25976e7008cf854a5519625dac Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 21 May 2024 15:55:30 +0800
Subject: [PATCH 21/36] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E6=BA=90):=20API?=
 =?UTF-8?q?=20=E6=95=B0=E6=8D=AE=E6=BA=90=E6=94=AF=E6=8C=81=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E8=AF=B7=E6=B1=82=E8=B6=85=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datasource/provider/ApiUtils.java         |  4 +--
 .../datasource/server/DatasourceServer.java   |  2 +-
 .../datasource/form/ApiHttpRequestDraw.vue    | 33 ++++++++++++++++++-
 .../io/dataease/api/ds/vo/ApiDefinition.java  |  3 +-
 4 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/ApiUtils.java b/core/core-backend/src/main/java/io/dataease/datasource/provider/ApiUtils.java
index 381b53db65..64e42f081f 100644
--- a/core/core-backend/src/main/java/io/dataease/datasource/provider/ApiUtils.java
+++ b/core/core-backend/src/main/java/io/dataease/datasource/provider/ApiUtils.java
@@ -59,7 +59,7 @@ public class ApiUtils {
         if (apiDefinition == null) {
             DEException.throwException("未找到");
         }
-        String response = execHttpRequest(apiDefinition, 10);
+        String response = execHttpRequest(apiDefinition, apiDefinition.getApiQueryTimeout() == null || apiDefinition.getApiQueryTimeout() <= 0 ? 10 : apiDefinition.getApiQueryTimeout());
         fieldList = getTableFields(apiDefinition);
         result.put("fieldList", fieldList);
         dataList = fetchResult(response, apiDefinition);
@@ -116,7 +116,7 @@ public class ApiUtils {
         if (apiDefinition == null) {
             DEException.throwException("未找到");
         }
-        String response = execHttpRequest(apiDefinition, 10);
+        String response = execHttpRequest(apiDefinition, apiDefinition.getApiQueryTimeout() == null || apiDefinition.getApiQueryTimeout() <= 0 ? 10 : apiDefinition.getApiQueryTimeout());
         return fetchResult(response, apiDefinition);
     }
 
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 eb7b13104c..587c358431 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
@@ -834,7 +834,7 @@ public class DatasourceServer implements DatasourceApi {
 
     public ApiDefinition checkApiDatasource(Map<String, String> request) throws DEException {
         ApiDefinition apiDefinition = JsonUtil.parseObject(new String(java.util.Base64.getDecoder().decode(request.get("data"))), ApiDefinition.class);
-        String response = ApiUtils.execHttpRequest(apiDefinition, 10);
+        String response = ApiUtils.execHttpRequest(apiDefinition, apiDefinition.getApiQueryTimeout() == null || apiDefinition.getApiQueryTimeout() <= 0 ? 10 : apiDefinition.getApiQueryTimeout());
         if (request.keySet().contains("type") && request.get("type").equals("apiStructure")) {
             apiDefinition.setShowApiStructure(true);
         }
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 268705ecd7..409d8f27ee 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
@@ -31,6 +31,7 @@ export interface ApiItem {
   fields: Field[]
   jsonFields: JsonField[]
   useJsonPath: boolean
+  apiQueryTimeout: number
   showApiStructure: boolean
   jsonPath: string
   serialNumber: number
@@ -81,6 +82,7 @@ let apiItem = reactive<ApiItem>({
   fields: [],
   jsonFields: [],
   useJsonPath: false,
+  apiQueryTimeout: 10,
   showApiStructure: false,
   jsonPath: '',
   serialNumber: -1
@@ -95,6 +97,24 @@ const loading = ref(false)
 const columns = shallowRef([])
 const tableData = shallowRef([])
 const apiItemBasicInfo = ref<FormInstance>()
+const isNumber = (rule, value, callback) => {
+  if (!value) {
+    callback(new Error(t('datasource.please_input_query_timeout')))
+    return
+  }
+  let isNumber = false
+  var reg = /^\d+$/
+  isNumber = reg.test(value)
+  if (!isNumber) {
+    callback(new Error(t('datasource.please_input_query_timeout')))
+    return
+  }
+  if (value <= 0 || value > 300) {
+    callback(new Error(t('datasource.please_input_query_timeout')))
+    return
+  }
+  callback()
+}
 const rule = reactive<FormRules>({
   name: [
     {
@@ -109,6 +129,13 @@ const rule = reactive<FormRules>({
       trigger: 'blur'
     }
   ],
+  apiQueryTimeout: [
+    {
+      required: true,
+      validator: isNumber,
+      trigger: ['blur', 'change']
+    }
+  ],
   url: [
     {
       required: true,
@@ -429,7 +456,11 @@ defineExpose({
             />
           </el-form-item>
         </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>
+          </el-input>
+        </el-form-item>
         <div class="title-form_primary request-info">
           <span>{{ t('datasource.isUseJsonPath') }}</span>
         </div>
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/ApiDefinition.java b/sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/ApiDefinition.java
index 30551f78df..810ef1964d 100644
--- a/sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/ApiDefinition.java
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/ApiDefinition.java
@@ -19,8 +19,7 @@ public class ApiDefinition {
     private ApiDefinitionRequest request;
     private String status;
     private List<Map<String, Object>> data = new ArrayList<>();
-
-
+    private Integer apiQueryTimeout = 10;
     private int previewNum = 10;
     private int maxPreviewNum = 10;
     private int serialNumber;

From cbb48209f0c1325834a908a116d3045f89f66d13 Mon Sep 17 00:00:00 2001
From: ulleo <ulleo.wang@gmail.com>
Date: Tue, 21 May 2024 17:43:36 +0800
Subject: [PATCH 22/36] =?UTF-8?q?feat(=E5=9B=BE=E8=A1=A8):=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=A1=91=E5=9F=BA=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/manage/ChartDataManage.java         |   4 +-
 core/core-frontend/src/assets/svg/sankey.svg  |   5 +
 core/core-frontend/src/locales/zh-CN.ts       |   3 +
 .../chart/components/editor/util/chart.ts     |   7 +
 .../js/panel/charts/others/sankey-common.ts   |  39 +++
 .../js/panel/charts/others/sankey.ts          | 280 ++++++++++++++++++
 6 files changed, 337 insertions(+), 1 deletion(-)
 create mode 100644 core/core-frontend/src/assets/svg/sankey.svg
 create mode 100644 core/core-frontend/src/views/chart/components/js/panel/charts/others/sankey-common.ts
 create mode 100644 core/core-frontend/src/views/chart/components/js/panel/charts/others/sankey.ts

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 87a7361254..97b9343ee9 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
@@ -115,7 +115,9 @@ public class ChartDataManage {
         if (StringUtils.equalsIgnoreCase(view.getType(), "table-pivot")
                 || StringUtils.containsIgnoreCase(view.getType(), "group")
                 || ("antv".equalsIgnoreCase(view.getRender()) && "line".equalsIgnoreCase(view.getType()))
-                || StringUtils.equalsIgnoreCase(view.getType(), "flow-map")) {
+                || StringUtils.equalsIgnoreCase(view.getType(), "flow-map")
+                || StringUtils.equalsIgnoreCase(view.getType(), "sankey")
+        ) {
             xAxis.addAll(xAxisExt);
         }
         List<ChartViewFieldDTO> yAxis = new ArrayList<>(view.getYAxis());
diff --git a/core/core-frontend/src/assets/svg/sankey.svg b/core/core-frontend/src/assets/svg/sankey.svg
new file mode 100644
index 0000000000..5645f5ded6
--- /dev/null
+++ b/core/core-frontend/src/assets/svg/sankey.svg
@@ -0,0 +1,5 @@
+<svg width="80" height="56" viewBox="0 0 80 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13 32.7862C35.0501 32.7862 43.9248 11.0972 67.002 10.375C67.0341 17.043 66.8736 16.9467 67.002 23.2296C45.7703 23.2296 43.0421 45.6408 13 45.6408C13.0642 40.0801 13.0963 40.0159 13 32.7862Z" fill="#00D6B9"/>
+<path d="M13 27.4899C34.6891 27.1288 37.1926 46.0576 67.002 47.9994C67.0341 41.0987 66.8736 51.4819 67.002 44.9744C38.7974 42.3826 36.4624 24.4648 13 24.4648C13.0642 30.2502 13.0963 20.0275 13 27.4899Z" fill="#3370FF"/>
+<path d="M13 20.9829C35.0501 20.9829 43.9247 40.2086 67.002 40.9629C67.8204 33.2036 66.8736 34.327 67.002 27.9799C45.7703 27.9799 43.0421 8 13 8C13.0642 13.6249 13.0963 13.7212 13 20.9829Z" fill="#3370FF"/>
+</svg>
diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts
index 08cc0e679d..f3a9c5b9de 100644
--- a/core/core-frontend/src/locales/zh-CN.ts
+++ b/core/core-frontend/src/locales/zh-CN.ts
@@ -690,6 +690,7 @@ export default {
     chart_pie_rose: '玫瑰图',
     chart_pie_donut_rose: '玫瑰环形图',
     chart_funnel: '漏斗图',
+    chart_sankey: '桑基图',
     chart_radar: '雷达图',
     chart_gauge: '仪表盘',
     chart_map: '地图',
@@ -764,6 +765,8 @@ export default {
     chart_data: '数据',
     chart_style: '样式',
     drag_block_type_axis: '类别轴',
+    drag_block_type_axis_start: '源',
+    drag_block_type_axis_end: '目的',
     drag_block_value_axis: '值轴',
     drag_block_value_start: '开始值',
     drag_block_value_end: '结束值',
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 4650afe6c9..4e04e5dc0d 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
@@ -1335,6 +1335,13 @@ export const CHART_TYPE_CONFIGS = [
         value: 'funnel',
         title: t('chart.chart_funnel'),
         icon: 'funnel'
+      },
+      {
+        render: 'antv',
+        category: 'relation',
+        value: 'sankey',
+        title: t('chart.chart_sankey'),
+        icon: 'sankey'
       }
     ]
   },
diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/others/sankey-common.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/others/sankey-common.ts
new file mode 100644
index 0000000000..80d63ff2e9
--- /dev/null
+++ b/core/core-frontend/src/views/chart/components/js/panel/charts/others/sankey-common.ts
@@ -0,0 +1,39 @@
+export const SANKEY_EDITOR_PROPERTY: EditorProperty[] = [
+  'background-overall-component',
+  'basic-style-selector',
+  'label-selector',
+  'tooltip-selector',
+  'title-selector',
+  'function-cfg',
+  'jump-set',
+  'linkage'
+]
+
+export const SANKEY_EDITOR_PROPERTY_INNER: EditorPropertyInner = {
+  'background-overall-component': ['all'],
+  'basic-style-selector': ['colors', 'alpha', 'gradient'],
+  'label-selector': ['fontSize', 'color', 'labelFormatter'],
+  'tooltip-selector': ['fontSize', 'color', 'tooltipFormatter'],
+  'title-selector': [
+    'title',
+    'fontSize',
+    'color',
+    'hPosition',
+    'isItalic',
+    'isBolder',
+    'remarkShow',
+    'fontFamily',
+    'letterSpace',
+    'fontShadow'
+  ],
+  'function-cfg': ['slider', 'emptyDataStrategy']
+}
+
+export const SANKEY_AXIS_TYPE: AxisType[] = [
+  'xAxis',
+  'xAxisExt',
+  'yAxis',
+  'filter',
+  'extLabel',
+  'extTooltip'
+]
diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/others/sankey.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/others/sankey.ts
new file mode 100644
index 0000000000..0d8d9fe0c9
--- /dev/null
+++ b/core/core-frontend/src/views/chart/components/js/panel/charts/others/sankey.ts
@@ -0,0 +1,280 @@
+import {
+  G2PlotChartView,
+  G2PlotDrawOptions
+} from '@/views/chart/components/js/panel/types/impl/g2plot'
+import { Sankey, SankeyOptions } from '@antv/g2plot/esm/plots/sankey'
+import { getPadding, setGradientColor } from '@/views/chart/components/js/panel/common/common_antv'
+import { cloneDeep, get } from 'lodash-es'
+import { flow, hexColorToRGBA, parseJson } from '@/views/chart/components/js/util'
+import { valueFormatter } from '@/views/chart/components/js/formatter'
+
+import { Datum } from '@antv/g2plot/esm/types/common'
+import { useI18n } from '@/hooks/web/useI18n'
+import {
+  SANKEY_AXIS_TYPE,
+  SANKEY_EDITOR_PROPERTY,
+  SANKEY_EDITOR_PROPERTY_INNER
+} from '@/views/chart/components/js/panel/charts/others/sankey-common'
+
+const { t } = useI18n()
+const DEFAULT_DATA = []
+
+/**
+ * 区间条形图
+ */
+export class RangeBar extends G2PlotChartView<SankeyOptions, Sankey> {
+  axisConfig = {
+    ...this['axisConfig'],
+    xAxis: {
+      name: `${t('chart.drag_block_type_axis_start')} / ${t('chart.dimension')}`,
+      limit: 1,
+      type: 'd'
+    },
+    xAxisExt: {
+      name: `${t('chart.drag_block_type_axis_end')} / ${t('chart.dimension')}`,
+      limit: 1,
+      type: 'd'
+    },
+    yAxis: {
+      name: `${t('chart.chart_data')} / ${t('chart.quota')}`,
+      limit: 1,
+      type: 'q'
+    }
+  }
+  properties = SANKEY_EDITOR_PROPERTY
+  propertyInner = {
+    ...SANKEY_EDITOR_PROPERTY_INNER,
+    'label-selector': ['color', 'fontSize'],
+    'tooltip-selector': ['fontSize', 'color', 'backgroundColor', 'tooltipFormatter']
+  }
+  axis: AxisType[] = [...SANKEY_AXIS_TYPE]
+  protected baseOptions: SankeyOptions = {
+    data: [],
+    sourceField: 'source',
+    targetField: 'target',
+    weightField: 'value',
+    rawFields: ['dimensionList', 'quotaList'],
+    interactions: [
+      {
+        type: 'legend-active',
+        cfg: {
+          start: [{ trigger: 'legend-item:mouseenter', action: ['element-active:reset'] }],
+          end: [{ trigger: 'legend-item:mouseleave', action: ['element-active:reset'] }]
+        }
+      },
+      {
+        type: 'legend-filter',
+        cfg: {
+          start: [
+            {
+              trigger: 'legend-item:click',
+              action: [
+                'list-unchecked:toggle',
+                'data-filter:filter',
+                'element-active:reset',
+                'element-highlight:reset'
+              ]
+            }
+          ]
+        }
+      },
+      {
+        type: 'tooltip',
+        cfg: {
+          start: [{ trigger: 'interval:mousemove', action: 'tooltip:show' }],
+          end: [{ trigger: 'interval:mouseleave', action: 'tooltip:hide' }]
+        }
+      },
+      {
+        type: 'active-region',
+        cfg: {
+          start: [{ trigger: 'interval:mousemove', action: 'active-region:show' }],
+          end: [{ trigger: 'interval:mouseleave', action: 'active-region:hide' }]
+        }
+      }
+    ]
+  }
+
+  drawChart(drawOptions: G2PlotDrawOptions<Sankey>): Sankey {
+    const { chart, container, action } = drawOptions
+    if (!chart.data?.data?.length) {
+      return
+    }
+    // data
+    const data: Array<any> = cloneDeep(chart.data.data)
+
+    data.forEach(d => {
+      if (d.dimensionList) {
+        if (d.dimensionList[0]) {
+          d.source = d.dimensionList[0].value
+        }
+        if (d.dimensionList[1]) {
+          d.target = d.dimensionList[1].value
+        }
+      }
+    })
+
+    // options
+    const initOptions: SankeyOptions = {
+      ...this.baseOptions,
+      appendPadding: getPadding(chart),
+      data,
+      nodeSort: (a, b) => {
+        // 这里是前端自己排序
+        if (chart.yAxis && chart.yAxis[0]) {
+          if (chart.yAxis[0].sort === 'asc') {
+            return a.value - b.value
+          } else if (chart.yAxis[0].sort === 'desc') {
+            return b.value - a.value
+          }
+        }
+
+        if (chart.xAxis && chart.xAxis[0] && a.sourceLinks.length > 0) {
+          if (chart.xAxis[0].sort === 'custom_sort' && chart.xAxis[0].customSort) {
+            return (
+              chart.xAxis[0].customSort.indexOf(a.name) - chart.xAxis[0].customSort.indexOf(b.name)
+            )
+          } else if (chart.xAxis[0].sort === 'asc') {
+            return a.name.localeCompare(b.name)
+          } else if (chart.xAxis[0].sort === 'desc') {
+            return b.name.localeCompare(a.name)
+          }
+        }
+        if (chart.xAxisExt && chart.xAxisExt[0] && a.targetLinks.length > 0) {
+          if (chart.xAxisExt[0].sort === 'custom_sort' && chart.xAxisExt[0].customSort) {
+            return (
+              chart.xAxisExt[0].customSort.indexOf(a.name) -
+              chart.xAxisExt[0].customSort.indexOf(b.name)
+            )
+          } else if (chart.xAxisExt[0].sort === 'asc') {
+            return a.name.localeCompare(b.name)
+          } else if (chart.xAxisExt[0].sort === 'desc') {
+            return b.name.localeCompare(a.name)
+          }
+        }
+
+        return b.value - a.value
+      }
+    }
+
+    const options = this.setupOptions(chart, initOptions)
+
+    // 开始渲染
+    const newChart = new Sankey(container, options)
+
+    newChart.on('edge:click', action)
+
+    return newChart
+  }
+
+  protected configTooltip(chart: Chart, options: SankeyOptions): SankeyOptions {
+    let tooltip
+    let customAttr: DeepPartial<ChartAttr>
+    if (chart.customAttr) {
+      customAttr = parseJson(chart.customAttr)
+      // tooltip
+      if (customAttr.tooltip) {
+        const t = JSON.parse(JSON.stringify(customAttr.tooltip))
+        if (t.show) {
+          tooltip = {
+            showTitle: false,
+            showMarkers: false,
+            shared: false,
+            // 内置：node 不显示 tooltip，edge 显示 tooltip
+            showContent: items => {
+              return !get(items, [0, 'data', 'isNode'])
+            },
+            formatter: (datum: Datum) => {
+              const { source, target, value } = datum
+              return {
+                name: source + ' -> ' + target,
+                value: valueFormatter(value, t.tooltipFormatter)
+              }
+            }
+          }
+        } else {
+          tooltip = false
+        }
+      }
+    }
+    return { ...options, tooltip }
+  }
+
+  protected configBasicStyle(chart: Chart, options: SankeyOptions): SankeyOptions {
+    const basicStyle = parseJson(chart.customAttr).basicStyle
+
+    let color = basicStyle.colors
+    color = color.map(ele => {
+      const tmp = hexColorToRGBA(ele, basicStyle.alpha)
+      if (basicStyle.gradient) {
+        return setGradientColor(tmp, true)
+      } else {
+        return tmp
+      }
+    })
+
+    options = {
+      ...options,
+      color
+    }
+    return options
+  }
+
+  setupDefaultOptions(chart: ChartObj): ChartObj {
+    const { customAttr, senior } = chart
+    const { label } = customAttr
+    if (!['left', 'middle', 'right'].includes(label.position)) {
+      label.position = 'middle'
+    }
+    senior.functionCfg.emptyDataStrategy = 'ignoreData'
+    return chart
+  }
+
+  protected configLabel(chart: Chart, options: SankeyOptions): SankeyOptions {
+    const labelAttr = parseJson(chart.customAttr).label
+    if (labelAttr.show) {
+      const label = {
+        //...tmpOptions.label,
+        formatter: ({ name }) => name,
+        callback: (x: number[]) => {
+          const isLast = x[1] === 1 // 最后一列靠边的节点
+          return {
+            style: {
+              fill: labelAttr.color,
+              fontSize: labelAttr.fontSize,
+              textAlign: isLast ? 'end' : 'start'
+            },
+            offsetX: isLast ? -8 : 8
+          }
+        },
+        layout: [{ type: 'hide-overlap' }, { type: 'limit-in-canvas' }]
+      }
+      return {
+        ...options,
+        label
+      }
+    } else {
+      return {
+        ...options,
+        label: false
+      }
+    }
+  }
+
+  protected setupOptions(chart: Chart, options: SankeyOptions): SankeyOptions {
+    return flow(
+      this.configTheme,
+      this.configBasicStyle,
+      this.configLabel,
+      this.configTooltip,
+      this.configLegend,
+      this.configSlider,
+      this.configAnalyseHorizontal,
+      this.configEmptyDataStrategy
+    )(chart, options)
+  }
+
+  constructor(name = 'sankey') {
+    super(name, DEFAULT_DATA)
+  }
+}

From 14e15a4bca62aaaadfb80d3973b02e193fb51651 Mon Sep 17 00:00:00 2001
From: ulleo <ulleo.wang@gmail.com>
Date: Tue, 21 May 2024 17:47:41 +0800
Subject: [PATCH 23/36] =?UTF-8?q?feat(=E5=9B=BE=E8=A1=A8):=20=E6=A1=91?=
 =?UTF-8?q?=E5=9F=BA=E5=9B=BE=E9=AB=98=E7=BA=A7=E8=AE=BE=E7=BD=AE=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/components/js/panel/charts/others/sankey-common.ts     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/others/sankey-common.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/others/sankey-common.ts
index 80d63ff2e9..90790b3fc3 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/charts/others/sankey-common.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/charts/others/sankey-common.ts
@@ -4,7 +4,6 @@ export const SANKEY_EDITOR_PROPERTY: EditorProperty[] = [
   'label-selector',
   'tooltip-selector',
   'title-selector',
-  'function-cfg',
   'jump-set',
   'linkage'
 ]

From aaa13dcda639f2b377d65ab2efdca0e9d7d72ef4 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 21 May 2024 17:50:09 +0800
Subject: [PATCH 24/36] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E6=BA=90):=20APi?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=905000=E6=9D=A1=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=95=B0=E6=8D=AE=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datasource/provider/ApiUtils.java         | 21 +++++++++++++++++++
 .../datasource/server/DatasourceServer.java   |  4 ++++
 .../datasource/form/ApiHttpRequestDraw.vue    |  2 +-
 .../io/dataease/api/ds/vo/ApiDefinition.java  |  3 +--
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/ApiUtils.java b/core/core-backend/src/main/java/io/dataease/datasource/provider/ApiUtils.java
index 64e42f081f..d6317d83cc 100644
--- a/core/core-backend/src/main/java/io/dataease/datasource/provider/ApiUtils.java
+++ b/core/core-backend/src/main/java/io/dataease/datasource/provider/ApiUtils.java
@@ -194,6 +194,26 @@ public class ApiUtils {
         return response;
     }
 
+    private static void previewNum(List<Map<String, Object>> field){
+        for (Map<String, Object> stringObjectMap : field) {
+            JSONArray newArray = new JSONArray();
+            if (stringObjectMap.get("value") != null) {
+                try {
+                    TypeReference<JSONArray> listTypeReference = new TypeReference<JSONArray>() {
+                    };
+                    JSONArray array = objectMapper.readValue(stringObjectMap.get("value").toString(), listTypeReference);
+                    if(array.size() > 100){
+                        for (int i = 0; i < Math.min(100, array.size()); i++) {
+                            newArray.add(array.get(i));
+                        }
+                        stringObjectMap.put("value", newArray);
+                    }
+                } catch (Exception e) {
+
+                }
+            }
+        }
+    }
 
     public static ApiDefinition checkApiDefinition(ApiDefinition apiDefinition, String response) throws DEException {
         if (StringUtils.isEmpty(response)) {
@@ -217,6 +237,7 @@ public class ApiUtils {
                 rootPath = "$";
                 handleStr(apiDefinition, response, fields, rootPath);
             }
+            previewNum(fields);
             apiDefinition.setJsonFields(fields);
             return apiDefinition;
         } else {
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 587c358431..bd37f22672 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
@@ -493,6 +493,9 @@ public class DatasourceServer implements DatasourceApi {
     public DatasourceDTO get(Long datasourceId) throws DEException {
         DatasourceDTO datasourceDTO = new DatasourceDTO();
         CoreDatasource datasource = datasourceMapper.selectById(datasourceId);
+        if(datasource == null){
+            DEException.throwException("不存在的数据源！");
+        }
         BeanUtils.copyBean(datasourceDTO, datasource);
         TypeReference<List<ApiDefinition>> listTypeReference = new TypeReference<List<ApiDefinition>>() {
         };
@@ -838,6 +841,7 @@ public class DatasourceServer implements DatasourceApi {
         if (request.keySet().contains("type") && request.get("type").equals("apiStructure")) {
             apiDefinition.setShowApiStructure(true);
         }
+
         ApiUtils.checkApiDefinition(apiDefinition, response);
         if (apiDefinition.getRequest().getAuthManager() != null && StringUtils.isNotBlank(apiDefinition.getRequest().getAuthManager().getUsername()) && StringUtils.isNotBlank(apiDefinition.getRequest().getAuthManager().getPassword()) && apiDefinition.getRequest().getAuthManager().getVerification().equals("Basic Auth")) {
             apiDefinition.getRequest().getAuthManager().setUsername(new String(Base64.getEncoder().encode(apiDefinition.getRequest().getAuthManager().getUsername().getBytes())));
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 409d8f27ee..ab4e66effd 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
@@ -293,8 +293,8 @@ const previewData = () => {
   for (let i = 0; i < apiItem.fields.length; i++) {
     for (let j = 0; j < apiItem.fields[i].value.length; j++) {
       data[j][apiItem.fields[i].name] = apiItem.fields[i].value[j]
-      data[j]['id'] = apiItem.fields[i].name
     }
+
     columnTmp.push({
       key: apiItem.fields[i].name,
       dataKey: apiItem.fields[i].name,
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/ApiDefinition.java b/sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/ApiDefinition.java
index 810ef1964d..8a6f3e18db 100644
--- a/sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/ApiDefinition.java
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/ApiDefinition.java
@@ -20,8 +20,7 @@ public class ApiDefinition {
     private String status;
     private List<Map<String, Object>> data = new ArrayList<>();
     private Integer apiQueryTimeout = 10;
-    private int previewNum = 10;
-    private int maxPreviewNum = 10;
+    private int previewNum = 100;
     private int serialNumber;
     private boolean useJsonPath;
     private String jsonPath;

From 515f44eeb31024c10f7b8ad4e7ad546fe6c9213f Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 21 May 2024 18:16:50 +0800
Subject: [PATCH 25/36] =?UTF-8?q?feat(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20ifra?=
 =?UTF-8?q?me=E5=B5=8C=E5=85=A5=E6=94=AF=E6=8C=81=E5=A4=96=E9=83=A8?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=8F=98=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data-visualization/PreviewCanvas.vue      | 51 +++++++++++++++++--
 1 file changed, 46 insertions(+), 5 deletions(-)

diff --git a/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue b/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue
index 8b4c21b366..93c9ca5cdf 100644
--- a/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue
+++ b/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
-import { onMounted, reactive } from 'vue'
+import { onMounted, reactive, computed, onUnmounted } from 'vue'
 import DePreview from '@/components/data-visualization/canvas/DePreview.vue'
 import router from '@/router'
 import { initCanvasData } from '@/utils/canvasUtils'
@@ -10,6 +10,9 @@ import { getOuterParamsInfo } from '@/api/visualization/outerParams'
 import { ElMessage } from 'element-plus-secondary'
 import { useI18n } from '@/hooks/web/useI18n'
 import { XpackComponent } from '@/components/plugin'
+import { useAppStoreWithOut } from '@/store/modules/app'
+const appStore = useAppStoreWithOut()
+
 const dvMainStore = dvMainStoreWithOut()
 const { t } = useI18n()
 const state = reactive({
@@ -29,9 +32,19 @@ const props = defineProps({
   isSelector: {
     type: Boolean,
     default: false
+  },
+  // JSON String 格式
+  embedParams: {
+    type: String,
+    required: false
   }
 })
 
+// div嵌入
+const isDataEaseBi = computed(() => appStore.getIsDataEaseBi)
+// iframe嵌入
+const isIframe = computed(() => appStore.getIsIframe)
+
 const loadCanvasDataAsync = async (dvId, dvType) => {
   const { jumpInfoParam } = router.currentRoute.value.query
   let jumpParam
@@ -55,14 +68,26 @@ const loadCanvasDataAsync = async (dvId, dvType) => {
   }
 
   // 添加外部参数
-  const attachParamsEncode = router.currentRoute.value.query.attachParams
   let attachParam
+  await getOuterParamsInfo(dvId).then(rsp => {
+    dvMainStore.setNowPanelOuterParamsInfo(rsp.data)
+  })
+
+  // 外部参数（iframe 或者 iframe嵌入）
+  const attachParamsEncode = router.currentRoute.value.query.attachParams
   if (attachParamsEncode) {
     try {
       attachParam = JSON.parse(Base64.decode(decodeURIComponent(attachParamsEncode)))
-      await getOuterParamsInfo(dvId).then(rsp => {
-        dvMainStore.setNowPanelOuterParamsInfo(rsp.data)
-      })
+    } catch (e) {
+      console.error(e)
+      ElMessage.error(t('visualization.outer_param_decode_error'))
+    }
+  }
+
+  // div嵌入
+  if (props.embedParams && isDataEaseBi.value) {
+    try {
+      attachParam = JSON.parse(props.embedParams)
     } catch (e) {
       console.error(e)
       ElMessage.error(t('visualization.outer_param_decode_error'))
@@ -97,6 +122,16 @@ const loadCanvasDataAsync = async (dvId, dvType) => {
     }
   )
 }
+const winMsgHandel = event => {
+  const msgInfo = JSON.parse(event.data.info)
+  if (msgInfo.type === 'attachParams') {
+    const attachParam = msgInfo.params
+    if (attachParam) {
+      dvMainStore.addOuterParamsFilter(attachParam)
+    }
+  }
+}
+
 let p = null
 const XpackLoaded = () => p(true)
 onMounted(async () => {
@@ -107,7 +142,13 @@ onMounted(async () => {
     return
   }
   dvMainStore.setPublicLinkStatus(props.publicLinkStatus)
+  window.addEventListener('embedParamsMessage', winMsgHandel)
 })
+
+onUnmounted(() => {
+  window.removeEventListener('embedParamsMessage', winMsgHandel)
+})
+
 defineExpose({
   loadCanvasDataAsync
 })

From 292d0caa287a48f62e2062d353fd24e9d3d181c0 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 22 May 2024 09:05:51 +0800
Subject: [PATCH 26/36] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=8B=BC?=
 =?UTF-8?q?=E5=86=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/data-visualization/PreviewCanvas.vue          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue b/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue
index 93c9ca5cdf..260bddcab7 100644
--- a/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue
+++ b/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue
@@ -122,7 +122,7 @@ const loadCanvasDataAsync = async (dvId, dvType) => {
     }
   )
 }
-const winMsgHandel = event => {
+const winMsgHandle = event => {
   const msgInfo = JSON.parse(event.data.info)
   if (msgInfo.type === 'attachParams') {
     const attachParam = msgInfo.params
@@ -142,11 +142,11 @@ onMounted(async () => {
     return
   }
   dvMainStore.setPublicLinkStatus(props.publicLinkStatus)
-  window.addEventListener('embedParamsMessage', winMsgHandel)
+  window.addEventListener('embedParamsMessage', winMsgHandle)
 })
 
 onUnmounted(() => {
-  window.removeEventListener('embedParamsMessage', winMsgHandel)
+  window.removeEventListener('embedParamsMessage', winMsgHandle)
 })
 
 defineExpose({

From 85a925db09a0e15dfd82f6c3441ec257467d41e5 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 22 May 2024 10:18:04 +0800
Subject: [PATCH 27/36] =?UTF-8?q?fix(=E5=B5=8C=E5=85=A5=E5=BC=8F):=20?=
 =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E8=B7=B3=E8=BD=AC=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E6=94=BE=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/components/ChartComponentG2Plot.vue |  4 +--
 .../views/components/ChartComponentS2.vue     |  5 +---
 .../views/chart/components/views/index.vue    | 26 ++++++++++++++++---
 3 files changed, 25 insertions(+), 10 deletions(-)

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 947620c2f5..d611c25d25 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
@@ -159,7 +159,6 @@ const renderG2Plot = (chart, chartView: G2PlotChartView<any, any>) => {
 const dynamicAreaId = ref('')
 const country = ref('')
 const appStore = useAppStoreWithOut()
-const isDataEaseBi = computed(() => appStore.getIsDataEaseBi)
 const chartContainer = ref<HTMLElement>(null)
 let mapTimer: number
 const renderL7Plot = async (chart: ChartObj, chartView: L7PlotChartView<any, any>, callback) => {
@@ -259,7 +258,7 @@ const trackClick = trackAction => {
       dvMainStore.addViewTrackFilter(linkageParam)
       break
     case 'jump':
-      if (isDataEaseBi.value || mobileInPc.value) return
+      if (mobileInPc.value) return
       emit('onJumpClick', jumpParam)
       break
     default:
@@ -284,7 +283,6 @@ const trackMenu = computed(() => {
     })
     jumpCount &&
       view.value?.jumpActive &&
-      !isDataEaseBi.value &&
       !mobileInPc.value &&
       trackMenuInfo.push('jump')
     linkageCount && view.value?.linkageActive && trackMenuInfo.push('linkage')
diff --git a/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue b/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue
index 6fc89da2db..d2a468b701 100644
--- a/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue
+++ b/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue
@@ -262,8 +262,6 @@ const action = param => {
 }
 const appStore = useAppStoreWithOut()
 
-const isDataEaseBi = computed(() => appStore.getIsDataEaseBi)
-
 const trackClick = trackAction => {
   const param = state.pointParam
   if (!param?.data?.dimensionList) {
@@ -296,7 +294,7 @@ const trackClick = trackAction => {
       dvMainStore.addViewTrackFilter(linkageParam)
       break
     case 'jump':
-      if (isDataEaseBi.value || mobileInPc.value) return
+      if (mobileInPc.value) return
       emit('onJumpClick', jumpParam)
       break
     default:
@@ -322,7 +320,6 @@ const trackMenu = computed(() => {
   })
   jumpCount &&
     view.value?.jumpActive &&
-    !isDataEaseBi.value &&
     !mobileInPc.value &&
     trackMenuInfo.push('jump')
   linkageCount && view.value?.linkageActive && trackMenuInfo.push('linkage')
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 2a4f42d3cf..272a0d417d 100644
--- a/core/core-frontend/src/views/chart/components/views/index.vue
+++ b/core/core-frontend/src/views/chart/components/views/index.vue
@@ -2,6 +2,8 @@
 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 { XpackComponent } from '@/components/plugin'
 import {
   computed,
   CSSProperties,
@@ -99,6 +101,7 @@ const props = defineProps({
 })
 const dynamicAreaId = ref('')
 const { view, showPosition, element, active, searchCount, scale } = toRefs(props)
+const appStore = useAppStoreWithOut()
 
 const titleShow = computed(
   () =>
@@ -235,6 +238,7 @@ watch([() => curComponent.value], () => {
     })
   }
 })
+const isDataEaseBi = computed(() => appStore.getIsDataEaseBi)
 
 const chartExtRequest = shallowRef(null)
 provide('chartExtRequest', chartExtRequest)
@@ -313,10 +317,21 @@ const filter = (firstLoad?: boolean) => {
 const onDrillFilters = param => {
   state.drillFilters = param ? param : []
 }
+const openHandler = ref(null)
+const initOpenHandler = newWindow => {
+  if (openHandler?.value) {
+    const pm = {
+      methodName: 'initOpenHandler',
+      args: newWindow
+    }
+    openHandler.value.invokeMethod(pm)
+  }
+}
 
 const windowsJump = (url, jumpType) => {
   try {
-    window.open(url, jumpType)
+    const newWindow = window.open(url, jumpType)
+    initOpenHandler(newWindow)
     if (jumpType === '_self') {
       location.reload()
     }
@@ -350,13 +365,17 @@ const jumpClick = param => {
     param.sourceDvId = dvInfo.value.id
     param.sourceViewId = param.viewId
     param.sourceFieldId = dimension.id
+    let embeddedBaseUrl = ''
+    if (isDataEaseBi.value) {
+      embeddedBaseUrl = embeddedStore.baseUrl
+    }
     // 内部仪表板跳转
     if (jumpInfo.linkType === 'inner') {
       if (jumpInfo.targetDvId) {
         if (publicLinkStatus.value) {
           // 判断是否有公共链接ID
           if (jumpInfo.publicJumpId) {
-            const url = `#/de-link/${jumpInfo.publicJumpId}?jumpInfoParam=${encodeURIComponent(
+            const url = `${embeddedBaseUrl}#/de-link/${jumpInfo.publicJumpId}?jumpInfoParam=${encodeURIComponent(
               Base64.encode(JSON.stringify(param))
             )}`
             const currentUrl = window.location.href
@@ -366,7 +385,7 @@ const jumpClick = param => {
             ElMessage.warning(t('visualization.public_link_tips'))
           }
         } else {
-          const url = `#/preview?dvId=${jumpInfo.targetDvId}&jumpInfoParam=${encodeURIComponent(
+          const url = `${embeddedBaseUrl}#/preview?dvId=${jumpInfo.targetDvId}&jumpInfoParam=${encodeURIComponent(
             Base64.encode(JSON.stringify(param))
           )}`
           windowsJump(url, jumpInfo.jumpType)
@@ -713,6 +732,7 @@ const titleIconStyle = computed(() => {
       :view-icon="view.type"
     ></chart-empty-info>
     <drill-path :drill-filters="state.drillFilters" @onDrillJump="drillJump" />
+    <XpackComponent ref="openHandler" jsname="L2NvbXBvbmVudC9lbWJlZGRlZC1pZnJhbWUvT3BlbkhhbmRsZXI=" />
   </div>
 </template>
 

From 0db12c54ade75400a6d542af9ee9221f8aa66a8b Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 22 May 2024 10:36:17 +0800
Subject: [PATCH 28/36] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Deslint=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/chart/components/views/index.vue  | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 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 272a0d417d..be4deeaab8 100644
--- a/core/core-frontend/src/views/chart/components/views/index.vue
+++ b/core/core-frontend/src/views/chart/components/views/index.vue
@@ -375,9 +375,9 @@ const jumpClick = param => {
         if (publicLinkStatus.value) {
           // 判断是否有公共链接ID
           if (jumpInfo.publicJumpId) {
-            const url = `${embeddedBaseUrl}#/de-link/${jumpInfo.publicJumpId}?jumpInfoParam=${encodeURIComponent(
-              Base64.encode(JSON.stringify(param))
-            )}`
+            const url = `${embeddedBaseUrl}#/de-link/${
+              jumpInfo.publicJumpId
+            }?jumpInfoParam=${encodeURIComponent(Base64.encode(JSON.stringify(param)))}`
             const currentUrl = window.location.href
             localStorage.setItem('beforeJumpUrl', currentUrl)
             windowsJump(url, jumpInfo.jumpType)
@@ -385,9 +385,9 @@ const jumpClick = param => {
             ElMessage.warning(t('visualization.public_link_tips'))
           }
         } else {
-          const url = `${embeddedBaseUrl}#/preview?dvId=${jumpInfo.targetDvId}&jumpInfoParam=${encodeURIComponent(
-            Base64.encode(JSON.stringify(param))
-          )}`
+          const url = `${embeddedBaseUrl}#/preview?dvId=${
+            jumpInfo.targetDvId
+          }&jumpInfoParam=${encodeURIComponent(Base64.encode(JSON.stringify(param)))}`
           windowsJump(url, jumpInfo.jumpType)
         }
       } else {
@@ -732,7 +732,10 @@ const titleIconStyle = computed(() => {
       :view-icon="view.type"
     ></chart-empty-info>
     <drill-path :drill-filters="state.drillFilters" @onDrillJump="drillJump" />
-    <XpackComponent ref="openHandler" jsname="L2NvbXBvbmVudC9lbWJlZGRlZC1pZnJhbWUvT3BlbkhhbmRsZXI=" />
+    <XpackComponent
+      ref="openHandler"
+      jsname="L2NvbXBvbmVudC9lbWJlZGRlZC1pZnJhbWUvT3BlbkhhbmRsZXI="
+    />
   </div>
 </template>
 

From c364a9253c05d3d0b79ae55ef086aa9261bacfe2 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 22 May 2024 10:54:54 +0800
Subject: [PATCH 29/36] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Deslint=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/views/components/ChartComponentG2Plot.vue     | 5 +----
 .../chart/components/views/components/ChartComponentS2.vue   | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

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 d611c25d25..93e5f87a23 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
@@ -281,10 +281,7 @@ const trackMenu = computed(() => {
         jumpCount++
       }
     })
-    jumpCount &&
-      view.value?.jumpActive &&
-      !mobileInPc.value &&
-      trackMenuInfo.push('jump')
+    jumpCount && view.value?.jumpActive && !mobileInPc.value && trackMenuInfo.push('jump')
     linkageCount && view.value?.linkageActive && trackMenuInfo.push('linkage')
     view.value.drillFields.length && trackMenuInfo.push('drill')
     // 如果同时配置jump linkage drill 切配置联动时同时下钻 在实际只显示两个 '跳转' '联动和下钻'
diff --git a/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue b/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue
index d2a468b701..01d97dc837 100644
--- a/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue
+++ b/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue
@@ -318,10 +318,7 @@ const trackMenu = computed(() => {
       jumpCount++
     }
   })
-  jumpCount &&
-    view.value?.jumpActive &&
-    !mobileInPc.value &&
-    trackMenuInfo.push('jump')
+  jumpCount && view.value?.jumpActive && !mobileInPc.value && trackMenuInfo.push('jump')
   linkageCount && view.value?.linkageActive && trackMenuInfo.push('linkage')
   view.value.drillFields.length && trackMenuInfo.push('drill')
   // 如果同时配置jump linkage drill 切配置联动时同时下钻 在实际只显示两个 '跳转' '联动和下钻'

From 24c861b2af3dd14ba7c4efdded3a1f35fc569d3d Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 22 May 2024 13:42:32 +0800
Subject: [PATCH 30/36] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B5=8C=E5=85=A5=E5=BC=8Fiframe=E4=BC=A0?=
 =?UTF-8?q?=E5=8F=82=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BB=AA=E8=A1=A8=E6=9D=BF?=
 =?UTF-8?q?ID=E6=A0=A1=E9=AA=8C=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom-component/de-frame/ComponentFrame.vue   |  2 +-
 .../src/store/modules/data-visualization/dvMain.ts |  9 ++++++++-
 .../src/views/data-visualization/PreviewCanvas.vue | 14 +++++++++-----
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/core/core-frontend/src/custom-component/de-frame/ComponentFrame.vue b/core/core-frontend/src/custom-component/de-frame/ComponentFrame.vue
index 8b464bee89..65980cbeb7 100644
--- a/core/core-frontend/src/custom-component/de-frame/ComponentFrame.vue
+++ b/core/core-frontend/src/custom-component/de-frame/ComponentFrame.vue
@@ -3,7 +3,7 @@
     <div v-if="element.frameLinks.src" class="main-frame">
       <iframe
         v-if="state.frameShow"
-        id="iframe"
+        :id="'iframe-' + element.id"
         :src="element.frameLinks.src"
         scrolling="auto"
         frameborder="0"
diff --git a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts
index 511d4e20b3..071c680b1b 100644
--- a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts
+++ b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts
@@ -850,10 +850,11 @@ export const dvMainStore = defineStore('dataVisualization', {
       })
     },
     // 添加外部参数的过滤条件
-    addOuterParamsFilter(params) {
+    addOuterParamsFilter(params, source = 'inner') {
       // params 结构 {key1:value1,key2:value2}
       const curComponentData = this.componentData
       if (params) {
+        const preActiveComponentIds = []
         const trackInfo = this.nowPanelOuterParamsInfo
         for (let index = 0; index < curComponentData.length; index++) {
           const element = curComponentData[index]
@@ -906,6 +907,7 @@ export const dvMainStore = defineStore('dataVisualization', {
                 // 不存在该条件 且 条件有效 直接保存该条件
                 // !filterExist && vValid && currentFilters.push(condition)
                 currentFilters.push(condition)
+                preActiveComponentIds.push(element.id)
               }
               if (element.component === 'VQuery') {
                 element.propValue.forEach(filterItem => {
@@ -951,6 +953,11 @@ export const dvMainStore = defineStore('dataVisualization', {
             curComponentData[index] = element
           })
         }
+        if (source === 'outer') {
+          preActiveComponentIds.forEach(viewId => {
+            useEmitt().emitter.emit('query-data-' + viewId)
+          })
+        }
       }
     },
     trackFilterCursor(element, checkQDList, trackInfo, preActiveComponentIds, viewId) {
diff --git a/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue b/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue
index 260bddcab7..7bc91bcc59 100644
--- a/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue
+++ b/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue
@@ -122,12 +122,16 @@ const loadCanvasDataAsync = async (dvId, dvType) => {
     }
   )
 }
+
+// 目标校验： 需要校验targetDvId 是否是当前可视化资源ID
 const winMsgHandle = event => {
-  const msgInfo = JSON.parse(event.data.info)
-  if (msgInfo.type === 'attachParams') {
+  console.info('PostMessage Params Received')
+  const msgInfo = event.data
+  // 校验targetDvId
+  if (msgInfo && msgInfo.type === 'attachParams' && msgInfo.targetDvId === state.dvInfo.id + '') {
     const attachParam = msgInfo.params
     if (attachParam) {
-      dvMainStore.addOuterParamsFilter(attachParam)
+      dvMainStore.addOuterParamsFilter(attachParam, 'outer')
     }
   }
 }
@@ -142,11 +146,11 @@ onMounted(async () => {
     return
   }
   dvMainStore.setPublicLinkStatus(props.publicLinkStatus)
-  window.addEventListener('embedParamsMessage', winMsgHandle)
+  window.addEventListener('message', winMsgHandle)
 })
 
 onUnmounted(() => {
-  window.removeEventListener('embedParamsMessage', winMsgHandle)
+  window.removeEventListener('message', winMsgHandle)
 })
 
 defineExpose({

From 20dc9716f6b987cb420dce25fc9fbfc90735d6dd Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 22 May 2024 14:46:35 +0800
Subject: [PATCH 31/36] =?UTF-8?q?feat(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81div=E5=B5=8C=E5=85=A5=E5=A4=96=E9=83=A8?=
 =?UTF-8?q?=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data-visualization/canvas/DePreview.vue   | 15 +++++++
 .../src/pages/panel/DashboardPreview.vue      | 27 ++++++++++++
 core/core-frontend/src/pages/panel/main.ts    |  7 ++++
 .../src/store/modules/embedded.ts             | 10 +++++
 .../data-visualization/PreviewCanvas.vue      | 42 +------------------
 5 files changed, 60 insertions(+), 41 deletions(-)

diff --git a/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue b/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue
index 67dc784914..62c0d551f2 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue
@@ -236,6 +236,19 @@ const initWatermark = (waterDomId = 'preview-canvas-main') => {
   }
 }
 
+// 目标校验： 需要校验targetDvId 是否是当前可视化资源ID
+const winMsgHandle = event => {
+  console.info('PostMessage Params Received')
+  const msgInfo = event.data
+  // 校验targetDvId
+  if (msgInfo && msgInfo.type === 'attachParams' && msgInfo.targetDvId === dvInfo.value.id + '') {
+    const attachParam = msgInfo.params
+    if (attachParam) {
+      dvMainStore.addOuterParamsFilter(attachParam, 'outer')
+    }
+  }
+}
+
 onMounted(() => {
   initRefreshTimer()
   resetLayout()
@@ -245,10 +258,12 @@ onMounted(() => {
     restore()
     initWatermark()
   })
+  window.addEventListener('message', winMsgHandle)
 })
 
 onBeforeUnmount(() => {
   clearInterval(refreshTimer.value)
+  window.removeEventListener('message', winMsgHandle)
 })
 
 const userViewEnlargeOpen = (opt, item) => {
diff --git a/core/core-frontend/src/pages/panel/DashboardPreview.vue b/core/core-frontend/src/pages/panel/DashboardPreview.vue
index e3e641e8f7..b1353682cf 100644
--- a/core/core-frontend/src/pages/panel/DashboardPreview.vue
+++ b/core/core-frontend/src/pages/panel/DashboardPreview.vue
@@ -5,10 +5,15 @@ import { interactiveStoreWithOut } from '@/store/modules/interactive'
 import { useEmbedded } from '@/store/modules/embedded'
 import { check } from '@/utils/CrossPermission'
 import { useCache } from '@/hooks/web/useCache'
+import { getOuterParamsInfo } from '@/api/visualization/outerParams'
+import { ElMessage } from 'element-plus-secondary'
+import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
+import { useI18n } from '@/hooks/web/useI18n'
 const { wsCache } = useCache()
 const interactiveStore = interactiveStoreWithOut()
 const embeddedStore = useEmbedded()
 const dashboardPreview = ref(null)
+const { t } = useI18n()
 const state = reactive({
   canvasDataPreview: null,
   canvasStylePreview: null,
@@ -16,6 +21,8 @@ const state = reactive({
   dvInfo: null,
   curPreviewGap: 0
 })
+const dvMainStore = dvMainStoreWithOut()
+
 const checkPer = async resourceId => {
   if (!window.DataEaseBi || !resourceId) {
     return true
@@ -30,6 +37,23 @@ onBeforeMount(async () => {
   if (!checkResult) {
     return
   }
+
+  // 添加外部参数
+  let attachParam
+  await getOuterParamsInfo(embeddedStore.dvId).then(rsp => {
+    dvMainStore.setNowPanelOuterParamsInfo(rsp.data)
+  })
+
+  // div嵌入
+  if (embeddedStore.outerParams) {
+    try {
+      attachParam = JSON.parse(embeddedStore.outerParams)
+    } catch (e) {
+      console.error(e)
+      ElMessage.error(t('visualization.outer_param_decode_error'))
+    }
+  }
+
   initCanvasData(
     embeddedStore.dvId,
     embeddedStore.busiFlag,
@@ -48,6 +72,9 @@ onBeforeMount(async () => {
       nextTick(() => {
         dashboardPreview.value.restore()
       })
+      if (attachParam) {
+        dvMainStore.addOuterParamsFilter(attachParam)
+      }
     }
   )
 })
diff --git a/core/core-frontend/src/pages/panel/main.ts b/core/core-frontend/src/pages/panel/main.ts
index 35f561db53..7023518fbf 100644
--- a/core/core-frontend/src/pages/panel/main.ts
+++ b/core/core-frontend/src/pages/panel/main.ts
@@ -70,6 +70,7 @@ const setupAll = async (
   dom: string,
   type: string,
   busiFlag: string,
+  outerParams: string,
   token: string,
   baseUrl: string,
   dvId: string,
@@ -86,6 +87,7 @@ const setupAll = async (
   const embeddedStore = useEmbedded()
   embeddedStore.setType(type)
   embeddedStore.setBusiFlag(busiFlag)
+  embeddedStore.setOuterParams(outerParams)
   embeddedStore.setToken(token)
   embeddedStore.setBaseUrl(baseUrl)
   embeddedStore.setDvId(dvId)
@@ -129,6 +131,7 @@ class DataEaseBi {
     | 'DashboardPanel'
   dvId: string
   busiFlag: 'dashboard' | 'dataV'
+  outerParams: string
   resourceId: string
   pid: string
   chartId: string
@@ -139,6 +142,7 @@ class DataEaseBi {
     this.type = type
     this.token = options.token
     this.busiFlag = options.busiFlag
+    this.outerParams = options.outerParams
     this.baseUrl = options.baseUrl
     this.dvId = options.dvId
     this.pid = options.pid
@@ -152,6 +156,7 @@ class DataEaseBi {
       this.deOptions.container,
       this.type,
       this.busiFlag,
+      this.outerParams,
       this.token,
       this.baseUrl,
       this.dvId,
@@ -169,6 +174,7 @@ class DataEaseBi {
     const embeddedStore = useEmbedded()
     embeddedStore.setType(null)
     embeddedStore.setBusiFlag(null)
+    embeddedStore.setOuterParams(null)
     embeddedStore.setToken(null)
     embeddedStore.setBaseUrl(null)
     embeddedStore.setDvId(null)
@@ -179,6 +185,7 @@ class DataEaseBi {
     this.type = null
     this.token = null
     this.busiFlag = null
+    this.outerParams = null
     this.baseUrl = null
     this.dvId = null
     this.pid = null
diff --git a/core/core-frontend/src/store/modules/embedded.ts b/core/core-frontend/src/store/modules/embedded.ts
index c7050d3b83..1826cdc687 100644
--- a/core/core-frontend/src/store/modules/embedded.ts
+++ b/core/core-frontend/src/store/modules/embedded.ts
@@ -4,6 +4,7 @@ interface AppState {
   type: string
   token: string
   busiFlag: string
+  outerParams: string
   baseUrl: string
   dvId: string
   pid: string
@@ -17,6 +18,7 @@ export const userStore = defineStore('embedded', {
       type: '',
       token: '',
       busiFlag: '',
+      outerParams: '',
       baseUrl: '',
       dvId: '',
       pid: '',
@@ -34,6 +36,9 @@ export const userStore = defineStore('embedded', {
     getBusiFlag(): string {
       return this.busiFlag
     },
+    getOuterParams(): string {
+      return this.outerParams
+    },
     getBaseUrl(): string {
       return this.baseUrl
     },
@@ -53,6 +58,7 @@ export const userStore = defineStore('embedded', {
       return {
         embeddedToken: this.token,
         busiFlag: this.busiFlag,
+        outerParams: this.outerParams,
         type: this.type,
         dvId: this.dvId,
         chartId: this.chartId,
@@ -71,6 +77,9 @@ export const userStore = defineStore('embedded', {
     setBusiFlag(busiFlag: string) {
       this.busiFlag = busiFlag
     },
+    setOuterParams(outerParams: string) {
+      this.outerParams = outerParams
+    },
     setBaseUrl(baseUrl: string) {
       this.baseUrl = baseUrl
     },
@@ -90,6 +99,7 @@ export const userStore = defineStore('embedded', {
       this.type = data['type']
       this.token = data['embeddedToken']
       this.busiFlag = data['busiFlag']
+      this.outerParams = data['outerParams']
       this.dvId = data['dvId']
       this.chartId = data['chartId']
       this.pid = data['pid']
diff --git a/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue b/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue
index 7bc91bcc59..6f74804593 100644
--- a/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue
+++ b/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
-import { onMounted, reactive, computed, onUnmounted } from 'vue'
+import { onMounted, reactive } from 'vue'
 import DePreview from '@/components/data-visualization/canvas/DePreview.vue'
 import router from '@/router'
 import { initCanvasData } from '@/utils/canvasUtils'
@@ -10,8 +10,6 @@ import { getOuterParamsInfo } from '@/api/visualization/outerParams'
 import { ElMessage } from 'element-plus-secondary'
 import { useI18n } from '@/hooks/web/useI18n'
 import { XpackComponent } from '@/components/plugin'
-import { useAppStoreWithOut } from '@/store/modules/app'
-const appStore = useAppStoreWithOut()
 
 const dvMainStore = dvMainStoreWithOut()
 const { t } = useI18n()
@@ -32,19 +30,9 @@ const props = defineProps({
   isSelector: {
     type: Boolean,
     default: false
-  },
-  // JSON String 格式
-  embedParams: {
-    type: String,
-    required: false
   }
 })
 
-// div嵌入
-const isDataEaseBi = computed(() => appStore.getIsDataEaseBi)
-// iframe嵌入
-const isIframe = computed(() => appStore.getIsIframe)
-
 const loadCanvasDataAsync = async (dvId, dvType) => {
   const { jumpInfoParam } = router.currentRoute.value.query
   let jumpParam
@@ -84,16 +72,6 @@ const loadCanvasDataAsync = async (dvId, dvType) => {
     }
   }
 
-  // div嵌入
-  if (props.embedParams && isDataEaseBi.value) {
-    try {
-      attachParam = JSON.parse(props.embedParams)
-    } catch (e) {
-      console.error(e)
-      ElMessage.error(t('visualization.outer_param_decode_error'))
-    }
-  }
-
   initCanvasData(
     dvId,
     dvType,
@@ -123,19 +101,6 @@ const loadCanvasDataAsync = async (dvId, dvType) => {
   )
 }
 
-// 目标校验： 需要校验targetDvId 是否是当前可视化资源ID
-const winMsgHandle = event => {
-  console.info('PostMessage Params Received')
-  const msgInfo = event.data
-  // 校验targetDvId
-  if (msgInfo && msgInfo.type === 'attachParams' && msgInfo.targetDvId === state.dvInfo.id + '') {
-    const attachParam = msgInfo.params
-    if (attachParam) {
-      dvMainStore.addOuterParamsFilter(attachParam, 'outer')
-    }
-  }
-}
-
 let p = null
 const XpackLoaded = () => p(true)
 onMounted(async () => {
@@ -146,11 +111,6 @@ onMounted(async () => {
     return
   }
   dvMainStore.setPublicLinkStatus(props.publicLinkStatus)
-  window.addEventListener('message', winMsgHandle)
-})
-
-onUnmounted(() => {
-  window.removeEventListener('message', winMsgHandle)
 })
 
 defineExpose({

From a672d3c2bbbcb96c1caacd61709c887cbfe0b87f Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 22 May 2024 15:00:59 +0800
Subject: [PATCH 32/36] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E6=8A=8A=E8=A1=A8=E7=9A=84comment?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B9=9F=E6=90=BA=E5=B8=A6=E8=BF=87=E6=9D=A5?=
 =?UTF-8?q?=20#9301?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/chart/components/editor/index.vue   |  6 +++-
 .../data/dataset/form/DatasetUnion.vue        | 32 +++++++++++++++----
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/editor/index.vue b/core/core-frontend/src/views/chart/components/editor/index.vue
index c6c2332292..69e2d17faf 100644
--- a/core/core-frontend/src/views/chart/components/editor/index.vue
+++ b/core/core-frontend/src/views/chart/components/editor/index.vue
@@ -2173,7 +2173,7 @@ const drop = (ev: MouseEvent, type = 'xAxis') => {
                       </div>
                       <div
                         class="tree-btn"
-                        :class="isFilterActive && 'active'"
+                        :class="{ 'tree-btn--dark': themes === 'dark', active: isFilterActive }"
                         @click="openTreeFilter"
                       >
                         <el-icon>
@@ -3489,6 +3489,10 @@ span {
       cursor: pointer;
       justify-content: center;
       font-size: 12px;
+      &.tree-btn--dark {
+        background: rgba(235, 235, 235, 0.05);
+        border-color: #5f5f5f;
+      }
 
       &.active {
         color: #3370ff;
diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue b/core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue
index 8358dfd05f..67f99ef35f 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue
@@ -708,12 +708,13 @@ const dragenter_handler = ev => {
 const drop_handler = ev => {
   ev.preventDefault()
   let data = ev.dataTransfer.getData('text')
-  const { tableName, type, datasourceId } = JSON.parse(data) as Table
+  const { tableName, type, datasourceId, name: noteName } = JSON.parse(data) as Table
   const extraData = {
     info: JSON.stringify({
       table: tableName,
       sql: ''
     }),
+    noteName,
     unionType: 'left',
     unionFields: [],
     currentDsFields: [],
@@ -1029,10 +1030,19 @@ const emits = defineEmits(['addComplete', 'joinEditor', 'updateAllfields', 'chan
     direction="rtl"
   >
     <template #header v-if="currentNode">
-      <div class="info">
-        <span :title="currentNode.tableName" class="name ellipsis">{{
-          currentNode.tableName
-        }}</span>
+      <div class="info-content">
+        <div class="info">
+          <span class="label">表名</span>
+          <span :title="currentNode.tableName" class="name ellipsis">{{
+            currentNode.tableName
+          }}</span>
+        </div>
+        <div class="info">
+          <span class="label">表备注</span>
+          <span :title="currentNode.noteName" class="name ellipsis">{{
+            currentNode.noteName || '-'
+          }}</span>
+        </div>
         <span :title="getDsName(currentNode.datasourceId)" class="ds ellipsis"
           >{{ t('auth.datasource') }}:{{ getDsName(currentNode.datasourceId) }}</span
         >
@@ -1082,15 +1092,25 @@ const emits = defineEmits(['addComplete', 'joinEditor', 'updateAllfields', 'chan
       top: 26px;
     }
 
+    .info-content {
+      display: flex;
+      flex-wrap: wrap;
+    }
+
     .info {
       display: flex;
       flex-direction: column;
-      .name {
+      width: 50%;
+      .label {
         font-weight: 500;
         font-size: 16px;
         color: #1f2329;
         max-width: 500px;
       }
+      .name {
+        font-weight: 400;
+        font-size: 14px;
+      }
       .ds {
         font-weight: 400;
         font-size: 14px;

From 567dccbb2d0a8b2a1a90546752168faa5f2eff5e Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Wed, 22 May 2024 15:20:13 +0800
Subject: [PATCH 33/36] =?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=E8=AE=BE=E7=BD=AE=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

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

diff --git a/de-xpack b/de-xpack
index 2960fb1df0..4ed3bd70e3 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 2960fb1df000a7136b7dd627040da0b4c0f1cd26
+Subproject commit 4ed3bd70e3ecd24fcc3db5dfd0218e72b0c2c18f

From f139e0a4bc37e261786fbc67162d0b35fee3619a Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 22 May 2024 16:07:09 +0800
Subject: [PATCH 34/36] =?UTF-8?q?feat(=E5=9B=BE=E8=A1=A8):=20=E5=B5=8C?=
 =?UTF-8?q?=E5=85=A5=E5=BC=8F=E5=9B=BE=E8=A1=A8=E6=94=AF=E6=8C=81=E5=A4=96?=
 =?UTF-8?q?=E9=83=A8=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data-visualization/canvas/DePreview.vue   | 12 +++--
 .../src/pages/panel/DashboardPreview.vue      |  2 +-
 .../src/pages/panel/ViewWrapper.vue           | 44 ++++++++++++++++++-
 .../modules/data-visualization/dvMain.ts      |  3 +-
 4 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue b/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue
index 62c0d551f2..d9deec239b 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue
@@ -236,15 +236,19 @@ const initWatermark = (waterDomId = 'preview-canvas-main') => {
   }
 }
 
-// 目标校验： 需要校验targetDvId 是否是当前可视化资源ID
+// 目标校验： 需要校验targetSourceId 是否是当前可视化资源ID
 const winMsgHandle = event => {
   console.info('PostMessage Params Received')
   const msgInfo = event.data
-  // 校验targetDvId
-  if (msgInfo && msgInfo.type === 'attachParams' && msgInfo.targetDvId === dvInfo.value.id + '') {
+  // 校验targetSourceId
+  if (
+    msgInfo &&
+    msgInfo.type === 'attachParams' &&
+    msgInfo.targetSourceId === dvInfo.value.id + ''
+  ) {
     const attachParam = msgInfo.params
     if (attachParam) {
-      dvMainStore.addOuterParamsFilter(attachParam, 'outer')
+      dvMainStore.addOuterParamsFilter(attachParam, componentData.value, 'outer')
     }
   }
 }
diff --git a/core/core-frontend/src/pages/panel/DashboardPreview.vue b/core/core-frontend/src/pages/panel/DashboardPreview.vue
index b1353682cf..61571aca40 100644
--- a/core/core-frontend/src/pages/panel/DashboardPreview.vue
+++ b/core/core-frontend/src/pages/panel/DashboardPreview.vue
@@ -73,7 +73,7 @@ onBeforeMount(async () => {
         dashboardPreview.value.restore()
       })
       if (attachParam) {
-        dvMainStore.addOuterParamsFilter(attachParam)
+        dvMainStore.addOuterParamsFilter(attachParam, canvasDataResult, 'outer')
       }
     }
   )
diff --git a/core/core-frontend/src/pages/panel/ViewWrapper.vue b/core/core-frontend/src/pages/panel/ViewWrapper.vue
index a1895ba174..742aa4063f 100644
--- a/core/core-frontend/src/pages/panel/ViewWrapper.vue
+++ b/core/core-frontend/src/pages/panel/ViewWrapper.vue
@@ -5,21 +5,41 @@ import { interactiveStoreWithOut } from '@/store/modules/interactive'
 import { useEmbedded } from '@/store/modules/embedded'
 import { check } from '@/utils/CrossPermission'
 import { useCache } from '@/hooks/web/useCache'
+import { getOuterParamsInfo } from '@/api/visualization/outerParams'
+import { ElMessage } from 'element-plus-secondary'
+import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
+import { useI18n } from '@/hooks/web/useI18n'
 const { wsCache } = useCache()
 const interactiveStore = interactiveStoreWithOut()
 const embeddedStore = useEmbedded()
 const config = ref()
 const viewInfo = ref()
 const userViewEnlargeRef = ref()
+const dvMainStore = dvMainStoreWithOut()
+const { t } = useI18n()
 
 const state = reactive({
   canvasDataPreview: null,
   canvasStylePreview: null,
   canvasViewInfoPreview: null,
   dvInfo: null,
-  curPreviewGap: 0
+  curPreviewGap: 0,
+  chartId: null
 })
 
+// 目标校验： 需要校验targetSourceId 是否是当前可视化资源ID
+const winMsgHandle = event => {
+  console.info('PostMessage Params Received')
+  const msgInfo = event.data
+  // 校验targetSourceId
+  if (msgInfo && msgInfo.type === 'attachParams' && msgInfo.targetSourceId === state.chartId + '') {
+    const attachParam = msgInfo.params
+    if (attachParam) {
+      dvMainStore.addOuterParamsFilter(attachParam, state.canvasDataPreview, 'outer')
+    }
+  }
+}
+
 const checkPer = async resourceId => {
   if (!window.DataEaseBi || !resourceId) {
     return true
@@ -34,6 +54,25 @@ onBeforeMount(async () => {
   if (!checkResult) {
     return
   }
+  state.chartId = embeddedStore.dvId
+  window.addEventListener('message', winMsgHandle)
+
+  // 添加外部参数
+  let attachParam
+  await getOuterParamsInfo(embeddedStore.dvId).then(rsp => {
+    dvMainStore.setNowPanelOuterParamsInfo(rsp.data)
+  })
+
+  // div嵌入
+  if (embeddedStore.outerParams) {
+    try {
+      attachParam = JSON.parse(embeddedStore.outerParams)
+    } catch (e) {
+      console.error(e)
+      ElMessage.error(t('visualization.outer_param_decode_error'))
+    }
+  }
+
   initCanvasDataPrepare(
     embeddedStore.dvId,
     embeddedStore.busiFlag,
@@ -49,6 +88,9 @@ onBeforeMount(async () => {
       state.canvasViewInfoPreview = canvasViewInfoPreview
       state.dvInfo = dvInfo
       state.curPreviewGap = curPreviewGap
+      if (attachParam) {
+        dvMainStore.addOuterParamsFilter(attachParam, canvasDataResult)
+      }
 
       viewInfo.value = canvasViewInfoPreview[embeddedStore.chartId]
       ;(
diff --git a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts
index 071c680b1b..d584faf0a2 100644
--- a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts
+++ b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts
@@ -850,9 +850,8 @@ export const dvMainStore = defineStore('dataVisualization', {
       })
     },
     // 添加外部参数的过滤条件
-    addOuterParamsFilter(params, source = 'inner') {
+    addOuterParamsFilter(params, curComponentData = this.componentData, source = 'inner') {
       // params 结构 {key1:value1,key2:value2}
-      const curComponentData = this.componentData
       if (params) {
         const preActiveComponentIds = []
         const trackInfo = this.nowPanelOuterParamsInfo

From 6a4964243318b01d78dacc9430e7948be72aea84 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 22 May 2024 17:12:24 +0800
Subject: [PATCH 35/36] =?UTF-8?q?feat(X-Pack):=20=E7=AC=AC=E4=B8=89?=
 =?UTF-8?q?=E6=96=B9=E5=B9=B3=E5=8F=B0=E8=AE=A4=E8=AF=81=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E8=BF=81=E7=A7=BB=E5=88=B0=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application.yml        |  2 +-
 .../main/resources/db/migration/V2.7__ddl.sql | 11 +++-
 core/core-frontend/src/locales/zh-CN.ts       |  1 +
 de-xpack                                      |  2 +-
 .../settings/XpackAuthenticationApi.java      | 33 ++++++++--
 .../settings/vo/XpackAuthenticationVO.java    |  4 +-
 .../api/xpack/settings/vo/XpackCasVO.java     | 14 ++++
 .../api/xpack/settings/vo/XpackOidcVO.java    | 26 ++++++++
 .../io/dataease/utils/HttpClientUtil.java     | 65 ++++++++++++++++++-
 9 files changed, 148 insertions(+), 10 deletions(-)
 create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/vo/XpackCasVO.java
 create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/vo/XpackOidcVO.java

diff --git a/core/core-backend/src/main/resources/application.yml b/core/core-backend/src/main/resources/application.yml
index 87a0091da2..f76ceef9e1 100644
--- a/core/core-backend/src/main/resources/application.yml
+++ b/core/core-backend/src/main/resources/application.yml
@@ -48,7 +48,7 @@ dataease:
   version: '@project.version@'
   origin-list: http://192.168.2.70:9080
   apisix-api:
-    domain: http://192.168.0.121:9180
+    domain: http://192.168.2.70:9180
     key: edd1c9f034335f136f87ad84b625c8f1
 
 # springdoc-openapi项目配置
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 81f0a52efc..303e400b80 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
@@ -11,5 +11,14 @@ CREATE TABLE `core_sys_startup_job`
 ) COMMENT ='项目启动任务';
 
 BEGIN;
-INSERT INTO `core_sys_startup_job` VALUES ('chartFilterMerge', 'chartFilterMerge', 'ready');
+INSERT INTO `core_sys_startup_job`
+VALUES ('chartFilterMerge', 'chartFilterMerge', 'ready');
 COMMIT;
+
+
+ALTER TABLE `xpack_setting_authentication`
+    ADD COLUMN `plugin_json` longtext NULL COMMENT '插件配置' AFTER `relational_ids`;
+ALTER TABLE `xpack_setting_authentication`
+    ADD COLUMN `synced` tinyint(1) NOT NULL DEFAULT 0 COMMENT '已同步' AFTER `plugin_json`;
+ALTER TABLE `xpack_setting_authentication`
+    ADD COLUMN `valid` tinyint(1) NOT NULL DEFAULT 0 COMMENT '有效' AFTER `synced`;
\ No newline at end of file
diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts
index 6cb595fa1c..8c68cc4a8f 100644
--- a/core/core-frontend/src/locales/zh-CN.ts
+++ b/core/core-frontend/src/locales/zh-CN.ts
@@ -1532,6 +1532,7 @@ export default {
     day_limit: '天不能小于1，大于31'
   },
   commons: {
+    test_connect: '测试连接',
     consanguinity: '血缘关系',
     collapse_navigation: '收起导航',
     operate_cancelled: '已取消操作',
diff --git a/de-xpack b/de-xpack
index d92e14e286..eac4bdc0d3 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit d92e14e286e9fed723b501323766bf8f2858ca42
+Subproject commit eac4bdc0d387c44088dbc7585a09f61b8e45ea12
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/XpackAuthenticationApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/XpackAuthenticationApi.java
index 489a1e60f5..393f7691e9 100644
--- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/XpackAuthenticationApi.java
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/XpackAuthenticationApi.java
@@ -2,11 +2,14 @@ package io.dataease.api.xpack.settings;
 
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.dataease.api.xpack.settings.request.XpackAuthenticationEditor;
+import io.dataease.api.xpack.settings.vo.XpackCasVO;
+import io.dataease.api.xpack.settings.vo.XpackOidcVO;
 import io.dataease.api.xpack.settings.vo.XpackAuthenticationStatusVO;
 import io.dataease.api.xpack.settings.vo.XpackAuthenticationVO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -16,17 +19,37 @@ import java.util.List;
 @ApiSupport(order = 899)
 public interface XpackAuthenticationApi {
 
-    @Operation(summary = "同步")
-    @GetMapping("/sync")
-    void sync();
 
     @Operation(summary = "查询列表")
     @GetMapping("/grid")
     List<XpackAuthenticationVO> grid();
 
     @Operation(summary = "切换状态")
-    @PostMapping("/update")
-    void update(@RequestBody XpackAuthenticationEditor editor);
+    @PostMapping("/switchEnable")
+    void switchEnable(@RequestBody XpackAuthenticationEditor editor);
+
+    @PostMapping("/save/oidc")
+    String saveOidc(@RequestBody XpackOidcVO editor);
+
+    @PostMapping("/save/cas")
+    String saveCas(@RequestBody XpackCasVO editor);
+
+
+    @GetMapping("/info/oidc")
+    XpackOidcVO oidcInfo();
+
+    @GetMapping("/info/cas")
+    XpackCasVO casInfo();
+
+
+    @PostMapping("/validate/oidc")
+    String validateOidc(@RequestBody XpackOidcVO editor);
+
+    @PostMapping("/validate/cas")
+    String validateCas(@RequestBody XpackCasVO editor);
+
+    @PostMapping("/validateId/{id}")
+    String validate(@PathVariable("id") Long id);
 
     @Operation(summary = "查询状态")
     @GetMapping("/status")
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/vo/XpackAuthenticationVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/vo/XpackAuthenticationVO.java
index 5b9b49df99..218cb6ab6e 100644
--- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/vo/XpackAuthenticationVO.java
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/vo/XpackAuthenticationVO.java
@@ -19,6 +19,8 @@ public class XpackAuthenticationVO implements Serializable {
     private Long id;
     @Schema(description = "名称")
     private String name;
-    @Schema(description = "状态")
+    @Schema(description = "开启")
     private boolean enable;
+    @Schema(description = "有效")
+    private boolean valid;
 }
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/vo/XpackCasVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/vo/XpackCasVO.java
new file mode 100644
index 0000000000..ca3fa7fb76
--- /dev/null
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/vo/XpackCasVO.java
@@ -0,0 +1,14 @@
+package io.dataease.api.xpack.settings.vo;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+@Data
+public class XpackCasVO implements Serializable {
+    @Serial
+    private static final long serialVersionUID = 3748231475265743038L;
+
+    private String idpUri;
+}
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/vo/XpackOidcVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/vo/XpackOidcVO.java
new file mode 100644
index 0000000000..395831f664
--- /dev/null
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/vo/XpackOidcVO.java
@@ -0,0 +1,26 @@
+package io.dataease.api.xpack.settings.vo;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+@Data
+public class XpackOidcVO implements Serializable {
+    @Serial
+    private static final long serialVersionUID = 3386314375628396307L;
+
+    private String discovery;
+
+    private String clientId;
+
+    private String clientSecret;
+
+    private String realm;
+
+    private String scope;
+
+    private boolean usePkce;
+
+    private String redirectUri;
+}
diff --git a/sdk/common/src/main/java/io/dataease/utils/HttpClientUtil.java b/sdk/common/src/main/java/io/dataease/utils/HttpClientUtil.java
index 71d35ebbdc..6e71094297 100755
--- a/sdk/common/src/main/java/io/dataease/utils/HttpClientUtil.java
+++ b/sdk/common/src/main/java/io/dataease/utils/HttpClientUtil.java
@@ -6,9 +6,9 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.NameValuePair;
-import org.apache.http.entity.mime.MultipartEntityBuilder;
 import org.apache.http.client.entity.EntityBuilder;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.HttpDelete;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPatch;
 import org.apache.http.client.methods.HttpPost;
@@ -20,6 +20,7 @@ import org.apache.http.conn.socket.PlainConnectionSocketFactory;
 import org.apache.http.conn.ssl.NoopHostnameVerifier;
 import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
 import org.apache.http.entity.ContentType;
+import org.apache.http.entity.mime.MultipartEntityBuilder;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.client.HttpClients;
@@ -77,6 +78,37 @@ public class HttpClientUtil {
         }
     }
 
+    public static boolean validateUrl(String url, HttpClientConfig config) {
+        CloseableHttpClient httpClient = null;
+        try {
+            httpClient = buildHttpClient(url);
+            HttpGet httpGet = new HttpGet(url);
+            if (config == null) {
+                config = new HttpClientConfig();
+            }
+            httpGet.setConfig(config.buildRequestConfig());
+
+            Map<String, String> header = config.getHeader();
+            for (String key : header.keySet()) {
+                httpGet.addHeader(key, header.get(key));
+            }
+            HttpResponse response = httpClient.execute(httpGet);
+            int statusCode = response.getStatusLine().getStatusCode();
+            return statusCode <= 400;
+        } catch (Exception e) {
+            logger.error("HttpClient查询失败", e);
+            throw new DEException(SYSTEM_INNER_ERROR.code(), "HttpClient查询失败: " + e.getMessage());
+        } finally {
+            try {
+                if (httpClient != null) {
+                    httpClient.close();
+                }
+            } catch (Exception e) {
+                logger.error("HttpClient关闭连接失败", e);
+            }
+        }
+    }
+
     /**
      * Get http请求
      *
@@ -342,4 +374,35 @@ public class HttpClientUtil {
             config.addHeader(entry.getKey(), entry.getValue().toString());
         }
     }
+
+    public static String delete(String url, HttpClientConfig config) {
+        CloseableHttpClient httpClient = null;
+        try {
+            httpClient = buildHttpClient(url);
+            HttpDelete httpDelete = new HttpDelete(url);
+
+            if (config == null) {
+                config = new HttpClientConfig();
+            }
+            httpDelete.setConfig(config.buildRequestConfig());
+
+            Map<String, String> header = config.getHeader();
+            for (String key : header.keySet()) {
+                httpDelete.addHeader(key, header.get(key));
+            }
+            HttpResponse response = httpClient.execute(httpDelete);
+            return getResponseStr(response, config);
+        } catch (Exception e) {
+            logger.error("HttpClient查询失败", e);
+            throw new DEException(SYSTEM_INNER_ERROR.code(), "HttpClient查询失败: " + e.getMessage());
+        } finally {
+            try {
+                if (httpClient != null) {
+                    httpClient.close();
+                }
+            } catch (Exception e) {
+                logger.error("HttpClient关闭连接失败", e);
+            }
+        }
+    }
 }

From 4b6da963b4db830c4e0da3b231efab20dbaf2f98 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Wed, 22 May 2024 18:18:09 +0800
Subject: [PATCH 36/36] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E6=BA=90):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20Excel=20=E6=96=87=E4=BB=B6=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E6=97=B6=E8=B6=85=E8=BF=87=201=20=E5=88=86=E9=92=9F?=
 =?UTF-8?q?=E8=A2=AB=E5=8F=96=E6=B6=88=E4=BD=86=E6=98=AF=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E6=97=A0=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E7=BB=99=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/api/datasource.ts      |  1 +
 .../core-frontend/src/config/axios/service.ts |  2 +-
 .../data/datasource/form/ExcelDetail.vue      | 24 +++++++++++++++----
 .../dataease/filter/HtmlResourceFilter.java   | 11 ++++++++-
 4 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/core/core-frontend/src/api/datasource.ts b/core/core-frontend/src/api/datasource.ts
index 8d85bf637e..ef14354ba6 100644
--- a/core/core-frontend/src/api/datasource.ts
+++ b/core/core-frontend/src/api/datasource.ts
@@ -152,6 +152,7 @@ export const uploadFile = async (data): Promise<IResponse> => {
     .post({
       url: '/datasource/uploadFile',
       data,
+      loading: true,
       headersType: 'multipart/form-data;'
     })
     .then(res => {
diff --git a/core/core-frontend/src/config/axios/service.ts b/core/core-frontend/src/config/axios/service.ts
index 5e63f9c618..fc68c6859a 100644
--- a/core/core-frontend/src/config/axios/service.ts
+++ b/core/core-frontend/src/config/axios/service.ts
@@ -210,7 +210,7 @@ service.interceptors.response.use(
     ) {
       ElMessage({
         type: 'error',
-        message: error.message,
+        message: error.response?.data?.msg ? error.response?.data?.msg : error.message,
         showClose: true
       })
     } else if (error?.config?.url.startsWith('/xpackComponent/content')) {
diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/ExcelDetail.vue b/core/core-frontend/src/views/visualized/data/datasource/form/ExcelDetail.vue
index 9d06d385d1..3c5c7704a8 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/form/ExcelDetail.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/ExcelDetail.vue
@@ -354,11 +354,24 @@ const uploadExcel = () => {
   formData.append('type', '')
   formData.append('editType', param.value.editType)
   formData.append('id', param.value.id || 0)
-  return uploadFile(formData).then(res => {
-    upload.value?.clearFiles()
-    uploadAgain.value?.clearFiles()
-    uploadSuccess(res)
-  })
+  loading.value = true
+  return uploadFile(formData)
+    .then(res => {
+      upload.value?.clearFiles()
+      uploadAgain.value?.clearFiles()
+      uploadSuccess(res)
+      loading.value = false
+    })
+    .catch(error => {
+      if (error.code === 'ECONNABORTED') {
+        ElMessage({
+          type: 'error',
+          message: error.message,
+          showClose: true
+        })
+      }
+      loading.value = false
+    })
 }
 const excelForm = ref()
 const submitForm = () => {
@@ -394,6 +407,7 @@ defineExpose({
         require-asterisk-position="right"
         :model="param"
         label-position="top"
+        v-loading="loading"
       >
         <el-form-item
           v-if="sheetFile.name"
diff --git a/sdk/common/src/main/java/io/dataease/filter/HtmlResourceFilter.java b/sdk/common/src/main/java/io/dataease/filter/HtmlResourceFilter.java
index c84453aafe..cdeda6baae 100644
--- a/sdk/common/src/main/java/io/dataease/filter/HtmlResourceFilter.java
+++ b/sdk/common/src/main/java/io/dataease/filter/HtmlResourceFilter.java
@@ -1,5 +1,7 @@
 package io.dataease.filter;
 
+import io.dataease.result.ResultMessage;
+import io.dataease.utils.JsonUtil;
 import jakarta.servlet.*;
 import jakarta.servlet.FilterConfig;
 import jakarta.servlet.http.HttpServletResponse;
@@ -36,7 +38,14 @@ public class HtmlResourceFilter implements Filter, Ordered {
             httpResponse.setHeader(HttpHeaders.EXPIRES, "0");
         }
         // 继续执行过滤器链
-        filterChain.doFilter(servletRequest, httpResponse);
+        try {
+            filterChain.doFilter(servletRequest, httpResponse);
+        }catch (Exception e){
+            httpResponse.setContentType("application/json");
+            httpResponse.setCharacterEncoding("UTF-8");
+            httpResponse.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+            httpResponse.getWriter().write(JsonUtil.toJSONString(new ResultMessage(HttpServletResponse.SC_BAD_REQUEST,e.getMessage())).toString());
+        }
     }
 
     @Override