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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/src/components/EditableTable/bizHooks/useViewSetting.ts +8 -6
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@lx-frontend/wrap-element-ui",
3
- "version": "1.0.24-beta.7",
3
+ "version": "1.0.24",
4
4
  "description": "wrap-element-ui",
5
5
  "author": "",
6
6
  "main": "src/components/index.ts",
package/src/components/EditableTable/bizHooks/useViewSetting.ts CHANGED
@@ -66,7 +66,8 @@ export function useViewSetting({
66
66
  await nextTick()
67
67
 
68
68
  const settingStorgeMigrationConfigs = props.settingStorgeMigrationConfigs ?? []
69
- const version = settingStorgeMigrationConfigs.length ? settingStorgeMigrationConfigs[settingStorgeMigrationConfigs.length - 1].version.to : undefined
69
+ const len = settingStorgeMigrationConfigs.length
70
+ const version = len ? settingStorgeMigrationConfigs[len - 1].version.to : undefined
70
71
 
71
72
  localStorage.setItem(storageKey.value, JSON.stringify({
72
73
  config: {
@@ -154,11 +155,12 @@ export function useViewSetting({
154
155
  const cache = handleMigration(JSON.parse(_cache)) as SettingStorgeConfig;
155
156
 
156
157
  updateShowingColumns(
157
- Object.entries(cache.config.fields)
158
- .filter(v => !v[1].hidden)
159
- .sort((a, b) => a[1].order - b[1].order)
160
- .map(v => v[0])
161
- )
158
+ val.filter(v => {
159
+ return cache.config.fields[v.prop] ? !cache.config.fields[v.prop].hidden : !v.defaultHide
160
+ }).sort((a, b) => {
161
+ return (cache.config.fields[a.prop]?.order ?? 0) - (cache.config.fields[b.prop]?.order ?? 0)
162
+ }).map(v => v.prop)
163
+ );
162
164
 
163
165
  const _leftFixedColumnCount = Number(cache?.config?.leftFixedColumnCount)
164
166
  leftFixedColumnCount.value = isNaN(_leftFixedColumnCount) ? (props.leftFixedCount as number) : _leftFixedColumnCount;