From 950fbf2a41df6043e13fe3416bf87c905dbbf15d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sedat=20=C3=96zt=C3=BCrk?= <sedat.ozturk@sozsoft.com>
Date: Sat, 8 Nov 2025 02:57:04 +0300
Subject: [PATCH] =?UTF-8?q?TreeList=20i=C3=A7in=20Pager=20ve=20di=C4=9Fer?=
 =?UTF-8?q?=20g=C3=BCncellemeler?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Administration/ListFormsAppService.cs     |  1 +
 .../Seeds/LanguagesData.json                  |  6 +++++
 .../admin/listForm/edit/FormTabPager.tsx      | 15 +++++++++++
 ui/src/views/list/Card.tsx                    |  2 +-
 ui/src/views/list/Grid.tsx                    |  6 ++++-
 ui/src/views/list/Tree.tsx                    | 25 +++++++++++++------
 6 files changed, 46 insertions(+), 9 deletions(-)

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 }) => (
           <Form>
             <FormContainer size="sm">
+              <FormItem
+                label={translate('::ListForms.ListFormEdit.PageSize')}
+                invalid={errors.pageSize && touched.pageSize}
+                errorMessage={errors.pageSize}
+              >
+                <Field
+                  type="number"
+                  className="w-20"
+                  autoComplete="off"
+                  name="pageSize"
+                  placeholder={translate('::ListForms.ListFormEdit.PageSize')}
+                  component={Input}
+                />
+              </FormItem>
+
               <FormItem
                 label={translate('::ListForms.ListFormEdit.PagingVisible')}
                 invalid={errors.pagerOptionDto?.visible && touched.pagerOptionDto?.visible}
diff --git a/ui/src/views/list/Card.tsx b/ui/src/views/list/Card.tsx
index 6408d78f..c4fe1ee8 100644
--- a/ui/src/views/list/Card.tsx
+++ b/ui/src/views/list/Card.tsx
@@ -31,7 +31,7 @@ type Option = {
 
 const Card = (props: CardProps) => {
   const { listFormCode, searchParams, gridDto } = props
-  const { createSelectDataSource } = useListFormCustomDataSource({})
+  const { createSelectDataSource } = useListFormCustomDataSource({} as any)
   const [data, setData] = useState<any[]>([])
   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}
                 ></Selection>
-                {/* <Paging pageSize={gridDto.gridOptions.pageSize ?? 0}></Paging> */}
+                <Paging
+                  defaultPageSize={gridDto.gridOptions.pageSize ?? 20}
+                  pageSize={gridDto.gridOptions.pageSize ?? 20}
+                />
                 <Pager
                   visible={gridDto.gridOptions.pagerOptionDto?.visible}
                   allowedPageSizes={gridDto.gridOptions.pagerOptionDto?.allowedPageSizes
diff --git a/ui/src/views/list/Tree.tsx b/ui/src/views/list/Tree.tsx
index 172792c1..65bfad26 100644
--- a/ui/src/views/list/Tree.tsx
+++ b/ui/src/views/list/Tree.tsx
@@ -22,6 +22,7 @@ import TreeListDx, {
   IStateStoringProps,
   LoadPanel,
   Pager,
+  Paging,
   RemoteOperations,
   Scrolling,
   SearchPanel,
@@ -671,16 +672,22 @@ const Tree = (props: TreeProps) => {
                 mode={gridDto.gridOptions.selectionDto?.mode}
                 recursive={gridDto.gridOptions.treeOptionDto?.recursiveSelection || false}
               ></Selection>
+              <Paging
+                enabled={true}
+                defaultPageSize={gridDto.gridOptions.pagerOptionDto?.allowedPageSizes
+                  ?.split(',')
+                  .map((a: any) => +a)?.[0] ?? 20}
+              />
               <Pager
-                visible={gridDto.gridOptions.pagerOptionDto?.visible}
+                visible={gridDto.gridOptions.pagerOptionDto?.visible ?? true}
                 allowedPageSizes={gridDto.gridOptions.pagerOptionDto?.allowedPageSizes
                   ?.split(',')
-                  .map((a: any) => +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'}
               ></Pager>
               <ColumnChooser
                 enabled={gridDto.gridOptions.columnOptionDto?.columnChooserEnabled}
@@ -689,7 +696,11 @@ const Tree = (props: TreeProps) => {
               <ColumnFixing
                 enabled={gridDto.gridOptions.columnOptionDto?.columnFixingEnabled}
               ></ColumnFixing>
-              <Scrolling mode={gridDto.gridOptions.pagerOptionDto?.scrollingMode}></Scrolling>
+              <Scrolling 
+                mode="virtual"
+                rowRenderingMode="virtual"
+                showScrollbar="always"
+              ></Scrolling>
               <LoadPanel
                 enabled={gridDto.gridOptions.pagerOptionDto?.loadPanelEnabled}
                 text={gridDto.gridOptions.pagerOptionDto?.loadPanelText}