@lx-frontend/wrap-element-ui 1.0.24-beta.4 → 1.0.24-beta.6

package/package.json

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

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

@@ -66,16 +66,17 @@ export function useViewSetting({
     await nextTick()
     localStorage.setItem(storageKey.value, JSON.stringify({
       config: {
-        fields: props.columnConfig.reduce((acc, curr) => {
+        fields: props.columnConfig.reduce((acc, curr, index) => {
+          const _index = showingColumns.value.findIndex(v => v === curr.prop)
           acc[curr.prop] = {
-            hidden: showingColumns.value.find(v => v === curr.prop) ? false : curr.defaultHide ?? false,
-            order: showingColumns.value.findIndex(v => v === curr.prop) ?? 0,
+            hidden: showingColumns.value.find(v => v === curr.prop) ? false : true,
+            order: _index === -1 ? index : _index,
           }
           return acc;
         }, {} as Record<string, { hidden: boolean, order: number }>),
         leftFixedColumnCount: leftFixedColumnCount.value,
       },
-      version: (props.settingStorgeMigrationConfigs ?? []).pop()?.version,
+      version: (props.settingStorgeMigrationConfigs ?? []).pop()?.version.to,
       schemaVersion: 1
     }))
   };
@@ -118,10 +119,9 @@ export function useViewSetting({
           const handleMigration = (_cache: any) => {
             const schemaVersion = _cache?.schemaVersion ?? 0
             if (!storgeSchemaMigrationConfig[schemaVersion]) { // 没有 schema 变动时，查找需要处理的业务迁移配置
-              const bizMigrationConfigs = (props.settingStorgeMigrationConfigs ?? [])
-                .filter(v => (v.schemaVersion ?? 1) === _cache.schemaVersion)
+              const bizMigrationConfigs = (props.settingStorgeMigrationConfigs ?? []).filter(v => (v.schemaVersion ?? 1) === _cache.schemaVersion)
 
-              const _versionIndex = bizMigrationConfigs.findIndex(v => v.version)
+              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]

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
 }[]