diff --git a/src/renderer/components/virtual-table/hooks/use-virtual-table.ts b/src/renderer/components/virtual-table/hooks/use-virtual-table.ts index a6ea7f36..66c78303 100644 --- a/src/renderer/components/virtual-table/hooks/use-virtual-table.ts +++ b/src/renderer/components/virtual-table/hooks/use-virtual-table.ts @@ -60,7 +60,7 @@ export const useVirtualTable = ({ const isPaginationEnabled = properties.display === ListDisplayType.TABLE_PAGINATED; const columnDefs: ColDef[] = useMemo(() => { - return getColumnDefs(properties.table.columns); + return getColumnDefs(properties.table.columns, true); }, [properties.table.columns]); const defaultColumnDefs: ColDef = useMemo(() => { diff --git a/src/renderer/components/virtual-table/index.tsx b/src/renderer/components/virtual-table/index.tsx index b713fa16..695735b4 100644 --- a/src/renderer/components/virtual-table/index.tsx +++ b/src/renderer/components/virtual-table/index.tsx @@ -337,14 +337,14 @@ export const getColumnDef = (column: TableColumn) => { return tableColumns[column as keyof typeof tableColumns]; }; -export const getColumnDefs = (columns: PersistedTableColumn[]) => { +export const getColumnDefs = (columns: PersistedTableColumn[], useWidth?: boolean) => { const columnDefs: ColDef[] = []; for (const column of columns) { const presetColumn = tableColumns[column.column as keyof typeof tableColumns]; if (presetColumn) { columnDefs.push({ ...presetColumn, - initialWidth: column.width, + [useWidth ? 'width' : 'initialWidth']: column.width, ...column.extraProps, }); } diff --git a/src/renderer/store/list.store.ts b/src/renderer/store/list.store.ts index 51e4f6f9..9ec27a44 100644 --- a/src/renderer/store/list.store.ts +++ b/src/renderer/store/list.store.ts @@ -251,10 +251,10 @@ export const useListStore = create()( }, setTableColumns: (args) => { set((state) => { - state.item[args.key as keyof ListState['item']].table.columns = { + state.item[args.key as keyof ListState['item']].table.columns = [ ...state.item[args.key as keyof ListState['item']].table.columns, ...args.data, - }; + ]; }); }, setTablePagination: (args) => {