merge code pull

src/views/stuwork/rewardrule/index.vue

@@ -143,6 +143,7 @@ import { useMessage, useMessageBox } from "/@/hooks/message";
 import TableColumnControl from '/@/components/TableColumnControl/index.vue'
 import FormDialog from './form.vue'
 import { List, Trophy, Collection, EditPen, Setting, Menu } from '@element-plus/icons-vue'
+import { getTableConfigFromLocal, saveTableConfigToLocal, updateUserTableConfig } from '/@/api/admin/usertable'
 
 // 定义变量内容
 const route = useRoute()
@@ -164,39 +165,28 @@ const visibleColumns = ref<string[]>([])
 // 列排序顺序
 const columnOrder = ref<string[]>([])
 
-// 立即从 localStorage 加载配置
+// 从本地统一存储加载配置
 const loadSavedConfig = () => {
   const routePath = route.path.replace(/^\//, '').replace(/\//g, '-')
   const storageKey = `table-columns-${routePath}`
-  const saved = localStorage.getItem(storageKey)
-  if (saved) {
-    try {
-      const savedColumns = JSON.parse(saved)
-      const validColumns = tableColumns.map(col => col.prop || col.label)
-      const filteredSaved = savedColumns.filter((col: string) => validColumns.includes(col))
-      visibleColumns.value = filteredSaved.length > 0 ? filteredSaved : validColumns
-    } catch (e) {
-      visibleColumns.value = tableColumns.map(col => col.prop || col.label)
-    }
+  const savedConfig = getTableConfigFromLocal(storageKey)
+  
+  if (savedConfig && savedConfig.visibleColumns) {
+    const validColumns = tableColumns.map(col => col.prop || col.label)
+    const filteredSaved = savedConfig.visibleColumns.filter((col: string) => validColumns.includes(col))
+    visibleColumns.value = filteredSaved.length > 0 ? filteredSaved : validColumns
   } else {
     visibleColumns.value = tableColumns.map(col => col.prop || col.label)
   }
   
-  const orderKey = `${storageKey}-order`
-  const savedOrder = localStorage.getItem(orderKey)
-  if (savedOrder) {
-    try {
-      const parsedOrder = JSON.parse(savedOrder)
-      const validColumns = tableColumns.map(col => col.prop || col.label)
-      columnOrder.value = parsedOrder.filter((key: string) => validColumns.includes(key))
-      validColumns.forEach(key => {
-        if (!columnOrder.value.includes(key)) {
-          columnOrder.value.push(key)
-        }
-      })
-    } catch (e) {
-      columnOrder.value = tableColumns.map(col => col.prop || col.label)
-    }
+  if (savedConfig && savedConfig.columnOrder) {
+    const validColumns = tableColumns.map(col => col.prop || col.label)
+    columnOrder.value = savedConfig.columnOrder.filter((key: string) => validColumns.includes(key))
+    validColumns.forEach(key => {
+      if (!columnOrder.value.includes(key)) {
+        columnOrder.value.push(key)
+      }
+    })
   } else {
     columnOrder.value = tableColumns.map(col => col.prop || col.label)
   }
@@ -211,7 +201,10 @@ const handleColumnChange = (value: string[]) => {
     const column = tableColumns.find(c => (c.prop || c.label) === col)
     return column && !column.alwaysShow && !column.fixed
   })
-  localStorage.setItem(storageKey, JSON.stringify(selectableColumns))
+  // 保存到本地统一存储
+  saveTableConfigToLocal(storageKey, { visibleColumns: selectableColumns })
+  // 异步保存到后端
+  updateUserTableConfig(storageKey, { visibleColumns: selectableColumns }).catch(() => {})
 }
 
 // 列排序变化处理
@@ -219,7 +212,10 @@ const handleColumnOrderChange = (order: string[]) => {
   columnOrder.value = order
   const routePath = route.path.replace(/^\//, '').replace(/\//g, '-')
   const storageKey = `table-columns-${routePath}`
-  localStorage.setItem(`${storageKey}-order`, JSON.stringify(order))
+  // 保存到本地统一存储
+  saveTableConfigToLocal(storageKey, { columnOrder: order })
+  // 异步保存到后端
+  updateUserTableConfig(storageKey, { columnOrder: order }).catch(() => {})
 }
 
 // 排序后的表格列