From ab1b551642d79caab46b853d2336f42b8fcabf73 Mon Sep 17 00:00:00 2001
From: hyx <hanyuxia@iie.ac.cn>
Date: Tue, 27 Jun 2023 10:54:36 +0800
Subject: [PATCH] =?UTF-8?q?CN-1075=20table=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E5=88=97=E7=BC=93=E5=AD=98=E5=8A=9F=E8=83=BD=E6=9C=89=E6=97=B6?=
 =?UTF-8?q?=E4=BC=9A=E5=9B=A0=E5=AD=97=E6=AE=B5=E5=8F=98=E5=8C=96=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E7=BC=93=E5=AD=98=E6=95=B0=E6=8D=AE=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/table/ColumnCustomize.vue | 33 ++++++++++++++++++++----
 src/indexedDB/index.js                   | 11 ++++++--
 src/mixins/data-list.js                  | 15 +++++++----
 src/utils/constants.js                   |  8 ++++++
 src/views/administration/User.vue        |  2 +-
 src/views/charts2/ChartList.vue          |  2 +-
 src/views/report/Report.vue              |  2 +-
 7 files changed, 58 insertions(+), 15 deletions(-)

diff --git a/src/components/table/ColumnCustomize.vue b/src/components/table/ColumnCustomize.vue
index 39a9898b..b411e49f 100644
--- a/src/components/table/ColumnCustomize.vue
+++ b/src/components/table/ColumnCustomize.vue
@@ -58,7 +58,9 @@
 </template>
 
 <script>
-import { storageKey } from '@/utils/constants'
+import indexedDBUtils from '@/indexedDB'
+import { storageKey, dbTableColumnCustomizeConfigPre } from '@/utils/constants'
+import { get } from '@/utils/http'
 export default {
   props: {
     customTableTitle: Array, // 自定义的title
@@ -74,10 +76,11 @@ export default {
     }
   },
   created () {
+    /*
     const localStorageTitle = JSON.parse(localStorage.getItem(storageKey.tableTitle + '-' + localStorage.getItem(storageKey.username) + '-' + this.tableId))
     if (localStorageTitle) {
       localStorage.setItem(storageKey.tableTitle + '-' + localStorage.getItem(storageKey.username) + '-' + this.tableId, JSON.stringify(localStorageTitle))
-    }
+    } */
   },
   watch: {
     customTableTitle: {
@@ -147,10 +150,30 @@ export default {
       }
     },
     // 点击第二个cancel
-    save () {
+    async save () {
       this.$emit('update', this.custom)
-      localStorage.setItem(storageKey.tableTitle + '-' + localStorage.getItem(storageKey.username) + '-' + this.tableId, JSON.stringify(this.custom))
-      // this.esc()
+      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) {
+        const oldVersion = defaultConfigInDb.version
+        if (oldVersion.startsWith(BASE_CONFIG.version)) {
+          const realVersion = Number(oldVersion.substring(BASE_CONFIG.version.length + 1))
+          fullVersion = BASE_CONFIG.version + '.' + (realVersion + 1)
+        } else {
+          fullVersion = BASE_CONFIG.version + '.1'
+        }
+      } else {
+        fullVersion = BASE_CONFIG.version + '.1'
+      }
+
+      await indexedDBUtils.selectTable(tableName).put({
+        id: userId,
+        version: fullVersion,
+        config: _.cloneDeep(this.custom)
+      })
     }
   },
   computed: {
diff --git a/src/indexedDB/index.js b/src/indexedDB/index.js
index 1c984855..6d39862c 100644
--- a/src/indexedDB/index.js
+++ b/src/indexedDB/index.js
@@ -1,11 +1,18 @@
-import { dbName, dbGeoDataTableName, dbDrilldownTableConfig } from '@/utils/constants'
+import { dbName, dbGeoDataTableName, dbDrilldownTableConfig, dbUserTableColumnCustomizeConfig, dbRoleTableColumnCustomizeConfig, dbOperationLogTableColumnCustomizeConfig, dbChartTableColumnCustomizeConfig, dbI18nTableColumnCustomizeConfig, dbReportTableColumnCustomizeConfig, dbGalaxySettingTableColumnCustomizeConfig } from '@/utils/constants'
 import Dexie from 'dexie'
 /* https://dexie.org/ */
 
 const db = new Dexie(dbName)
-db.version(3).stores({
+db.version(4).stores({
   [dbGeoDataTableName]: '++name, geo',
   [dbDrilldownTableConfig]: '++id, config',
+  [dbUserTableColumnCustomizeConfig]: '++id, config',
+  [dbRoleTableColumnCustomizeConfig]: '++id, config',
+  [dbOperationLogTableColumnCustomizeConfig]: '++id, config',
+  [dbChartTableColumnCustomizeConfig]: '++id, config',
+  [dbI18nTableColumnCustomizeConfig]: '++id, config',
+  [dbReportTableColumnCustomizeConfig]: '++id, config',
+  [dbGalaxySettingTableColumnCustomizeConfig]: '++id, config',
   test: '++id, name'
 })
 function selectTable (tableName) {
diff --git a/src/mixins/data-list.js b/src/mixins/data-list.js
index a2cc18a2..b6300e5c 100644
--- a/src/mixins/data-list.js
+++ b/src/mixins/data-list.js
@@ -1,11 +1,12 @@
 import { tableSort } from '@/utils/tools'
-import { defaultPageSize, fromRoute, position, storageKey } from '@/utils/constants'
+import { defaultPageSize, fromRoute, position, storageKey, dbTableColumnCustomizeConfigPre } from '@/utils/constants'
 import { get, del } from '@/utils/http'
 import { ref } from 'vue'
 import pagination from '@/components/common/Pagination'
 import axios from 'axios'
 import { api } from '@/utils/api'
 import Loading from '@/components/common/Loading'
+import indexedDBUtils from '@/indexedDB'
 
 export default {
   components: {
@@ -111,7 +112,7 @@ export default {
         this.searchLabel = { ...this.searchLabel, ...params }
       }
       this.searchLabel = { ...this.searchLabel, ...this.pageObj }
-      //this.tableData = []
+      // this.tableData = []
       this.isNoData = false
       this.toggleLoading(true)
       delete this.searchLabel.total
@@ -395,13 +396,17 @@ export default {
       }
     }
   },
-  mounted () {
+  async mounted () {
     const pageSize = localStorage.getItem(storageKey.pageSize + '-' + localStorage.getItem(storageKey.username) + '-' + this.tableId)
     if (pageSize && pageSize !== 'undefined') {
       this.pageObj.pageSize = pageSize
     }
-    let localStorageTableTitle = localStorage.getItem(storageKey.tableTitle + '-' + localStorage.getItem(storageKey.username) + '-' + this.tableId)
-    localStorageTableTitle = localStorageTableTitle ? JSON.parse(localStorageTableTitle) : this.$refs.dataTable.tableTitle
+    const userId = localStorage.getItem(storageKey.userId)
+    let localStorageTableTitle = await indexedDBUtils.selectTable(dbTableColumnCustomizeConfigPre + '-' + this.tableId).get({ id: userId })
+
+    localStorageTableTitle = localStorageTableTitle && localStorageTableTitle.config
+      ? localStorageTableTitle.config
+      : (this.$refs.dataTable && this.$refs.dataTable.tableTitle ? this.$refs.dataTable.tableTitle : [])
     // 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 947488c7..b1326aef 100644
--- a/src/utils/constants.js
+++ b/src/utils/constants.js
@@ -5,6 +5,14 @@ export const dbName = 'cn-db'
 // indexedDB表名
 export const dbGeoDataTableName = 'geodata'
 export const dbDrilldownTableConfig = 'cn-drilldown-table-config'
+export const dbTableColumnCustomizeConfigPre = 'cn-table-column-customize-config'
+export const dbUserTableColumnCustomizeConfig = 'cn-table-column-customize-config-userTable'
+export const dbRoleTableColumnCustomizeConfig = 'cn-table-column-customize-config-rolesTable'
+export const dbOperationLogTableColumnCustomizeConfig = 'cn-table-column-customize-config-operationLogTable'
+export const dbChartTableColumnCustomizeConfig = 'cn-table-column-customize-config-chartTable'
+export const dbI18nTableColumnCustomizeConfig = 'cn-table-column-customize-config-i18nTable'
+export const dbReportTableColumnCustomizeConfig = 'cn-table-column-customize-config-reportTable'
+export const dbGalaxySettingTableColumnCustomizeConfig = 'cn-table-column-customize-config-galaxySettingTable'
 export const storageKey = {
   iso36112Capital: 'cn-iso3611-2-capital',
   iso36112WorldLow: 'cn-iso3611-2-world-low',
diff --git a/src/views/administration/User.vue b/src/views/administration/User.vue
index 19f8b298..644f7713 100644
--- a/src/views/administration/User.vue
+++ b/src/views/administration/User.vue
@@ -104,7 +104,7 @@ export default {
       }
       this.searchLabel = { ...this.searchLabel, ...this.pageObj }
       this.isNoData = false
-      //this.tableData = []
+      // this.tableData = []
       this.toggleLoading(true)
       delete this.searchLabel.total
       let listUrl = this.url
diff --git a/src/views/charts2/ChartList.vue b/src/views/charts2/ChartList.vue
index 5cca8a16..ffdf3563 100644
--- a/src/views/charts2/ChartList.vue
+++ b/src/views/charts2/ChartList.vue
@@ -75,7 +75,7 @@ export default {
           selector: '.entity-detail-info',
           correctionHeight: 161,
           chartType: typeMapping.entityDetail.basicInfo
-        }*/
+        } */
       ]
     }
   },
diff --git a/src/views/report/Report.vue b/src/views/report/Report.vue
index 8f3fa406..ae13a5fe 100644
--- a/src/views/report/Report.vue
+++ b/src/views/report/Report.vue
@@ -250,7 +250,7 @@ export default {
       // this.builtinRightLoading = true
       // this.loading = true
       this.isNoData = false
-      //this.tableData = []
+      // this.tableData = []
       this.toggleLoading(true)
       delete this.searchLabel.total
       let listUrl = this.url