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

package/package.json

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

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

@@ -75,6 +75,7 @@ export function useViewSetting({
         }, {} as Record<string, { hidden: boolean, order: number }>),
         leftFixedColumnCount: leftFixedColumnCount.value,
       },
+      version: (props.settingStorgeMigrationConfigs ?? []).pop()?.version.to,
       schemaVersion: 1
     }))
   };
@@ -114,24 +115,35 @@ export function useViewSetting({
         leftFixedColumnCount.value = props.leftFixedCount as number;
       } else {
         try {
-          // 缓存数据字段可能随着更新导致对不上，清理无效数据，防止出问题
           const handleMigration = (_cache: any) => {
             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)
+            if (!storgeSchemaMigrationConfig[schemaVersion]) { // 没有 schema 变动时，查找需要处理的业务迁移配置
+              const bizMigrationConfigs = (props.settingStorgeMigrationConfigs ?? []).filter(v => (v.schemaVersion ?? 1) === _cache.schemaVersion)
+
+              const _versionIndex = bizMigrationConfigs.findIndex(v => v.version.form === _cache.version)
+              if (_versionIndex > -1) {
+                for (let i = _versionIndex; i < bizMigrationConfigs.length; i++) {
+                  const curr = bizMigrationConfigs[i]
+                  _cache = curr.migration(_cache.config, val)
+                }
+              }
+              return _cache
+            } else {
+              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
             }
-
-            return storgeSchemaMigrationConfig[schemaVersion].nextSchemaVersion
-              ? handleMigration(__cache)
-              : __cache
           }
 
           const cache = handleMigration(JSON.parse(_cache)) as SettingStorgeConfig;

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

@@ -169,7 +169,10 @@ export type SettingStorgeConfig = {
 
 export type SettingStorgeMigrationConfigs = {
   schemaVersion?: number
-  version: string
+  version: {
+    form: string
+    to: string
+  }
   migration: (currentConfig: any, columns: IColumnConfig[]) => SettingStorgeConfig
 }[]