diff --git a/core/frontend/src/components/canvas/components/editor/ComponentWrapper.vue b/core/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
index 721904e056..ebcfcf0084 100644
--- a/core/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
+++ b/core/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
@@ -387,9 +387,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/components/dataease/DeOutWidget.vue b/core/frontend/src/components/dataease/DeOutWidget.vue
index de71cebda8..6daf889bd6 100644
--- a/core/frontend/src/components/dataease/DeOutWidget.vue
+++ b/core/frontend/src/components/dataease/DeOutWidget.vue
@@ -212,7 +212,6 @@ export default {
         if (!this.titleStyle) {
           this.titleStyle = {}
         }
-        this.titleStyle.marginTop = '-20px'
       }
     },
     getCondition() {
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/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/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>
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/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;
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;
diff --git a/core/frontend/src/lang/en.js b/core/frontend/src/lang/en.js
index 934c318c46..5fe31acd2d 100644
--- a/core/frontend/src/lang/en.js
+++ b/core/frontend/src/lang/en.js
@@ -2430,6 +2430,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 d940fefc30..24dc04c877 100644
--- a/core/frontend/src/lang/tw.js
+++ b/core/frontend/src/lang/tw.js
@@ -2424,6 +2424,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 818a608ef0..4126cbe1ae 100644
--- a/core/frontend/src/lang/zh.js
+++ b/core/frontend/src/lang/zh.js
@@ -2424,6 +2424,7 @@ export default {
     webFormat: '请输入以[https://或http://]开头的正确网址'
   },
   auth: {
+    selct_filter_fields: '请选择筛选字段',
     no_item_selected: '请在左侧选择组织、角色或用户',
     no_resource_selected: '请在左侧选择资源',
     search_pre: '通过',
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()
     }
   }
diff --git a/core/frontend/src/views/chart/components/map/MapLayerController.vue b/core/frontend/src/views/chart/components/map/MapLayerController.vue
index 5423511f43..0d303921e3 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="left-start"
+    placement="left"
     title=""
     width="150"
     :append-to-body="false"
diff --git a/core/frontend/src/views/chart/view/TitleRemark.vue b/core/frontend/src/views/chart/view/TitleRemark.vue
index 2d6beaa0b2..b17f7728e8 100644
--- a/core/frontend/src/views/chart/view/TitleRemark.vue
+++ b/core/frontend/src/views/chart/view/TitleRemark.vue
@@ -1,9 +1,11 @@
 <template>
-  <span>
+  <span style="transform: translate(0);display: inline-block;position: relative;
+    z-index: 10;">
     <el-popover
       placement="bottom"
       trigger="hover"
       width="300"
+      :append-to-body="false"
       popper-class="remark-pop"
       :visible-arrow="false"
     >
@@ -74,6 +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/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 d7ef3e36e3..ae6e540b6e 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) => {
@@ -340,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 895ed1c28d..2ef54cc9a2 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"
@@ -914,8 +914,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
@@ -931,7 +934,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() {
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"
             />
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;
   }
 }