diff --git a/src/qqq/components/widgets/DashboardWidgets.tsx b/src/qqq/components/widgets/DashboardWidgets.tsx index f2d1dc0..6b5f4f8 100644 --- a/src/qqq/components/widgets/DashboardWidgets.tsx +++ b/src/qqq/components/widgets/DashboardWidgets.tsx @@ -638,8 +638,28 @@ function DashboardWidgets({widgetMetaDataList, tableName, entityPrimaryKey, reco if (!omitWrappingGridContainer) { - // @ts-ignore - renderedWidget = ( + const gridProps: {[key: string]: any} = {}; + + for(let size of ["xs", "sm", "md", "lg", "xl", "xxl"]) + { + const key = `gridCols:sizeClass:${size}` + if(widgetMetaData?.defaultValues.has(key)) + { + gridProps[size] = widgetMetaData?.defaultValues.get(key); + } + } + + if(!gridProps["xxl"]) + { + gridProps["xxl"] = widgetMetaData.gridColumns ? widgetMetaData.gridColumns : 12; + } + + if(!gridProps["xs"]) + { + gridProps["xs"] = 12; + } + + renderedWidget = ( {renderedWidget} ); }