diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Dto/ColumnEditingDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Dto/ColumnEditingDto.cs deleted file mode 100644 index 45d6a03..0000000 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Dto/ColumnEditingDto.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Sozsoft.Platform.ListForms; - -public class ColumnEditingDto -{ - public bool AllowEditing { get; set; } = true; - //public bool AllowInserting { get; set; } = true; - //public object DefaultValue { get; set; } -} - diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Dto/ColumnFormatDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Dto/ColumnFormatDto.cs index ef192a9..ba59e53 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Dto/ColumnFormatDto.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Dto/ColumnFormatDto.cs @@ -79,6 +79,7 @@ public class ColumnFormatDto : AuditedEntityDto /// butun alanlarda OR ile arama yaptigi icin varsayilan ozelligi kapatildi, bilincli olarak acilmalidir /// public bool AllowSearch { get; set; } = false; + public bool AllowEditing { get; set; } = true; public string ColumnCssClass { get; set; } // Sutuna css sinif ismi //[TextArea] public string ColumnCssValue { get; set; } // Sutuna ait css sinifinin icerigi @@ -163,19 +164,6 @@ public class ColumnFormatDto : AuditedEntityDto set { GroupSummaryJson = JsonSerializer.Serialize(value); } } - [JsonIgnore] - public string EditingJson { get; set; } - public ColumnEditingDto ColumnEditingDto - { - get - { - if (!string.IsNullOrEmpty(EditingJson)) - return JsonSerializer.Deserialize(EditingJson); - return new ColumnEditingDto(); - } - set { EditingJson = JsonSerializer.Serialize(value); } - } - [JsonIgnore] public string LookupJson { get; set; } public LookupDto LookupDto diff --git a/api/src/Sozsoft.Platform.Application/ListForms/Administration/ListFormFieldsAppService.cs b/api/src/Sozsoft.Platform.Application/ListForms/Administration/ListFormFieldsAppService.cs index 037d155..9d171cf 100644 --- a/api/src/Sozsoft.Platform.Application/ListForms/Administration/ListFormFieldsAppService.cs +++ b/api/src/Sozsoft.Platform.Application/ListForms/Administration/ListFormFieldsAppService.cs @@ -55,8 +55,8 @@ public class ListFormFieldsAppService : CrudAppService< entity.BandName = updateInput.BandName; entity.IsActive = updateInput.IsActive; entity.Visible = updateInput.Visible; - entity.EditingJson = JsonSerializer.Serialize(updateInput.ColumnEditingDto); entity.AllowSearch = updateInput.AllowSearch; + entity.AllowEditing = updateInput.AllowEditing; entity.ListOrderNo = updateInput.ListOrderNo; entity.SourceDbType = updateInput.SourceDbType; entity.Width = updateInput.Width; @@ -146,8 +146,8 @@ public class ListFormFieldsAppService : CrudAppService< item.SortIndex = input.SortIndex; item.IsActive = input.IsActive; item.Visible = input.Visible; - item.EditingJson = input.EditingJson; item.AllowSearch = input.AllowSearch; + item.AllowEditing = input.AllowEditing; } else if (input.EditType == ListFormFieldEditTabs.CustomizationForm) { @@ -262,14 +262,12 @@ public class ListFormFieldsAppService : CrudAppService< field.IsActive = sourceField.IsActive; field.Visible = sourceField.Visible; field.AllowSearch = sourceField.AllowSearch; - field.EditingJson = sourceField.EditingJson; + field.AllowEditing = sourceField.AllowEditing; } else if (input.CopiedFields.All || input.CopiedFields.Permission) { field.PermissionJson = sourceField.PermissionJson; } - else if (input.CopiedFields.All || input.CopiedFields.Lookup) - field.EditingJson = sourceField.LookupJson; else if (input.CopiedFields.All || input.CopiedFields.Customization) field.ColumnCustomizationJson = sourceField.ColumnCustomizationJson; else if (input.CopiedFields.All || input.CopiedFields.Filtering) diff --git a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/ListForm/ListFormField.cs b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/ListForm/ListFormField.cs index 95f7046..36fcc2d 100644 --- a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/ListForm/ListFormField.cs +++ b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/ListForm/ListFormField.cs @@ -22,6 +22,7 @@ public class ListFormField : FullAuditedEntity public string SortDirection { get; set; } // Sortindex varsa alacagi degerler asc, desc public bool? AllowSearch { get; set; } + public bool? AllowEditing { get; set; } public string BandName { get; set; } public string ColumnFilterJson { get; set; } @@ -33,7 +34,6 @@ public class ListFormField : FullAuditedEntity public string ColumnCssClass { get; set; } // Sutuna css sinif ismi public string ColumnCssValue { get; set; } // Sutuna ait css sinifinin icerigi public string JoinTableJson { get; set; } // kolon farkli bir tablodan gelecek ise ona ait gerekli ayarlar - public string EditingJson { get; set; } public string LookupJson { get; set; } public string ValidationRuleJson { get; set; } public string ColumnStylingJson { get; set; } diff --git a/api/src/Sozsoft.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs b/api/src/Sozsoft.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs index 8c1d502..e64317e 100644 --- a/api/src/Sozsoft.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs +++ b/api/src/Sozsoft.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs @@ -358,6 +358,7 @@ public class PlatformDbContext : // Varsayılan değerler b.Property(a => a.AllowSearch).HasDefaultValue(false); + b.Property(a => a.AllowEditing).HasDefaultValue(true); b.Property(a => a.IsActive).HasDefaultValue(true); b.Property(a => a.Visible).HasDefaultValue(true); b.Property(a => a.ListOrderNo).HasDefaultValue(30); @@ -373,7 +374,6 @@ public class PlatformDbContext : b.Property(a => a.TotalSummaryJson).HasColumnType("text"); b.Property(a => a.GroupSummaryJson).HasColumnType("text"); b.Property(a => a.JoinTableJson).HasColumnType("text"); - b.Property(a => a.EditingJson).HasColumnType("text"); b.Property(a => a.LookupJson).HasColumnType("text"); b.Property(a => a.ValidationRuleJson).HasColumnType("text"); b.Property(a => a.ColumnStylingJson).HasColumnType("text"); diff --git a/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260311115619_Initial.Designer.cs b/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260315193224_Initial.Designer.cs similarity index 99% rename from api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260311115619_Initial.Designer.cs rename to api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260315193224_Initial.Designer.cs index 44e5c4a..f125413 100644 --- a/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260311115619_Initial.Designer.cs +++ b/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260315193224_Initial.Designer.cs @@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore; namespace Sozsoft.Platform.Migrations { [DbContext(typeof(PlatformDbContext))] - [Migration("20260311115619_Initial")] + [Migration("20260315193224_Initial")] partial class Initial { /// @@ -2449,6 +2449,11 @@ namespace Sozsoft.Platform.Migrations .HasColumnType("nvarchar(20)") .HasDefaultValue("left"); + b.Property("AllowEditing") + .ValueGeneratedOnAdd() + .HasColumnType("bit") + .HasDefaultValue(true); + b.Property("AllowSearch") .ValueGeneratedOnAdd() .HasColumnType("bit") @@ -2503,9 +2508,6 @@ namespace Sozsoft.Platform.Migrations .HasColumnType("datetime2") .HasColumnName("DeletionTime"); - b.Property("EditingJson") - .HasColumnType("text"); - b.Property("EditorOptions") .HasColumnType("text"); diff --git a/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260311115619_Initial.cs b/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260315193224_Initial.cs similarity index 99% rename from api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260311115619_Initial.cs rename to api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260315193224_Initial.cs index f402f00..476caeb 100644 --- a/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260311115619_Initial.cs +++ b/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260315193224_Initial.cs @@ -1989,6 +1989,7 @@ namespace Sozsoft.Platform.Migrations SortIndex = table.Column(type: "int", nullable: true), SortDirection = table.Column(type: "nvarchar(10)", maxLength: 10, nullable: true), AllowSearch = table.Column(type: "bit", nullable: true, defaultValue: false), + AllowEditing = table.Column(type: "bit", nullable: true, defaultValue: true), BandName = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: true), ColumnFilterJson = table.Column(type: "text", nullable: true), ColumnHeaderJson = table.Column(type: "text", nullable: true), @@ -1999,7 +2000,6 @@ namespace Sozsoft.Platform.Migrations ColumnCssClass = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: true), ColumnCssValue = table.Column(type: "nvarchar(256)", maxLength: 256, nullable: true), JoinTableJson = table.Column(type: "text", nullable: true), - EditingJson = table.Column(type: "text", nullable: true), LookupJson = table.Column(type: "text", nullable: true), ValidationRuleJson = table.Column(type: "text", nullable: true), ColumnStylingJson = table.Column(type: "text", nullable: true), diff --git a/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs b/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs index 8898b33..19677b2 100644 --- a/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs +++ b/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs @@ -2446,6 +2446,11 @@ namespace Sozsoft.Platform.Migrations .HasColumnType("nvarchar(20)") .HasDefaultValue("left"); + b.Property("AllowEditing") + .ValueGeneratedOnAdd() + .HasColumnType("bit") + .HasDefaultValue(true); + b.Property("AllowSearch") .ValueGeneratedOnAdd() .HasColumnType("bit") @@ -2500,9 +2505,6 @@ namespace Sozsoft.Platform.Migrations .HasColumnType("datetime2") .HasColumnName("DeletionTime"); - b.Property("EditingJson") - .HasColumnType("text"); - b.Property("EditorOptions") .HasColumnType("text"); diff --git a/ui/src/proxy/form/models.ts b/ui/src/proxy/form/models.ts index 427cd35..26227dd 100644 --- a/ui/src/proxy/form/models.ts +++ b/ui/src/proxy/form/models.ts @@ -186,10 +186,6 @@ export interface ColumnCustomizationDto { allowReordering: boolean } -export interface ColumnEditingDto { - allowEditing: boolean -} - export interface ColumnFilterDto { allowFiltering: boolean filterOperations: string[] @@ -211,6 +207,7 @@ export interface ColumnFormatDto extends AuditedEntityDto { sortIndex: number sortDirection?: string allowSearch: boolean + allowEditing: boolean columnCssClass?: string columnCssValue?: string bandName?: string @@ -226,8 +223,6 @@ export interface ColumnFormatDto extends AuditedEntityDto { columnTotalSummaryDto: ColumnTotalSummaryDto groupSummaryJson?: string columnGroupSummaryDto: ColumnTotalSummaryDto - editingJson?: string - columnEditingDto: ColumnEditingDto lookupJson?: string lookupDto: LookupDto validationRuleJson?: string diff --git a/ui/src/views/admin/listForm/WizardStep2.tsx b/ui/src/views/admin/listForm/WizardStep2.tsx index cc7122e..fdc8b79 100644 --- a/ui/src/views/admin/listForm/WizardStep2.tsx +++ b/ui/src/views/admin/listForm/WizardStep2.tsx @@ -187,31 +187,31 @@ const WizardStep2 = ({ translate('::ListForms.Wizard.Step2.StoredProcedures') || 'Stored Procedures', options: dbObjects.storedProcedures.map((p) => ({ - label: p.procedureName, - value: p.procedureName, + label: p.objectName, + value: p.objectName, __type: SelectCommandTypeEnum.StoredProcedure, __schema: p.schemaName, - __rawName: p.procedureName, + __rawName: p.objectName, })), }, { label: translate('::ListForms.Wizard.Step2.Views') || 'Views', options: dbObjects.views.map((v) => ({ - label: v.viewName, - value: v.viewName, + label: v.objectName, + value: v.objectName, __type: SelectCommandTypeEnum.View, __schema: v.schemaName, - __rawName: v.viewName, + __rawName: v.objectName, })), }, { label: translate('::ListForms.Wizard.Step2.Functions') || 'Functions', options: dbObjects.functions.map((f) => ({ - label: f.functionName, - value: f.functionName, + label: f.objectName, + value: f.objectName, __type: SelectCommandTypeEnum.TableValuedFunction, __schema: f.schemaName, - __rawName: f.functionName, + __rawName: f.objectName, })), }, ] diff --git a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabOptions.tsx b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabOptions.tsx index 60f66a4..a2f253d 100644 --- a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabOptions.tsx +++ b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabOptions.tsx @@ -16,12 +16,8 @@ const schema = object().shape({ sortIndex: number(), isActive: bool().required(), visible: bool().required(), - columnEditingDto: object() - .shape({ - allowEditing: bool().required(), - }) - .required(), allowSearch: bool().required(), + allowEditing: bool().required(), }) function FormFieldTabOptions({ @@ -102,12 +98,12 @@ function FormFieldTabOptions({ > - - - + + +