From 7cd4d99b58d61499e090887d45d10535a7c0d9ed Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 7 Nov 2023 12:31:00 +0800
Subject: [PATCH 01/25] =?UTF-8?q?feat:=20=E6=96=87=E6=9C=AC=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E9=80=89=E6=8B=A9=E9=A6=96=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/editor/ComponentWrapper.vue    |  4 ++
 .../canvas/components/editor/Preview.vue      |  6 +-
 .../canvas/customComponent/UserView.vue       | 18 +++++-
 .../src/components/dataease/DeOutWidget.vue   |  4 ++
 .../components/widget/deWidget/DeSelect.vue   | 20 +++++-
 .../serviceImpl/TextSelectServiceImpl.js      |  9 ++-
 core/frontend/src/utils/conditionUtil.js      | 63 ++++++++++++++++---
 .../src/views/panel/filter/FilterDialog.vue   |  5 +-
 .../panel/filter/filterMain/FilterFoot.vue    | 20 +++++-
 9 files changed, 131 insertions(+), 18 deletions(-)

diff --git a/core/frontend/src/components/canvas/components/editor/ComponentWrapper.vue b/core/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
index ebcfcf0084..b67ff70527 100644
--- a/core/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
+++ b/core/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
@@ -48,6 +48,7 @@
         :h="config.style.height"
         :search-count="searchCount"
         :canvas-id="canvasId"
+        @filter-loaded="filterLoaded"
       />
       <component
         :is="config.component"
@@ -235,6 +236,9 @@ export default {
     runAnimation(this.$el, this.config.animations)
   },
   methods: {
+    filterLoaded(p) {
+      this.$emit('filter-loaded', p)
+    },
     getComponentId() {
       return this.config.id
     },
diff --git a/core/frontend/src/components/canvas/components/editor/Preview.vue b/core/frontend/src/components/canvas/components/editor/Preview.vue
index aa4edd1aa2..f4256c5fa8 100644
--- a/core/frontend/src/components/canvas/components/editor/Preview.vue
+++ b/core/frontend/src/components/canvas/components/editor/Preview.vue
@@ -59,6 +59,7 @@
           :screen-shot="screenShot"
           :canvas-style-data="canvasStyleData"
           :show-position="showPosition"
+          @filter-loaded="filterLoaded"
         />
       </div>
     </div>
@@ -155,7 +156,7 @@ import eventBus from '@/components/canvas/utils/eventBus'
 import elementResizeDetectorMaker from 'element-resize-detector'
 import CanvasOptBar from '@/components/canvas/components/editor/CanvasOptBar'
 import bus from '@/utils/bus'
-import { buildFilterMap, buildViewKeyMap, formatCondition, valueValid, viewIdMatch } from '@/utils/conditionUtil'
+import { buildFilterMap, buildViewKeyMap, formatCondition, valueValid, viewIdMatch, buildAfterFilterLoaded } from '@/utils/conditionUtil'
 import { hasDataPermission } from '@/utils/permission'
 import { activeWatermark } from '@/components/canvas/tools/watermark'
 import { proxyUserLoginInfo, userLoginInfo } from '@/api/systemInfo/userLogin'
@@ -461,6 +462,9 @@ export default {
     bus.$off('trigger-reset-button', this.triggerResetButton)
   },
   methods: {
+    filterLoaded(p) {
+      buildAfterFilterLoaded(this.componentData, this.filterMap, p)
+    },
     getWrapperChildRefs() {
       return this.$refs['viewWrapperChild']
     },
diff --git a/core/frontend/src/components/canvas/customComponent/UserView.vue b/core/frontend/src/components/canvas/customComponent/UserView.vue
index 28b88e8b10..becace60e6 100644
--- a/core/frontend/src/components/canvas/customComponent/UserView.vue
+++ b/core/frontend/src/components/canvas/customComponent/UserView.vue
@@ -599,7 +599,23 @@ export default {
     this.refId = uuid.v1
     if (this.element && this.element.propValue && this.element.propValue.viewId) {
       // 如果watch.filters 已经进行数据初始化时候，此处放弃数据初始化
-
+      const unReadyList = []
+      const readyList = []
+      this.filters.forEach(f => {
+        if (f instanceof Promise) {
+          unReadyList.push(f)
+        } else {
+          readyList.push(f)
+        }
+      })
+      if (unReadyList.length) {
+        Promise.all(this.filters.filter(f => f instanceof Promise)).then(fList => {
+          readyList.concat(fList)
+          this.filter.filters = readyList
+          this.getData(this.element.propValue.viewId, false)
+        })
+        return
+      }
       this.getData(this.element.propValue.viewId, false)
     }
   },
diff --git a/core/frontend/src/components/dataease/DeOutWidget.vue b/core/frontend/src/components/dataease/DeOutWidget.vue
index 6daf889bd6..3b7cbd8e73 100644
--- a/core/frontend/src/components/dataease/DeOutWidget.vue
+++ b/core/frontend/src/components/dataease/DeOutWidget.vue
@@ -49,6 +49,7 @@
                 :element="element"
                 :in-draw="inDraw"
                 :in-screen="inScreen"
+                @filter-loaded="filterLoaded"
               />
             </div>
           </div>
@@ -180,6 +181,9 @@ export default {
     this.$set(this.element.style, 'innerBgColor', innerBgColor || '')
   },
   methods: {
+    filterLoaded(p) {
+      this.$emit('filter-loaded', p)
+    },
     getComponentId() {
       return this.element.id
     },
diff --git a/core/frontend/src/components/widget/deWidget/DeSelect.vue b/core/frontend/src/components/widget/deWidget/DeSelect.vue
index 1aa8f2ba68..1a00faf14b 100644
--- a/core/frontend/src/components/widget/deWidget/DeSelect.vue
+++ b/core/frontend/src/components/widget/deWidget/DeSelect.vue
@@ -133,6 +133,9 @@ export default {
     },
     isCustomSortWidget() {
       return this.element.serviceName === 'textSelectWidget'
+    },
+    selectFirst() {
+      return this.element.serviceName === 'textSelectWidget' && this.element.options.attrs.selectFirst
     }
   },
 
@@ -286,16 +289,26 @@ export default {
     },
     initLoad() {
       this.value = this.fillValueDerfault()
-      this.initOptions()
-      if (this.element.options.value) {
+      this.initOptions(this.fillFirstSelected)
+      if (this.element.options.value && !this.selectFirst) {
         this.value = this.fillValueDerfault()
         this.changeValue(this.value)
       }
     },
+    fillFirstSelected() {
+      if (this.selectFirst && this.data?.length) {
+        this.element.options.value = this.data[0]['id']
+        this.value = this.fillValueDerfault()
+        this.$emit('filter-loaded', {
+          componentId: this.element.id,
+          val: this.value
+        })
+      }
+    },
     refreshLoad() {
       this.initOptions()
     },
-    initOptions() {
+    initOptions(cb) {
       this.data = []
       if (this.element.options.attrs.fieldId) {
         let method = multFieldValues
@@ -310,6 +323,7 @@ export default {
         }).then(res => {
           this.data = this.optionData(res.data)
           bus.$emit('valid-values-change', true)
+          cb && cb()
         }).catch(e => {
           bus.$emit('valid-values-change', false)
         })
diff --git a/core/frontend/src/components/widget/serviceImpl/TextSelectServiceImpl.js b/core/frontend/src/components/widget/serviceImpl/TextSelectServiceImpl.js
index 3d052e2823..455db68835 100644
--- a/core/frontend/src/components/widget/serviceImpl/TextSelectServiceImpl.js
+++ b/core/frontend/src/components/widget/serviceImpl/TextSelectServiceImpl.js
@@ -87,8 +87,13 @@ class TextSelectServiceImpl extends WidgetService {
     })
   }
 
-  getParam(element) {
-    const value = this.fillValueDerfault(element)
+  getParam(element, val) {
+    let value = null
+    if (!val) {
+      value = this.fillValueDerfault(element)
+    } else {
+      value = [val]
+    }
     const param = {
       component: element,
       value: !value ? [] : Array.isArray(value) ? value : value.toString().split(','),
diff --git a/core/frontend/src/utils/conditionUtil.js b/core/frontend/src/utils/conditionUtil.js
index 56a91e9b68..4a4d170278 100644
--- a/core/frontend/src/utils/conditionUtil.js
+++ b/core/frontend/src/utils/conditionUtil.js
@@ -79,6 +79,7 @@ export const buildViewKeyFilters = (panelItems, result) => {
     if (element.type !== 'custom') {
       return true
     }
+    const selectFirst = element.serviceName === 'textSelectWidget' && element.options.attrs.selectFirst
 
     let param = null
     const widget = ApplicationContext.getService(element.serviceName)
@@ -88,15 +89,28 @@ export const buildViewKeyFilters = (panelItems, result) => {
     const filterComponentId = condition.componentId
     Object.keys(result).forEach(viewId => {
       const vidMatch = viewIdMatch(condition.viewIds, viewId)
-      const viewFilters = result[viewId]
-      let j = viewFilters.length
-      while (j--) {
-        const filter = viewFilters[j]
-        if (filter.componentId === filterComponentId) {
-          viewFilters.splice(j, 1)
+      if (vidMatch && selectFirst) {
+        
+        const promise = new Promise(resolve => {
+          cbParam => {
+            const newCondition = buildAfterFilterLoaded1(element, cbParam)
+            resolve(newCondition)
+          }
+        })
+        promise.componentId = filterComponentId
+        // promise.cb = 
+        result[viewId].push(promise)
+      } else {
+        const viewFilters = result[viewId]
+        let j = viewFilters.length
+        while (j--) {
+          const filter = viewFilters[j]
+          if (filter.componentId === filterComponentId) {
+            viewFilters.splice(j, 1)
+          }
         }
+        vidMatch && vValid && viewFilters.push(condition)
       }
-      vidMatch && vValid && viewFilters.push(condition)
     })
   })
   return result
@@ -108,6 +122,41 @@ export const buildFilterMap = panelItems => {
   return result
 }
 
+const getElementById = (componentId, panelItems) => {
+  for (let index = 0; index < panelItems.length; index++) {
+    const element = panelItems[index]
+    if (element.id === componentId) {
+      return element
+    }
+  }
+  return null
+}
+const buildAfterFilterLoaded1 = (element, p) => {
+  const widget = ApplicationContext.getService(element.serviceName)
+  const param = widget.getParam(element, p.val)
+  const condition = formatCondition(param)
+  return condition
+}
+export const buildAfterFilterLoaded = (panelItems, originMap, p) => {
+  const componentId = p.componentId
+  const element = getElementById(componentId, panelItems)
+  let param = null
+  const widget = ApplicationContext.getService(element.serviceName)
+  param = widget.getParam(element, p.val)
+  const condition = formatCondition(param)
+  const vValid = valueValid(condition)
+  Object.keys(originMap).forEach(viewId => {
+    const conditions = originMap[viewId]
+    if (conditions?.length) {
+      conditions.forEach(condition => {
+        if (condition instanceof Promise && condition.componentId === componentId && vValid) {
+          condition.resolve(condition)
+        }
+      })
+    }
+  })
+}
+
 export const fillElementsFilter = (panelItems, filterMap) => {
   panelItems.forEach(element => {
     if (element.type === 'view') {
diff --git a/core/frontend/src/views/panel/filter/FilterDialog.vue b/core/frontend/src/views/panel/filter/FilterDialog.vue
index 457650e75b..3d4b187d4f 100644
--- a/core/frontend/src/views/panel/filter/FilterDialog.vue
+++ b/core/frontend/src/views/panel/filter/FilterDialog.vue
@@ -278,7 +278,10 @@
           :active-name="activeName"
         />
 
-        <filter-foot :element="currentElement" />
+        <filter-foot
+          :element="currentElement"
+          :control-attrs="myAttrs"
+        />
 
       </div>
     </de-main-container>
diff --git a/core/frontend/src/views/panel/filter/filterMain/FilterFoot.vue b/core/frontend/src/views/panel/filter/filterMain/FilterFoot.vue
index 998cff9015..85a8b39a2a 100644
--- a/core/frontend/src/views/panel/filter/filterMain/FilterFoot.vue
+++ b/core/frontend/src/views/panel/filter/filterMain/FilterFoot.vue
@@ -8,6 +8,14 @@
         >
           <div style="margin-bottom: 10px;">
             <span>{{ $t('dynamic_time.set_default') }}</span>
+
+            <el-checkbox
+              v-if="element.serviceName === 'textSelectWidget'"
+              v-model="element.options.attrs.selectFirst"
+              class="select-first-check"
+              @change="selectFirstChange"
+            >首项
+            </el-checkbox>
           </div>
           <div class="custom-component-class">
             <component
@@ -67,12 +75,15 @@ export default {
   },
   data() {
     return {
-
+      attrs: null
     }
   },
-
+  created() {
+  },
   methods: {
-
+    selectFirstChange(val) {
+      console.log(val)
+    }
   }
 }
 
@@ -91,5 +102,8 @@ export default {
     max-height: 100%;
     overflow-y: scroll;
   }
+  .select-first-check {
+    margin-left: 25px;
+  }
 
 </style>

From 3cfcd5461ae43ac18a69dad3db9a4f54e161cd7e Mon Sep 17 00:00:00 2001
From: xuwei-fit2cloud <wei@fit2cloud.com>
Date: Tue, 7 Nov 2023 17:30:39 +0800
Subject: [PATCH 02/25] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9healthcheck?=
 =?UTF-8?q?=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/installer/dataease/dectl b/installer/dataease/dectl
index fe90ff84b1..532d579a8c 100755
--- a/installer/dataease/dectl
+++ b/installer/dataease/dectl
@@ -60,7 +60,7 @@ function _healthcheck() {
    container_name=$(grep "container_name" $DE_BASE/dataease/docker-compose.yml | awk -F': ' '{print $2}')
    sleep 1
    if [ -z $(docker ps --filter "name=$container_name" -q) ];then
-      echo "未找到容器 $container_name，请检查配置文件。"
+      echo "未找到容器 $container_name。"
       exit 1
    fi
 

From 2d32f82c78a8095921dcad1d806fd535c1261dda Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 7 Nov 2023 17:38:53 +0800
Subject: [PATCH 03/25] =?UTF-8?q?perf:=20=E5=B0=9D=E8=AF=95=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E6=96=87=E6=9C=AC=E4=B8=8B=E6=8B=89=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/components/editor/DeEditor.vue     | 82 ++++++++++---------
 .../canvas/components/editor/Preview.vue      |  2 +-
 .../canvas/customComponent/UserView.vue       |  3 +-
 .../src/components/elVisualSelect/index.vue   | 13 ++-
 .../components/widget/deWidget/DeSelect.vue   | 38 +++++++--
 core/frontend/src/lang/en.js                  |  1 +
 core/frontend/src/lang/tw.js                  |  1 +
 core/frontend/src/lang/zh.js                  |  1 +
 core/frontend/src/utils/conditionUtil.js      | 38 +++------
 .../src/views/panel/filter/FilterDialog.vue   |  3 +
 .../panel/filter/filterMain/FilterFoot.vue    |  4 +-
 .../panel/filter/filterMain/FilterHead.vue    |  1 -
 .../src/views/panel/outerParamsSet/index.vue  |  5 +-
 .../system/sysParam/MapSetting/OnlineMap.vue  |  1 -
 14 files changed, 112 insertions(+), 81 deletions(-)

diff --git a/core/frontend/src/components/canvas/components/editor/DeEditor.vue b/core/frontend/src/components/canvas/components/editor/DeEditor.vue
index 1dfb9b573a..16a6b428fa 100644
--- a/core/frontend/src/components/canvas/components/editor/DeEditor.vue
+++ b/core/frontend/src/components/canvas/components/editor/DeEditor.vue
@@ -80,6 +80,7 @@
         :out-style="getShapeStyleInt(item.style)"
         :active="item === curComponent"
         :h="getShapeStyleIntDeDrag(item.style,'height')"
+        @filter-loaded="filterLoaded"
       />
       <component
         :is="item.component"
@@ -126,7 +127,7 @@
       :canvas-id="canvasId"
     />
     <!-- 右击菜单 -->
-    <ContextMenu/>
+    <ContextMenu />
 
     <!-- 对齐标线 -->
     <span
@@ -150,13 +151,13 @@
 </template>
 
 <script>
-import {mapState} from 'vuex'
+import { mapState } from 'vuex'
 import Shape from './Shape'
 import DeDrag from '@/components/deDrag'
 
 // eslint-disable-next-line no-unused-vars
-import {getComponentRotatedStyle, getStyle} from '@/components/canvas/utils/style'
-import {_$, imgUrlTrans} from '@/components/canvas/utils/utils'
+import { getComponentRotatedStyle, getStyle } from '@/components/canvas/utils/style'
+import { _$, imgUrlTrans } from '@/components/canvas/utils/utils'
 import ContextMenu from './ContextMenu'
 import MarkLine from './MarkLine'
 import Area from './Area'
@@ -164,19 +165,19 @@ import eventBus from '@/components/canvas/utils/eventBus'
 import Grid from './Grid'
 import PageLineEditor from './PageLineEditor'
 import PGrid from './PGrid'
-import {changeStyleWithScale} from '@/components/canvas/utils/translate'
+import { changeStyleWithScale } from '@/components/canvas/utils/translate'
 import UserViewDialog from '@/components/canvas/customComponent/UserViewDialog'
 import DeOutWidget from '@/components/dataease/DeOutWidget'
 import DragShadow from '@/components/deDrag/Shadow'
 import bus from '@/utils/bus'
 import LinkJumpSet from '@/views/panel/linkJumpSet'
-import {buildFilterMap, buildViewKeyMap, formatCondition, valueValid, viewIdMatch} from '@/utils/conditionUtil'
+import { buildFilterMap, buildViewKeyMap, formatCondition, valueValid, viewIdMatch, buildAfterFilterLoaded } from '@/utils/conditionUtil'
 // 挤占式画布
 import _ from 'lodash'
 import _jq from 'jquery'
 import Background from '@/views/background/index'
 import PointShadow from '@/components/deDrag/PointShadow'
-import {hexColorToRGBA} from "@/views/chart/chart/util";
+import { hexColorToRGBA } from '@/views/chart/chart/util'
 
 // let positionBox = []
 // let coordinates = [] // 坐标点集合
@@ -190,11 +191,11 @@ let itemMaxX = 0
 
 function debounce(func, time) {
   if (!isOverlay) {
-    (function (t) {
+    (function(t) {
       isOverlay = true
-      setTimeout(function () {
+      setTimeout(function() {
         t()
-        setTimeout(function () {
+        setTimeout(function() {
           isOverlay = false
           if (lastTask !== undefined) {
             debounce(lastTask, time)
@@ -319,10 +320,10 @@ function init() {
   resetPositionBox.call(this)
   initPosition(this)
   let i = 0
-  const timeid = setInterval(function () {
+  const timeid = setInterval(function() {
     if (i >= vm.yourList.length) {
       clearInterval(timeid)
-      vm.$nextTick(function () {
+      vm.$nextTick(function() {
         vm.moveAnimate = true
       })
     } else {
@@ -339,7 +340,7 @@ function resizePlayer(item, newSize) {
   removeItemFromPositionBox.call(vm, item)
 
   const belowItems = findBelowItems.call(this, item)
-  _.forEach(belowItems, function (upItem) {
+  _.forEach(belowItems, function(upItem) {
     const canGoUpRows = canItemGoUp.call(vm, upItem)
     if (canGoUpRows > 0) {
       moveItemUp.call(vm, upItem, canGoUpRows)
@@ -426,7 +427,7 @@ function movePlayer(item, position) {
   removeItemFromPositionBox.call(vm, item)
 
   const belowItems = findBelowItems.call(this, item)
-  _.forEach(belowItems, function (upItem) {
+  _.forEach(belowItems, function(upItem) {
     const canGoUpRows = canItemGoUp.call(vm, upItem)
     if (canGoUpRows > 0) {
       moveItemUp.call(vm, upItem, canGoUpRows)
@@ -452,7 +453,7 @@ function removeItem(index) {
     removeItemFromPositionBox.call(vm, item)
 
     const belowItems = findBelowItems.call(this, item)
-    _.forEach(belowItems, function (upItem) {
+    _.forEach(belowItems, function(upItem) {
       const canGoUpRows = canItemGoUp.call(vm, upItem)
       if (canGoUpRows > 0) {
         moveItemUp.call(vm, upItem, canGoUpRows)
@@ -544,7 +545,7 @@ function findClosetCoords(item, tCoord) {
     y: collisionsItem[0].coord.el.y
   })
 
-  setTimeout(function () {
+  setTimeout(function() {
     isOverlay = false
   }, 200)
 }
@@ -592,7 +593,7 @@ function changeItemCoord(item) {
     el: item
   }
 
-  const index = _.findIndex(vm.coordinates, function (o) {
+  const index = _.findIndex(vm.coordinates, function(o) {
     return o.el._dragId === item._dragId
   })
   if (index !== -1) {
@@ -609,7 +610,7 @@ function emptyTargetCell(item) {
   const vm = this
   const belowItems = findBelowItems.call(vm, item)
 
-  _.forEach(belowItems, function (downItem, index) {
+  _.forEach(belowItems, function(downItem, index) {
     if (downItem._dragId === item._dragId) return
     const moveSize = item.y + item.sizey - downItem.y
     if (moveSize > 0) {
@@ -649,7 +650,7 @@ function moveItemDown(item, size) {
   const vm = this
   removeItemFromPositionBox.call(vm, item)
   const belowItems = findBelowItems.call(vm, item)
-  _.forEach(belowItems, function (downItem, index) {
+  _.forEach(belowItems, function(downItem, index) {
     if (downItem._dragId === item._dragId) return
     const moveSize = calcDiff.call(vm, item, downItem, size)
     if (moveSize > 0) {
@@ -722,7 +723,7 @@ function moveItemUp(item, size) {
 
   changeItemCoord.call(this, item)
 
-  _.forEach(belowItems, function (upItem, index) {
+  _.forEach(belowItems, function(upItem, index) {
     const moveSize = canItemGoUp.call(vm, upItem)
     if (moveSize > 0) {
       moveItemUp.call(vm, upItem, moveSize)
@@ -806,19 +807,19 @@ export default {
     dragStart: {
       required: false,
       type: Function,
-      default: function () {
+      default: function() {
       }
     },
     dragging: {
       required: false,
       type: Function,
-      default: function () {
+      default: function() {
       }
     },
     dragEnd: {
       required: false,
       type: Function,
-      default: function () {
+      default: function() {
       }
     },
     resizable: {
@@ -829,19 +830,19 @@ export default {
     resizeStart: {
       required: false,
       type: Function,
-      default: function () {
+      default: function() {
       }
     },
     resizing: {
       required: false,
       type: Function,
-      default: function () {
+      default: function() {
       }
     },
     resizeEnd: {
       required: false,
       type: Function,
-      default: function () {
+      default: function() {
       }
     },
     matrixCount: {
@@ -1143,11 +1144,14 @@ export default {
   created() {
   },
   methods: {
+    filterLoaded(p) {
+      buildAfterFilterLoaded(this.filterMap, p)
+    },
     getWrapperChildRefs() {
       return this.$refs['wrapperChild']
     },
     getAllWrapperChildRefs() {
-      let allChildRefs = []
+      const allChildRefs = []
       const currentChildRefs = this.getWrapperChildRefs()
       if (currentChildRefs && currentChildRefs.length > 0) {
         allChildRefs.push.apply(allChildRefs, currentChildRefs)
@@ -1290,7 +1294,7 @@ export default {
       }
       return -1
     },
-    pluginEditHandler({e, id}) {
+    pluginEditHandler({ e, id }) {
       let index = -1
       for (let i = 0; i < this.componentData.length; i++) {
         const item = this.componentData[i]
@@ -1400,12 +1404,12 @@ export default {
     getSelectArea() {
       const result = []
       // 区域起点坐标
-      const {x, y} = this.start
+      const { x, y } = this.start
       // 计算所有的组件数据，判断是否在选中区域内
       this.componentData.forEach(component => {
         if (component.isLock) return
 
-        const {left, top, width, height} = component.style
+        const { left, top, width, height } = component.style
         if (x <= left && y <= top && (left + width <= x + this.width) && (top + height <= y + this.height)) {
           result.push(component)
         }
@@ -1461,7 +1465,7 @@ export default {
 
     getTextareaHeight(element, text) {
       // eslint-disable-next-line prefer-const
-      let {lineHeight, fontSize, height} = element.style
+      let { lineHeight, fontSize, height } = element.style
       if (lineHeight === '') {
         lineHeight = 1.5
       }
@@ -1552,7 +1556,7 @@ export default {
       }
     },
     getRefLineParams(params) {
-      const {vLine, hLine} = params
+      const { vLine, hLine } = params
       this.vLine = vLine
       this.hLine = hLine
     },
@@ -1705,8 +1709,8 @@ export default {
       newX = newX > 0 ? newX : 1
       newY = newY > 0 ? newY : 1
       if (item.sizex !== nowX || item.sizey !== nowY) {
-        debounce((function (newX, oldX, newY, oldY) {
-          return function () {
+        debounce((function(newX, oldX, newY, oldY) {
+          return function() {
             if (newX !== oldX || oldY !== newY) {
               movePlayer.call(vm, resizeItem, {
                 x: newX,
@@ -1742,8 +1746,8 @@ export default {
         return
       }
       if (newX !== oldX || oldY !== newY) {
-        debounce((function (newX, oldX, newY, oldY) {
-          return function () {
+        debounce((function(newX, oldX, newY, oldY) {
+          return function() {
             if (newX !== oldX || oldY !== newY) {
               movePlayer.call(vm, moveItem, {
                 x: newX,
@@ -1781,7 +1785,7 @@ export default {
       // 不使用copy 保持原有对象
       const finalList = []
       const _this = this
-      _.forEach(this.componentData, function (item, index) {
+      _.forEach(this.componentData, function(item, index) {
         if (_.isEmpty(item)) return
         if (_this.canvasId === item.canvasId) {
           delete item['_dragId']
@@ -1823,7 +1827,7 @@ export default {
     addItemBox(item) {
       this.yourList.push(item)
 
-      this.$nextTick(function () {
+      this.$nextTick(function() {
         addItem.call(this, item, this.yourList.length - 1)
       })
     },
@@ -1854,7 +1858,7 @@ export default {
     // 调整父级组件边界
     resizeParentBoundsRef() {
       const _this = this
-      _this.componentData.forEach(function (data, index) {
+      _this.componentData.forEach(function(data, index) {
         _this.$refs.deDragRef && _this.$refs.deDragRef[index] && _this.$refs.deDragRef[index].checkParentSize()
       })
     },
diff --git a/core/frontend/src/components/canvas/components/editor/Preview.vue b/core/frontend/src/components/canvas/components/editor/Preview.vue
index f4256c5fa8..835e6d7652 100644
--- a/core/frontend/src/components/canvas/components/editor/Preview.vue
+++ b/core/frontend/src/components/canvas/components/editor/Preview.vue
@@ -463,7 +463,7 @@ export default {
   },
   methods: {
     filterLoaded(p) {
-      buildAfterFilterLoaded(this.componentData, this.filterMap, p)
+      buildAfterFilterLoaded(this.filterMap, p)
     },
     getWrapperChildRefs() {
       return this.$refs['viewWrapperChild']
diff --git a/core/frontend/src/components/canvas/customComponent/UserView.vue b/core/frontend/src/components/canvas/customComponent/UserView.vue
index becace60e6..760d28f964 100644
--- a/core/frontend/src/components/canvas/customComponent/UserView.vue
+++ b/core/frontend/src/components/canvas/customComponent/UserView.vue
@@ -610,8 +610,7 @@ export default {
       })
       if (unReadyList.length) {
         Promise.all(this.filters.filter(f => f instanceof Promise)).then(fList => {
-          readyList.concat(fList)
-          this.filter.filters = readyList
+          this.filter.filter = readyList.concat(fList)
           this.getData(this.element.propValue.viewId, false)
         })
         return
diff --git a/core/frontend/src/components/elVisualSelect/index.vue b/core/frontend/src/components/elVisualSelect/index.vue
index a4b83b659d..31ee58e20d 100644
--- a/core/frontend/src/components/elVisualSelect/index.vue
+++ b/core/frontend/src/components/elVisualSelect/index.vue
@@ -7,7 +7,7 @@
     popper-class="VisualSelects coustom-de-select"
     no-match-text=" "
     reserve-keyword
-    clearable
+    :clearable="clearable"
     v-bind="$attrs"
     v-on="$listeners"
     @change="visualChange"
@@ -23,7 +23,7 @@
         :indeterminate="isIndeterminate"
         @change="selectAllChange"
       >
-      <span :style="{ color: `${isConfig ? '#1F2329' : customStyle.wordColor} !important`}">{{ $t('dataset.check_all') }}</span>
+        <span :style="{ color: `${isConfig ? '#1F2329' : customStyle.wordColor} !important`}">{{ $t('dataset.check_all') }}</span>
       </el-checkbox>
     </p>
     <el-option
@@ -32,6 +32,7 @@
       :label="item.text"
       :value="item.id"
       :class="setSelect(item.id)"
+      :disabled="itemDisabled"
     >
       <span :title="item.text">{{ item.text }}</span>
     </el-option>
@@ -76,6 +77,14 @@ export default {
     keyWord: {
       type: String,
       default: ''
+    },
+    itemDisabled: {
+      type: Boolean,
+      default: false
+    },
+    clearable: {
+      type: Boolean,
+      default: true
     }
   },
   data() {
diff --git a/core/frontend/src/components/widget/deWidget/DeSelect.vue b/core/frontend/src/components/widget/deWidget/DeSelect.vue
index 1a00faf14b..fd1f17830c 100644
--- a/core/frontend/src/components/widget/deWidget/DeSelect.vue
+++ b/core/frontend/src/components/widget/deWidget/DeSelect.vue
@@ -6,19 +6,20 @@
     v-model="value"
     :class-id="'visual-' + element.id + '-' + inDraw + '-' + inScreen"
     :collapse-tags="showNumber"
-    :clearable="!element.options.attrs.multiple"
+    :clearable="!element.options.attrs.multiple && (inDraw || !selectFirst)"
     :multiple="element.options.attrs.multiple"
     :placeholder="$t(element.options.attrs.placeholder) + placeholderSuffix"
     :popper-append-to-body="inScreen"
     :size="size"
     :filterable="true"
     :filter-method="filterMethod"
+    :item-disabled="!inDraw && selectFirst"
     :key-word="keyWord"
     popper-class="coustom-de-select"
     :list="data"
     :is-config="isConfig"
-    @resetKeyWords="filterMethod"
     :custom-style="customStyle"
+    @resetKeyWords="filterMethod"
     @change="changeValue"
     @focus="setOptionWidth"
     @blur="onBlur"
@@ -31,6 +32,7 @@
       :style="{width:selectOptionWidth}"
       :label="item[element.options.attrs.label]"
       :value="item[element.options.attrs.value]"
+      :disabled="!inDraw && selectFirst"
     >
       <span
         :title="item[element.options.attrs.label]"
@@ -142,6 +144,7 @@ export default {
   watch: {
     'viewIds': function(value, old) {
       if (typeof value === 'undefined' || value === old) return
+      this.value = this.fillFirstValue()
       this.setCondition()
     },
     'defaultValueStr': function(value, old) {
@@ -167,12 +170,18 @@ export default {
       this.element.options.attrs.fieldId.length > 0 &&
       method(param).then(res => {
         this.data = this.optionData(res.data)
+
         this.clearDefault(this.data)
+        this.fillFirstValue()
         bus.$emit('valid-values-change', true)
       }).catch(e => {
         bus.$emit('valid-values-change', false)
       }) || (this.element.options.value = '')
     },
+    'selectFirst': function(value, old) {
+      if (value === old) return
+      this.fillFirstValue()
+    },
     'element.options.attrs.multiple': function(value, old) {
       if (typeof old === 'undefined' || value === old) return
       if (!this.inDraw) {
@@ -182,6 +191,7 @@ export default {
 
       this.show = false
       this.$nextTick(() => {
+        this.fillFirstValue()
         this.show = true
         this.handleCoustomStyle()
       })
@@ -207,6 +217,7 @@ export default {
       method(param).then(res => {
         this.data = this.optionData(res.data)
         this.$nextTick(() => {
+          this.fillFirstValue()
           this.show = true
           this.handleCoustomStyle()
         })
@@ -288,7 +299,7 @@ export default {
       }, 500)
     },
     initLoad() {
-      this.value = this.fillValueDerfault()
+      // this.value = this.fillValueDerfault()
       this.initOptions(this.fillFirstSelected)
       if (this.element.options.value && !this.selectFirst) {
         this.value = this.fillValueDerfault()
@@ -297,8 +308,7 @@ export default {
     },
     fillFirstSelected() {
       if (this.selectFirst && this.data?.length) {
-        this.element.options.value = this.data[0]['id']
-        this.value = this.fillValueDerfault()
+        this.fillFirstValue()
         this.$emit('filter-loaded', {
           componentId: this.element.id,
           val: this.value
@@ -352,6 +362,10 @@ export default {
       this.setCondition()
       this.handleShowNumber()
     },
+    firstChange(value) {
+      this.setCondition()
+      this.handleShowNumber()
+    },
     handleShowNumber() {
       this.showNumber = false
 
@@ -391,6 +405,20 @@ export default {
       }
       return this.value.split(',')
     },
+    fillFirstValue() {
+      if (!this.selectFirst) {
+        return
+      }
+      const defaultV = this.data[0].id
+      if (this.element.options.attrs.multiple) {
+        if (defaultV === null || typeof defaultV === 'undefined' || defaultV === '' || defaultV === '[object Object]') return []
+        this.value = defaultV.split(this.separator)
+      } else {
+        if (defaultV === null || typeof defaultV === 'undefined' || defaultV === '' || defaultV === '[object Object]') return null
+        this.value = defaultV.split(this.separator)[0]
+      }
+      this.firstChange(this.value)
+    },
     fillValueDerfault() {
       const defaultV = this.element.options.value === null ? '' : this.element.options.value.toString()
       if (this.element.options.attrs.multiple) {
diff --git a/core/frontend/src/lang/en.js b/core/frontend/src/lang/en.js
index 5fe31acd2d..d1a55db15f 100644
--- a/core/frontend/src/lang/en.js
+++ b/core/frontend/src/lang/en.js
@@ -2024,6 +2024,7 @@ export default {
     back_parent: 'Back to previous'
   },
   panel: {
+    first_item: 'First item',
     forbidden_copy: 'Forbidden copy',
     url_check_error: 'Jump error, Illegal URL',
     view_style: 'View Style',
diff --git a/core/frontend/src/lang/tw.js b/core/frontend/src/lang/tw.js
index 24dc04c877..64afc32597 100644
--- a/core/frontend/src/lang/tw.js
+++ b/core/frontend/src/lang/tw.js
@@ -2018,6 +2018,7 @@ export default {
     back_parent: '返回上一級'
   },
   panel: {
+    first_item: '首項',
     forbidden_copy: '當前組件不允許復製',
     url_check_error: '跳轉錯誤，URL不合法',
     view_style: '視圖樣式',
diff --git a/core/frontend/src/lang/zh.js b/core/frontend/src/lang/zh.js
index 4126cbe1ae..ec312a6fab 100644
--- a/core/frontend/src/lang/zh.js
+++ b/core/frontend/src/lang/zh.js
@@ -2018,6 +2018,7 @@ export default {
     back_parent: '返回上一级'
   },
   panel: {
+    first_item: '首项',
     forbidden_copy: '当前组件不允许复制',
     url_check_error: '跳转错误，URL不合法',
     view_style: '视图样式',
diff --git a/core/frontend/src/utils/conditionUtil.js b/core/frontend/src/utils/conditionUtil.js
index 4a4d170278..62d38caa2a 100644
--- a/core/frontend/src/utils/conditionUtil.js
+++ b/core/frontend/src/utils/conditionUtil.js
@@ -70,6 +70,9 @@ export const buildViewKeyMap = panelItems => {
   return result
 }
 
+const cacheCondition = (cb, obj) => {
+  obj.cb = cb
+}
 export const buildViewKeyFilters = (panelItems, result) => {
   if (!(panelItems && panelItems.length > 0)) {
     return result
@@ -90,15 +93,15 @@ export const buildViewKeyFilters = (panelItems, result) => {
     Object.keys(result).forEach(viewId => {
       const vidMatch = viewIdMatch(condition.viewIds, viewId)
       if (vidMatch && selectFirst) {
-        
+        const obj = {}
         const promise = new Promise(resolve => {
-          cbParam => {
-            const newCondition = buildAfterFilterLoaded1(element, cbParam)
+          cacheCondition(cbParam => {
+            const newCondition = getCondition(element, cbParam)
             resolve(newCondition)
-          }
+          }, obj)
         })
         promise.componentId = filterComponentId
-        // promise.cb = 
+        promise.cacheObj = obj
         result[viewId].push(promise)
       } else {
         const viewFilters = result[viewId]
@@ -122,35 +125,20 @@ export const buildFilterMap = panelItems => {
   return result
 }
 
-const getElementById = (componentId, panelItems) => {
-  for (let index = 0; index < panelItems.length; index++) {
-    const element = panelItems[index]
-    if (element.id === componentId) {
-      return element
-    }
-  }
-  return null
-}
-const buildAfterFilterLoaded1 = (element, p) => {
+const getCondition = (element, p) => {
   const widget = ApplicationContext.getService(element.serviceName)
-  const param = widget.getParam(element, p.val)
+  const param = widget.getParam(element, p?.val)
   const condition = formatCondition(param)
   return condition
 }
-export const buildAfterFilterLoaded = (panelItems, originMap, p) => {
+export const buildAfterFilterLoaded = (originMap, p) => {
   const componentId = p.componentId
-  const element = getElementById(componentId, panelItems)
-  let param = null
-  const widget = ApplicationContext.getService(element.serviceName)
-  param = widget.getParam(element, p.val)
-  const condition = formatCondition(param)
-  const vValid = valueValid(condition)
   Object.keys(originMap).forEach(viewId => {
     const conditions = originMap[viewId]
     if (conditions?.length) {
       conditions.forEach(condition => {
-        if (condition instanceof Promise && condition.componentId === componentId && vValid) {
-          condition.resolve(condition)
+        if (condition instanceof Promise && condition.componentId === componentId && condition.cacheObj?.cb) {
+          condition.cacheObj.cb(p)
         }
       })
     }
diff --git a/core/frontend/src/views/panel/filter/FilterDialog.vue b/core/frontend/src/views/panel/filter/FilterDialog.vue
index 3d4b187d4f..07ec8c2b9b 100644
--- a/core/frontend/src/views/panel/filter/FilterDialog.vue
+++ b/core/frontend/src/views/panel/filter/FilterDialog.vue
@@ -925,6 +925,9 @@ export default {
     },
 
     getElementInfo() {
+      if (this.currentElement.options.attrs.selectFirst) {
+        this.currentElement.options.value = ''
+      }
       return this.currentElement
     },
 
diff --git a/core/frontend/src/views/panel/filter/filterMain/FilterFoot.vue b/core/frontend/src/views/panel/filter/filterMain/FilterFoot.vue
index 85a8b39a2a..d333411c9e 100644
--- a/core/frontend/src/views/panel/filter/filterMain/FilterFoot.vue
+++ b/core/frontend/src/views/panel/filter/filterMain/FilterFoot.vue
@@ -14,7 +14,8 @@
               v-model="element.options.attrs.selectFirst"
               class="select-first-check"
               @change="selectFirstChange"
-            >首项
+            >
+              {{ $t('panel.first_item') }}
             </el-checkbox>
           </div>
           <div class="custom-component-class">
@@ -82,7 +83,6 @@ export default {
   },
   methods: {
     selectFirstChange(val) {
-      console.log(val)
     }
   }
 }
diff --git a/core/frontend/src/views/panel/filter/filterMain/FilterHead.vue b/core/frontend/src/views/panel/filter/filterMain/FilterHead.vue
index 38181d2511..6f093a3682 100644
--- a/core/frontend/src/views/panel/filter/filterMain/FilterHead.vue
+++ b/core/frontend/src/views/panel/filter/filterMain/FilterHead.vue
@@ -74,7 +74,6 @@ export default {
     getTableName(tableId) {
       let tableName = null
       this.$emit('dataset-name', tableId, t => { tableName = t })
-      console.log(tableName)
       return tableName
     },
     onMove(e, originalEvent) {
diff --git a/core/frontend/src/views/panel/outerParamsSet/index.vue b/core/frontend/src/views/panel/outerParamsSet/index.vue
index f17820d1cf..d63421dca9 100644
--- a/core/frontend/src/views/panel/outerParamsSet/index.vue
+++ b/core/frontend/src/views/panel/outerParamsSet/index.vue
@@ -287,12 +287,11 @@ export default {
     panelInfo() {
       return this.$store.state.panel.panelInfo
     },
-    viewSelectedField(){
+    viewSelectedField() {
       const viewIds = []
-      this.outerParamsInfo.targetViewInfoList.forEach((targetViewInfo)=>{
+      this.outerParamsInfo.targetViewInfoList.forEach((targetViewInfo) => {
         viewIds.push(targetViewInfo.targetViewId)
       })
-      console.log('viewIds='+JSON.stringify(viewIds))
       return viewIds
     },
     ...mapState([
diff --git a/core/frontend/src/views/system/sysParam/MapSetting/OnlineMap.vue b/core/frontend/src/views/system/sysParam/MapSetting/OnlineMap.vue
index b4c436a286..f7efa6e908 100644
--- a/core/frontend/src/views/system/sysParam/MapSetting/OnlineMap.vue
+++ b/core/frontend/src/views/system/sysParam/MapSetting/OnlineMap.vue
@@ -114,7 +114,6 @@ export default {
       })
     },
     initLoad() {
-      console.log('map load ...')
       queryMapKey().then(res => {
         this.key = res.data
         this.loadMap()

From 970f04e52a036f8356e3d84b91b0a7eecff67ef5 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Tue, 7 Nov 2023 17:41:34 +0800
Subject: [PATCH 04/25] =?UTF-8?q?fix:=20=E7=AC=A6=E5=8F=B7=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E7=82=B9=E5=87=BB=E5=90=8E=E8=B7=9F=E9=9A=8F=E9=BC=A0?=
 =?UTF-8?q?=E6=A0=87=E7=A7=BB=E5=8A=A8#5901?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../view-symbolmap-frontend/src/views/antv/symbolmap/index.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/extensions/dataease-extensions-view/view-symbolmap/view-symbolmap-frontend/src/views/antv/symbolmap/index.vue b/extensions/dataease-extensions-view/view-symbolmap/view-symbolmap-frontend/src/views/antv/symbolmap/index.vue
index ae24cd1645..9181587217 100644
--- a/extensions/dataease-extensions-view/view-symbolmap/view-symbolmap-frontend/src/views/antv/symbolmap/index.vue
+++ b/extensions/dataease-extensions-view/view-symbolmap/view-symbolmap-frontend/src/views/antv/symbolmap/index.vue
@@ -307,9 +307,6 @@ export default {
             this.addGlobalImage()
 
             this.drawView()
-            this.myChart.on('click', ev => {
-              this.$emit('trigger-edit-click', ev.originEvent)
-            })
           })
         } else {
           this.loading = false

From a3e9ec650b6b124547ce9d0bb9aa82bff07662a2 Mon Sep 17 00:00:00 2001
From: ulleo <ulleo.wang@gmail.com>
Date: Wed, 8 Nov 2023 11:31:47 +0800
Subject: [PATCH 05/25] =?UTF-8?q?feat:=20tab=E7=BB=84=E4=BB=B6=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=E5=8F=AF=E4=BB=A5=E9=9A=90=E8=97=8F=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#6447
---
 .../src/components/dataeaseTabs/index.vue     |  5 +-
 .../src/components/widget/deWidget/DeTabs.vue |  8 +++
 .../components/widget/deWidget/TabStyle.vue   |  6 ++
 core/frontend/src/styles/de-tabs.scss         | 57 ++++++++++---------
 core/frontend/src/views/chart/chart/chart.js  |  2 +
 core/frontend/src/views/panel/panel.js        |  1 +
 6 files changed, 51 insertions(+), 28 deletions(-)

diff --git a/core/frontend/src/components/dataeaseTabs/index.vue b/core/frontend/src/components/dataeaseTabs/index.vue
index 3fd408fb59..fa732ec6bf 100644
--- a/core/frontend/src/components/dataeaseTabs/index.vue
+++ b/core/frontend/src/components/dataeaseTabs/index.vue
@@ -14,7 +14,7 @@
 export default {
   name: 'DataeaseTabs',
   props: {
-
+    hideTitle: Boolean,
     fontColor: String,
     activeColor: String,
     borderColor: String,
@@ -43,7 +43,8 @@ export default {
         this.fontColor && 'fontColor',
         this.activeColor && 'activeColor',
         this.noBorder ? 'noBorder' : this.borderColor && 'borderColor',
-        this.borderActiveColor && 'borderActiveColor'
+        this.borderActiveColor && 'borderActiveColor',
+        this.hideTitle && 'no-header'
       ]
       return classes
     },
diff --git a/core/frontend/src/components/widget/deWidget/DeTabs.vue b/core/frontend/src/components/widget/deWidget/DeTabs.vue
index 0f944a69af..a779804acc 100644
--- a/core/frontend/src/components/widget/deWidget/DeTabs.vue
+++ b/core/frontend/src/components/widget/deWidget/DeTabs.vue
@@ -14,6 +14,7 @@
       style-type="radioGroup"
       class="de-tabs-height"
       :class="isCurrentEdit ? 'de-tabs-edit' : ''"
+      :hide-title="hideTitle"
       :font-color="fontColor"
       :active-color="activeColor"
       :border-color="borderColor"
@@ -391,6 +392,13 @@ export default {
         return 'none'
       }
     },
+    hideTitle() {
+      if (this.element && this.element.style && this.element.style.titleHide && typeof this.element.style.titleHide === 'boolean') {
+        return this.element.style.titleHide
+      } else {
+        return false
+      }
+    },
     titleValid() {
       return !!this.textarea && !!this.textarea.trim()
     },
diff --git a/core/frontend/src/components/widget/deWidget/TabStyle.vue b/core/frontend/src/components/widget/deWidget/TabStyle.vue
index 27d44b66e2..9a802ec8a2 100644
--- a/core/frontend/src/components/widget/deWidget/TabStyle.vue
+++ b/core/frontend/src/components/widget/deWidget/TabStyle.vue
@@ -10,6 +10,12 @@
       size="small"
       class="de-form-item"
     >
+      <el-form-item
+        label="选项卡标题"
+        prop="titleShow"
+      >
+        <el-checkbox v-model="styleInfo.titleHide">隐藏</el-checkbox>
+      </el-form-item>
       <el-form-item
         label="头部字体颜色"
         prop="headFrontColor"
diff --git a/core/frontend/src/styles/de-tabs.scss b/core/frontend/src/styles/de-tabs.scss
index 80c4d8445c..08992957a7 100644
--- a/core/frontend/src/styles/de-tabs.scss
+++ b/core/frontend/src/styles/de-tabs.scss
@@ -3,128 +3,134 @@
    @import "./variables";
 
    .de-tabs {
+     &.no-header {
+       .el-tabs__header {
+         display: none;
+       }
+     }
+
      &.fontColor {
        .el-tabs__item {
          color: var(--font-color);
-   
+
          &.is-active {
            color: $--color-primary;
          }
-   
+
          &:hover {
            color: $--color-primary;
          }
        }
      }
-   
+
      &.activeColor {
        .el-tabs__item {
          &.is-active {
            color: var(--active-color);
          }
-   
+
          &:hover {
            color: var(--active-color);
          }
        }
-   
+
        .el-tabs__active-bar {
          background-color: var(--active-color);
        }
      }
-   
+
      // card样式的边框
      &.noBorder.el-tabs--card {
        >.el-tabs__header {
          border-bottom: none;
-   
+
          .el-tabs__nav {
            border: none;
          }
-   
+
          .el-tabs__item {
            border-left: none;
          }
-   
+
          .el-tabs__item.is-active {
            border-bottom: none;
          }
        }
      }
-   
+
      &.borderActiveColor.el-tabs--card {
        >.el-tabs__header .el-tabs__item.is-active {
          border-bottom-color: var(--border-active-color);
        }
      }
-   
+
      &.borderColor.el-tabs--card {
        >.el-tabs__header {
          border-bottom-color: var(--border-color);
-   
+
          .el-tabs__nav {
            border-color: var(--border-color);
          }
-   
+
          .el-tabs__item {
            border-left-color: var(--border-color);
          }
        }
-   
+
        .el-tabs__item {
          &.is-active {
            color: var(--active-color);
          }
-   
+
          &:hover {
            color: var(--active-color);
          }
        }
-   
+
        .el-tabs__active-bar {
          background-color: var(--active-color);
        }
      }
-   
+
      // 简洁样式的边框
      &.noBorder {
        .el-tabs__nav-wrap::after {
          background: none;
        }
      }
-   
+
      &.borderColor {
        .el-tabs__nav-wrap::after {
          background: var(--border-color);
        }
      }
-   
+
      // radioGroup 类型
      &.radioGroup.borderColor.el-tabs--card {
        >.el-tabs__header {
          border-bottom: none;
-   
+
          .el-tabs__nav {
            border: none;
          }
-   
+
          .el-tabs__item {
            border: 1px solid var(--border-color);
            border-right: 0;
-   
+
            &:first-child {
              border-left: 1px solid var(--border-color);
              border-radius: 4px 0 0 4px;
            }
-   
+
            &:last-child {
              border-right: 1px solid var(--border-color);
              border-radius: 0 4px 4px 0;
            }
-   
+
            &.is-active {
              border: 1px solid var(--border-active-color);
-   
+
              &+.el-tabs__item {
                border-left: 0;
              }
@@ -133,4 +139,3 @@
        }
      }
    }
-   
\ No newline at end of file
diff --git a/core/frontend/src/views/chart/chart/chart.js b/core/frontend/src/views/chart/chart/chart.js
index 255ca90a4d..a687a7aafe 100644
--- a/core/frontend/src/views/chart/chart/chart.js
+++ b/core/frontend/src/views/chart/chart/chart.js
@@ -1,4 +1,5 @@
 export const DEFAULT_TAB_COLOR_CASE_DARK = {
+  titleHide: false,
   headFontColor: '#FFFFFF',
   headFontActiveColor: '#FFFFFF',
   headBorderColor: '#131E42',
@@ -7,6 +8,7 @@ export const DEFAULT_TAB_COLOR_CASE_DARK = {
 }
 
 export const DEFAULT_TAB_COLOR_CASE_LIGHT = {
+  titleHide: false,
   headFontColor: '#OOOOOO',
   headFontActiveColor: '#OOOOOO',
   headBorderColor: '#OOOOOO',
diff --git a/core/frontend/src/views/panel/panel.js b/core/frontend/src/views/panel/panel.js
index 223ba074e3..a41302a7c8 100644
--- a/core/frontend/src/views/panel/panel.js
+++ b/core/frontend/src/views/panel/panel.js
@@ -4,6 +4,7 @@ import { deepCopy } from '@/components/canvas/utils/utils'
 import { COMMON_BACKGROUND } from '@/components/canvas/customComponent/component-list'
 
 export const TAB_COMMON_STYLE = {
+  titleHide: false,
   headFontColor: '#000000',
   headFontActiveColor: '#000000',
   headBorderColor: '#ffffff',

From 08edc27cf7fa4b5afe782c02a71ea20b1606c1af Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 8 Nov 2023 14:21:54 +0800
Subject: [PATCH 06/25] =?UTF-8?q?perf:=20=E6=96=87=E6=9C=AC=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E9=80=89=E6=8B=A9=E9=A6=96=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/widget/deWidget/DeSelect.vue  | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/core/frontend/src/components/widget/deWidget/DeSelect.vue b/core/frontend/src/components/widget/deWidget/DeSelect.vue
index fd1f17830c..e01b735f2d 100644
--- a/core/frontend/src/components/widget/deWidget/DeSelect.vue
+++ b/core/frontend/src/components/widget/deWidget/DeSelect.vue
@@ -144,7 +144,7 @@ export default {
   watch: {
     'viewIds': function(value, old) {
       if (typeof value === 'undefined' || value === old) return
-      this.value = this.fillFirstValue()
+      this.fillFirstValue()
       this.setCondition()
     },
     'defaultValueStr': function(value, old) {
@@ -180,7 +180,12 @@ export default {
     },
     'selectFirst': function(value, old) {
       if (value === old) return
-      this.fillFirstValue()
+      if (value) {
+        this.fillFirstValue()
+      } else {
+        this.value = ''
+        this.firstChange(this.value)
+      }
     },
     'element.options.attrs.multiple': function(value, old) {
       if (typeof old === 'undefined' || value === old) return
@@ -285,6 +290,11 @@ export default {
     },
     resetDefaultValue(id) {
       if (this.inDraw && this.manualModify && this.element.id === id) {
+        if (this.selectFirst) {
+          this.fillFirstValue()
+          this.firstChange(this.value)
+          return
+        }
         this.value = this.fillValueDerfault()
         this.changeValue(this.value)
       }
@@ -311,7 +321,7 @@ export default {
         this.fillFirstValue()
         this.$emit('filter-loaded', {
           componentId: this.element.id,
-          val: this.value
+          val: (this.value && Array.isArray(this.value)) ? this.value.join(',') : this.value
         })
       }
     },

From ab61720ec3e006f9afbf20b91f49f2cc58f48588 Mon Sep 17 00:00:00 2001
From: ulleo <ulleo.wang@gmail.com>
Date: Wed, 8 Nov 2023 14:23:50 +0800
Subject: [PATCH 07/25] =?UTF-8?q?feat:=20=E8=B7=B3=E8=BD=AC=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=80=89=E6=8B=A9=E4=BB=AA=E8=A1=A8=E6=9D=BF=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E9=BC=A0=E6=A0=87hover=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E5=80=99=EF=BC=8C=E6=8F=90=E7=A4=BA=E5=AE=8C=E6=95=B4=E7=9A=84?=
 =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#5816
---
 core/frontend/src/views/panel/linkJumpSet/index.vue | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/core/frontend/src/views/panel/linkJumpSet/index.vue b/core/frontend/src/views/panel/linkJumpSet/index.vue
index 9e4de9061f..072837e421 100644
--- a/core/frontend/src/views/panel/linkJumpSet/index.vue
+++ b/core/frontend/src/views/panel/linkJumpSet/index.vue
@@ -83,7 +83,16 @@
                   style="margin-right: 10px"
                   @select="panelNodeClick"
                   @input="inputVal"
-                />
+                >
+                  <label
+                    slot="option-label"
+                    slot-scope="{ node, labelClassName }"
+                    :class="labelClassName"
+                    :title="node.label"
+                  >
+                    {{ node.label }}
+                  </label>
+                </treeselect>
               </el-col>
             </el-row>
             <el-row style="margin-top: 10px;height: 30px">

From 52254e8b58b7e8bf3b0ee75639ed08b4adb0011a Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 8 Nov 2023 14:46:53 +0800
Subject: [PATCH 08/25] =?UTF-8?q?perf:=20=E6=96=87=E6=9C=AC=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E9=80=89=E6=8B=A9=E9=A6=96=E9=A1=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/frontend/src/components/elVisualSelect/index.vue  |  2 +-
 .../src/components/widget/deWidget/DeSelect.vue        | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/core/frontend/src/components/elVisualSelect/index.vue b/core/frontend/src/components/elVisualSelect/index.vue
index 31ee58e20d..9778792549 100644
--- a/core/frontend/src/components/elVisualSelect/index.vue
+++ b/core/frontend/src/components/elVisualSelect/index.vue
@@ -14,7 +14,7 @@
     @visible-change="popChange"
   >
     <p
-      v-if="startIndex === 0 && $attrs.multiple"
+      v-if="startIndex === 0 && $attrs.multiple && !itemDisabled"
       class="select-all"
     >
       <el-checkbox
diff --git a/core/frontend/src/components/widget/deWidget/DeSelect.vue b/core/frontend/src/components/widget/deWidget/DeSelect.vue
index e01b735f2d..fa5cddcb81 100644
--- a/core/frontend/src/components/widget/deWidget/DeSelect.vue
+++ b/core/frontend/src/components/widget/deWidget/DeSelect.vue
@@ -11,11 +11,12 @@
     :placeholder="$t(element.options.attrs.placeholder) + placeholderSuffix"
     :popper-append-to-body="inScreen"
     :size="size"
-    :filterable="true"
+    :filterable="inDraw || !selectFirst"
     :filter-method="filterMethod"
     :item-disabled="!inDraw && selectFirst"
     :key-word="keyWord"
     popper-class="coustom-de-select"
+    :class="{'disabled-close': !inDraw && selectFirst && element.options.attrs.multiple}"
     :list="data"
     :is-config="isConfig"
     :custom-style="customStyle"
@@ -467,7 +468,14 @@ export default {
 }
 </script>
 
+<style lang="scss" scoped>
+  .disabled-close ::v-deep .el-icon-close {
+    display: none !important;
+  }
+</style>
 <style lang="scss">
+
+
 .coustom-de-select {
   background-color: var(--BgSelectColor, #FFFFFF) !important;
   border-color: var(--BrSelectColor, #E4E7ED) !important;

From b3a8446156d7178acb8265cb6d49cb022acaae65 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Wed, 8 Nov 2023 15:33:44 +0800
Subject: [PATCH 09/25] =?UTF-8?q?fix:=20Excel=E6=95=B0=E6=8D=AE=E9=9B=86?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=AD=97=E6=AE=B5=E6=8F=90=E7=A4=BA=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/dataset/DataSetTableService.java  | 33 +++++++++----------
 .../resources/i18n/messages_en_US.properties  |  2 +-
 .../resources/i18n/messages_zh_CN.properties  |  2 +-
 .../resources/i18n/messages_zh_TW.properties  |  2 +-
 4 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
index 83e209f781..19586b83dc 100644
--- a/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -218,9 +218,7 @@ public class DataSetTableService {
                     excelSheetDataList.forEach(excelSheetData -> {
                         String[] fieldArray = excelSheetData.getFields().stream().map(TableField::getFieldName)
                                 .toArray(String[]::new);
-                        if (checkIsRepeat(fieldArray)) {
-                            DataEaseException.throwException(Translator.get("i18n_excel_field_repeat"));
-                        }
+                        checkIsRepeat(fieldArray);
                         excelSheetData.setData(null);
                         excelSheetData.setJsonArray(null);
                     });
@@ -254,9 +252,7 @@ public class DataSetTableService {
                 for (ExcelSheetData sheet : datasetTable.getSheets()) {
                     String[] fieldArray = sheet.getFields().stream().map(TableField::getFieldName)
                             .toArray(String[]::new);
-                    if (checkIsRepeat(fieldArray)) {
-                        DataEaseException.throwException(Translator.get("i18n_excel_field_repeat"));
-                    }
+                    checkIsRepeat(fieldArray);
                 }
 
                 for (ExcelSheetData sheet : datasetTable.getSheets()) {
@@ -304,9 +300,7 @@ public class DataSetTableService {
             }
 
             String[] fieldArray = sheet.getFields().stream().map(TableField::getFieldName).toArray(String[]::new);
-            if (checkIsRepeat(fieldArray)) {
-                DataEaseException.throwException(Translator.get("i18n_excel_field_repeat"));
-            }
+            checkIsRepeat(fieldArray);
             sheet.setData(null);
             sheet.setJsonArray(null);
             excelSheetDataList.add(sheet);
@@ -1221,9 +1215,7 @@ public class DataSetTableService {
         List<String[]> data = result.get("dataList");
         List<TableField> fields = result.get("fieldList");
         String[] fieldArray = fields.stream().map(TableField::getFieldName).toArray(String[]::new);
-        if (checkIsRepeat(fieldArray)) {
-            DataEaseException.throwException(Translator.get("i18n_excel_field_repeat"));
-        }
+        checkIsRepeat(fieldArray);
         List<Map<String, Object>> jsonArray = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(data)) {
             jsonArray = data.stream().map(ele -> {
@@ -1305,9 +1297,7 @@ public class DataSetTableService {
         List<String[]> data = result.get("dataList");
         List<TableField> fields = result.get("fieldList");
         String[] fieldArray = fields.stream().map(TableField::getFieldName).toArray(String[]::new);
-        if (checkIsRepeat(fieldArray)) {
-            DataEaseException.throwException(Translator.get("i18n_excel_field_repeat"));
-        }
+        checkIsRepeat(fieldArray);
         List<Map<String, Object>> jsonArray = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(data)) {
             jsonArray = data.stream().map(ele -> {
@@ -2755,15 +2745,22 @@ public class DataSetTableService {
     /*
      * 判断数组中是否有重复的值
      */
-    public static boolean checkIsRepeat(String[] array) {
+    public static void checkIsRepeat(String[] array) {
         HashSet<String> hashSet = new HashSet<>();
+        HashSet<String> repeat = new HashSet<>();
         for (String s : array) {
             if (StringUtils.isEmpty(s)) {
                 throw new RuntimeException(Translator.get("i18n_excel_empty_column"));
             }
-            hashSet.add(s);
+            if(hashSet.contains(s)){
+                repeat.add(s);
+            }else {
+                hashSet.add(s);
+            }
+        }
+        if(CollectionUtils.isNotEmpty(repeat)){
+            DataEaseException.throwException(Translator.get("i18n_excel_field_repeat") + ": " + String.valueOf(repeat));
         }
-        return hashSet.size() != array.length;
     }
 
     public DatasetTable syncDatasetTableField(String id) throws Exception {
diff --git a/core/backend/src/main/resources/i18n/messages_en_US.properties b/core/backend/src/main/resources/i18n/messages_en_US.properties
index 2aaf7f0b7e..0d5b36e213 100644
--- a/core/backend/src/main/resources/i18n/messages_en_US.properties
+++ b/core/backend/src/main/resources/i18n/messages_en_US.properties
@@ -92,7 +92,7 @@ i18n_sql_add_not_matching=The data column of incremental SQL does not match the
 i18n_sql_delete_not_matching=The data column of incremental delete SQL does not match the dataset,
 i18n_cst_ds_tb_or_field_deleted=Custom dataset union data is deleted or field changed,can not display
 i18n_no_all_delete_privilege_folder=This folder have sources which have no manage or view privilege,Can Not Be Deleted.
-i18n_excel_field_repeat=Duplicate fields exist, please modify and try again.
+i18n_excel_field_repeat=Duplicate fields exist:  
 i18n_schema_is_empty=Database schema is empty
 \u7AD9\u5185\u6D88\u606F=Messages Center
 \u6240\u6709\u6D88\u606F=All Messages
diff --git a/core/backend/src/main/resources/i18n/messages_zh_CN.properties b/core/backend/src/main/resources/i18n/messages_zh_CN.properties
index b27d1036df..a31e8745dc 100644
--- a/core/backend/src/main/resources/i18n/messages_zh_CN.properties
+++ b/core/backend/src/main/resources/i18n/messages_zh_CN.properties
@@ -92,7 +92,7 @@ i18n_sql_add_not_matching=\u589E\u91CF\u6DFB\u52A0 SQL \u7684\u6570\u636E\u5217\
 i18n_sql_delete_not_matching=\u589E\u91CF\u5220\u9664 SQL \u7684\u6570\u636E\u5217\u4E0E\u6570\u636E\u96C6\u4E0D\u5339\u914D, 
 i18n_cst_ds_tb_or_field_deleted=\u81EA\u5B9A\u4E49\u6570\u636E\u96C6\u6240\u5173\u8054\u6570\u636E\u88AB\u5220\u9664\u6216\u5B57\u6BB5\u53D1\u751F\u53D8\u5316\uFF0C\u65E0\u6CD5\u6B63\u5E38\u663E\u793A
 i18n_no_all_delete_privilege_folder=\u8BE5\u76EE\u5F55\u4E0B\u5B58\u5728\u6CA1\u6709\u7BA1\u7406\u6743\u9650\u6216\u67E5\u770B\u6743\u9650\u7684\u8D44\u6E90\uFF0C\u65E0\u6CD5\u5220\u9664
-i18n_excel_field_repeat=\u5B58\u5728\u91CD\u590D\u5B57\u6BB5\uFF0C\u8BF7\u4FEE\u6539\u540E\u91CD\u8BD5
+i18n_excel_field_repeat=\u5b58\u5728\u91cd\u590d\u5b57\u6bb5\uff1a
 i18n_schema_is_empty=\u6570\u636E\u5E93 Schema \u4E3A\u7A7A
 \u7AD9\u5185\u6D88\u606F=\u6D88\u606F\u4E2D\u5FC3
 \u6240\u6709\u6D88\u606F=\u6240\u6709\u6D88\u606F
diff --git a/core/backend/src/main/resources/i18n/messages_zh_TW.properties b/core/backend/src/main/resources/i18n/messages_zh_TW.properties
index 969fd1440a..e5b121220c 100644
--- a/core/backend/src/main/resources/i18n/messages_zh_TW.properties
+++ b/core/backend/src/main/resources/i18n/messages_zh_TW.properties
@@ -92,7 +92,7 @@ i18n_sql_add_not_matching=\u589E\u91CF\u6DFB\u52A0 sql \u7684\u6578\u64DA\u5217\
 i18n_sql_delete_not_matching=\u589E\u91CF\u522A\u9664 sql \u7684\u6578\u64DA\u5217\u8207\u6578\u64DA\u96C6\u4E0D\u5339\u914D, 
 i18n_cst_ds_tb_or_field_deleted=\u81EA\u5B9A\u7FA9\u6578\u64DA\u96C6\u6240\u95DC\u806F\u6578\u64DA\u88AB\u522A\u9664\u6216\u5B57\u6BB5\u767C\u751F\u8B8A\u5316\uFF0C\u7121\u6CD5\u6B63\u5E38\u986F\u793A
 i18n_no_all_delete_privilege_folder=\u8A72\u76EE\u9304\u4E0B\u5B58\u5728\u6C92\u6709\u7BA1\u7406\u6B0A\u9650\u6216\u67E5\u770B\u6B0A\u9650\u7684\u8CC7\u6E90\uFF0C\u7121\u6CD5\u522A\u9664
-i18n_excel_field_repeat=\u5B58\u5728\u91CD\u5FA9\u5B57\u6BB5\uFF0C\u8ACB\u4FEE\u6539\u5F8C\u91CD\u8BD5
+i18n_excel_field_repeat=\u5b58\u5728\u91cd\u5fa9\u5b57\u6bb5\uff1a
 i18n_schema_is_empty=\u6578\u64DA\u5EAB Schema \u70BA\u7A7A
 \u7AD9\u5185\u6D88\u606F=\u6D88\u606F\u4E2D\u5FC3
 \u6240\u6709\u6D88\u606F=\u6240\u6709\u6D88\u606F

From c43486bc7331079df88a39a386f22d7b4d7b4c4c Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 8 Nov 2023 15:38:11 +0800
Subject: [PATCH 10/25] =?UTF-8?q?fix:=20=E5=9C=B0=E5=9B=BE=E9=AB=98?=
 =?UTF-8?q?=E7=BA=A7=E9=85=8D=E7=BD=AE=E6=9C=80=E5=90=8E=E4=B8=80=E9=A1=B5?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BAundefined?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../frontend/src/views/chart/components/senior/MapMapping.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/frontend/src/views/chart/components/senior/MapMapping.vue b/core/frontend/src/views/chart/components/senior/MapMapping.vue
index 37eaeae6d9..3689ac8952 100644
--- a/core/frontend/src/views/chart/components/senior/MapMapping.vue
+++ b/core/frontend/src/views/chart/components/senior/MapMapping.vue
@@ -227,7 +227,9 @@ export default {
         }
 
         features.forEach(feature => {
-          this.mappingForm[cCode][feature.properties.name || feature.properties.NAME] = null
+          if (feature.properties.name || feature.properties.NAME) {
+            this.mappingForm[cCode][feature.properties.name || feature.properties.NAME] = null
+          }
         })
       }
       const cCode = this.currentAreaCode

From 2e74720455a99bb2c093a59465289bcb52c40264 Mon Sep 17 00:00:00 2001
From: ulleo <ulleo.wang@gmail.com>
Date: Wed, 8 Nov 2023 16:41:40 +0800
Subject: [PATCH 11/25] =?UTF-8?q?feat:=20=E6=8C=87=E6=A0=87=E5=8D=A1?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E9=98=88=E5=80=BC=E7=9A=84=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E8=83=8C=E6=99=AF=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#6231
---
 .../chart/components/normal/LabelNormal.vue   | 65 +++++++++++++++----
 .../chart/components/senior/Threshold.vue     | 11 +++-
 .../senior/dialog/TextThresholdEdit.vue       | 16 ++++-
 3 files changed, 79 insertions(+), 13 deletions(-)

diff --git a/core/frontend/src/views/chart/components/normal/LabelNormal.vue b/core/frontend/src/views/chart/components/normal/LabelNormal.vue
index b20f8f2f91..b973e11d31 100644
--- a/core/frontend/src/views/chart/components/normal/LabelNormal.vue
+++ b/core/frontend/src/views/chart/components/normal/LabelNormal.vue
@@ -171,6 +171,8 @@ export default {
           // color threshold
           this.colorThreshold(customAttr.color.quotaColor)
         }
+        // 设置背景
+        this.colorThreshold(null, true)
         if (customAttr.size) {
           this.dimensionShow = customAttr.size.dimensionShow
           this.quotaShow = customAttr.size.quotaShow
@@ -201,6 +203,7 @@ export default {
       }
       if (this.chart.customStyle) {
         const customStyle = JSON.parse(this.chart.customStyle)
+        console.log(customStyle)
         if (customStyle.text) {
           this.title_show = customStyle.text.show
           this.title_class.fontSize = customStyle.text.fontSize + 'px'
@@ -214,7 +217,9 @@ export default {
           this.title_class.textShadow = customStyle.text.fontShadow ? '2px 2px 4px' : 'none'
         }
         if (customStyle.background) {
-          this.bg_class.background = hexColorToRGBA(customStyle.background.color, customStyle.background.alpha)
+          // 没有这个设置，不用管
+          this.colorThreshold(hexColorToRGBA(customStyle.background.color, customStyle.background.alpha), true)
+          // this.bg_class.background = hexColorToRGBA(customStyle.background.color, customStyle.background.alpha)
         }
       }
     },
@@ -223,7 +228,8 @@ export default {
       this.calcHeight()
     },
 
-    colorThreshold(valueColor) {
+    colorThreshold(valueColor, setBg) {
+      console.log(valueColor, setBg)
       if (this.chart.senior) {
         const senior = JSON.parse(this.chart.senior)
         if (senior.threshold && senior.threshold.labelThreshold && senior.threshold.labelThreshold.length > 0) {
@@ -232,52 +238,89 @@ export default {
             let flag = false
             const t = senior.threshold.labelThreshold[i]
             const tv = parseFloat(t.value)
+            console.log(t)
             if (t.term === 'eq') {
               if (value === tv) {
-                this.label_content_class.color = t.color
+                if (!setBg) {
+                  this.label_content_class.color = t.color
+                } else {
+                  this.bg_class.background = t.backgroundColor ? t.backgroundColor : valueColor
+                }
                 flag = true
               }
             } else if (t.term === 'not_eq') {
               if (value !== tv) {
-                this.label_content_class.color = t.color
+                if (!setBg) {
+                  this.label_content_class.color = t.color
+                } else {
+                  this.bg_class.background = t.backgroundColor ? t.backgroundColor : valueColor
+                }
                 flag = true
               }
             } else if (t.term === 'lt') {
               if (value < tv) {
-                this.label_content_class.color = t.color
+                if (!setBg) {
+                  this.label_content_class.color = t.color
+                } else {
+                  this.bg_class.background = t.backgroundColor ? t.backgroundColor : valueColor
+                }
                 flag = true
               }
             } else if (t.term === 'gt') {
               if (value > tv) {
-                this.label_content_class.color = t.color
+                if (!setBg) {
+                  this.label_content_class.color = t.color
+                } else {
+                  this.bg_class.background = t.backgroundColor ? t.backgroundColor : valueColor
+                }
                 flag = true
               }
             } else if (t.term === 'le') {
               if (value <= tv) {
-                this.label_content_class.color = t.color
+                if (!setBg) {
+                  this.label_content_class.color = t.color
+                } else {
+                  this.bg_class.background = t.backgroundColor ? t.backgroundColor : valueColor
+                }
                 flag = true
               }
             } else if (t.term === 'ge') {
               if (value >= tv) {
-                this.label_content_class.color = t.color
+                if (!setBg) {
+                  this.label_content_class.color = t.color
+                } else {
+                  this.bg_class.background = t.backgroundColor ? t.backgroundColor : valueColor
+                }
                 flag = true
               }
             } else if (t.term === 'between') {
               const min = parseFloat(t.min)
               const max = parseFloat(t.max)
               if (min <= value && value <= max) {
-                this.label_content_class.color = t.color
+                if (!setBg) {
+                  this.label_content_class.color = t.color
+                } else {
+                  this.bg_class.background = t.backgroundColor ? t.backgroundColor : valueColor
+                }
                 flag = true
               }
             }
             if (flag) {
               break
             } else if (i === senior.threshold.labelThreshold.length - 1) {
-              this.label_content_class.color = valueColor
+              if (!setBg) {
+                this.label_content_class.color = valueColor
+              } else {
+                this.bg_class.background = valueColor
+              }
             }
           }
         } else {
-          this.label_content_class.color = valueColor
+          if (!setBg) {
+            this.label_content_class.color = valueColor
+          } else {
+            this.bg_class.background = valueColor
+          }
         }
       }
     },
diff --git a/core/frontend/src/views/chart/components/senior/Threshold.vue b/core/frontend/src/views/chart/components/senior/Threshold.vue
index 74239f9377..565a2b540c 100644
--- a/core/frontend/src/views/chart/components/senior/Threshold.vue
+++ b/core/frontend/src/views/chart/components/senior/Threshold.vue
@@ -196,9 +196,18 @@
                 {{ item.min }}&nbsp;≤{{ $t('chart.drag_block_label_value') }}≤&nbsp;{{ item.max }}
               </span>
             </el-col>
-            <el-col :span="6">
+            <el-col
+              :span="3"
+              :title="$t('chart.textColor')"
+            >
               <span :style="{width:'14px', height:'14px', backgroundColor: item.color, border: 'solid 1px #e1e4e8'}" />
             </el-col>
+            <el-col
+              :span="3"
+              :title="$t('chart.backgroundColor')"
+            >
+              <span :style="{width:'14px', height:'14px', backgroundColor: item.backgroundColor, border: 'solid 1px #e1e4e8'}" />
+            </el-col>
           </el-row>
         </el-col>
       </el-col>
diff --git a/core/frontend/src/views/chart/components/senior/dialog/TextThresholdEdit.vue b/core/frontend/src/views/chart/components/senior/dialog/TextThresholdEdit.vue
index f837e5749d..9429db9086 100644
--- a/core/frontend/src/views/chart/components/senior/dialog/TextThresholdEdit.vue
+++ b/core/frontend/src/views/chart/components/senior/dialog/TextThresholdEdit.vue
@@ -34,7 +34,7 @@
           </el-select>
         </el-col>
         <el-col
-          :span="14"
+          :span="12"
           style="text-align: center;"
         >
           <el-input
@@ -72,6 +72,20 @@
         >
           <el-color-picker
             v-model="item.color"
+            :title="$t('chart.textColor')"
+            show-alpha
+            class="color-picker-style"
+            :predefine="predefineColors"
+            @change="changeThreshold"
+          />
+        </el-col>
+        <el-col
+          :span="2"
+          style="text-align: center;"
+        >
+          <el-color-picker
+            v-model="item.backgroundColor"
+            :title="$t('chart.backgroundColor')"
             show-alpha
             class="color-picker-style"
             :predefine="predefineColors"

From 6d554add8686de72bee05f3fa3ff8abf8afbb6b6 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Wed, 8 Nov 2023 19:24:37 +0800
Subject: [PATCH 12/25] =?UTF-8?q?feat:=20Echarts=20=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E8=81=94=E5=8A=A8=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/components/editor/SettingMenu.vue  |   6 +-
 .../canvas/customComponent/UserView.vue       |   5 +-
 .../chart/components/table/TableNormal.vue    | 114 ++++++++++++++++--
 3 files changed, 113 insertions(+), 12 deletions(-)

diff --git a/core/frontend/src/components/canvas/components/editor/SettingMenu.vue b/core/frontend/src/components/canvas/components/editor/SettingMenu.vue
index 7b06044173..2b7a96923f 100644
--- a/core/frontend/src/components/canvas/components/editor/SettingMenu.vue
+++ b/core/frontend/src/components/canvas/components/editor/SettingMenu.vue
@@ -220,13 +220,11 @@ export default {
     },
     linkJumpSetShow() {
       return this.curComponent.type === 'view' &&
-        !this.jumpExcludeViewType.includes(this.curComponent.propValue.innerType) &&
-        !(this.curComponent.propValue.innerType?.includes('table') && this.curComponent.propValue.render === 'echarts')
+        !this.jumpExcludeViewType.includes(this.curComponent.propValue.innerType)
     },
     linkageSettingShow() {
       return this.curComponent.type === 'view' &&
-        !this.linkageExcludeViewType.includes(this.curComponent.propValue.innerType) &&
-        !(this.curComponent.propValue.innerType?.includes('table') && this.curComponent.propValue.render === 'echarts')
+        !this.linkageExcludeViewType.includes(this.curComponent.propValue.innerType)
     },
     panelInfo() {
       return this.$store.state.panel.panelInfo
diff --git a/core/frontend/src/components/canvas/customComponent/UserView.vue b/core/frontend/src/components/canvas/customComponent/UserView.vue
index 760d28f964..4e7c078f90 100644
--- a/core/frontend/src/components/canvas/customComponent/UserView.vue
+++ b/core/frontend/src/components/canvas/customComponent/UserView.vue
@@ -100,7 +100,10 @@
       :ref="element.propValue.id"
       :show-summary="chart.type === 'table-normal'"
       :chart="chart"
+      :track-menu="trackMenu"
       class="table-class"
+      @onChartClick="chartClick"
+      @onJumpClick="jumpClick"
       @onPageChange="pageClick"
     />
     <label-normal
@@ -749,7 +752,7 @@ export default {
     clearPanelLinkage(param) {
       if (param.viewId === 'all' || param.viewId === this.element.propValue.viewId) {
         try {
-          this.$refs[this.element.propValue.id]?.reDrawView()
+          this.$refs[this.element.propValue.id]?.reDrawView?.()
         } catch (e) {
           console.error('reDrawView-error：', this.element.propValue.id)
         }
diff --git a/core/frontend/src/views/chart/components/table/TableNormal.vue b/core/frontend/src/views/chart/components/table/TableNormal.vue
index bdd1667af1..3b10d9977f 100644
--- a/core/frontend/src/views/chart/components/table/TableNormal.vue
+++ b/core/frontend/src/views/chart/components/table/TableNormal.vue
@@ -2,8 +2,15 @@
   <div
     ref="tableContainer"
     :style="bg_class"
-    style="padding: 8px;width: 100%;height: 100%;overflow: hidden;"
+    style="padding: 8px;width: 100%;height: 100%;overflow: hidden;position: relative;"
   >
+    <view-track-bar
+      ref="viewTrack"
+      :track-menu="trackMenu"
+      :style="trackBarStyle"
+      class="track-bar"
+      @trackClick="trackClick"
+    />
     <el-row
       style="height: 100%;"
       :style="cssVars"
@@ -28,6 +35,7 @@
         :show-summary="showSummary"
         :summary-method="summaryMethod"
         :index-config="{seqMethod}"
+        @cell-click="cellClick"
       >
         <ux-table-column
           type="index"
@@ -95,13 +103,13 @@
 
 <script>
 import { hexColorToRGBA } from '../../chart/util'
-import eventBus from '@/components/canvas/utils/eventBus'
 import { DEFAULT_COLOR_CASE, DEFAULT_SCROLL, DEFAULT_SIZE, NOT_SUPPORT_PAGE_DATASET } from '@/views/chart/chart/chart'
 import { mapState } from 'vuex'
 import DePagination from '@/components/deCustomCm/pagination.js'
+import ViewTrackBar from '@/components/canvas/components/editor/ViewTrackBar.vue'
 export default {
   name: 'TableNormal',
-  components: { DePagination },
+  components: { ViewTrackBar, DePagination },
   props: {
     chart: {
       type: Object,
@@ -123,6 +131,18 @@ export default {
       type: Boolean,
       required: false,
       default: true
+    },
+    trackMenu: {
+      type: Array,
+      required: false,
+      default: function() {
+        return ['drill']
+      }
+    },
+    searchCount: {
+      type: Number,
+      required: false,
+      default: 0
     }
   },
   data() {
@@ -186,7 +206,13 @@ export default {
         overflow: 'hidden',
         textOverflow: 'ellipsis',
         whiteSpace: 'nowrap'
-      }
+      },
+      trackBarStyle: {
+        position: 'absolute',
+        left: '0px',
+        top: '0px'
+      },
+      pointParam: null
     }
   },
   computed: {
@@ -234,11 +260,8 @@ export default {
   },
   mounted() {
     this.init()
-    // 监听元素变动事件
-    eventBus.$on('resizing', this.chartResize)
   },
   beforeDestroy() {
-    eventBus.$off('resizing', this.chartResize)
     clearInterval(this.scrollTimer)
     window.removeEventListener('resize', this.calcHeightDelay)
   },
@@ -614,6 +637,83 @@ export default {
           })
         }, senior.scrollCfg.interval)
       }
+    },
+    cellClick(row, col, cell, ev) {
+      const nameIdMap = this.chart.data.fields.reduce((pre, next) => {
+        pre[next['dataeaseName']] = next['id']
+        return pre
+      }, {})
+      const dimensionList = []
+      for (const key in row) {
+        if (nameIdMap[key]) {
+          dimensionList.push({ id: nameIdMap[key], value: row[key] })
+        }
+      }
+      const parent = cell.offsetParent
+      // 元素离顶部距离减去滚动距离加上表头高度加上点击位置高度
+      const y = cell.offsetTop - parent.scrollTop + parent.offsetTop + ev.offsetY
+      const position = {
+        x: cell.offsetLeft + ev.offsetX,
+        y
+      }
+      this.antVActionPost(dimensionList, nameIdMap[col.property] || 'null', position)
+    },
+    antVActionPost(dimensionList, name, param) {
+      this.pointParam = {
+        data: {
+          dimensionList: dimensionList,
+          quotaList: [],
+          name: name,
+          sourceType: this.chart.type
+        }
+      }
+
+      if (this.trackMenu.length < 2) { // 只有一个事件直接调用
+        this.trackClick(this.trackMenu[0])
+      } else { // 视图关联多个事件
+        this.trackBarStyle.left = param.x + 'px'
+        this.trackBarStyle.top = (param.y + 10) + 'px'
+        this.$refs.viewTrack.trackButtonClick()
+      }
+    },
+    trackClick(trackAction) {
+      const param = this.pointParam
+      if (!param?.data?.dimensionList) {
+        // 地图提示没有关联字段 其他没有维度信息的 直接返回
+        if (this.chart.type === 'map') {
+          this.$warning(this.$t('panel.no_drill_field'))
+        }
+        return
+      }
+      const linkageParam = {
+        option: 'linkage',
+        name: this.pointParam.data.name,
+        viewId: this.chart.id,
+        dimensionList: this.pointParam.data.dimensionList,
+        quotaList: this.pointParam.data.quotaList
+      }
+      const jumpParam = {
+        option: 'jump',
+        name: this.pointParam.data.name,
+        viewId: this.chart.id,
+        dimensionList: this.pointParam.data.dimensionList,
+        quotaList: this.pointParam.data.quotaList,
+        sourceType: this.pointParam.data.sourceType
+      }
+      switch (trackAction) {
+        case 'drill':
+          this.currentPage.page = 1
+          this.$emit('onChartClick', this.pointParam)
+          break
+        case 'linkage':
+          this.$store.commit('addViewTrackFilter', linkageParam)
+          break
+        case 'jump':
+          this.$emit('onJumpClick', jumpParam)
+          break
+        default:
+          break
+      }
     }
   }
 }

From d94189d1532a7d2816a0c0c2a6ca8f7587f08a18 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 9 Nov 2023 15:38:24 +0800
Subject: [PATCH 13/25] =?UTF-8?q?feat:=20=E4=B8=8B=E6=8B=89=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E5=99=A8=E8=AE=BE=E7=BD=AE=E4=B8=BA=E5=BF=85=E5=A1=AB?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/components/editor/DeEditor.vue     |  5 +-
 .../canvas/components/editor/Preview.vue      |  5 +-
 .../canvas/customComponent/UserView.vue       | 60 +++++++++++++++----
 .../src/components/dataease/DeOutWidget.vue   | 23 ++++++-
 .../src/components/widget/bean/Condition.js   |  1 +
 .../components/widget/deWidget/DeSelect.vue   | 13 ++--
 core/frontend/src/store/index.js              |  5 +-
 .../src/views/panel/filter/FilterDialog.vue   | 26 ++++++--
 .../panel/filter/filterMain/FilterFoot.vue    |  6 ++
 .../panel/filter/filterMain/FilterHead.vue    | 18 +++++-
 10 files changed, 134 insertions(+), 28 deletions(-)

diff --git a/core/frontend/src/components/canvas/components/editor/DeEditor.vue b/core/frontend/src/components/canvas/components/editor/DeEditor.vue
index 3d8fb883b1..7340198ee3 100644
--- a/core/frontend/src/components/canvas/components/editor/DeEditor.vue
+++ b/core/frontend/src/components/canvas/components/editor/DeEditor.vue
@@ -1258,7 +1258,10 @@ export default {
         }
         param = wrapperChild.getCondition && wrapperChild.getCondition()
         const condition = formatCondition(param)
-        const vValid = valueValid(condition)
+        let vValid = valueValid(condition)
+        const required = element.options.attrs.required
+        condition.requiredInvalid = required && !vValid
+        vValid = vValid || required
         const filterComponentId = condition.componentId
         const conditionCanvasId = wrapperChild.getCanvasId && wrapperChild.getCanvasId()
         Object.keys(result).forEach(viewId => {
diff --git a/core/frontend/src/components/canvas/components/editor/Preview.vue b/core/frontend/src/components/canvas/components/editor/Preview.vue
index 835e6d7652..357c632813 100644
--- a/core/frontend/src/components/canvas/components/editor/Preview.vue
+++ b/core/frontend/src/components/canvas/components/editor/Preview.vue
@@ -593,7 +593,10 @@ export default {
         }
         param = wrapperChild.getCondition && wrapperChild.getCondition()
         const condition = formatCondition(param)
-        const vValid = valueValid(condition)
+        let vValid = valueValid(condition)
+        const required = element.options.attrs.required
+        condition.requiredInvalid = required && !vValid
+        vValid = vValid || required
         const filterComponentId = condition.componentId
         const conditionCanvasId = wrapperChild.getCanvasId && wrapperChild.getCanvasId()
         Object.keys(result).forEach(viewId => {
diff --git a/core/frontend/src/components/canvas/customComponent/UserView.vue b/core/frontend/src/components/canvas/customComponent/UserView.vue
index 4e7c078f90..3e834e3222 100644
--- a/core/frontend/src/components/canvas/customComponent/UserView.vue
+++ b/core/frontend/src/components/canvas/customComponent/UserView.vue
@@ -28,8 +28,15 @@
         {{ $t('chart.chart_error_tips') }}
       </div>
     </div>
+    <div v-if="view.unReadyMsg" class="chart-error-class">
+      <div class="chart-error-message-class">
+        {{ view.unReadyMsg }},{{ $t('chart.chart_show_error') }}
+        <br>
+        {{ $t('chart.chart_error_tips') }}
+      </div>
+    </div>
     <plugin-com
-      v-if="chart.isPlugin"
+      v-else-if="chart.isPlugin"
       :ref="element.propValue.id"
       :component-name="chart.type + '-view'"
       :obj="{active, chart, trackMenu, searchCount, terminalType: scaleCoefficientType}"
@@ -601,16 +608,9 @@ export default {
   created() {
     this.refId = uuid.v1
     if (this.element && this.element.propValue && this.element.propValue.viewId) {
-      // 如果watch.filters 已经进行数据初始化时候，此处放弃数据初始化
-      const unReadyList = []
-      const readyList = []
-      this.filters.forEach(f => {
-        if (f instanceof Promise) {
-          unReadyList.push(f)
-        } else {
-          readyList.push(f)
-        }
-      })
+      const group = this.groupFilter(this.filters)
+      const unReadyList = group.unReady
+      const readyList = group.ready
       if (unReadyList.length) {
         Promise.all(this.filters.filter(f => f instanceof Promise)).then(fList => {
           this.filter.filter = readyList.concat(fList)
@@ -622,6 +622,34 @@ export default {
     }
   },
   methods: {
+    groupFilter(filters) {
+      const result = {
+        ready: [],
+        unReady: []
+      }
+      filters.forEach(f => {
+        if (f instanceof Promise) {
+          result.unReady.push(f)
+        } else {
+          result.ready.push(f)
+        }
+      })
+      return result
+    },
+    groupRequiredInvalid(filters) {
+      const result = {
+        ready: [],
+        unReady: []
+      }
+      filters.forEach(f => {
+        if (f.requiredInvalid) {
+          result.unReady.push(f)
+        } else {
+          result.ready.push(f)
+        }
+      })
+      return result
+    },
     equalsAny,
     tabSwitch(tabCanvasId) {
       if (this.charViewS2ShowFlag && tabCanvasId === this.canvasId && this.$refs[this.element.propValue.id]) {
@@ -791,6 +819,15 @@ export default {
     },
     getData(id, cache = true, dataBroadcast = false) {
       if (id) {
+        const filters = this.filter.filter
+        const group = this.groupRequiredInvalid(filters)
+        if (group.unReady?.length) {
+          this.view.unReadyMsg = '请先完成必填项过滤器！'
+          this.getDataLoading = false
+          return
+        } else {
+          this.view.unReadyMsg = ''
+        }
         if (this.getDataLoading || Vue.prototype.$currentHttpRequestList.get(`/chart/view/getData/${id}/${this.panelInfo.id}`)) {
           const url = `/chart/view/getData/${id}/${this.panelInfo.id}`
           Vue.prototype.$cancelRequest(url)
@@ -812,6 +849,7 @@ export default {
         if (!token && linkToken) {
           method = viewInfo
         }
+        
         const requestInfo = {
           ...this.filter,
           cache: cache,
diff --git a/core/frontend/src/components/dataease/DeOutWidget.vue b/core/frontend/src/components/dataease/DeOutWidget.vue
index 3b7cbd8e73..d68712a26c 100644
--- a/core/frontend/src/components/dataease/DeOutWidget.vue
+++ b/core/frontend/src/components/dataease/DeOutWidget.vue
@@ -26,9 +26,12 @@
       <div
         ref="deContentContainer"
         class="condition-content"
-        :class="(element.options.attrs.showTitle && element.options.attrs.title) ? '' : 'condition-content-default'"
+        :class="{'condition-content-default' : !(element.options.attrs.showTitle && element.options.attrs.title)}"
       >
-        <div class="condition-content-container">
+        <div
+          class="condition-content-container"
+          :class="{'widget-required' : element.options.attrs.required}"
+        >
           <div class="first-element">
             <div
               :class="element.component === 'de-select-grid' ? 'first-element-grid-container': ''"
@@ -55,6 +58,12 @@
           </div>
 
         </div>
+        <div
+          v-if="element.options.attrs.required"
+          class="widget-required-symbol"
+        >
+          <span>*</span>
+        </div>
       </div>
     </div>
   </div>
@@ -270,6 +279,16 @@ export default {
   overflow: auto hidden;
   letter-spacing: 0px !important;
   width: 100%;
+  .widget-required {
+    width: calc(100% - 10px) !important;
+    float: left !important;
+  }
+  .widget-required-symbol {
+    color: #f54a45;
+    height: 40px;
+    line-height: 40px;
+    float: right;
+  }
 }
 
 .condition-content-container {
diff --git a/core/frontend/src/components/widget/bean/Condition.js b/core/frontend/src/components/widget/bean/Condition.js
index bf5ca5f799..5b73e602f0 100644
--- a/core/frontend/src/components/widget/bean/Condition.js
+++ b/core/frontend/src/components/widget/bean/Condition.js
@@ -13,5 +13,6 @@ export class Condition {
     this.viewIds = viewIds
     this.parameters = parameters
     this.isTree = isTree || false
+    this.requiredInvalid = false
   }
 }
diff --git a/core/frontend/src/components/widget/deWidget/DeSelect.vue b/core/frontend/src/components/widget/deWidget/DeSelect.vue
index fa5cddcb81..2d5020a517 100644
--- a/core/frontend/src/components/widget/deWidget/DeSelect.vue
+++ b/core/frontend/src/components/widget/deWidget/DeSelect.vue
@@ -143,6 +143,11 @@ export default {
   },
 
   watch: {
+    'value': function(val, old) {
+      if (!this.inDraw) {
+        this.$emit('widget-value-changed', val)
+      }
+    },
     'viewIds': function(value, old) {
       if (typeof value === 'undefined' || value === old) return
       this.fillFirstValue()
@@ -214,6 +219,9 @@ export default {
       if (!token && linkToken) {
         method = linkMultFieldValues
       }
+      if (!this.element.options.attrs.fieldId) {
+        return
+      }
       const param = { fieldIds: this.element.options.attrs.fieldId.split(this.separator), sort: this.element.options.attrs.sort }
       if (this.panelInfo.proxy) {
         param.userId = this.panelInfo.proxy
@@ -474,14 +482,9 @@ export default {
   }
 </style>
 <style lang="scss">
-
-
 .coustom-de-select {
   background-color: var(--BgSelectColor, #FFFFFF) !important;
   border-color: var(--BrSelectColor, #E4E7ED) !important;
-  // .popper__arrow::after{
-  //   border-bottom-color: var(--BgSelectColor, #FFFFFF) !important;
-  // }
 
   .popper__arrow,
   .popper__arrow::after {
diff --git a/core/frontend/src/store/index.js b/core/frontend/src/store/index.js
index 141596fa3f..e1543b32f9 100644
--- a/core/frontend/src/store/index.js
+++ b/core/frontend/src/store/index.js
@@ -307,8 +307,11 @@ const data = {
     },
 
     addViewFilter(state, data) {
+      const required = data.component.options.attrs.required
       const condition = formatCondition(data)
-      const vValid = valueValid(condition)
+      let vValid = valueValid(condition)
+      condition.requiredInvalid = required && !vValid
+      vValid = vValid || required
       //   1.根据componentId过滤
       const filterComponentId = condition.componentId
       const canvasId = data.canvasId
diff --git a/core/frontend/src/views/panel/filter/FilterDialog.vue b/core/frontend/src/views/panel/filter/FilterDialog.vue
index 07ec8c2b9b..fec2a6bc83 100644
--- a/core/frontend/src/views/panel/filter/FilterDialog.vue
+++ b/core/frontend/src/views/panel/filter/FilterDialog.vue
@@ -267,6 +267,7 @@
         <filter-head
           :element="currentElement"
           @dataset-name="dataSetName"
+          @required-change="requiredChange"
         />
 
         <filter-control
@@ -281,6 +282,7 @@
         <filter-foot
           :element="currentElement"
           :control-attrs="myAttrs"
+          @widget-value-changed="widgetValChange"
         />
 
       </div>
@@ -391,13 +393,18 @@ export default {
       datasetParams: [],
       currentElement: null,
       tempTreeData: null,
-      showTips: false
+      showTips: false,
+      widgetValue: null,
+      required: false
     }
   },
   computed: {
     isTree() {
       return this.widget && this.widget.isTree
     },
+    requiredMatch() {
+      return !this.required || !!this.widgetValue?.length
+    },
     ...mapState([
       'componentData'
     ])
@@ -408,7 +415,6 @@ export default {
       if (values && values.length > 0) {
         const fieldIds = values.map(val => val.id)
         this.myAttrs.fieldId = fieldIds.join()
-        // this.myAttrs.dragItems = values
         this.myAttrs.activeName = this.activeName
         this.myAttrs.fieldsParent = this.fieldsParent
       } else if (this.myAttrs && this.myAttrs.fieldId) {
@@ -417,7 +423,9 @@ export default {
       }
       this.enableSureButton()
     },
-
+    requiredMatch(val) {
+      this.enableSureButton()
+    },
     keyWord(val) {
       this.expandedArray = []
       if (this.showDomType === 'field') {
@@ -449,6 +457,7 @@ export default {
   created() {
     this.widget = this.widgetInfo
     this.currentElement = JSON.parse(JSON.stringify(this.element))
+    this.required = !!this.currentElement.options.attrs.required
     this.myAttrs = this.currentElement.options.attrs
     this.treeNode(this.groupForm)
     this.loadViews()
@@ -467,6 +476,12 @@ export default {
     bus.$off('valid-values-change', this.validateFilterValue)
   },
   methods: {
+    widgetValChange(val) {
+      this.widgetValue = val
+    },
+    requiredChange(val) {
+      this.required = val
+    },
     dataSetName(tableId, callback) {
       let result = null
       if (tableId) {
@@ -914,14 +929,13 @@ export default {
 
     enableSureButton() {
       let valid = true
-
       const enable =
       this.currentElement.options.attrs.dragItems && this.currentElement.options.attrs.dragItems
         .length > 0
       if (this.widget.validDynamicValue) {
         valid = this.widget.validDynamicValue(this.currentElement)
       }
-      this.$emit('sure-button-status', enable && valid)
+      this.$emit('sure-button-status', enable && valid && this.requiredMatch)
     },
 
     getElementInfo() {
@@ -934,7 +948,7 @@ export default {
     validateFilterValue(valid) {
       const enable = this.currentElement.options.attrs.dragItems && this.currentElement.options.attrs.dragItems
         .length > 0
-      this.$emit('sure-button-status', enable && valid)
+      this.$emit('sure-button-status', enable && valid && this.requiredMatch)
     }
 
   }
diff --git a/core/frontend/src/views/panel/filter/filterMain/FilterFoot.vue b/core/frontend/src/views/panel/filter/filterMain/FilterFoot.vue
index d333411c9e..420f949b47 100644
--- a/core/frontend/src/views/panel/filter/filterMain/FilterFoot.vue
+++ b/core/frontend/src/views/panel/filter/filterMain/FilterFoot.vue
@@ -27,6 +27,7 @@
               is-config
               :element="element"
               :in-draw="false"
+              @widget-value-changed="widgetValChange"
             />
           </div>
 
@@ -39,6 +40,7 @@
           <de-date-default
             v-if="element.component === 'de-date' && element.serviceName !== 'timeDateRangeWidget'"
             :element="element"
+            @widget-value-changed="widgetValChange"
           />
         </el-card>
 
@@ -49,6 +51,7 @@
           <de-date-range-default
             v-if="element.component === 'de-date' && element.serviceName === 'timeDateRangeWidget'"
             :element="element"
+            @widget-value-changed="widgetValChange"
           />
         </el-card>
 
@@ -83,6 +86,9 @@ export default {
   },
   methods: {
     selectFirstChange(val) {
+    },
+    widgetValChange(val) {
+      this.$emit('widget-value-changed', val)
     }
   }
 }
diff --git a/core/frontend/src/views/panel/filter/filterMain/FilterHead.vue b/core/frontend/src/views/panel/filter/filterMain/FilterHead.vue
index 6f093a3682..925c67809b 100644
--- a/core/frontend/src/views/panel/filter/filterMain/FilterHead.vue
+++ b/core/frontend/src/views/panel/filter/filterMain/FilterHead.vue
@@ -1,6 +1,6 @@
 <template>
   <el-row>
-    <el-col :span="24">
+    <el-col :span="20">
       <div class="filter-field">
         <div class="field-content">
 
@@ -38,6 +38,14 @@
         </div>
       </div>
     </el-col>
+    <el-col :span="4">
+      <div class="de-filter-required">
+        <el-checkbox
+          v-model="element.options.attrs.required"
+          @change="requiredChange"
+        >{{ $t('commons.required') }}</el-checkbox>
+      </div>
+    </el-col>
   </el-row>
 </template>
 
@@ -71,6 +79,9 @@ export default {
 
   },
   methods: {
+    requiredChange(val) {
+      this.$emit('required-change', val)
+    },
     getTableName(tableId) {
       let tableName = null
       this.$emit('dataset-name', tableId, t => { tableName = t })
@@ -94,6 +105,11 @@ export default {
 
 </script>
 <style lang="scss" scoped>
+.de-filter-required {
+  height: 40px;
+  line-height: 40px;
+  float: right;
+}
 .filter-field {
   border-radius: 4px;
   height: 40px;

From 6cdf45fc2763a3d3e694b586fede7fb6d3411bf9 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Thu, 9 Nov 2023 16:21:36 +0800
Subject: [PATCH 14/25] =?UTF-8?q?feat:=20Excel=E6=95=B0=E6=8D=AE=E9=9B=86?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E5=90=8E=EF=BC=8C=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E6=94=AF=E6=8C=81=E5=88=A0=E9=99=A4=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/dataset/add/AddExcel.vue        | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/core/frontend/src/views/dataset/add/AddExcel.vue b/core/frontend/src/views/dataset/add/AddExcel.vue
index ba068a6ef8..a0e4f28425 100644
--- a/core/frontend/src/views/dataset/add/AddExcel.vue
+++ b/core/frontend/src/views/dataset/add/AddExcel.vue
@@ -68,10 +68,9 @@
           @node-click="handleNodeClick"
           @check-change="handleCheckChange"
         >
-          <span
-            slot-scope="{ data }"
+          <span class="custom-tree-node"
+            slot-scope="{ node, data}"
             :title="data.excelLabel"
-            class="custom-tree-node"
           >
             <span class="label">{{ data.excelLabel }}</span>
             <span
@@ -87,6 +86,16 @@
                 class="ds-icon-scene"
               />
             </span>
+            <span>
+              <el-button
+                v-show="!data.sheet"
+                type="text"
+                size="mini"
+                @click="() => remove(node, data)">
+              {{ $t('dataset.delete') }}
+           </el-button>
+            </span>
+
           </span>
         </el-tree>
       </div>
@@ -465,7 +474,12 @@ export default {
         store.dispatch('user/refreshToken', refreshToken)
       }
     },
-
+    remove(node, data) {
+      const parent = node.parent;
+      const children = parent.data.children || parent.data;
+      const index = children.findIndex(d => d.id === data.id);
+      children.splice(index, 1);
+    },
     save() {
       var validate = true
       var selectedSheet = []

From e917c852049bf7878ca5c1edf76fb46c52ce3db0 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 9 Nov 2023 16:29:21 +0800
Subject: [PATCH 15/25] =?UTF-8?q?feat:=20=E8=BF=87=E6=BB=A4=E5=99=A8?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=BA=E5=BF=85=E5=A1=AB=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/widget/deWidget/DeDate.vue    |  6 +++++-
 .../components/widget/deWidget/DeInputSearch.vue |  5 +++++
 .../components/widget/deWidget/DeNumberRange.vue | 10 ++++++++++
 .../components/widget/deWidget/DeSelectGrid.vue  |  5 +++++
 .../components/widget/deWidget/DeSelectTree.vue  |  5 +++++
 .../src/views/panel/filter/FilterDialog.vue      |  6 +++++-
 .../panel/filter/defaultValue/DeDateDefault.vue  | 16 ++++++++++++++++
 .../filter/defaultValue/DeDateRangeDefault.vue   | 16 ++++++++++++++++
 8 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/core/frontend/src/components/widget/deWidget/DeDate.vue b/core/frontend/src/components/widget/deWidget/DeDate.vue
index 86082f1363..ff355563cc 100644
--- a/core/frontend/src/components/widget/deWidget/DeDate.vue
+++ b/core/frontend/src/components/widget/deWidget/DeDate.vue
@@ -226,7 +226,11 @@ export default {
 
   },
   watch: {
-
+    'values': function(val, old) {
+      if (!this.inDraw) {
+        this.$emit('widget-value-changed', val)
+      }
+    },
     'viewIds': function(value, old) {
       if (typeof value === 'undefined' || value === old) return
       this.setCondition()
diff --git a/core/frontend/src/components/widget/deWidget/DeInputSearch.vue b/core/frontend/src/components/widget/deWidget/DeInputSearch.vue
index e54b9e554e..f2becf0ad6 100644
--- a/core/frontend/src/components/widget/deWidget/DeInputSearch.vue
+++ b/core/frontend/src/components/widget/deWidget/DeInputSearch.vue
@@ -66,6 +66,11 @@ export default {
     }
   },
   watch: {
+    'value': function(val, old) {
+      if (!this.inDraw) {
+        this.$emit('widget-value-changed', val)
+      }
+    },
     'viewIds': function(value, old) {
       if (typeof value === 'undefined' || value === old) return
       this.setCondition()
diff --git a/core/frontend/src/components/widget/deWidget/DeNumberRange.vue b/core/frontend/src/components/widget/deWidget/DeNumberRange.vue
index c4ef17d931..beb9410fdf 100644
--- a/core/frontend/src/components/widget/deWidget/DeNumberRange.vue
+++ b/core/frontend/src/components/widget/deWidget/DeNumberRange.vue
@@ -105,6 +105,16 @@ export default {
     }
   },
   watch: {
+    'form.min': function(val, old) {
+      if (!this.inDraw) {
+        this.$emit('widget-value-changed', val)
+      }
+    },
+    'form.max': function(val, old) {
+      if (!this.inDraw) {
+        this.$emit('widget-value-changed', val)
+      }
+    },
     'viewIds': function(value, old) {
       if (typeof value === 'undefined' || value === old) return
       this.setCondition()
diff --git a/core/frontend/src/components/widget/deWidget/DeSelectGrid.vue b/core/frontend/src/components/widget/deWidget/DeSelectGrid.vue
index 46023bfe7d..892719dfee 100644
--- a/core/frontend/src/components/widget/deWidget/DeSelectGrid.vue
+++ b/core/frontend/src/components/widget/deWidget/DeSelectGrid.vue
@@ -148,6 +148,11 @@ export default {
     }
   },
   watch: {
+    'value': function(val, old) {
+      if (!this.inDraw) {
+        this.$emit('widget-value-changed', val)
+      }
+    },
     'viewIds': function(value, old) {
       if (typeof value === 'undefined' || value === old) return
       this.setCondition()
diff --git a/core/frontend/src/components/widget/deWidget/DeSelectTree.vue b/core/frontend/src/components/widget/deWidget/DeSelectTree.vue
index f9f2d3eea3..23ef17f385 100644
--- a/core/frontend/src/components/widget/deWidget/DeSelectTree.vue
+++ b/core/frontend/src/components/widget/deWidget/DeSelectTree.vue
@@ -122,6 +122,11 @@ export default {
   },
 
   watch: {
+    'value': function(val, old) {
+      if (!this.inDraw) {
+        this.$emit('widget-value-changed', val)
+      }
+    },
     'viewIds': function(value, old) {
       if (typeof value === 'undefined' || value === old) return
       this.setCondition()
diff --git a/core/frontend/src/views/panel/filter/FilterDialog.vue b/core/frontend/src/views/panel/filter/FilterDialog.vue
index fec2a6bc83..cd40d9f742 100644
--- a/core/frontend/src/views/panel/filter/FilterDialog.vue
+++ b/core/frontend/src/views/panel/filter/FilterDialog.vue
@@ -477,7 +477,11 @@ export default {
   },
   methods: {
     widgetValChange(val) {
-      this.widgetValue = val
+      if (val === null) {
+        this.widgetValue = null
+        return
+      }
+      this.widgetValue = val.toString()
     },
     requiredChange(val) {
       this.required = val
diff --git a/core/frontend/src/views/panel/filter/defaultValue/DeDateDefault.vue b/core/frontend/src/views/panel/filter/defaultValue/DeDateDefault.vue
index feb598b706..44136cb275 100644
--- a/core/frontend/src/views/panel/filter/defaultValue/DeDateDefault.vue
+++ b/core/frontend/src/views/panel/filter/defaultValue/DeDateDefault.vue
@@ -138,6 +138,7 @@
           :style="element.style"
           :element="element"
           :in-draw="false"
+          @widget-value-changed="widgetValChanged"
         />
       </el-form-item>
 
@@ -195,11 +196,26 @@ export default {
       return 2
     }
   },
+  watch: {
+    'dval': function(val, old) {
+      if (this.element.options.attrs.default.isDynamic) {
+        this.$emit('widget-value-changed', val)
+      }
+    }
+  },
   created() {
     this.setDval()
   },
   methods: {
+    widgetValChanged(val) {
+      if (!this.element.options.attrs.default.isDynamic) {
+        this.$emit('widget-value-changed', val)
+      }
+    },
     dynamicChange(value) {
+      if (!value) {
+        this.$emit('widget-value-changed', this.element.options.value)
+      }
       this.setDval()
     },
     dkeyChange(value) {
diff --git a/core/frontend/src/views/panel/filter/defaultValue/DeDateRangeDefault.vue b/core/frontend/src/views/panel/filter/defaultValue/DeDateRangeDefault.vue
index a11971d4c0..53933b9f23 100644
--- a/core/frontend/src/views/panel/filter/defaultValue/DeDateRangeDefault.vue
+++ b/core/frontend/src/views/panel/filter/defaultValue/DeDateRangeDefault.vue
@@ -275,6 +275,7 @@
           :element="element"
           class="relative-time"
           :in-draw="false"
+          @widget-value-changed="widgetValChanged"
         />
       </el-form-item>
 
@@ -334,12 +335,27 @@ export default {
       return result
     }
   },
+  watch: {
+    'dval': function(val, old) {
+      if (this.element.options.attrs.default.isDynamic) {
+        this.$emit('widget-value-changed', val)
+      }
+    }
+  },
   created() {
     this.fillEmptySuffixTime()
     this.setDval()
   },
   methods: {
+    widgetValChanged(val) {
+      if (!this.element.options.attrs.default.isDynamic) {
+        this.$emit('widget-value-changed', val)
+      }
+    },
     dynamicChange(value) {
+      if (!value) {
+        this.$emit('widget-value-changed', this.element.options.value)
+      }
       this.setDval()
     },
     dkeyChange(value) {

From 5275c28bd397a0ad48815c49563995b05cb070cc Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Thu, 9 Nov 2023 16:34:18 +0800
Subject: [PATCH 16/25] =?UTF-8?q?fix:=20=E6=96=B0=E5=BC=80=E5=8F=91?=
 =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E6=BA=90=E6=8F=92=E4=BB=B6=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2=E6=97=B6=EF=BC=8C=E5=AD=98=E5=9C=A8=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=95=B0=E6=8D=AE=E6=BA=90=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=9B=86=E5=88=99=E6=97=A0=E6=B3=95=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/controller/sys/SysPluginController.java     | 2 +-
 .../main/java/io/dataease/service/sys/PluginService.java    | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/backend/src/main/java/io/dataease/controller/sys/SysPluginController.java b/core/backend/src/main/java/io/dataease/controller/sys/SysPluginController.java
index 782953a328..a3f81c0aeb 100644
--- a/core/backend/src/main/java/io/dataease/controller/sys/SysPluginController.java
+++ b/core/backend/src/main/java/io/dataease/controller/sys/SysPluginController.java
@@ -58,7 +58,7 @@ public class SysPluginController {
     @RequiresPermissions("plugin:upload")
     public Map<String, Object> update(@PathVariable("pluginId") Long pluginId, @RequestParam("file") MultipartFile file) throws Exception {
         DeFileUtils.validateFile(file);
-        if (pluginService.uninstall(pluginId)) {
+        if (pluginService.uninstallForUpdate(pluginId, true)) {
             return pluginService.localInstall(file);
         }
         return null;
diff --git a/core/backend/src/main/java/io/dataease/service/sys/PluginService.java b/core/backend/src/main/java/io/dataease/service/sys/PluginService.java
index 9df89c03dc..f3589418d9 100644
--- a/core/backend/src/main/java/io/dataease/service/sys/PluginService.java
+++ b/core/backend/src/main/java/io/dataease/service/sys/PluginService.java
@@ -221,6 +221,10 @@ public class PluginService {
      * @return
      */
     public Boolean uninstall(Long pluginId) {
+       return uninstallForUpdate(pluginId, false);
+    }
+
+    public Boolean uninstallForUpdate(Long pluginId, boolean forUpdate) {
         MyPlugin myPlugin = myPluginMapper.selectByPrimaryKey(pluginId);
         if (ObjectUtils.isEmpty(myPlugin)) {
             String msg = "当前插件不存在";
@@ -232,7 +236,7 @@ public class PluginService {
         CacheUtils.removeAll(AuthConstants.USER_ROLE_CACHE_NAME);
         CacheUtils.removeAll(AuthConstants.USER_PERMISSION_CACHE_NAME);
 
-        if (myPlugin.getCategory().equalsIgnoreCase("datasource")) {
+        if (myPlugin.getCategory().equalsIgnoreCase("datasource") && !forUpdate) {
             if (CollectionUtils.isNotEmpty(datasourceService.selectByType(myPlugin.getDsType()))) {
                 DEException.throwException(Translator.get("i18n_plugin_not_allow_delete"));
             }

From 8bd0a30e15a3a8ceb5d0fa528f7f807146e8e81b Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 9 Nov 2023 16:47:31 +0800
Subject: [PATCH 17/25] =?UTF-8?q?fix:=20=E8=A7=92=E8=89=B2=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=99=AE=E9=80=9A=E5=91=98=E5=B7=A5=E7=A6=81=E6=AD=A2?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=8F=90=E7=A4=BA=E6=96=87=E6=A1=88#6593?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/core/frontend/src/lang/en.js b/core/frontend/src/lang/en.js
index 609f7da0ab..394a9ca95c 100644
--- a/core/frontend/src/lang/en.js
+++ b/core/frontend/src/lang/en.js
@@ -766,6 +766,8 @@ export default {
     can_not_move: `Can't be removed, keep at least one administrator`,
     manage_can_not_move: 'Administrator is a preset role of the system. By default, he has all the permissions of system management and cannot be deleted',
     manage_can_not_update: 'Administrator is a preset role of the system. By default, he has all the permissions of system management and cannot be edit',
+    inner_can_not_move: 'System built-in roles,cannot be deleted',
+    inner_can_not_update: 'System built-in roles,cannot be edit',
     role_description: 'Role description',
     editer_role: 'Edit role',
     add_role: 'Add role',
diff --git a/core/frontend/src/lang/tw.js b/core/frontend/src/lang/tw.js
index 454ab31525..da2374679d 100644
--- a/core/frontend/src/lang/tw.js
+++ b/core/frontend/src/lang/tw.js
@@ -765,6 +765,8 @@ export default {
     can_not_move: '不可移除，至少保留一位管理員',
     manage_can_not_move: '管理員是系統預置角色，默認擁有系統管理全部權限，無法刪除',
     manage_can_not_update: '管理員是系統預置角色，默認擁有系統管理全部權限，無法編輯',
+    inner_can_not_move: '系統預置角色，無法刪除',
+    inner_can_not_update: '系統預置角色，無法編輯',
     role_description: '角色描述',
     editer_role: '編輯角色',
     add_role: '添加角色',
diff --git a/core/frontend/src/lang/zh.js b/core/frontend/src/lang/zh.js
index f27c6fa2a4..6f002f1ade 100644
--- a/core/frontend/src/lang/zh.js
+++ b/core/frontend/src/lang/zh.js
@@ -764,6 +764,8 @@ export default {
     can_not_move: '不可移除，至少保留一位管理员',
     manage_can_not_move: '管理员是系统预置角色，默认拥有系统管理全部权限，无法删除',
     manage_can_not_update: '管理员是系统预置角色，默认拥有系统管理全部权限，无法编辑',
+    inner_can_not_move: '系统预置角色，无法删除',
+    inner_can_not_update: '系统预置角色，无法编辑',
     role_description: '角色描述',
     editer_role: '编辑角色',
     add_role: '添加角色',

From dcfaeb33b37abe2428b15d961f4b5842b8883eba Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Thu, 9 Nov 2023 17:06:20 +0800
Subject: [PATCH 18/25] =?UTF-8?q?feat:=20=E6=89=80=E6=9C=89=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=A6=82=E6=9E=9C=E4=BD=BF=E7=94=A8=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E7=99=BB=E5=BD=95=EF=BC=8C=E5=9D=87=E5=BC=BA?=
 =?UTF-8?q?=E5=88=B6=E8=A6=81=E6=B1=82=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/io/dataease/auth/server/AuthServer.java   | 5 +++++
 core/frontend/src/App.vue                                   | 6 ++++--
 core/frontend/src/store/modules/user.js                     | 3 +++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/core/backend/src/main/java/io/dataease/auth/server/AuthServer.java b/core/backend/src/main/java/io/dataease/auth/server/AuthServer.java
index 9f1b2b082a..3684ff8869 100644
--- a/core/backend/src/main/java/io/dataease/auth/server/AuthServer.java
+++ b/core/backend/src/main/java/io/dataease/auth/server/AuthServer.java
@@ -196,6 +196,11 @@ public class AuthServer implements AuthApi {
             }
             if (user.getIsAdmin() && user.getPassword().equals("40b8893ea9ebc2d631c4bb42bb1e8996")) {
                 result.put("passwordModified", false);
+                result.put("defaultPwd", "dataease");
+            }
+            if (!user.getIsAdmin() && user.getPassword().equals("83d923c9f1d8fcaa46cae0ed2aaa81b5")) {
+                result.put("passwordModified", false);
+                result.put("defaultPwd", DEFAULT_PWD);
             }
         }
 
diff --git a/core/frontend/src/App.vue b/core/frontend/src/App.vue
index 380888af6b..40f3077521 100644
--- a/core/frontend/src/App.vue
+++ b/core/frontend/src/App.vue
@@ -13,7 +13,7 @@
       :title="$t('user.change_password')"
       :show-close="false"
     >
-      <PasswordUpdateForm old-pwd="dataease" />
+      <PasswordUpdateForm :old-pwd=defaultPwd />
     </el-dialog>
   </div>
 </template>
@@ -28,7 +28,8 @@ export default {
   components: { PluginCom, PasswordUpdateForm },
   data() {
     return {
-      showPasswordModifiedDialog: false
+      showPasswordModifiedDialog: false,
+      defaultPwd: 'dataease'
     }
   },
   computed: {
@@ -46,6 +47,7 @@ export default {
   },
   mounted() {
     const passwordModified = JSON.parse(localStorage.getItem('passwordModified'))
+    this.defaultPwd = localStorage.getItem('defaultPwd')
     if (typeof passwordModified === 'boolean') {
       this.$store.commit('user/SET_PASSWORD_MODIFIED', passwordModified)
     }
diff --git a/core/frontend/src/store/modules/user.js b/core/frontend/src/store/modules/user.js
index 4156ec3ea9..a49152b1c6 100644
--- a/core/frontend/src/store/modules/user.js
+++ b/core/frontend/src/store/modules/user.js
@@ -86,6 +86,9 @@ const actions = {
         if (Object.prototype.hasOwnProperty.call(data, 'passwordModified')) {
           passwordModified = data.passwordModified
         }
+        if (Object.prototype.hasOwnProperty.call(data, 'defaultPwd')) {
+          localStorage.setItem('defaultPwd', data.defaultPwd)
+        }
         commit('SET_PASSWORD_MODIFIED', passwordModified)
         localStorage.setItem('passwordModified', passwordModified)
         resolve()

From 1bff8251c1cf68dd14cc3cdc0d26374504cd2faf Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Thu, 9 Nov 2023 17:25:04 +0800
Subject: [PATCH 19/25] =?UTF-8?q?feat:=20=E5=9C=A8=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84=E9=85=8D=E7=BD=AE=E9=A1=B5=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=AF=B7=E6=B1=82=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E7=9A=84=E6=8E=A7=E5=88=B6=EF=BC=8C=E9=BB=98=E8=AE=A4=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4=E4=B8=BA=EF=BC=9A?=
 =?UTF-8?q?30s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request/datasource/ApiDefinition.java     |  1 +
 .../provider/datasource/ApiProvider.java      |  9 ++------
 .../system/datasource/DsConfiguration.vue     | 23 +++++++++++++++++++
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/core/backend/src/main/java/io/dataease/controller/request/datasource/ApiDefinition.java b/core/backend/src/main/java/io/dataease/controller/request/datasource/ApiDefinition.java
index 540081cefa..f786e37618 100644
--- a/core/backend/src/main/java/io/dataease/controller/request/datasource/ApiDefinition.java
+++ b/core/backend/src/main/java/io/dataease/controller/request/datasource/ApiDefinition.java
@@ -17,6 +17,7 @@ public class ApiDefinition {
     private List<DatasetTableFieldDTO> fields;
     private ApiDefinitionRequest request;
     private String dataPath;
+    private Integer queryTimeout;
     private String status;
     private List<Map<String,String>> data = new ArrayList<>();
     private List<JSONObject> jsonFields = new ArrayList<>();
diff --git a/core/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java b/core/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java
index b9478cb16e..31d26fce1c 100644
--- a/core/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java
+++ b/core/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java
@@ -37,14 +37,10 @@ public class ApiProvider extends Provider {
 
     private static String path = "['%s']";
 
-    @Resource
-    private SystemParameterService systemParameterService;
-
     @Override
     public List<String[]> getData(DatasourceRequest datasourceRequest) throws Exception {
-        BasicInfo basicInfo = systemParameterService.basicInfo();
         ApiDefinition apiDefinition = checkApiDefinition(datasourceRequest);
-        String response = execHttpRequest(apiDefinition, StringUtils.isNotBlank(basicInfo.getFrontTimeOut()) ? Integer.parseInt(basicInfo.getFrontTimeOut()) : 10);
+        String response = execHttpRequest(apiDefinition, apiDefinition.getQueryTimeout() == null || apiDefinition.getQueryTimeout()<=0 ? 30 : apiDefinition.getQueryTimeout());
         return fetchResult(response, apiDefinition);
     }
 
@@ -68,12 +64,11 @@ public class ApiProvider extends Provider {
     }
 
     public Map<String, List> fetchResultAndField(DatasourceRequest datasourceRequest) throws Exception {
-        BasicInfo basicInfo = systemParameterService.basicInfo();
         Map<String, List> result = new HashMap<>();
         List<String[]> dataList = new ArrayList<>();
         List<TableField> fieldList = new ArrayList<>();
         ApiDefinition apiDefinition = checkApiDefinition(datasourceRequest);
-        String response = execHttpRequest(apiDefinition, StringUtils.isNotBlank(basicInfo.getFrontTimeOut()) ? Integer.parseInt(basicInfo.getFrontTimeOut()) : 10);
+        String response = execHttpRequest(apiDefinition, apiDefinition.getQueryTimeout() == null || apiDefinition.getQueryTimeout()<=0 ? 30 : apiDefinition.getQueryTimeout());
 
         fieldList = getTableFields(apiDefinition);
         result.put("fieldList", fieldList);
diff --git a/core/frontend/src/views/system/datasource/DsConfiguration.vue b/core/frontend/src/views/system/datasource/DsConfiguration.vue
index 53dea4b597..34b9f4894d 100644
--- a/core/frontend/src/views/system/datasource/DsConfiguration.vue
+++ b/core/frontend/src/views/system/datasource/DsConfiguration.vue
@@ -525,6 +525,20 @@
             </el-input>
           </el-form-item>
 
+          <el-form-item
+              :label="$t('datasource.query_timeout')"
+              prop="apiQueryTimeout"
+          >
+            <el-input
+                v-model="apiItem.queryTimeout"
+                autocomplete="off"
+                type="number"
+                :min="0"
+            >
+              <template slot="append">{{ $t('panel.second') }}</template>
+            </el-input>
+          </el-form-item>
+
           <div v-loading="loading">
             <div class="row-rules mr40">
               <span>{{ $t('datasource.req_param') }}</span>
@@ -981,6 +995,13 @@ export default {
             trigger: 'blur'
           }
         ],
+        'apiQueryTimeout': [
+          {
+            required: true,
+            message: i18n.t('datasource.please_input_query_timeout'),
+            trigger: 'blur'
+          }
+        ],
         dataPath: [
           {
             required: true,
@@ -1001,6 +1022,7 @@ export default {
         name: '',
         url: '',
         method: 'GET',
+        queryTimeout: 30,
         request: {
           headers: [{}],
           arguments: [],
@@ -1018,6 +1040,7 @@ export default {
         url: '',
         method: 'GET',
         dataPath: '',
+        queryTimeout: 30,
         request: {
           headers: [],
           arguments: [],

From 6157b74c8b0b518da301fbd030b0183088d6b846 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 9 Nov 2023 17:39:09 +0800
Subject: [PATCH 20/25] =?UTF-8?q?fix:=20echarts=E5=9C=B0=E5=9B=BE=E9=AB=98?=
 =?UTF-8?q?=E7=BA=A7=E9=85=8D=E7=BD=AE=E5=9C=B0=E5=90=8D=E6=98=A0=E5=B0=84?=
 =?UTF-8?q?=E4=BC=9A=E5=BD=B1=E5=93=8D=E5=9C=B0=E5=9B=BE=E9=A2=9C=E8=89=B2?=
 =?UTF-8?q?#6192?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/chart/components/ChartComponent.vue | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/core/frontend/src/views/chart/components/ChartComponent.vue b/core/frontend/src/views/chart/components/ChartComponent.vue
index 9a82351f7c..d58cbb2888 100644
--- a/core/frontend/src/views/chart/components/ChartComponent.vue
+++ b/core/frontend/src/views/chart/components/ChartComponent.vue
@@ -467,6 +467,25 @@ export default {
         }
       }
       const chart_option = baseMapOption(base_json, geoJson, chart, this.buttonTextColor, curAreaCode, this.currentSeriesId)
+      if (chart_option.series?.length) {
+        const dataNames = []
+        chart_option.series.filter(se => se.type === 'map').forEach(se => {
+          se.data.forEach(d => {
+            if (d?.name) {
+              dataNames.push(d.name)
+            }
+          })
+        })
+        for (const key in chart_option.geo.nameMap) {
+          if (Object.hasOwnProperty.call(chart_option.geo.nameMap, key)) {
+            const element = chart_option.geo.nameMap[key]
+            if (element && !dataNames.includes(element)) {
+              chart_option.geo.nameMap[key] = key
+            }
+          }
+        }
+      }
+
       this.myEcharts(chart_option)
       const opt = this.myChart.getOption()
       if (opt && opt.series) {

From 9b8cd839ee1e05a8905f75cb08dc8dea2970004b Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Thu, 9 Nov 2023 17:49:27 +0800
Subject: [PATCH 21/25] =?UTF-8?q?feat:=20=E8=A1=A8=E6=A0=BC=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E9=9A=90=E8=97=8F=E8=A1=A8=E5=A4=B4#5873?=
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 +
 core/frontend/src/views/chart/chart/chart.js  |   3 +-
 .../src/views/chart/chart/table/table-info.js |  18 ++
 core/frontend/src/views/chart/chart/util.js   |  12 +-
 .../components/shapeAttr/SizeSelector.vue     | 198 +++++++------
 .../components/shapeAttr/SizeSelectorAntV.vue | 275 ++++++++++--------
 .../chart/components/table/TableNormal.vue    |   9 +-
 9 files changed, 295 insertions(+), 223 deletions(-)

diff --git a/core/frontend/src/lang/en.js b/core/frontend/src/lang/en.js
index 609f7da0ab..fcbad70544 100644
--- a/core/frontend/src/lang/en.js
+++ b/core/frontend/src/lang/en.js
@@ -1147,6 +1147,7 @@ export default {
     table_header_font_color: 'Header Font',
     table_item_font_color: 'Table Font',
     table_show_index: 'Show Index',
+    table_show_table_header: 'Show Table Header',
     stripe: 'Zebra pattern',
     start_angle: 'Start Angle',
     end_angle: 'End Angle',
diff --git a/core/frontend/src/lang/tw.js b/core/frontend/src/lang/tw.js
index 454ab31525..fb6656ba65 100644
--- a/core/frontend/src/lang/tw.js
+++ b/core/frontend/src/lang/tw.js
@@ -1146,6 +1146,7 @@ export default {
     table_header_font_color: '表頭字體',
     table_item_font_color: '表格字體',
     table_show_index: '顯示序號',
+    table_show_table_header: '顯示表頭',
     stripe: '斑馬紋',
     start_angle: '起始角度',
     end_angle: '結束角度',
diff --git a/core/frontend/src/lang/zh.js b/core/frontend/src/lang/zh.js
index f27c6fa2a4..3175cc9525 100644
--- a/core/frontend/src/lang/zh.js
+++ b/core/frontend/src/lang/zh.js
@@ -1145,6 +1145,7 @@ export default {
     table_header_font_color: '表头字体',
     table_item_font_color: '表格字体',
     table_show_index: '显示序号',
+    table_show_table_header: '显示表头',
     stripe: '斑马纹',
     start_angle: '起始角度',
     end_angle: '结束角度',
diff --git a/core/frontend/src/views/chart/chart/chart.js b/core/frontend/src/views/chart/chart/chart.js
index a687a7aafe..2058b8a829 100644
--- a/core/frontend/src/views/chart/chart/chart.js
+++ b/core/frontend/src/views/chart/chart/chart.js
@@ -156,7 +156,8 @@ export const DEFAULT_SIZE = {
   mapLineAnimateInterval: 1,
   mapLineAnimateTrailLength: 1,
   wordSizeRange: [8, 32],
-  wordSpacing: 6
+  wordSpacing: 6,
+  showTableHeader: true
 }
 export const DEFAULT_SUSPENSION = {
   show: true
diff --git a/core/frontend/src/views/chart/chart/table/table-info.js b/core/frontend/src/views/chart/chart/table/table-info.js
index 8f7179089f..2c9b8edd21 100644
--- a/core/frontend/src/views/chart/chart/table/table-info.js
+++ b/core/frontend/src/views/chart/chart/table/table-info.js
@@ -111,6 +111,15 @@ export function baseTableInfo(s2, container, chart, action, tableData, pageInfo)
       return new DataCell(viewMeta, viewMeta?.spreadsheet)
     }
   }
+  // 隐藏表头，保留顶部的分割线, 禁用表头横向 resize
+  if (customAttr.size.showTableHeader === false) {
+    s2Options.style.colCfg.height = 1
+    s2Options.interaction = {
+      resize: {
+        colCellVertical: false
+      }
+    }
+  }
 
   // 开始渲染
   if (s2) {
@@ -284,6 +293,15 @@ export function baseTableNormal(s2, container, chart, action, tableData) {
       }
     }
   }
+  // 隐藏表头，保留顶部的分割线, 禁用表头横向 resize
+  if (customAttr.size.showTableHeader === false) {
+    s2Options.style.colCfg.height = 1
+    s2Options.interaction = {
+      resize: {
+        colCellVertical: false
+      }
+    }
+  }
 
   // 开始渲染
   if (s2) {
diff --git a/core/frontend/src/views/chart/chart/util.js b/core/frontend/src/views/chart/chart/util.js
index 92a9757112..347dbd41c2 100644
--- a/core/frontend/src/views/chart/chart/util.js
+++ b/core/frontend/src/views/chart/chart/util.js
@@ -63,7 +63,8 @@ export const TYPE_CONFIGS = [
         'tableColumnMode',
         'showIndex',
         'indexLabel',
-        'tableColTooltip'
+        'tableColTooltip',
+        'showTableHeader'
       ],
       'title-selector-ant-v': [
         'show',
@@ -113,7 +114,8 @@ export const TYPE_CONFIGS = [
         'tableColumnMode',
         'showIndex',
         'indexLabel',
-        'tableColTooltip'
+        'tableColTooltip',
+        'showTableHeader'
       ],
       'title-selector-ant-v': [
         'show',
@@ -1987,7 +1989,8 @@ export const TYPE_CONFIGS = [
         'tableColumnWidth',
         'showIndex',
         'indexLabel',
-        'tableAutoBreakLine'
+        'tableAutoBreakLine',
+        'showTableHeader'
       ],
       'title-selector': [
         'show',
@@ -2031,7 +2034,8 @@ export const TYPE_CONFIGS = [
         'tableColumnWidth',
         'showIndex',
         'indexLabel',
-        'tableAutoBreakLine'
+        'tableAutoBreakLine',
+        'showTableHeader'
       ],
       'title-selector': [
         'show',
diff --git a/core/frontend/src/views/chart/components/shapeAttr/SizeSelector.vue b/core/frontend/src/views/chart/components/shapeAttr/SizeSelector.vue
index bfaa06d0ec..ca4a384770 100644
--- a/core/frontend/src/views/chart/components/shapeAttr/SizeSelector.vue
+++ b/core/frontend/src/views/chart/components/shapeAttr/SizeSelector.vue
@@ -242,7 +242,42 @@
         </el-form-item>
         <!--radar-end-->
         <!--table-begin-->
-
+        <el-form-item
+          v-show="showProperty('tableItemFontSize')"
+          label-width="100px"
+          :label="$t('chart.table_item_fontsize')"
+          class="form-item"
+        >
+          <el-select
+            v-model="sizeForm.tableItemFontSize"
+            :placeholder="$t('chart.table_item_fontsize')"
+            @change="changeBarSizeCase('tableItemFontSize')"
+          >
+            <el-option
+              v-for="option in fontSize"
+              :key="option.value"
+              :label="option.name"
+              :value="option.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          v-show="showProperty('tableItemHeight')"
+          label-width="100px"
+          :label="$t('chart.table_item_height')"
+          class="form-item form-item-slider"
+        >
+          <el-slider
+            v-model="sizeForm.tableItemHeight"
+            :disabled="sizeForm.tableAutoBreakLine"
+            :min="36"
+            :max="100"
+            show-input
+            :show-input-controls="false"
+            input-size="mini"
+            @change="changeBarSizeCase('tableItemHeight')"
+          />
+        </el-form-item>
         <el-form-item
           v-show="showProperty('tablePageMode')"
           label-width="100px"
@@ -283,6 +318,22 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item
+          v-show="showProperty('tableColumnWidth')"
+          label-width="100px"
+          :label="$t('chart.table_column_width_config')"
+          class="form-item form-item-slider"
+        >
+          <el-slider
+            v-model="sizeForm.tableColumnWidth"
+            :min="10"
+            :max="1000"
+            show-input
+            :show-input-controls="false"
+            input-size="mini"
+            @change="changeBarSizeCase('tableColumnWidth')"
+          />
+        </el-form-item>
         <el-form-item
           v-show="showProperty('tableAutoBreakLine')"
           label-width="100px"
@@ -303,97 +354,10 @@
             </div>
             <i
               class="el-icon-info"
-              style="cursor: pointer;color: gray;font-size: 12px;"
+              style="cursor: pointer;color: grey;font-size: 12px;"
             />
           </el-tooltip>
         </el-form-item>
-        <el-form-item
-          v-show="showProperty('tableTitleFontSize')"
-          label-width="100px"
-          :label="$t('chart.table_title_fontsize')"
-          class="form-item"
-        >
-          <el-select
-            v-model="sizeForm.tableTitleFontSize"
-            :placeholder="$t('chart.table_title_fontsize')"
-            @change="changeBarSizeCase('tableTitleFontSize')"
-          >
-            <el-option
-              v-for="option in fontSize"
-              :key="option.value"
-              :label="option.name"
-              :value="option.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item
-          v-show="showProperty('tableItemFontSize')"
-          label-width="100px"
-          :label="$t('chart.table_item_fontsize')"
-          class="form-item"
-        >
-          <el-select
-            v-model="sizeForm.tableItemFontSize"
-            :placeholder="$t('chart.table_item_fontsize')"
-            @change="changeBarSizeCase('tableItemFontSize')"
-          >
-            <el-option
-              v-for="option in fontSize"
-              :key="option.value"
-              :label="option.name"
-              :value="option.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item
-          v-show="showProperty('tableTitleHeight')"
-          label-width="100px"
-          :label="$t('chart.table_title_height')"
-          class="form-item form-item-slider"
-        >
-          <el-slider
-            v-model="sizeForm.tableTitleHeight"
-            :min="36"
-            :max="100"
-            show-input
-            :show-input-controls="false"
-            input-size="mini"
-            @change="changeBarSizeCase('tableTitleHeight')"
-          />
-        </el-form-item>
-        <el-form-item
-          v-show="showProperty('tableItemHeight')"
-          label-width="100px"
-          :label="$t('chart.table_item_height')"
-          class="form-item form-item-slider"
-        >
-          <el-slider
-            v-model="sizeForm.tableItemHeight"
-            :disabled="sizeForm.tableAutoBreakLine"
-            :min="36"
-            :max="100"
-            show-input
-            :show-input-controls="false"
-            input-size="mini"
-            @change="changeBarSizeCase('tableItemHeight')"
-          />
-        </el-form-item>
-        <el-form-item
-          v-show="showProperty('tableColumnWidth')"
-          label-width="100px"
-          :label="$t('chart.table_column_width_config')"
-          class="form-item form-item-slider"
-        >
-          <el-slider
-            v-model="sizeForm.tableColumnWidth"
-            :min="10"
-            :max="1000"
-            show-input
-            :show-input-controls="false"
-            input-size="mini"
-            @change="changeBarSizeCase('tableColumnWidth')"
-          />
-        </el-form-item>
         <el-form-item
           v-show="showProperty('showIndex')"
           label-width="100px"
@@ -421,6 +385,59 @@
             @blur="changeBarSizeCase('indexLabel')"
           />
         </el-form-item>
+        <el-divider v-show="includesAny(chart.type ,'table')" />
+        <el-form-item
+          v-show="showProperty('showTableHeader')"
+          label-width="100px"
+          :label="$t('chart.table_show_table_header')"
+          class="form-item"
+        >
+          <el-radio-group
+            v-model="sizeForm.showTableHeader"
+            @change="changeBarSizeCase('showTableHeader')"
+          >
+            <el-radio :label="true">{{ $t('commons.yes') }}</el-radio>
+            <el-radio :label="false">{{ $t('commons.no') }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <div v-show="showProperty('showTableHeader') && sizeForm.showTableHeader">
+          <el-form-item
+            v-show="showProperty('tableTitleFontSize')"
+            label-width="100px"
+            :label="$t('chart.table_title_fontsize')"
+            class="form-item"
+          >
+            <el-select
+              v-model="sizeForm.tableTitleFontSize"
+              :placeholder="$t('chart.table_title_fontsize')"
+              @change="changeBarSizeCase('tableTitleFontSize')"
+            >
+              <el-option
+                v-for="option in fontSize"
+                :key="option.value"
+                :label="option.name"
+                :value="option.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item
+            v-show="showProperty('tableTitleHeight')"
+            label-width="100px"
+            :label="$t('chart.table_title_height')"
+            class="form-item form-item-slider"
+          >
+            <el-slider
+              v-model="sizeForm.tableTitleHeight"
+              :min="36"
+              :max="100"
+              show-input
+              :show-input-controls="false"
+              input-size="mini"
+              @change="changeBarSizeCase('tableTitleHeight')"
+            />
+          </el-form-item>
+        </div>
 
         <!--table-end-->
         <!--gauge-begin-->
@@ -1055,6 +1072,7 @@
 
 <script>
 import { CHART_FONT_FAMILY, CHART_FONT_LETTER_SPACE, DEFAULT_SIZE } from '../../chart/chart'
+import { includesAny } from '@/utils/StringUtils'
 export default {
   name: 'SizeSelector',
   props: {
@@ -1118,6 +1136,7 @@ export default {
     this.initData()
   },
   methods: {
+    includesAny,
     initData() {
       const chart = JSON.parse(JSON.stringify(this.chart))
       if (chart.customAttr) {
@@ -1145,6 +1164,7 @@ export default {
           this.sizeForm.tablePageSize = this.sizeForm.tablePageSize ? this.sizeForm.tablePageSize : DEFAULT_SIZE.tablePageSize
 
           this.sizeForm.showIndex = this.sizeForm.showIndex ? this.sizeForm.showIndex : DEFAULT_SIZE.showIndex
+          this.sizeForm.showTableHeader = this.sizeForm.showTableHeader !== false
           if (this.sizeForm.indexLabel === null || this.sizeForm.indexLabel === undefined) {
             this.sizeForm.indexLabel = DEFAULT_SIZE.indexLabel
           }
diff --git a/core/frontend/src/views/chart/components/shapeAttr/SizeSelectorAntV.vue b/core/frontend/src/views/chart/components/shapeAttr/SizeSelectorAntV.vue
index 86ff082cfb..0b4bf1aee2 100644
--- a/core/frontend/src/views/chart/components/shapeAttr/SizeSelectorAntV.vue
+++ b/core/frontend/src/views/chart/components/shapeAttr/SizeSelectorAntV.vue
@@ -162,7 +162,60 @@
         </el-form-item>
         <!--radar-end-->
         <!--table-begin-->
-
+        <el-form-item
+          v-show="showProperty('tableItemFontSize')"
+          label-width="100px"
+          :label="$t('chart.table_item_fontsize')"
+          class="form-item"
+        >
+          <el-select
+            v-model="sizeForm.tableItemFontSize"
+            :placeholder="$t('chart.table_item_fontsize')"
+            @change="changeBarSizeCase('tableItemFontSize')"
+          >
+            <el-option
+              v-for="option in fontSize"
+              :key="option.value"
+              :label="option.name"
+              :value="option.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          v-show="showProperty('tableItemAlign')"
+          label-width="100px"
+          :label="$t('chart.table_item_align')"
+          class="form-item"
+        >
+          <el-select
+            v-model="sizeForm.tableItemAlign"
+            :placeholder="$t('chart.table_item_align')"
+            @change="changeBarSizeCase('tableItemAlign')"
+          >
+            <el-option
+              v-for="option in alignOptions"
+              :key="option.value"
+              :label="option.name"
+              :value="option.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          v-show="showProperty('tableItemHeight')"
+          label-width="100px"
+          :label="$t('chart.table_item_height')"
+          class="form-item form-item-slider"
+        >
+          <el-slider
+            v-model="sizeForm.tableItemHeight"
+            :min="20"
+            :max="100"
+            show-input
+            :show-input-controls="false"
+            input-size="mini"
+            @change="changeBarSizeCase('tableItemHeight')"
+          />
+        </el-form-item>
         <el-form-item
           v-show="showProperty('tablePageMode')"
           label-width="100px"
@@ -203,114 +256,6 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item
-          v-show="showProperty('tableTitleFontSize')"
-          label-width="100px"
-          :label="$t('chart.table_title_fontsize')"
-          class="form-item"
-        >
-          <el-select
-            v-model="sizeForm.tableTitleFontSize"
-            :placeholder="$t('chart.table_title_fontsize')"
-            @change="changeBarSizeCase('tableTitleFontSize')"
-          >
-            <el-option
-              v-for="option in fontSize"
-              :key="option.value"
-              :label="option.name"
-              :value="option.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item
-          v-show="showProperty('tableItemFontSize')"
-          label-width="100px"
-          :label="$t('chart.table_item_fontsize')"
-          class="form-item"
-        >
-          <el-select
-            v-model="sizeForm.tableItemFontSize"
-            :placeholder="$t('chart.table_item_fontsize')"
-            @change="changeBarSizeCase('tableItemFontSize')"
-          >
-            <el-option
-              v-for="option in fontSize"
-              :key="option.value"
-              :label="option.name"
-              :value="option.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item
-          v-show="showProperty('tableHeaderAlign')"
-          label-width="100px"
-          :label="$t('chart.table_header_align')"
-          class="form-item"
-        >
-          <el-select
-            v-model="sizeForm.tableHeaderAlign"
-            :placeholder="$t('chart.table_header_align')"
-            @change="changeBarSizeCase('tableHeaderAlign')"
-          >
-            <el-option
-              v-for="option in alignOptions"
-              :key="option.value"
-              :label="option.name"
-              :value="option.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item
-          v-show="showProperty('tableItemAlign')"
-          label-width="100px"
-          :label="$t('chart.table_item_align')"
-          class="form-item"
-        >
-          <el-select
-            v-model="sizeForm.tableItemAlign"
-            :placeholder="$t('chart.table_item_align')"
-            @change="changeBarSizeCase('tableItemAlign')"
-          >
-            <el-option
-              v-for="option in alignOptions"
-              :key="option.value"
-              :label="option.name"
-              :value="option.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item
-          v-show="showProperty('tableTitleHeight')"
-          label-width="100px"
-          :label="$t('chart.table_title_height')"
-          class="form-item form-item-slider"
-        >
-          <el-slider
-            v-model="sizeForm.tableTitleHeight"
-            :min="20"
-            :max="100"
-            show-input
-            :show-input-controls="false"
-            input-size="mini"
-            @change="changeBarSizeCase('tableTitleHeight')"
-          />
-        </el-form-item>
-        <el-form-item
-          v-show="showProperty('tableItemHeight')"
-          label-width="100px"
-          :label="$t('chart.table_item_height')"
-          class="form-item form-item-slider"
-        >
-          <el-slider
-            v-model="sizeForm.tableItemHeight"
-            :min="20"
-            :max="100"
-            show-input
-            :show-input-controls="false"
-            input-size="mini"
-            @change="changeBarSizeCase('tableItemHeight')"
-          />
-        </el-form-item>
         <el-form-item
           v-show="showProperty('tableColumnMode')"
           label-width="100px"
@@ -384,29 +329,100 @@
             @blur="changeBarSizeCase('indexLabel')"
           />
         </el-form-item>
+        <el-divider v-show="equalsAny(chart.type, 'table-info', 'table-normal')" />
         <el-form-item
-          v-show="showProperty('tableRowTooltip')"
+          v-show="showProperty('showTableHeader')"
           label-width="100px"
-          :label="$t('chart.table_row_tooltip')"
+          :label="$t('chart.table_show_table_header')"
           class="form-item"
         >
-          <el-checkbox
-            v-model="sizeForm.tableRowTooltip.show"
-            @change="changeBarSizeCase('tableRowTooltip')"
-          />
+          <el-radio-group
+            v-model="sizeForm.showTableHeader"
+            @change="changeBarSizeCase('showTableHeader')"
+          >
+            <el-radio :label="true">{{ $t('commons.yes') }}</el-radio>
+            <el-radio :label="false">{{ $t('commons.no') }}</el-radio>
+          </el-radio-group>
         </el-form-item>
-        <el-form-item
-          v-show="showProperty('tableColTooltip')"
-          label-width="100px"
-          :label="$t('chart.table_col_tooltip')"
-          class="form-item"
-        >
-          <el-checkbox
-            v-model="sizeForm.tableColTooltip.show"
-            @change="changeBarSizeCase('tableColTooltip')"
-          />
-        </el-form-item>
-
+        <div v-show="showProperty('showTableHeader') && sizeForm.showTableHeader">
+          <el-form-item
+            v-show="showProperty('tableTitleFontSize')"
+            label-width="100px"
+            :label="$t('chart.table_title_fontsize')"
+            class="form-item"
+          >
+            <el-select
+              v-model="sizeForm.tableTitleFontSize"
+              :placeholder="$t('chart.table_title_fontsize')"
+              @change="changeBarSizeCase('tableTitleFontSize')"
+            >
+              <el-option
+                v-for="option in fontSize"
+                :key="option.value"
+                :label="option.name"
+                :value="option.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            v-show="showProperty('tableHeaderAlign')"
+            label-width="100px"
+            :label="$t('chart.table_header_align')"
+            class="form-item"
+          >
+            <el-select
+              v-model="sizeForm.tableHeaderAlign"
+              :placeholder="$t('chart.table_header_align')"
+              @change="changeBarSizeCase('tableHeaderAlign')"
+            >
+              <el-option
+                v-for="option in alignOptions"
+                :key="option.value"
+                :label="option.name"
+                :value="option.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            v-show="showProperty('tableTitleHeight')"
+            label-width="100px"
+            :label="$t('chart.table_title_height')"
+            class="form-item form-item-slider"
+          >
+            <el-slider
+              v-model="sizeForm.tableTitleHeight"
+              :min="20"
+              :max="100"
+              show-input
+              :show-input-controls="false"
+              input-size="mini"
+              @change="changeBarSizeCase('tableTitleHeight')"
+            />
+          </el-form-item>
+          <el-form-item
+            v-show="showProperty('tableRowTooltip')"
+            label-width="100px"
+            :label="$t('chart.table_row_tooltip')"
+            class="form-item"
+          >
+            <el-checkbox
+              v-model="sizeForm.tableRowTooltip.show"
+              @change="changeBarSizeCase('tableRowTooltip')"
+            />
+          </el-form-item>
+          <el-form-item
+            v-show="showProperty('tableColTooltip')"
+            label-width="100px"
+            :label="$t('chart.table_col_tooltip')"
+            class="form-item"
+          >
+            <el-checkbox
+              v-model="sizeForm.tableColTooltip.show"
+              @change="changeBarSizeCase('tableColTooltip')"
+            />
+          </el-form-item>
+        </div>
+        <!--table-end-->
         <!--chart-mix-start-->
         <span v-show="showProperty('mix')">
           <el-divider
@@ -1427,7 +1443,7 @@
 
 <script>
 import { CHART_FONT_FAMILY, CHART_FONT_LETTER_SPACE, DEFAULT_SIZE } from '../../chart/chart'
-import { equalsAny } from '@/utils/StringUtils'
+import { equalsAny, includesAny } from '@/utils/StringUtils'
 import { mapState } from 'vuex'
 
 export default {
@@ -1537,6 +1553,8 @@ export default {
     this.initData()
   },
   methods: {
+    equalsAny,
+    includesAny,
     initField() {
       this.quotaData = this.quotaFields.filter(ele => !ele.chartId && ele.id !== 'count')
       if (this.sizeForm.gaugeMinField.id) {
@@ -1590,6 +1608,7 @@ export default {
           this.sizeForm.tableColTooltip = this.sizeForm.tableColTooltip ?? DEFAULT_SIZE.tableColTooltip
 
           this.sizeForm.showIndex = this.sizeForm.showIndex ? this.sizeForm.showIndex : DEFAULT_SIZE.showIndex
+          this.sizeForm.showTableHeader = this.sizeForm.showTableHeader !== false
           if (this.sizeForm.indexLabel === null || this.sizeForm.indexLabel === undefined) {
             this.sizeForm.indexLabel = DEFAULT_SIZE.indexLabel
           }
diff --git a/core/frontend/src/views/chart/components/table/TableNormal.vue b/core/frontend/src/views/chart/components/table/TableNormal.vue
index 3b10d9977f..e51eaa59f8 100644
--- a/core/frontend/src/views/chart/components/table/TableNormal.vue
+++ b/core/frontend/src/views/chart/components/table/TableNormal.vue
@@ -23,18 +23,19 @@
       <ux-grid
         ref="plxTable"
         size="mini"
+        class="table-class"
         :style="tableStyle"
         :height="height"
         :checkbox-config="{highlight: true}"
         :width-resize="true"
         :header-row-style="table_header_class"
         :row-style="getRowStyle"
-        class="table-class"
         :class="chart.id"
         :merge-cells="mergeCells"
         :show-summary="showSummary"
         :summary-method="summaryMethod"
         :index-config="{seqMethod}"
+        :show-header="showHeader"
         @cell-click="cellClick"
       >
         <ux-table-column
@@ -194,6 +195,7 @@ export default {
       scrollTop: 0,
       showIndex: false,
       indexLabel: '序号',
+      showHeader: true,
       scrollBarColor: DEFAULT_COLOR_CASE.tableScrollBarColor,
       scrollBarHoverColor: DEFAULT_COLOR_CASE.tableScrollBarHoverColor,
       totalStyle: {
@@ -451,6 +453,11 @@ export default {
           } else {
             this.indexLabel = customAttr.size.indexLabel
           }
+          if (customAttr.size.showTableHeader === false) {
+            this.showHeader = false
+          } else {
+            this.showHeader = true
+          }
 
           const autoBreakLine = customAttr.size.tableAutoBreakLine ? customAttr.size.tableAutoBreakLine : DEFAULT_SIZE.tableAutoBreakLine
           if (autoBreakLine) {

From e2f59d5da4bb87c55f8a01ae428d56610cfc94ad Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Thu, 9 Nov 2023 17:51:29 +0800
Subject: [PATCH 22/25] =?UTF-8?q?feat:=20decimal=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=BA=94=E8=AF=A5=E6=98=A0=E5=B0=84=E4=B8=BADoris=E7=9A=84DECI?=
 =?UTF-8?q?MALV3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/provider/engine/doris/DorisDDLProvider.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/backend/src/main/java/io/dataease/provider/engine/doris/DorisDDLProvider.java b/core/backend/src/main/java/io/dataease/provider/engine/doris/DorisDDLProvider.java
index 374fa8460f..011eb80edc 100644
--- a/core/backend/src/main/java/io/dataease/provider/engine/doris/DorisDDLProvider.java
+++ b/core/backend/src/main/java/io/dataease/provider/engine/doris/DorisDDLProvider.java
@@ -73,7 +73,7 @@ public class DorisDDLProvider extends DDLProviderImpl {
                     break;
                 case 3:
                    if(datasetTableField.getType().equalsIgnoreCase("DECIMAL") && datasetTableField.getAccuracy() != 0){
-                       Column_Fields.append("DECIMAL(" + datasetTableField.getSize() + "," + datasetTableField.getAccuracy() + ")").append(",`");
+                       Column_Fields.append("DecimalV3(" + datasetTableField.getSize() + "," + datasetTableField.getAccuracy() + ")").append(",`");
                    }else {
                        Column_Fields.append("DOUBLE").append(",`");
                    }

From e9581e0b683f1b8d500b4f4c38eac4a64912be5c Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Fri, 10 Nov 2023 15:38:26 +0800
Subject: [PATCH 23/25] =?UTF-8?q?fix:=20=E5=9B=BE=E8=A1=A8=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/canvas/customComponent/UserView.vue     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/frontend/src/components/canvas/customComponent/UserView.vue b/core/frontend/src/components/canvas/customComponent/UserView.vue
index 3e834e3222..2b07d4daba 100644
--- a/core/frontend/src/components/canvas/customComponent/UserView.vue
+++ b/core/frontend/src/components/canvas/customComponent/UserView.vue
@@ -28,7 +28,10 @@
         {{ $t('chart.chart_error_tips') }}
       </div>
     </div>
-    <div v-if="view.unReadyMsg" class="chart-error-class">
+    <div
+      v-if="view && view.unReadyMsg"
+      class="chart-error-class"
+    >
       <div class="chart-error-message-class">
         {{ view.unReadyMsg }},{{ $t('chart.chart_show_error') }}
         <br>
@@ -849,7 +852,7 @@ export default {
         if (!token && linkToken) {
           method = viewInfo
         }
-        
+
         const requestInfo = {
           ...this.filter,
           cache: cache,

From f83d6ac88012400fd9b62ea4645e4bb5b18cd2f0 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Fri, 10 Nov 2023 16:52:09 +0800
Subject: [PATCH 24/25] =?UTF-8?q?feat:=20=E3=80=90=E4=BB=AA=E8=A1=A8?=
 =?UTF-8?q?=E6=9D=BF=E3=80=91=E6=96=87=E6=9C=AC=E6=90=9C=E7=B4=A2=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=94=AF=E6=8C=81=20SQL=20=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/panel/filter/filterMain/FilterControl.vue         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/frontend/src/views/panel/filter/filterMain/FilterControl.vue b/core/frontend/src/views/panel/filter/filterMain/FilterControl.vue
index 4bec477cef..d4ce4b3a16 100644
--- a/core/frontend/src/views/panel/filter/filterMain/FilterControl.vue
+++ b/core/frontend/src/views/panel/filter/filterMain/FilterControl.vue
@@ -368,7 +368,7 @@ export default {
       this.showParams = true
       this.isRangeParamWidget = this.widget.isRangeParamWidget && this.widget.isRangeParamWidget()
     }
-    if ('timeYearWidget,timeMonthWidget,timeDateWidget,textSelectWidget,numberSelectWidget'.indexOf(this.widget.name) !== -1) {
+    if ('textInputWidget,timeYearWidget,timeMonthWidget,timeDateWidget,textSelectWidget,numberSelectWidget'.indexOf(this.widget.name) !== -1) {
       this.showParams = true
     }
   },

From 3a11d762c03d8a16f218007770c7a42533a2b927 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Fri, 10 Nov 2023 17:10:32 +0800
Subject: [PATCH 25/25] =?UTF-8?q?feat:=20oracle=20=E6=94=AF=E6=8C=81=20?=
 =?UTF-8?q?=E5=AD=97=E7=AC=A6=E9=9B=86"US7ASCII",=20"AL32UTF8"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/plugins/common/constants/DatasourceTypes.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/constants/DatasourceTypes.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/constants/DatasourceTypes.java
index 1ded945483..ad6f1c77df 100644
--- a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/constants/DatasourceTypes.java
+++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/constants/DatasourceTypes.java
@@ -15,7 +15,7 @@ public enum DatasourceTypes {
     pg("pg", "PostgreSQL", "\"", "\"", "\"", "\"", "", true, DatasourceCalculationMode.DIRECT_AND_SYNC, null, null,true, DatabaseClassification.OLTP),
     kingbase("kingbase", "KingBase", "\"", "\"", "\"", "\"", "", false, DatasourceCalculationMode.DIRECT, null,null,true, DatabaseClassification.OLTP),
     sqlServer("sqlServer", "SQL Server", "\"", "\"", "\"", "\"", "", true, DatasourceCalculationMode.DIRECT_AND_SYNC, null, null,true, DatabaseClassification.OLTP),
-    oracle("oracle", "Oracle", "\"", "\"", "\"", "\"", "", true, DatasourceCalculationMode.DIRECT_AND_SYNC, Arrays.asList("Default", "GBK", "BIG5", "ISO-8859-1", "UTF-8", "UTF-16", "CP850", "EUC_JP", "EUC_KR"), Arrays.asList("Default", "GBK", "UTF-8"),true, DatabaseClassification.OLTP),
+    oracle("oracle", "Oracle", "\"", "\"", "\"", "\"", "", true, DatasourceCalculationMode.DIRECT_AND_SYNC, Arrays.asList("Default", "GBK", "BIG5", "ISO-8859-1", "UTF-8", "UTF-16", "CP850", "EUC_JP", "EUC_KR", "US7ASCII", "AL32UTF8"), Arrays.asList("Default", "GBK", "UTF-8"),true, DatabaseClassification.OLTP),
     mongo("mongo", "MongoDB", "`", "`", "\"", "\"", "rebuildschema=true&authSource=admin", true, DatasourceCalculationMode.DIRECT, null, null,true, DatabaseClassification.OLTP),
     ck("ck", "ClickHouse", "`", "`", "", "", "", true, DatasourceCalculationMode.DIRECT, null, null,true, DatabaseClassification.OLAP),
     db2("db2", "Db2", "\"", "\"", "\"", "\"", "", true, DatasourceCalculationMode.DIRECT_AND_SYNC, null, null,true, DatabaseClassification.OLTP),