@lx-frontend/wrap-element-ui 1.0.24-beta.1 → 1.0.24-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lx-frontend/wrap-element-ui",
-  "version": "1.0.24-beta.1",
+  "version": "1.0.24-beta.3",
   "description": "wrap-element-ui",
   "author": "",
   "main": "src/components/index.ts",

package/src/components/EditableTable/bizHooks/useViewSetting.ts

@@ -1,5 +1,5 @@
 import { ref, watch, Ref, computed, nextTick } from "vue"
-import { IColumnConfig, IProps } from "../types"
+import { IColumnConfig, IProps, SettingStorgeConfig } from "../types"
 
 interface IViewSettingParams {
   showingColumns: Ref<string[]>
@@ -15,16 +15,16 @@ interface IViewSettingParams {
 }
 
 /** 默认迁移配置 */
-const defaultStorgeMigrationConfig: Record<number, {
+const storgeSchemaMigrationConfig: Record<number, {
   /** 迁移方法 */
   migration: (
     /** 当前本地配置 */
     currentConfig: any,
     /** 当前的列配置 */
     columns: IColumnConfig[]
-  ) => ({ version: number, config: any })
+  ) => ({ schemaVersion: number, config: any, version?: string })
   /** 迁移到的下一个版本号 */
-  nextVersion?: number
+  nextSchemaVersion?: number
 }> = {
   '0': {
     migration: (config: { showingColumns: string[], leftFixedColumnCount: number }, columns: IColumnConfig[]) => {
@@ -32,17 +32,17 @@ const defaultStorgeMigrationConfig: Record<number, {
         config: {
           fields: columns.reduce((acc, curr) => {
             acc[curr.prop] = {
-              hidden: config.showingColumns.find(v => v === curr.prop) ? false : curr.defaultHide ?? false,
+              hidden: config.showingColumns.find(v => v === curr.prop) ? false : true,
               order: config.showingColumns.findIndex(v => v === curr.prop) ?? 0,
             }
             return acc;
           }, {} as Record<string, { hidden: boolean, order: number }>),
           leftFixedColumnCount: config.leftFixedColumnCount,
         },
-        version: 1,
+        schemaVersion: 1,
       }
     },
-    nextVersion: 1,
+    nextSchemaVersion: 1,
   }
 }
 
@@ -75,7 +75,7 @@ export function useViewSetting({
         }, {} as Record<string, { hidden: boolean, order: number }>),
         leftFixedColumnCount: leftFixedColumnCount.value,
       },
-      version: 1
+      schemaVersion: 1
     }))
   };
 
@@ -116,26 +116,25 @@ export function useViewSetting({
         try {
           // 缓存数据字段可能随着更新导致对不上，清理无效数据，防止出问题
           const handleMigration = (_cache: any) => {
-            const version = _cache?.version ?? 0
-            if (defaultStorgeMigrationConfig[version]) {
-              const __cache = defaultStorgeMigrationConfig[version].migration(_cache, val)
-              if (defaultStorgeMigrationConfig[version].nextVersion) {
-                return handleMigration(__cache)
-              } else {
-                return __cache
-              }
-            } else {
-              return _cache
+            const schemaVersion = _cache?.schemaVersion ?? 0
+            if (!storgeSchemaMigrationConfig[schemaVersion]) return _cache
+            let __cache = storgeSchemaMigrationConfig[schemaVersion].migration(_cache, val)
+
+            // 处理当前schema版本需要处理的变更
+            const bizMigrationConfigs = (props.settingStorgeMigrationConfigs ?? []).filter(v => (v.schemaVersion ?? 1) === __cache.schemaVersion)
+            if (bizMigrationConfigs.length) {
+              __cache = bizMigrationConfigs.reduce((acc, curr) => ({
+                ...curr.migration(acc.config, val),
+                schemaVersion: __cache.schemaVersion,
+              }), __cache)
             }
+
+            return storgeSchemaMigrationConfig[schemaVersion].nextSchemaVersion
+              ? handleMigration(__cache)
+              : __cache
           }
 
-          const cache = handleMigration(JSON.parse(_cache)) as {
-            version: number,
-            config: {
-              fields: Record<string, { hidden: boolean, order: number }>,
-              leftFixedColumnCount: number
-            }
-          };
+          const cache = handleMigration(JSON.parse(_cache)) as SettingStorgeConfig;
 
           updateShowingColumns(
             Object.entries(cache.config.fields)

package/src/components/EditableTable/index.vue

@@ -339,7 +339,7 @@ import {
   useDragSort,
 } from './bizHooks'
 
-import { ITableDataItem, IColumnConfig, IDefaultOperationType, IColorList } from './types';
+import { ITableDataItem, IColumnConfig, IDefaultOperationType, IColorList, SettingStorgeMigrationConfigs } from './types';
 
 // defineProps泛型参数如果从外部传入，编译报错
 interface IProps {
@@ -382,6 +382,8 @@ interface IProps {
   pageSizes?: number[]
   /** 分页器展示数量 */
   pagerCount?: number;
+  /** 设置的迁移配置 */
+  settingStorgeMigrationConfigs?: SettingStorgeMigrationConfigs
 }
 
 interface IEmits {

package/src/components/EditableTable/types/index.ts

@@ -159,6 +159,20 @@ export type ITableDataItem = {
   [k: string]: any;
 }
 
+export type SettingStorgeConfig = {
+  version: string,
+  config: {
+    fields: Record<string, { hidden: boolean, order: number }>,
+    leftFixedColumnCount: number
+  }
+}
+
+export type SettingStorgeMigrationConfigs = {
+  schemaVersion?: number
+  version: string
+  migration: (currentConfig: any, columns: IColumnConfig[]) => SettingStorgeConfig
+}[]
+
 export interface IProps {
   dataList: ITableDataItem[];
   columnConfig: IColumnConfig[];
@@ -174,6 +188,7 @@ export interface IProps {
   dragSemiRange?: number;
   loading?: boolean;
   settingStorgeKey?: string
+  settingStorgeMigrationConfigs?: SettingStorgeMigrationConfigs
   localSort?: boolean
   localFilter?: boolean
   currentPage: number