diff --git a/api/src/Kurs.Platform.Application/ListForms/Administration/ListFormsAppService.cs b/api/src/Kurs.Platform.Application/ListForms/Administration/ListFormsAppService.cs index c8811f43..d3a49553 100644 --- a/api/src/Kurs.Platform.Application/ListForms/Administration/ListFormsAppService.cs +++ b/api/src/Kurs.Platform.Application/ListForms/Administration/ListFormsAppService.cs @@ -152,6 +152,7 @@ public class ListFormsAppService : CrudAppService< } else if (input.EditType == ListFormEditTabs.PagerForm) { + item.PageSize = input.PageSize; item.PagerOptionJson = JsonSerializer.Serialize(input.PagerOptionDto); } else if (input.EditType == ListFormEditTabs.StateForm) diff --git a/api/src/Kurs.Platform.DbMigrator/Seeds/LanguagesData.json b/api/src/Kurs.Platform.DbMigrator/Seeds/LanguagesData.json index f2bcae6b..70ba1621 100644 --- a/api/src/Kurs.Platform.DbMigrator/Seeds/LanguagesData.json +++ b/api/src/Kurs.Platform.DbMigrator/Seeds/LanguagesData.json @@ -5413,6 +5413,12 @@ "en": "Allowed Page Sizes", "tr": "İzin Verilen Sayfa Boyutları" }, + { + "resourceName": "Platform", + "key": "ListForms.ListFormEdit.PageSize", + "en": "Page Size", + "tr": "Sayfa Boyutu" + }, { "resourceName": "Platform", "key": "ListForms.ListFormEdit.PagingInfoText", diff --git a/ui/src/views/admin/listForm/edit/FormTabPager.tsx b/ui/src/views/admin/listForm/edit/FormTabPager.tsx index 40865d81..819a5f49 100644 --- a/ui/src/views/admin/listForm/edit/FormTabPager.tsx +++ b/ui/src/views/admin/listForm/edit/FormTabPager.tsx @@ -36,6 +36,21 @@ function FormTabPager(props: FormEditProps) { {({ touched, errors, isSubmitting, values }) => (
+ + + + { const { listFormCode, searchParams, gridDto } = props - const { createSelectDataSource } = useListFormCustomDataSource({}) + const { createSelectDataSource } = useListFormCustomDataSource({} as any) const [data, setData] = useState([]) const [totalCount, setTotalCount] = useState(0) const [currentPage, setCurrentPage] = useState(1) diff --git a/ui/src/views/list/Grid.tsx b/ui/src/views/list/Grid.tsx index 3e0976c1..2c48d60f 100644 --- a/ui/src/views/list/Grid.tsx +++ b/ui/src/views/list/Grid.tsx @@ -32,6 +32,7 @@ import DataGrid, { IStateStoringProps, LoadPanel, Pager, + Paging, Scrolling, SearchPanel, Selection, @@ -1091,7 +1092,10 @@ const Grid = (props: GridProps) => { selectAllMode={gridDto.gridOptions.selectionDto?.selectAllMode} showCheckBoxesMode={gridDto.gridOptions.selectionDto?.showCheckBoxesMode} > - {/* */} + { mode={gridDto.gridOptions.selectionDto?.mode} recursive={gridDto.gridOptions.treeOptionDto?.recursiveSelection || false} > + +a)?.[0] ?? 20} + /> +a)} - showPageSizeSelector={gridDto.gridOptions.pagerOptionDto?.showPageSizeSelector} - showInfo={gridDto.gridOptions.pagerOptionDto?.showInfo} - showNavigationButtons={gridDto.gridOptions.pagerOptionDto?.showNavigationButtons} + .map((a: any) => +a) ?? [10, 20, 50, 100]} + showPageSizeSelector={gridDto.gridOptions.pagerOptionDto?.showPageSizeSelector ?? true} + showInfo={gridDto.gridOptions.pagerOptionDto?.showInfo ?? true} + showNavigationButtons={gridDto.gridOptions.pagerOptionDto?.showNavigationButtons ?? true} infoText={gridDto.gridOptions.pagerOptionDto?.infoText} - displayMode={gridDto.gridOptions.pagerOptionDto?.displayMode} + displayMode={gridDto.gridOptions.pagerOptionDto?.displayMode ?? 'full'} > { - +