diff --git a/api/src/Erp.Platform.Application.Contracts/ListForms/GridOptionsDto/GridOptionsDto.cs b/api/src/Erp.Platform.Application.Contracts/ListForms/GridOptionsDto/GridOptionsDto.cs index 9ad2c07c..fafc211e 100644 --- a/api/src/Erp.Platform.Application.Contracts/ListForms/GridOptionsDto/GridOptionsDto.cs +++ b/api/src/Erp.Platform.Application.Contracts/ListForms/GridOptionsDto/GridOptionsDto.cs @@ -24,6 +24,8 @@ public class GridOptionsDto : AuditedEntityDto public int PageSize { get; set; } public int Width { get; set; } public int Height { get; set; } + public bool FullHeight { get; set; } + //[TextArea] public string Description { get; set; } diff --git a/api/src/Erp.Platform.Application/ListForms/Administration/ListFormsAppService.cs b/api/src/Erp.Platform.Application/ListForms/Administration/ListFormsAppService.cs index 2d447c45..d645dfe9 100644 --- a/api/src/Erp.Platform.Application/ListForms/Administration/ListFormsAppService.cs +++ b/api/src/Erp.Platform.Application/ListForms/Administration/ListFormsAppService.cs @@ -62,6 +62,7 @@ public class ListFormsAppService : CrudAppService< item.Name = input.Name; item.Width = input.Width; item.Height = input.Height; + item.FullHeight = input.FullHeight; item.Description = input.Description; item.IsSubForm = input.IsSubForm; item.ShowActivity = input.ShowActivity; diff --git a/api/src/Erp.Platform.DbMigrator/Seeds/LanguagesData.json b/api/src/Erp.Platform.DbMigrator/Seeds/LanguagesData.json index 9059e8dc..889d212d 100644 --- a/api/src/Erp.Platform.DbMigrator/Seeds/LanguagesData.json +++ b/api/src/Erp.Platform.DbMigrator/Seeds/LanguagesData.json @@ -3793,6 +3793,12 @@ "en": "Height", "tr": "Yükseklik" }, + { + "resourceName": "Platform", + "key": "ListForms.ListFormEdit.DetailsFullHeight", + "en": "Full Height", + "tr": "Tam Yükseklik" + }, { "resourceName": "Platform", "key": "ListForms.ListFormEdit.DetailsLayoutDto.GridLayout", diff --git a/api/src/Erp.Platform.Domain/Entities/Host/ListForm.cs b/api/src/Erp.Platform.Domain/Entities/Host/ListForm.cs index 67fca882..12e8ddc6 100644 --- a/api/src/Erp.Platform.Domain/Entities/Host/ListForm.cs +++ b/api/src/Erp.Platform.Domain/Entities/Host/ListForm.cs @@ -28,6 +28,7 @@ public class ListForm : FullAuditedEntity public int PageSize { get; set; } // Sayfa basina kayit sayisi 10, 25, 50, 100 public int? Width { get; set; } public int? Height { get; set; } + public bool FullHeight { get; set; } = false; public string DefaultFilter { get; set; } // Her sorgunun sonuna eklenecek default WHERE condition public string ColumnOptionJson { get; set; } diff --git a/api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251112140020_Initial.Designer.cs b/api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251112185040_Initial.Designer.cs similarity index 99% rename from api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251112140020_Initial.Designer.cs rename to api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251112185040_Initial.Designer.cs index 52a03cfd..439d7392 100644 --- a/api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251112140020_Initial.Designer.cs +++ b/api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251112185040_Initial.Designer.cs @@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore; namespace Erp.Platform.Migrations { [DbContext(typeof(PlatformDbContext))] - [Migration("20251112140020_Initial")] + [Migration("20251112185040_Initial")] partial class Initial { /// @@ -5063,6 +5063,9 @@ namespace Erp.Platform.Migrations b.Property("FormFieldsDefaultValueJson") .HasColumnType("text"); + b.Property("FullHeight") + .HasColumnType("bit"); + b.Property("GroupPanelJson") .HasColumnType("text"); diff --git a/api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251112140020_Initial.cs b/api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251112185040_Initial.cs similarity index 99% rename from api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251112140020_Initial.cs rename to api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251112185040_Initial.cs index d76f877b..97fc1a38 100644 --- a/api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251112140020_Initial.cs +++ b/api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251112185040_Initial.cs @@ -1882,6 +1882,7 @@ namespace Erp.Platform.Migrations PageSize = table.Column(type: "int", nullable: false, defaultValue: 50), Width = table.Column(type: "int", nullable: true), Height = table.Column(type: "int", nullable: true), + FullHeight = table.Column(type: "bit", nullable: false), DefaultFilter = table.Column(type: "text", nullable: true), ColumnOptionJson = table.Column(type: "text", nullable: true), PivotOptionJson = table.Column(type: "text", nullable: true), diff --git a/api/src/Erp.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs b/api/src/Erp.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs index aa0394a4..899cd2c8 100644 --- a/api/src/Erp.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs +++ b/api/src/Erp.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs @@ -5060,6 +5060,9 @@ namespace Erp.Platform.Migrations b.Property("FormFieldsDefaultValueJson") .HasColumnType("text"); + b.Property("FullHeight") + .HasColumnType("bit"); + b.Property("GroupPanelJson") .HasColumnType("text"); diff --git a/ui/src/proxy/form/models.ts b/ui/src/proxy/form/models.ts index b375efe1..18463bda 100644 --- a/ui/src/proxy/form/models.ts +++ b/ui/src/proxy/form/models.ts @@ -463,6 +463,7 @@ export interface GridOptionsDto extends AuditedEntityDto { pageSize?: number width: number height: number + fullHeight: boolean description?: string filterRowJson?: string filterRowDto: GridFilterRowDto diff --git a/ui/src/views/admin/listForm/edit/FormTabDetails.tsx b/ui/src/views/admin/listForm/edit/FormTabDetails.tsx index 9bb84969..e583b86e 100644 --- a/ui/src/views/admin/listForm/edit/FormTabDetails.tsx +++ b/ui/src/views/admin/listForm/edit/FormTabDetails.tsx @@ -217,6 +217,17 @@ function FormTabDetails( component={Input} /> + + + {values.listFormType === 'List' && ( diff --git a/ui/src/views/list/Grid.tsx b/ui/src/views/list/Grid.tsx index 468f3626..a2fcbc3d 100644 --- a/ui/src/views/list/Grid.tsx +++ b/ui/src/views/list/Grid.tsx @@ -709,7 +709,13 @@ const Grid = (props: GridProps) => { //dataSource={gridDataSource} //remoteOperations={{ groupPaging: true }} //remoteOperations={false} - height={gridDto.gridOptions.height || `calc(100vh - ${170 + widgetGroupHeight}px)`} + height={ + gridDto.gridOptions.height > 0 + ? gridDto.gridOptions.height + : gridDto.gridOptions.fullHeight + ? `calc(100vh - ${170 + widgetGroupHeight}px)` + : undefined + } width={gridDto.gridOptions.width || '100%'} allowColumnResizing={gridDto.gridOptions.columnOptionDto?.allowColumnResizing} allowColumnReordering={gridDto.gridOptions.columnOptionDto?.allowColumnReordering} diff --git a/ui/src/views/list/Tree.tsx b/ui/src/views/list/Tree.tsx index 965e36a1..49f90db2 100644 --- a/ui/src/views/list/Tree.tsx +++ b/ui/src/views/list/Tree.tsx @@ -608,7 +608,13 @@ const Tree = (props: TreeProps) => { 0 + ? gridDto.gridOptions.height + : gridDto.gridOptions.fullHeight + ? `calc(100vh - ${170 + widgetGroupHeight}px)` + : undefined + } width={gridDto.gridOptions.width || '100%'} dataStructure="plain" keyExpr={gridDto.gridOptions.treeOptionDto?.keyExpr}