antebudimir/feishin
1
0
Fork 0
mirror of https://github.com/antebudimir/feishin.git synced 2026-01-02 10:53:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

[bugfix]: use persistent columns def instead of default merge behavior

Browse source
This commit is contained in:
Kendall Garner 2024-04-23 23:25:32 -07:00
parent 087ea44737
commit dc95a3c66b
No known key found for this signature in database
GPG key ID: 18D2767419676C87
5 changed files with 27 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/renderer/store/list.store.ts
View file

@ -1,4 +1,3 @@
import merge from 'lodash/merge';
import { create } from 'zustand';
import { devtools, persist } from 'zustand/middleware';
import { immer } from 'zustand/middleware/immer';
@ -19,6 +18,7 @@ import {
} from '/@/renderer/api/types';
import { DataTableProps, PersistedTableColumn } from '/@/renderer/store/settings.store';
import { ListDisplayType, TableColumn, TablePagination } from '/@/renderer/types';
import { mergeOverridingColumns } from '/@/renderer/store/utils';
export const generatePageKey = (page: string, id?: string) => {
return id ? `${page}_${id}` : page;
@ -613,9 +613,7 @@ export const useListStore = create<ListSlice>()(
{ name: 'store_list' },
),
{
merge: (persistedState, currentState) => {
return merge(currentState, persistedState);
},
merge: mergeOverridingColumns,
name: 'store_list',
partialize: (state) => {
return Object.fromEntries(