pogmommy/feishin
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix column width declarations

Browse source
This commit is contained in:
jeffvli 2023-07-16 11:06:09 -07:00
parent 481258484c
commit 47ecbf0601
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/renderer/components/virtual-table/hooks/use-virtual-table.ts
View file

@ -60,7 +60,7 @@ export const useVirtualTable = <TResponse, TFilter>({
const isPaginationEnabled = properties.display === ListDisplayType.TABLE_PAGINATED; const isPaginationEnabled = properties.display === ListDisplayType.TABLE_PAGINATED;
const columnDefs: ColDef[] = useMemo(() => { const columnDefs: ColDef[] = useMemo(() => {
return getColumnDefs(properties.table.columns); return getColumnDefs(properties.table.columns, true);
}, [properties.table.columns]); }, [properties.table.columns]);
const defaultColumnDefs: ColDef = useMemo(() => { const defaultColumnDefs: ColDef = useMemo(() => {

4
src/renderer/components/virtual-table/index.tsx
View file

@ -337,14 +337,14 @@ export const getColumnDef = (column: TableColumn) => {
return tableColumns[column as keyof typeof tableColumns]; return tableColumns[column as keyof typeof tableColumns];
}; };
export const getColumnDefs = (columns: PersistedTableColumn[]) => { export const getColumnDefs = (columns: PersistedTableColumn[], useWidth?: boolean) => {
const columnDefs: ColDef[] = []; const columnDefs: ColDef[] = [];
for (const column of columns) { for (const column of columns) {
const presetColumn = tableColumns[column.column as keyof typeof tableColumns]; const presetColumn = tableColumns[column.column as keyof typeof tableColumns];
if (presetColumn) { if (presetColumn) {
columnDefs.push({ columnDefs.push({
...presetColumn, ...presetColumn,
initialWidth: column.width, [useWidth ? 'width' : 'initialWidth']: column.width,
...column.extraProps, ...column.extraProps,
}); });
} }

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

@ -251,10 +251,10 @@ export const useListStore = create<ListSlice>()(
}, },
setTableColumns: (args) => { setTableColumns: (args) => {
set((state) => { 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, ...state.item[args.key as keyof ListState['item']].table.columns,
...args.data, ...args.data,
}; ];
}); });
}, },
setTablePagination: (args) => { setTablePagination: (args) => {