vxe-table 4.23.10 → 4.23.12

package/lib/ui/index.js

@@ -33,7 +33,7 @@ __export(ui_exports, {
 module.exports = __toCommonJS(ui_exports);
 var import_core = require("@vxe-ui/core");
 var import_utils = require("./src/utils");
-const version = "4.23.10";
+const version = "4.23.12";
 import_core.VxeUI.version = version;
 import_core.VxeUI.tableVersion = version;
 import_core.VxeUI.setConfig({
@@ -143,6 +143,7 @@ import_core.VxeUI.setConfig({
     },
     customConfig: {
       // enabled: false,
+      storeDriver: "localStorage",
       allowVisible: true,
       allowResizable: true,
       allowFixed: true,

package/lib/ui/src/log.js

@@ -25,7 +25,7 @@ __export(log_exports, {
 module.exports = __toCommonJS(log_exports);
 var import_core = require("@vxe-ui/core");
 const { log } = import_core.VxeUI;
-const tableVersion = `table v${"4.23.10"}`;
+const tableVersion = `table v${"4.23.12"}`;
 function createComponentLog(name) {
   const uiVersion = import_core.VxeUI.uiVersion ? `ui v${import_core.VxeUI.uiVersion}` : "";
   const ganttVersion = import_core.VxeUI.ganttVersion ? `gantt v${import_core.VxeUI.ganttVersion}` : "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "4.23.10",
+  "version": "4.23.12",
   "description": "A PC-end table component based on Vxe UI, supporting copy-paste, data pivot table, and high-performance virtual list table solution.",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -75,7 +75,14 @@
     "typescript": "~5.9.3",
     "vue": "3.4.27",
     "vue-router": "~4.5.1",
-    "vxe-pc-ui": "4.20.30"
+    "vxe-pc-ui": "4.20.33"
+  },
+  "allowScripts": {
+    "esbuild@0.28.2": true,
+    "@parcel/watcher@2.5.6": true,
+    "yorkie@2.0.0": true,
+    "core-js@3.49.0": true,
+    "es5-ext@0.10.64": true
   },
   "vetur": {
     "tags": "helper/vetur/tags.json",

package/packages/components.ts

@@ -34,6 +34,9 @@ export { VxeUI }
 // eslint-disable-next-line import/export
 export * from '@vxe-ui/core'
 
+// 兼容老版本
+export * from './ui'
+
 // Components
 export * from './table'
 export * from './column'

package/packages/grid/src/grid.ts

@@ -254,7 +254,7 @@ function createInternalData(): GridInternalData {
   }
 }
 
-export default defineVxeComponent({
+export default /* define-vxe-component start */ defineVxeComponent({
   name: 'VxeGrid',
   props: gridProps,
   emits: gridEmits,
@@ -2226,4 +2226,4 @@ export default defineVxeComponent({
   render() {
     return this.renderVN()
   }
-})
+}) /* define-vxe-component end */

package/packages/table/src/column.ts

@@ -145,7 +145,7 @@ export const columnProps = {
   params: Object as PropType<VxeColumnPropTypes.Params>
 }
 
-export default defineVxeComponent({
+export default /* define-vxe-component start */ defineVxeComponent({
   name: 'VxeColumn',
   props: columnProps,
   setup(props, { slots }) {
@@ -189,4 +189,4 @@ export default defineVxeComponent({
 
     return renderVN
   }
-})
+}) /* define-vxe-component end */

package/packages/table/src/group.ts

@@ -6,7 +6,7 @@ import Cell from './cell'
 
 import type { VxeTableConstructor, VxeTablePrivateMethods } from '../../../types'
 
-export default defineVxeComponent({
+export default /* define-vxe-component start */ defineVxeComponent({
   name: 'VxeColgroup',
   props: columnProps,
   setup(props, { slots }) {
@@ -64,4 +64,4 @@ export default defineVxeComponent({
 
     return renderVN
   }
-})
+}) /* define-vxe-component end */

package/packages/table/src/table.ts

@@ -83,7 +83,7 @@ import type {
 
 const { warnLog, errLog } = createComponentLog('table')
 
-const { getConfig, getIcon, getI18n, renderer, formats, createEvent, globalResize, interceptor, hooks, domUtils, globalEvents, GLOBAL_EVENT_KEYS, useFns, renderEmptyElement } = VxeUI
+const { getConfig, getIcon, getI18n, renderer, formats, createEvent, dbUtils, globalResize, interceptor, hooks, domUtils, globalEvents, GLOBAL_EVENT_KEYS, useFns, renderEmptyElement } = VxeUI
 
 const supportMaxRow = 5e6
 const customStorageKey = 'VXE_CUSTOM_STORE'
@@ -97,7 +97,7 @@ let crossTableDragRowObj: {
   $newTable: (VxeTableConstructor & VxeTablePrivateMethods) | null
 } | null = null
 
-export default defineVxeComponent({
+export default /* define-vxe-component start */ defineVxeComponent({
   name: 'VxeTable',
   props: tableProps,
   emits: tableEmits,
@@ -1080,8 +1080,13 @@ export default defineVxeComponent({
       xegrid: $xeGrid
     } as unknown as VxeTableConstructor & VxeTableMethods & VxeTablePrivateMethods
 
-    const { refTrackXElem, refTrackYElem, refThumbXElem, refThumbYElem, updateThumbSize, updateThumbOffset, clickTrackXEvent, clickTrackYEvent, pointerdownThumbXEvent, pointermoveThumbXEvent, cleatPointerThumbEvent, pointerdownThumbYEvent, pointermoveThumbYEvent } =
-      useFns.useInitVScrollbar($xeTable)
+    const customStoreDB = dbUtils
+      ? dbUtils.createStore<VxeTableDefines.CustomStoreData>(customStorageKey, {
+        driver: computeCustomOpts.value.storeDriver
+      })
+      : null
+
+    const { refTrackXElem, refTrackYElem, refThumbXElem, refThumbYElem, updateThumbSize, updateThumbOffset, clickTrackXEvent, clickTrackYEvent, pointerdownThumbXEvent, pointermoveThumbXEvent, cleatPointerThumbEvent, pointerdownThumbYEvent, pointermoveThumbYEvent } = useFns.useInitVScrollbar($xeTable)
 
     const eqCellValue = (newRow: any, oldRow: any, field: string) => {
       const val1 = XEUtils.get(newRow, field)
@@ -1111,19 +1116,43 @@ export default defineVxeComponent({
       return orders[oIndex < orders.length ? oIndex : 0]
     }
 
-    const getCustomStorageMap = (id?: string) => {
-      const version = getConfig().version
-      const rest = XEUtils.toStringJSON(localStorage.getItem(customStorageKey) || '')
-      const maps = rest && rest._v === version ? rest : { _v: version }
-      return (id ? maps[id] : maps) || {}
+    /**
+     * 获取个性化数据
+     */
+    function getCustomStorageMap(id: string) {
+      if (customStoreDB) {
+        return customStoreDB.getById(id).then(dbRest => dbRest ? dbRest.data : {})
+      }
+
+      // 已废弃，兼容旧版本
+      return new Promise<VxeTableDefines.CustomStoreData>(resolve => {
+        const version = getConfig().version
+        const rest = XEUtils.toStringJSON(localStorage.getItem(customStorageKey) || '')
+        const maps = rest && rest._v === version ? rest : { _v: version }
+        resolve((id ? maps[id] : maps) || {})
+      })
     }
 
+    /**
+     * 更新个性化数据
+     * 储存结构以 id 为 key， 储存个性化数据，上升版本号可以用于重置组件保存的数据
+     * {
+     *  [id: string]: VxeTableDefines.CustomStoreData,
+     *  v: 1
+     * }
+     */
     const setCustomStorageMap = (id: string, data: any) => {
+      if (customStoreDB) {
+        return customStoreDB.updateById(id, data)
+      }
+
+      // 已废弃，兼容旧版本
       const version = getConfig().version
-      const maps = getCustomStorageMap()
+      const rest = XEUtils.toStringJSON(localStorage.getItem(customStorageKey) || '')
+      const maps = rest && rest._v === version ? rest : { _v: version }
       maps[id] = data || undefined
-      maps._v = version
       localStorage.setItem(customStorageKey, XEUtils.toJSONString(maps))
+      return Promise.resolve()
     }
 
     const getRecoverRowMaps = (keyMaps: Record<string, any>) => {
@@ -1879,20 +1908,21 @@ export default defineVxeComponent({
           errLog('vxe.error.reqProp', ['id'])
           return
         }
-        const storeData: VxeTableDefines.CustomStoreData = getCustomStorageMap(tableId)
-        if (restoreStore) {
-          return Promise.resolve(restoreStore({ $table: $xeTable, id: tableId, type: 'restore', storeData }))
-            .then((storeData) => {
-              if (!storeData) {
-                return
-              }
-              return handleCustomRestore(storeData)
-            })
-            .catch((e) => e)
-        } else {
+        return getCustomStorageMap(tableId).then((storeData) => {
+          if (restoreStore) {
+            return Promise.resolve(restoreStore({ $table: $xeTable, id: tableId, type: 'restore', storeData }))
+              .then((storeData) => {
+                if (!storeData) {
+                  return
+                }
+                return handleCustomRestore(storeData)
+              })
+              .catch((e) => e)
+          }
           return handleCustomRestore(storeData)
-        }
+        })
       }
+      return Promise.resolve()
     }
 
     const updateColumnAllOverflow = () => {
@@ -10691,9 +10721,8 @@ export default defineVxeComponent({
               type,
               storeData
             })
-          } else {
-            setCustomStorageMap(tableId, type === 'reset' ? null : storeData)
           }
+          return setCustomStorageMap(tableId, type === 'reset' ? null : storeData)
         }
         return nextTick()
       },
@@ -16008,4 +16037,4 @@ export default defineVxeComponent({
   render() {
     return this.renderVN()
   }
-})
+}) /* define-vxe-component end */

package/packages/toolbar/src/toolbar.ts

@@ -26,7 +26,7 @@ function createInternalData(): ToolbarInternalData {
   }
 }
 
-export default defineVxeComponent({
+export default /* define-vxe-component start */ defineVxeComponent({
   name: 'VxeToolbar',
   props: {
     loading: Boolean,
@@ -765,4 +765,4 @@ export default defineVxeComponent({
   render() {
     return this.renderVN()
   }
-})
+}) /* define-vxe-component end */

package/packages/ui/index.ts

@@ -116,6 +116,7 @@ VxeUI.setConfig({
     },
     customConfig: {
       // enabled: false,
+      storeDriver: 'localStorage',
       allowVisible: true,
       allowResizable: true,
       allowFixed: true,