From 4e73bb90d436cf8b21ff7888454c3ae26a2ad06a Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Fri, 8 Dec 2023 11:11:49 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E6=96=91?=
 =?UTF-8?q?=E9=A9=AC=E7=BA=B9=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/chart/components/shapeAttr/ColorSelector.vue     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/frontend/src/views/chart/components/shapeAttr/ColorSelector.vue b/core/frontend/src/views/chart/components/shapeAttr/ColorSelector.vue
index f4941b0671..615fe73872 100644
--- a/core/frontend/src/views/chart/components/shapeAttr/ColorSelector.vue
+++ b/core/frontend/src/views/chart/components/shapeAttr/ColorSelector.vue
@@ -605,7 +605,8 @@ export default {
           this.colorForm.tableHeaderFontColor = this.colorForm.tableHeaderFontColor ? this.colorForm.tableHeaderFontColor : this.colorForm.tableFontColor
           this.$set(this.colorForm, 'gradient', this.colorForm.gradient || false)
           this.colorForm.tableScrollBarColor = this.colorForm.tableScrollBarColor ? this.colorForm.tableScrollBarColor : DEFAULT_COLOR_CASE.tableScrollBarColor
-          this.colorForm.quotaSuffixColor = this.colorForm.quotaSuffixColor ? this.colorForm.quotaSuffixColor :DEFAULT_COLOR_CASE.quotaSuffixColor
+          this.colorForm.quotaSuffixColor = this.colorForm.quotaSuffixColor ? this.colorForm.quotaSuffixColor : DEFAULT_COLOR_CASE.quotaSuffixColor
+          this.colorForm.tableItemSubBgColor = this.colorForm.tableItemSubBgColor ? this.colorForm.tableItemSubBgColor : DEFAULT_COLOR_CASE.tableItemSubBgColor
 
           this.colorForm.mapStyle = this.colorForm.mapStyle ? this.colorForm.mapStyle : DEFAULT_COLOR_CASE.mapStyle
           this.colorForm.mapLineGradient = this.colorForm.mapLineGradient ? this.colorForm.mapLineGradient : DEFAULT_COLOR_CASE.mapLineGradient

From c83772f6ba2820ad8679cb71234805671237e054 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Fri, 8 Dec 2023 11:19:00 +0800
Subject: [PATCH 2/3] =?UTF-8?q?style:=20=E4=BB=A3=E7=A0=81=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/frontend/src/App.vue                     |  2 +-
 .../canvas/components/editor/EditBar.vue      | 14 +++---
 .../src/components/widget/deWidget/DeTabs.vue |  2 +-
 .../chart/components/ChartComponentS2.vue     |  2 +-
 .../src/views/dataset/add/AddExcel.vue        | 18 +++----
 .../system/datasource/DsConfiguration.vue     | 48 +++++++++----------
 .../views/system/sysParam/BasicSetting.vue    | 10 ++--
 7 files changed, 49 insertions(+), 47 deletions(-)

diff --git a/core/frontend/src/App.vue b/core/frontend/src/App.vue
index 40f3077521..cd8ee87b6b 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=defaultPwd />
+      <PasswordUpdateForm :old-pwd="defaultPwd" />
     </el-dialog>
   </div>
 </template>
diff --git a/core/frontend/src/components/canvas/components/editor/EditBar.vue b/core/frontend/src/components/canvas/components/editor/EditBar.vue
index 36d3f127f6..0514c0162e 100644
--- a/core/frontend/src/components/canvas/components/editor/EditBar.vue
+++ b/core/frontend/src/components/canvas/components/editor/EditBar.vue
@@ -145,7 +145,7 @@
           :target="curComponent.hyperlinks.openMode "
           :href="curComponent.hyperlinks.content "
         >
-          <i class="icon iconfont icon-com-jump"/>
+          <i class="icon iconfont icon-com-jump" />
         </a>
       </span>
 
@@ -193,7 +193,7 @@
 </template>
 
 <script>
-import {mapState} from 'vuex'
+import { mapState } from 'vuex'
 import bus from '@/utils/bus'
 import SettingMenu from '@/components/canvas/components/editor/SettingMenu'
 import LinkageField from '@/components/canvas/components/editor/LinkageField'
@@ -202,13 +202,13 @@ import FieldsList from '@/components/canvas/components/editor/FieldsList'
 import LinkJumpSet from '@/views/panel/linkJumpSet'
 import Background from '@/views/background/index'
 import MapLayerController from '@/views/chart/components/map/MapLayerController'
-import {uploadFileResult} from '@/api/staticResource/staticResource'
+import { uploadFileResult } from '@/api/staticResource/staticResource'
 import eventBus from '@/components/canvas/utils/eventBus'
-import {hasDataPermission} from '@/utils/permission'
-import {exportExcelDownload} from '@/components/canvas/utils/utils'
+import { hasDataPermission } from '@/utils/permission'
+import { exportExcelDownload } from '@/components/canvas/utils/utils'
 
 export default {
-  components: {Background, LinkJumpSet, FieldsList, SettingMenu, LinkageField, MapLayerController},
+  components: { Background, LinkJumpSet, FieldsList, SettingMenu, LinkageField, MapLayerController },
 
   props: {
     canvasId: {
@@ -467,7 +467,7 @@ export default {
       }
     },
     showViewDetails(openType = 'details') {
-      this.$emit('showViewDetails', {openType: openType})
+      this.$emit('showViewDetails', { openType: openType })
     },
     exportExcelDownload() {
       exportExcelDownload(this.chart)
diff --git a/core/frontend/src/components/widget/deWidget/DeTabs.vue b/core/frontend/src/components/widget/deWidget/DeTabs.vue
index 66e8581be7..827022cff0 100644
--- a/core/frontend/src/components/widget/deWidget/DeTabs.vue
+++ b/core/frontend/src/components/widget/deWidget/DeTabs.vue
@@ -495,7 +495,7 @@ export default {
     bus.$off('add-new-tab', this.addNewTab)
   },
   methods: {
-    setTabLayout: _.debounce(function () {
+    setTabLayout: _.debounce(function() {
       this.headClassScroll = !!this.$refs?.deTabsConstom?.$refs?.tabsConstom?.$refs?.nav?.scrollable ? 'head-class-scroll' : ''
     }, 100),
     calcTabLength() {
diff --git a/core/frontend/src/views/chart/components/ChartComponentS2.vue b/core/frontend/src/views/chart/components/ChartComponentS2.vue
index a051995a50..5f6e389496 100644
--- a/core/frontend/src/views/chart/components/ChartComponentS2.vue
+++ b/core/frontend/src/views/chart/components/ChartComponentS2.vue
@@ -14,8 +14,8 @@
     <span
       v-if="chart.type"
       v-show="title_show"
-      :class="titleIsRight"
       ref="title"
+      :class="titleIsRight"
       :style="title_class"
       style="cursor: default;display: block;"
     >
diff --git a/core/frontend/src/views/dataset/add/AddExcel.vue b/core/frontend/src/views/dataset/add/AddExcel.vue
index a0e4f28425..ae124321d1 100644
--- a/core/frontend/src/views/dataset/add/AddExcel.vue
+++ b/core/frontend/src/views/dataset/add/AddExcel.vue
@@ -68,8 +68,9 @@
           @node-click="handleNodeClick"
           @check-change="handleCheckChange"
         >
-          <span class="custom-tree-node"
+          <span
             slot-scope="{ node, data}"
+            class="custom-tree-node"
             :title="data.excelLabel"
           >
             <span class="label">{{ data.excelLabel }}</span>
@@ -91,9 +92,10 @@
                 v-show="!data.sheet"
                 type="text"
                 size="mini"
-                @click="() => remove(node, data)">
-              {{ $t('dataset.delete') }}
-           </el-button>
+                @click="() => remove(node, data)"
+              >
+                {{ $t('dataset.delete') }}
+              </el-button>
             </span>
 
           </span>
@@ -475,10 +477,10 @@ export default {
       }
     },
     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);
+      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
diff --git a/core/frontend/src/views/system/datasource/DsConfiguration.vue b/core/frontend/src/views/system/datasource/DsConfiguration.vue
index 78e27d1705..332a1e414a 100644
--- a/core/frontend/src/views/system/datasource/DsConfiguration.vue
+++ b/core/frontend/src/views/system/datasource/DsConfiguration.vue
@@ -526,14 +526,14 @@
           </el-form-item>
 
           <el-form-item
-              :label="$t('datasource.query_timeout')"
-              prop="apiQueryTimeout"
+            :label="$t('datasource.query_timeout')"
+            prop="apiQueryTimeout"
           >
             <el-input
-                v-model="apiItem.apiQueryTimeout"
-                autocomplete="off"
-                type="number"
-                :min="0"
+              v-model="apiItem.apiQueryTimeout"
+              autocomplete="off"
+              type="number"
+              :min="0"
             >
               <template slot="append">{{ $t('panel.second') }}</template>
             </el-input>
@@ -1158,24 +1158,24 @@ export default {
       }
       callback()
     },
-      isNumber(rule, value, callback) {
-        if (!value) {
-            callback(new Error(i18n.t('datasource.please_input_query_timeout')))
-            return
-        }
-        let isNumber = false
-        var reg = /^\d+$/;
-        isNumber =  reg.test(value);
-        if (!isNumber) {
-            callback(new Error(i18n.t('datasource.please_input_query_timeout')))
-            return
-        }
-        if(value <= 0 ||  value > 300){
-            callback(new Error(i18n.t('datasource.please_input_query_timeout')))
-            return
-        }
-        callback()
-      },
+    isNumber(rule, value, callback) {
+      if (!value) {
+        callback(new Error(i18n.t('datasource.please_input_query_timeout')))
+        return
+      }
+      let isNumber = false
+      var reg = /^\d+$/
+      isNumber = reg.test(value)
+      if (!isNumber) {
+        callback(new Error(i18n.t('datasource.please_input_query_timeout')))
+        return
+      }
+      if (value <= 0 || value > 300) {
+        callback(new Error(i18n.t('datasource.please_input_query_timeout')))
+        return
+      }
+      callback()
+    },
     next() {
       if (this.active === 1) {
         let hasRepeatName = false
diff --git a/core/frontend/src/views/system/sysParam/BasicSetting.vue b/core/frontend/src/views/system/sysParam/BasicSetting.vue
index 475b66afbe..56e3455145 100644
--- a/core/frontend/src/views/system/sysParam/BasicSetting.vue
+++ b/core/frontend/src/views/system/sysParam/BasicSetting.vue
@@ -85,14 +85,14 @@
       </el-form-item>
 
       <el-form-item
-          :label="$t('system_parameter_setting.ds_sync_log_retention_time')"
-          prop="logTimeOut"
+        :label="$t('system_parameter_setting.ds_sync_log_retention_time')"
+        prop="logTimeOut"
       >
         <el-input
-            v-model="formInline.dsSyncLogTimeOut"
-            :placeholder="$t('system_parameter_setting.empty_msg')"
+          v-model="formInline.dsSyncLogTimeOut"
+          :placeholder="$t('system_parameter_setting.empty_msg')"
         ><template
-            slot="append"
+          slot="append"
         >{{ $t('components.day') }}</template></el-input>
       </el-form-item>
 

From 06a28fa1f4cec75ed0eb1c4379f3d782f2200a28 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Fri, 8 Dec 2023 14:27:39 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E8=AF=A6=E6=83=85=E4=BD=BF=E7=94=A8=E5=8E=9F=E6=9C=89?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=EF=BC=8C=E5=85=B6=E4=BB=96=E8=A7=86=E5=9B=BE?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=A0=B7=E5=BC=8F=EF=BC=8C=E4=B8=8D=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E6=96=91=E9=A9=AC=E7=BA=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/canvas/customComponent/UserView.vue    | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/frontend/src/components/canvas/customComponent/UserView.vue b/core/frontend/src/components/canvas/customComponent/UserView.vue
index 2a5e8ff15e..a5c3b61b28 100644
--- a/core/frontend/src/components/canvas/customComponent/UserView.vue
+++ b/core/frontend/src/components/canvas/customComponent/UserView.vue
@@ -1025,10 +1025,13 @@ export default {
       const tableChart = deepCopy(this.chart)
       tableChart.customAttr = JSON.parse(this.chart.customAttr)
       tableChart.customStyle = JSON.parse(this.chart.customStyle)
-      tableChart.customAttr.color.tableHeaderBgColor = '#f8f8f9'
-      tableChart.customAttr.color.tableItemBgColor = '#ffffff'
-      tableChart.customAttr.color.tableHeaderFontColor = '#7c7e81'
-      tableChart.customAttr.color.tableFontColor = '#7c7e81'
+      if (!this.chart.type?.includes('table')) {
+        tableChart.customAttr.color.tableHeaderBgColor = '#f8f8f9'
+        tableChart.customAttr.color.tableItemBgColor = '#ffffff'
+        tableChart.customAttr.color.tableHeaderFontColor = '#7c7e81'
+        tableChart.customAttr.color.tableFontColor = '#7c7e81'
+        tableChart.customAttr.color.enableTableCrossBG = false
+      }
       tableChart.customAttr.color.tableStripe = true
       tableChart.customAttr.size.tablePageMode = 'pull'
       tableChart.customStyle.text.show = false