From 32060fc31cadc2c6826051b5ff7eef7164199430 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 1 Nov 2023 10:27:31 +0800
Subject: [PATCH 01/13] =?UTF-8?q?fix:=20=E5=85=A8=E5=B1=8F=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E6=A8=A1=E5=BC=8F=E4=B8=8B=E8=A7=86=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=E7=9A=84=E5=A4=87=E6=B3=A8=E6=97=A0=E6=B3=95=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=20#6207?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/frontend/src/views/chart/view/TitleRemark.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/frontend/src/views/chart/view/TitleRemark.vue b/core/frontend/src/views/chart/view/TitleRemark.vue
index 2d6beaa0b2..83d29b96c7 100644
--- a/core/frontend/src/views/chart/view/TitleRemark.vue
+++ b/core/frontend/src/views/chart/view/TitleRemark.vue
@@ -1,9 +1,10 @@
 <template>
-  <span>
+  <span style="transform: translate(0);">
     <el-popover
       placement="bottom"
       trigger="hover"
       width="300"
+      :append-to-body="false"
       popper-class="remark-pop"
       :visible-arrow="false"
     >
@@ -75,5 +76,6 @@ export default {
   border: none;
   margin-top: 8px!important;
   background: transparent;
+  top: 22px !important;
 }
 </style>

From a4e15251b0ab6ac3a897c8b041d1b666ef2c8a49 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 1 Nov 2023 11:11:58 +0800
Subject: [PATCH 02/13] =?UTF-8?q?fix:=20=E4=B8=8B=E6=8B=89=E6=A0=91?=
 =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E7=9B=AE=E5=BD=95=E8=BF=87=E9=95=BF=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E6=97=A0=E6=A8=AA=E5=90=91=E6=BB=9A=E5=8A=A8=E6=9D=A1?=
 =?UTF-8?q?=20#6264?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/frontend/src/components/widget/deWidget/DeSelectTree.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/frontend/src/components/widget/deWidget/DeSelectTree.vue b/core/frontend/src/components/widget/deWidget/DeSelectTree.vue
index e7d79b3845..f9f2d3eea3 100644
--- a/core/frontend/src/components/widget/deWidget/DeSelectTree.vue
+++ b/core/frontend/src/components/widget/deWidget/DeSelectTree.vue
@@ -423,6 +423,7 @@ export default {
   .el-tree {
     background: var(--BgSelectTreeColor, #FFFFFF) !important;
     color: var(--SelectTreeColor, #606266) !important;
+    width: max-content;
 
     .el-tree-node.is-current {
       background-color: rgb(245, 247, 250, .5) !important;

From 4ac6e09cf9ffbb6c3dbbf17262f3be7b4b30850f Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 1 Nov 2023 11:45:38 +0800
Subject: [PATCH 03/13] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E6=95=B0=E6=8D=AE=E9=9B=86=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E7=AC=AC=E4=B8=80=E6=AC=A1=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E5=BA=93A=E4=B8=8B=E8=A1=A8?=
 =?UTF-8?q?=E8=BE=83=E5=A4=9A=EF=BC=8C=E5=9C=A8=E8=BF=98=E6=B2=A1=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E5=AE=8C=E6=88=90=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E8=A1=A8=E8=BE=83=E5=B0=91=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93B=EF=BC=8C=E8=BF=99=E4=B8=AA=E6=97=B6=E5=80=99B?=
 =?UTF-8?q?=E5=BA=93=E4=B8=8B=E6=98=BE=E7=A4=BA=E7=9A=84=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E8=A1=A8=E6=97=B6A=E5=BA=93=E4=B8=8B=E7=9A=84=E8=A1=A8=20#6102?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/frontend/src/views/dataset/add/AddDB.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/frontend/src/views/dataset/add/AddDB.vue b/core/frontend/src/views/dataset/add/AddDB.vue
index d7ef3e36e3..c8f22d37b4 100644
--- a/core/frontend/src/views/dataset/add/AddDB.vue
+++ b/core/frontend/src/views/dataset/add/AddDB.vue
@@ -292,6 +292,9 @@ export default {
         this.activeName = ''
         this.activeTable = {}
         const dsName = this.options.find((ele) => ele.id === val).name
+        this.$currentHttpRequestList.forEach((item, key) => {
+          key.indexOf('/datasource/getTables/') > -1 && item('Operation canceled by the user.')
+        })
         post('/datasource/getTables/' + val, {}).then((response) => {
           this.tables = response.data
           this.tables.forEach((ele) => {

From 0c1fe30485263007790a6e4f811391d6c9f27264 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 1 Nov 2023 11:55:50 +0800
Subject: [PATCH 04/13] =?UTF-8?q?fix:=20=E5=85=A8=E5=B1=8F=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E4=B8=8B=E5=9C=B0=E5=9B=BE=E9=80=89=E6=8B=A9=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=86=85=E5=AE=B9=E5=BC=B9=E7=AA=97=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E5=B1=95=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/chart/components/map/MapLayerController.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/frontend/src/views/chart/components/map/MapLayerController.vue b/core/frontend/src/views/chart/components/map/MapLayerController.vue
index 04478ec4c3..bec2f6781d 100644
--- a/core/frontend/src/views/chart/components/map/MapLayerController.vue
+++ b/core/frontend/src/views/chart/components/map/MapLayerController.vue
@@ -1,7 +1,7 @@
 <template>
 
   <el-popover
-    placement="right"
+    placement="left"
     title=""
     width="150"
     :append-to-body="false"

From 33dcfadae13beaa4ee25457ea9959c3a345054c9 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 1 Nov 2023 13:52:21 +0800
Subject: [PATCH 05/13] =?UTF-8?q?fix:=20=E6=95=B0=E5=80=BC=E8=8C=83?=
 =?UTF-8?q?=E5=9B=B4=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=9E=82=E7=9B=B4=E5=B1=85=E4=B8=AD=EF=BC=8C=E4=B8=8E=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6=E6=94=BE=E5=9C=A8?=
 =?UTF-8?q?=E4=B8=80=E8=B5=B7=E6=98=BE=E7=A4=BA=E5=BE=88=E4=B8=8D=E5=8D=8F?=
 =?UTF-8?q?=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/frontend/src/components/dataease/DeOutWidget.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/frontend/src/components/dataease/DeOutWidget.vue b/core/frontend/src/components/dataease/DeOutWidget.vue
index 48a9bfb896..d981b4f4b3 100644
--- a/core/frontend/src/components/dataease/DeOutWidget.vue
+++ b/core/frontend/src/components/dataease/DeOutWidget.vue
@@ -207,7 +207,6 @@ export default {
         if (!this.titleStyle) {
           this.titleStyle = {}
         }
-        this.titleStyle.marginTop = '-20px'
       }
     },
     getCondition() {

From d5b5421cf14089a80cd890927eae561bb34f07e9 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 1 Nov 2023 13:57:19 +0800
Subject: [PATCH 06/13] =?UTF-8?q?fix:=20=E8=A1=8C=E6=9D=83=E9=99=90-?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=8F=98=E9=87=8F=E9=BB=98=E8=AE=A4=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/frontend/src/lang/en.js | 1 +
 core/frontend/src/lang/tw.js | 1 +
 core/frontend/src/lang/zh.js | 1 +
 3 files changed, 3 insertions(+)

diff --git a/core/frontend/src/lang/en.js b/core/frontend/src/lang/en.js
index 3d339a99e0..08801bc895 100644
--- a/core/frontend/src/lang/en.js
+++ b/core/frontend/src/lang/en.js
@@ -2429,6 +2429,7 @@ export default {
     webFormat: 'Please enter the correct URL starting with [https:// or http://]'
   },
   auth: {
+    selct_filter_fields: 'Please select a filter field',
     no_item_selected: 'Please select organization、user or role on the left',
     no_resource_selected: 'Please select resource on the left',
     search_pre: 'Search by ',
diff --git a/core/frontend/src/lang/tw.js b/core/frontend/src/lang/tw.js
index a4c6f889ea..68ed9e7965 100644
--- a/core/frontend/src/lang/tw.js
+++ b/core/frontend/src/lang/tw.js
@@ -2423,6 +2423,7 @@ export default {
     webFormat: '請輸入以[https://或http://]開頭的正確網址'
   },
   auth: {
+    selct_filter_fields: '請選擇篩選字段',
     no_item_selected: '請在左側選擇組織、角色或用戶',
     no_resource_selected: '請在左側選擇資源',
     search_pre: '通過',
diff --git a/core/frontend/src/lang/zh.js b/core/frontend/src/lang/zh.js
index d8d963222e..a1fed00e95 100644
--- a/core/frontend/src/lang/zh.js
+++ b/core/frontend/src/lang/zh.js
@@ -2423,6 +2423,7 @@ export default {
     webFormat: '请输入以[https://或http://]开头的正确网址'
   },
   auth: {
+    selct_filter_fields: '请选择筛选字段',
     no_item_selected: '请在左侧选择组织、角色或用户',
     no_resource_selected: '请在左侧选择资源',
     search_pre: '通过',

From 4ea68be2818f5d21fc612fec849374112eb8218e Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 1 Nov 2023 13:57:40 +0800
Subject: [PATCH 07/13] =?UTF-8?q?fix:=20=E6=95=B0=E5=80=BC=E8=8C=83?=
 =?UTF-8?q?=E5=9B=B4=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=9E=82=E7=9B=B4=E5=B1=85=E4=B8=AD=EF=BC=8C=E4=B8=8E=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6=E6=94=BE=E5=9C=A8?=
 =?UTF-8?q?=E4=B8=80=E8=B5=B7=E6=98=BE=E7=A4=BA=E5=BE=88=E4=B8=8D=E5=8D=8F?=
 =?UTF-8?q?=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/frontend/src/components/widget/deWidget/DeNumberRange.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/frontend/src/components/widget/deWidget/DeNumberRange.vue b/core/frontend/src/components/widget/deWidget/DeNumberRange.vue
index 8606f386a3..c4ef17d931 100644
--- a/core/frontend/src/components/widget/deWidget/DeNumberRange.vue
+++ b/core/frontend/src/components/widget/deWidget/DeNumberRange.vue
@@ -311,6 +311,7 @@ export default {
     width: calc(50% - 10px) !important;
     display: inline-block;
     padding: 0 5px;
+    margin-bottom: 0;
   }
 }
 </style>

From 2c02f47a07191d691e4e60c13ebb67f3dea1d254 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 1 Nov 2023 14:53:13 +0800
Subject: [PATCH 08/13] =?UTF-8?q?fix:=20=E5=85=A8=E5=B1=8F=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E6=97=B6=E4=B8=8B=E6=8B=89=E6=A1=86=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=E9=94=99=E4=BD=8D=20#5532?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/components/editor/ComponentWrapper.vue          | 6 +++---
 core/frontend/src/views/chart/view/TitleRemark.vue         | 4 ++--
 core/frontend/src/views/panel/list/PanelViewShow.vue       | 7 +------
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/core/frontend/src/components/canvas/components/editor/ComponentWrapper.vue b/core/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
index 1059a9408c..2145c143ef 100644
--- a/core/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
+++ b/core/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
@@ -386,9 +386,9 @@ export default {
   height: 100% !important;
 }
 
-.component-outer {
-  transform: translate(0);
-}
+// .component-outer {
+//   transform: translate(0);
+// }
 
 .component-active {
   z-index: 1;
diff --git a/core/frontend/src/views/chart/view/TitleRemark.vue b/core/frontend/src/views/chart/view/TitleRemark.vue
index 83d29b96c7..b17f7728e8 100644
--- a/core/frontend/src/views/chart/view/TitleRemark.vue
+++ b/core/frontend/src/views/chart/view/TitleRemark.vue
@@ -1,5 +1,6 @@
 <template>
-  <span style="transform: translate(0);">
+  <span style="transform: translate(0);display: inline-block;position: relative;
+    z-index: 10;">
     <el-popover
       placement="bottom"
       trigger="hover"
@@ -75,7 +76,6 @@ export default {
   padding: 0;
   border: none;
   margin-top: 8px!important;
-  background: transparent;
   top: 22px !important;
 }
 </style>
diff --git a/core/frontend/src/views/panel/list/PanelViewShow.vue b/core/frontend/src/views/panel/list/PanelViewShow.vue
index 3a68ffd854..2076688bcd 100644
--- a/core/frontend/src/views/panel/list/PanelViewShow.vue
+++ b/core/frontend/src/views/panel/list/PanelViewShow.vue
@@ -932,13 +932,8 @@ export default {
     top: inherit !important;
     left: inherit !important;
   }
-  .el-tree-select-popper {
-    left: 0 !important;
-    top: inherit !important;
-  }
 
-  .track-menu,
-  .coustom-date-picker {
+  .track-menu {
     left: inherit !important;
   }
 }

From 75e715544b9ae94b45749bc7d1e9897b9baffbfe Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 1 Nov 2023 16:44:02 +0800
Subject: [PATCH 09/13] =?UTF-8?q?fix:=20=E9=80=89=E9=A1=B9=E5=8D=A1?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=9C=A8=E5=88=9B=E5=BB=BA=E5=A4=9A=E4=B8=AA?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=97=B6=E7=AC=AC=E4=B8=80=E4=B8=AA=E5=92=8C?=
 =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E4=B8=AA=E6=A0=87=E7=AD=BE=E8=A2=AB=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/dataeaseTabs/index.vue     |  1 +
 .../src/components/widget/deWidget/DeTabs.vue | 24 +++++++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/core/frontend/src/components/dataeaseTabs/index.vue b/core/frontend/src/components/dataeaseTabs/index.vue
index 08afcceafa..3fd408fb59 100644
--- a/core/frontend/src/components/dataeaseTabs/index.vue
+++ b/core/frontend/src/components/dataeaseTabs/index.vue
@@ -1,5 +1,6 @@
 <template>
   <el-tabs
+    ref="tabsConstom"
     :class="['de-tabs',...tabClassName]"
     :style="tabStyle"
     v-bind="$attrs"
diff --git a/core/frontend/src/components/widget/deWidget/DeTabs.vue b/core/frontend/src/components/widget/deWidget/DeTabs.vue
index 223493b866..fd423cf34f 100644
--- a/core/frontend/src/components/widget/deWidget/DeTabs.vue
+++ b/core/frontend/src/components/widget/deWidget/DeTabs.vue
@@ -1,13 +1,14 @@
 <template>
   <div
     class="de-tabs-div"
-    :class="headClass"
+    :class="[headClass, headClassScroll]"
   >
     <div
       v-if="maskShow"
       class="frame-mask edit-mask"
     />
     <dataease-tabs
+      ref="deTabsConstom"
       v-model="activeTabName"
       type="card"
       style-type="radioGroup"
@@ -228,7 +229,7 @@ import { getNowCanvasComponentData } from '@/components/canvas/utils/utils'
 import DeCanvasTab from '@/components/canvas/DeCanvas'
 import Preview from '@/components/canvas/components/editor/Preview'
 import TextAttr from '@/components/canvas/components/TextAttr'
-
+import _ from 'lodash'
 export default {
   name: 'DeTabs',
   components: { TextAttr, Preview, DeCanvasTab, TabUseList, ViewSelect, DataeaseTabs },
@@ -294,6 +295,7 @@ export default {
         'de-stream-media',
         'de-frame'
       ],
+      headClassScroll: 'head-class-scroll',
       activeTabName: null,
       tabIndex: 1,
       dialogVisible: false,
@@ -400,6 +402,14 @@ export default {
     }
   },
   watch: {
+    'outStyle.width': {
+      handler() {
+        this.setTabLayout()
+      }
+    },
+    headClass() {
+      this.setTabLayout()
+    },
     'element.style.carouselEnable': {
       handler(newVal, oldVla) {
         this.initCarousel()
@@ -471,11 +481,15 @@ export default {
   mounted() {
     this.initCarousel()
     this.calcTabLength()
+    this.setTabLayout()
   },
   beforeDestroy() {
     bus.$off('add-new-tab', this.addNewTab)
   },
   methods: {
+    setTabLayout: _.debounce(function() {
+      this.headClassScroll = !!this.$refs.deTabsConstom.$refs.tabsConstom.$refs.nav.scrollable && 'head-class-scroll'
+    }, 100),
     calcTabLength(){
       this.$nextTick(()=>{
         if(this.element.options.tabList.length>1){
@@ -695,9 +709,11 @@ export default {
       }
       this.$store.dispatch('chart/setViewId', null)
       this.styleChange()
+      this.setTabLayout()
     },
     addTab() {
       this.addNewTab(this.element.id)
+      this.setTabLayout()
     },
 
     addNewTab(componentId) {
@@ -783,6 +799,10 @@ export default {
   justify-content: center;
 }
 
+.head-class-scroll ::v-deep .el-tabs__nav-scroll {
+  display: block !important;
+}
+
 .frame-mask {
   display: flex;
   opacity: 0;

From 54006b924adcf89eff53fb5a26d7f7abc5329363 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Thu, 2 Nov 2023 13:58:25 +0800
Subject: [PATCH 10/13] =?UTF-8?q?fix:=20SQL=E6=95=B0=E6=8D=AE=E9=9B=86?=
 =?UTF-8?q?=E8=BF=9B=E5=85=A5=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E9=A9=AC?=
 =?UTF-8?q?=E4=B8=8A=E7=82=B9=E5=87=BB=E4=BF=9D=E5=AD=98=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=EF=BC=8C=E4=BF=9D=E5=AD=98=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=81=A2=E5=A4=8D=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/frontend/src/views/dataset/Form.vue          | 8 ++++----
 core/frontend/src/views/dataset/add/AddApi.vue    | 1 +
 core/frontend/src/views/dataset/add/AddCustom.vue | 1 +
 core/frontend/src/views/dataset/add/AddDB.vue     | 1 +
 core/frontend/src/views/dataset/add/AddExcel.vue  | 1 +
 core/frontend/src/views/dataset/add/AddSQL.vue    | 7 +++++--
 core/frontend/src/views/dataset/add/AddUnion.vue  | 1 +
 7 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/core/frontend/src/views/dataset/Form.vue b/core/frontend/src/views/dataset/Form.vue
index c2732e9f32..325e965cb3 100644
--- a/core/frontend/src/views/dataset/Form.vue
+++ b/core/frontend/src/views/dataset/Form.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="de-dataset-form">
-    <div class="top" v-loading="loading">
+    <div v-loading="saveDisabled" class="top">
       <span class="name">
         <i
           class="el-icon-arrow-left"
@@ -41,7 +41,7 @@
         >{{ $t('deDataset.selected') }} {{ tableNum }}
           {{ ['excel'].includes(datasetType) ? $t('deDataset.table') : $t('deDataset.item') }}</span>
         <deBtn
-          :disabled="['db', 'excel', 'api', 'union'].includes(datasetType) && !tableNum"
+          :disabled="(['db', 'excel', 'api', 'union'].includes(datasetType) && !tableNum)"
           type="primary"
           @click="datasetSave"
         >{{
@@ -56,8 +56,8 @@
         :param="table"
         :origin-name="originName"
         :name-list="nameList"
+        @setSaveDisabled="(val) => (saveDisabled = val)"
         @setTableNum="(val) => (tableNum = val)"
-        @datasourceLoading="(val) => loading = val"
       />
     </div>
   </div>
@@ -79,8 +79,8 @@ export default {
   data() {
     return {
       originName: '',
+      saveDisabled: true,
       tableNum: 0,
-      loading: false,
       showInput: false,
       editType: '',
       selectDatasets: [],
diff --git a/core/frontend/src/views/dataset/add/AddApi.vue b/core/frontend/src/views/dataset/add/AddApi.vue
index 0b90528090..6a0b73606b 100644
--- a/core/frontend/src/views/dataset/add/AddApi.vue
+++ b/core/frontend/src/views/dataset/add/AddApi.vue
@@ -321,6 +321,7 @@ export default {
     this.initDataSource()
     window.addEventListener('resize', this.calHeight)
     this.calHeight()
+    this.$emit('setSaveDisabled', false)
   },
   activated() {
     this.initDataSource()
diff --git a/core/frontend/src/views/dataset/add/AddCustom.vue b/core/frontend/src/views/dataset/add/AddCustom.vue
index e336ce4bb0..81c9ec38db 100644
--- a/core/frontend/src/views/dataset/add/AddCustom.vue
+++ b/core/frontend/src/views/dataset/add/AddCustom.vue
@@ -152,6 +152,7 @@ export default {
       this.getCustomTable()
       this.getUnionData()
     }
+    this.$emit('setSaveDisabled', false)
   },
   methods: {
     calHeight() {
diff --git a/core/frontend/src/views/dataset/add/AddDB.vue b/core/frontend/src/views/dataset/add/AddDB.vue
index c8f22d37b4..ae6e540b6e 100644
--- a/core/frontend/src/views/dataset/add/AddDB.vue
+++ b/core/frontend/src/views/dataset/add/AddDB.vue
@@ -343,6 +343,7 @@ export default {
     this.initDataSource()
     window.addEventListener('resize', this.calHeight)
     this.calHeight()
+    this.$emit('setSaveDisabled', false)
   },
   activated() {
     this.initDataSource()
diff --git a/core/frontend/src/views/dataset/add/AddExcel.vue b/core/frontend/src/views/dataset/add/AddExcel.vue
index 66aee823ff..a16422a4e0 100644
--- a/core/frontend/src/views/dataset/add/AddExcel.vue
+++ b/core/frontend/src/views/dataset/add/AddExcel.vue
@@ -316,6 +316,7 @@ export default {
   mounted() {
     window.addEventListener('resize', this.calHeight)
     this.calHeight()
+    this.$emit('setSaveDisabled', false)
   },
   created() {
     if (!this.param.tableId) {
diff --git a/core/frontend/src/views/dataset/add/AddSQL.vue b/core/frontend/src/views/dataset/add/AddSQL.vue
index 74d2b29c3f..2d76414a4e 100644
--- a/core/frontend/src/views/dataset/add/AddSQL.vue
+++ b/core/frontend/src/views/dataset/add/AddSQL.vue
@@ -905,8 +905,11 @@ export default {
 
     initTableInfo() {
       const tableId = this.param.tableId || this.$route.query.id
+      if (!tableId) {
+        this.$emit('setSaveDisabled', false)
+        return
+      }
       if (tableId) {
-        this.$emit('datasourceLoading', true)
         getTable(tableId).then((response) => {
           const table = response.data
           this.dataSource = table.dataSourceId
@@ -922,7 +925,7 @@ export default {
           }
           this.variables = JSON.parse(table.sqlVariableDetails)
         }).finally(() => {
-          this.$emit('datasourceLoading', false)
+          this.$emit('setSaveDisabled', false)
         })
       }
     },
diff --git a/core/frontend/src/views/dataset/add/AddUnion.vue b/core/frontend/src/views/dataset/add/AddUnion.vue
index afd8e8b94f..9e551bbd9b 100644
--- a/core/frontend/src/views/dataset/add/AddUnion.vue
+++ b/core/frontend/src/views/dataset/add/AddUnion.vue
@@ -229,6 +229,7 @@ export default {
   },
   mounted() {
     this.initTableData()
+    this.$emit('setSaveDisabled', false)
   },
   methods: {
     mousedownDrag() {

From 01cce13e3eb83194f15467a7ce98ec1bb4a3e8c2 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Fri, 3 Nov 2023 10:00:40 +0800
Subject: [PATCH 11/13] =?UTF-8?q?fix:=20SQL=E6=95=B0=E6=8D=AE=E9=9B=86?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E9=A2=84=E8=A7=88=E5=8F=B3?=
 =?UTF-8?q?=E4=BE=A7=E4=B8=8B=E6=8B=89=E6=A1=86=E7=A9=BA=E7=99=BD=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/frontend/src/views/dataset/add/AddSQL.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/frontend/src/views/dataset/add/AddSQL.vue b/core/frontend/src/views/dataset/add/AddSQL.vue
index 2d76414a4e..cc8b7f007a 100644
--- a/core/frontend/src/views/dataset/add/AddSQL.vue
+++ b/core/frontend/src/views/dataset/add/AddSQL.vue
@@ -274,7 +274,7 @@
               :description="$t('deDataset.run_failed')"
             >{{ errMsgCont }}
             </el-empty>
-            <div style="float: left" v-else-if="fields.length">
+            <div style="float: left; min-width: 100%;" v-else-if="fields.length">
               <el-table
               :data="plxTableData"
               size="mini"

From 11743009b998a213a5d73ff9ca6efe639d653de8 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Fri, 3 Nov 2023 10:57:39 +0800
Subject: [PATCH 12/13] =?UTF-8?q?fix:=20=E6=96=B0=E5=BB=BA=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=BA=90URL=E9=80=80=E5=87=BA=E5=90=8E=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8URL=E7=99=BB=E9=99=86=E7=B1=BB=E5=9E=8B=E4=B8=A2?=
 =?UTF-8?q?=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/frontend/src/permission.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/frontend/src/permission.js b/core/frontend/src/permission.js
index 3358904ec1..f16fefd7a3 100644
--- a/core/frontend/src/permission.js
+++ b/core/frontend/src/permission.js
@@ -141,7 +141,7 @@ router.beforeEach(async (to, from, next) => routeBefore(() => {
       next()
     } else {
       // other pages that do not have permission to access are redirected to the login page.
-      next(`/login?redirect=${to.fullPath}`)
+      next(`/login?redirect=${encodeURIComponent(to.fullPath)}`)
       NProgress.done()
     }
   }

From 830fb029bba2b21d1f1f377624124d6fa763ad5d Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Fri, 3 Nov 2023 12:01:47 +0800
Subject: [PATCH 13/13] =?UTF-8?q?fix:=20=E5=A4=9A=E9=80=89=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=B7=B1=E8=89=B2=E8=83=8C=E6=99=AF=E4=B8=8B=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E4=B8=BA=E7=99=BD=E8=89=B2=EF=BC=8C=E5=BB=BA=E8=AE=AE?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/frontend/src/components/elVisualSelect/index.vue  | 10 +++++++---
 .../src/components/widget/deWidget/DeSelect.vue        |  6 ++++++
 .../src/views/panel/filter/filterMain/FilterFoot.vue   |  1 +
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/core/frontend/src/components/elVisualSelect/index.vue b/core/frontend/src/components/elVisualSelect/index.vue
index 326c5af39d..a4b83b659d 100644
--- a/core/frontend/src/components/elVisualSelect/index.vue
+++ b/core/frontend/src/components/elVisualSelect/index.vue
@@ -22,7 +22,8 @@
         v-customStyle="customStyle"
         :indeterminate="isIndeterminate"
         @change="selectAllChange"
-      >{{ $t('dataset.check_all') }}
+      >
+      <span :style="{ color: `${isConfig ? '#1F2329' : customStyle.wordColor} !important`}">{{ $t('dataset.check_all') }}</span>
       </el-checkbox>
     </p>
     <el-option
@@ -39,7 +40,6 @@
 
 <script>
 import { handlerInputStyle } from '@/components/widget/deWidget/serviceNameFn.js'
-
 import { uuid } from 'vue-uuid'
 
 export default {
@@ -69,6 +69,10 @@ export default {
       type: [String, Number, Array],
       default: ''
     },
+    isConfig: {
+      type: Boolean,
+      default: false
+    },
     keyWord: {
       type: String,
       default: ''
@@ -181,7 +185,7 @@ export default {
       this.options = this.newList.slice(0, this.maxLength)
     },
     customInputStyle() {
-      if (!this.$parent.$parent.handlerInputStyle || !this.$refs.visualSelect) return
+      if (!this.$parent.$parent.handlerInputStyle || !this.$refs.visualSelect || this.isConfig) return
       handlerInputStyle(this.$refs.visualSelect.$el.querySelector('.el-input__inner'), this.$parent.element.style)
       handlerInputStyle(this.$refs.visualSelect.$el.querySelector('.el-select__input'), { wordColor: this.$parent.element.style.wordColor })
     },
diff --git a/core/frontend/src/components/widget/deWidget/DeSelect.vue b/core/frontend/src/components/widget/deWidget/DeSelect.vue
index 666ee8bab7..1aa8f2ba68 100644
--- a/core/frontend/src/components/widget/deWidget/DeSelect.vue
+++ b/core/frontend/src/components/widget/deWidget/DeSelect.vue
@@ -16,6 +16,7 @@
     :key-word="keyWord"
     popper-class="coustom-de-select"
     :list="data"
+    :is-config="isConfig"
     @resetKeyWords="filterMethod"
     :custom-style="customStyle"
     @change="changeValue"
@@ -66,6 +67,10 @@ export default {
       type: Boolean,
       default: true
     },
+    isConfig: {
+      type: Boolean,
+      default: false
+    },
     inScreen: {
       type: Boolean,
       required: false,
@@ -274,6 +279,7 @@ export default {
       // this.onFocus = false
     },
     handleElTagStyle() {
+      if (this.isConfig) return
       setTimeout(() => {
         this.$refs['deSelect'] && this.$refs['deSelect'].$el && textSelectWidget(this.$refs['deSelect'].$el, this.element.style)
       }, 500)
diff --git a/core/frontend/src/views/panel/filter/filterMain/FilterFoot.vue b/core/frontend/src/views/panel/filter/filterMain/FilterFoot.vue
index 515cd771dd..998cff9015 100644
--- a/core/frontend/src/views/panel/filter/filterMain/FilterFoot.vue
+++ b/core/frontend/src/views/panel/filter/filterMain/FilterFoot.vue
@@ -15,6 +15,7 @@
               :id="'component' + element.id"
               class="component"
               :style="element.style"
+              is-config
               :element="element"
               :in-draw="false"
             />