mirror of
https://github.com/jeffvli/feishin.git
synced 2026-05-09 20:29:36 +02:00
Fix column width declarations
This commit is contained in:
@@ -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(() => {
|
||||||
|
|||||||
@@ -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,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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) => {
|
||||||
|
|||||||
Reference in New Issue
Block a user