From 859a0ee2cfe3e1185d856857ad97ce734d077924 Mon Sep 17 00:00:00 2001
From: hanyuxia <hanyuxia@geedgenetworks.com>
Date: Mon, 29 Apr 2024 17:26:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A1=A8=E6=A0=BC=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E7=BC=93=E5=AD=98=E4=BF=AE=E6=94=B9=EF=BC=881.=20?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E8=AF=BB=E5=8F=96=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=88=A4=E6=96=AD=E7=BC=93=E5=AD=98=E9=87=8C?=
 =?UTF-8?q?=E7=9A=84version=E5=92=8C=E5=BD=93=E5=89=8Dversion=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E4=B8=80=E8=87=B4=EF=BC=8C=E4=B8=8D=E4=B8=80=E8=87=B4?=
 =?UTF-8?q?=E5=88=99=E6=B8=85=E6=8E=89=E7=BC=93=E5=AD=98=EF=BC=8C=E6=94=B9?=
 =?UTF-8?q?=E7=94=A8=E4=BB=A3=E7=A0=81=E9=87=8C=E7=9A=84tableTitle?=
 =?UTF-8?q?=EF=BC=9B2.=20=E5=9C=A8=E4=BF=9D=E5=AD=98=E6=97=B6=EF=BC=8Cvers?=
 =?UTF-8?q?ion=E5=AD=97=E6=AE=B5=E7=9B=B4=E6=8E=A5=E7=94=A8=E5=BD=93?=
 =?UTF-8?q?=E5=89=8Dversion=EF=BC=8C=E4=B8=8D=E7=94=A8=E5=8A=A0=E5=B0=8F?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/config.js                         |  2 +-
 src/components/table/ColumnCustomize.vue | 19 ++++++++++--------
 src/mixins/data-list.js                  | 18 +++++++++++++----
 src/utils/constants.js                   | 25 ++++++++++++++++++++++++
 4 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/public/config.js b/public/config.js
index ba0a6d64..e532ba8d 100644
--- a/public/config.js
+++ b/public/config.js
@@ -1,6 +1,6 @@
 const BASE_CONFIG = {
   baseUrl: 'http://192.168.44.54:8090/',
-  version: '24.03',
+  version: '24.04',
   apiVersion: 'v1'
 }
 // 默认时间过滤条件，单位分钟. 0表示请求接口时不传时间参数
diff --git a/src/components/table/ColumnCustomize.vue b/src/components/table/ColumnCustomize.vue
index 6188ee15..c68c8602 100644
--- a/src/components/table/ColumnCustomize.vue
+++ b/src/components/table/ColumnCustomize.vue
@@ -59,7 +59,7 @@
 
 <script>
 import indexedDBUtils from '@/indexedDB'
-import { storageKey, dbTableColumnCustomizeConfigPre } from '@/utils/constants'
+import { storageKey, dbTableColumnCustomizeConfigPre,dbTableColumnCustomizeConfig } from '@/utils/constants'
 export default {
   props: {
     customTableTitle: Array, // 自定义的title
@@ -153,7 +153,7 @@ export default {
       this.$emit('update', this.custom)
       const userId = localStorage.getItem(storageKey.userId)
       const tableName = dbTableColumnCustomizeConfigPre + '-' + this.tableId
-
+/*
       const defaultConfigInDb = await indexedDBUtils.selectTable(tableName).get({ id: userId })
       let fullVersion = ''
       if (defaultConfigInDb && defaultConfigInDb.version) {
@@ -167,12 +167,15 @@ export default {
       } else {
         fullVersion = BASE_CONFIG.version + '.1'
       }
-
-      await indexedDBUtils.selectTable(tableName).put({
-        id: userId,
-        version: fullVersion,
-        config: _.cloneDeep(this.custom)
-      })
+*/
+      let curTableConfig = dbTableColumnCustomizeConfig.find(item => item.tableName === tableName)
+      if(curTableConfig) {
+        await indexedDBUtils.selectTable(tableName).put({
+          id: userId,
+          version: curTableConfig.version,
+          config: _.cloneDeep(this.custom)
+        })
+      }
     }
   },
   computed: {
diff --git a/src/mixins/data-list.js b/src/mixins/data-list.js
index edd079c0..87aab097 100644
--- a/src/mixins/data-list.js
+++ b/src/mixins/data-list.js
@@ -1,5 +1,5 @@
 import { tableSort } from '@/utils/tools'
-import { defaultPageSize, fromRoute, position, storageKey, dbTableColumnCustomizeConfigPre } from '@/utils/constants'
+import { defaultPageSize, fromRoute, position, storageKey, dbTableColumnCustomizeConfigPre,dbTableColumnCustomizeConfig } from '@/utils/constants'
 import _ from 'lodash'
 import { ref } from 'vue'
 import pagination from '@/components/common/Pagination'
@@ -428,9 +428,19 @@ export default {
       localStorageTableTitle = await indexedDBUtils.selectTable(tableName).get({ id: userId })
     }
 
-    localStorageTableTitle = localStorageTableTitle && localStorageTableTitle.config
-      ? localStorageTableTitle.config
-      : (this.$refs.dataTable && this.$refs.dataTable.tableTitle ? this.$refs.dataTable.tableTitle : [])
+    let curTableTitles = this.$refs.dataTable && this.$refs.dataTable.tableTitle ? this.$refs.dataTable.tableTitle : []
+    let curTableConfig = dbTableColumnCustomizeConfig.find(item => item.tableName === tableName)
+    if(localStorageTableTitle && curTableConfig &&
+          localStorageTableTitle.version !== curTableConfig.version && curTableTitles) {
+      this.$emit('update', curTableTitles)
+      await indexedDBUtils.selectTable(tableName).put({
+        id: userId,
+        version: curTableConfig.version,
+        config: _.cloneDeep(curTableTitles)
+      })
+    }
+
+    localStorageTableTitle = localStorageTableTitle && localStorageTableTitle.config ? localStorageTableTitle.config : curTableTitles
     // this.tools.customTableTitle = this.$refs.dataTable.tableTitle.map((item, index) => { // 修复切换中英文的问题
     //   if (localStorageTableTitle[index]) {
     //     item.show = localStorageTableTitle[index].show
diff --git a/src/utils/constants.js b/src/utils/constants.js
index 2cce8ec3..8a92a60f 100644
--- a/src/utils/constants.js
+++ b/src/utils/constants.js
@@ -52,6 +52,31 @@ export const storageKey = {
 }
 export const largeCountryList = ['CN', 'US', 'RU', 'AU', 'CA', 'KZ', 'IN', 'BR']
 
+export const dbTableColumnCustomizeConfig = [
+  {
+    version: '24.04.01',
+    tableName: dbUserTableColumnCustomizeConfig
+  },{
+    version: '24.04.01',
+    tableName: dbRoleTableColumnCustomizeConfig
+  },{
+    version: '24.04.01',
+    tableName: dbOperationLogTableColumnCustomizeConfig
+  },{
+    version: '24.04.01',
+    tableName: dbChartTableColumnCustomizeConfig
+  },{
+    version: '24.04.01',
+    tableName: dbI18nTableColumnCustomizeConfig
+  },{
+    version: '24.04.01',
+    tableName: dbReportTableColumnCustomizeConfig
+  },{
+    version: '24.04.01',
+    tableName: dbGalaxySettingTableColumnCustomizeConfig
+  }
+]
+
 // 统一定义跳转来源
 export const fromRoute = {
   trafficSummary: 'trafficSummary',