From 6c23875b59ed8d1c503d4bb121bedd91b0176823 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sedat=20=C3=96ZT=C3=9CRK?= <76204082+iamsedatozturk@users.noreply.github.com> Date: Tue, 9 Jun 2026 14:09:17 +0300 Subject: [PATCH] ListForm Seeder --- .../Seeds/ListFormSeeder_Administration.cs | 27 ++- .../Seeds/ListFormSeeder_DefaultJsons.cs | 1 + .../Seeds/ListFormSeeder_Saas.cs | 155 +++++++++++------- .../WizardConsts.cs | 1 + .../edit/form-fields/FormFieldEdit.tsx | 10 +- 5 files changed, 127 insertions(+), 67 deletions(-) diff --git a/api/src/Sozsoft.Platform.DbMigrator/Seeds/ListFormSeeder_Administration.cs b/api/src/Sozsoft.Platform.DbMigrator/Seeds/ListFormSeeder_Administration.cs index 87feae6..7c4e1fb 100644 --- a/api/src/Sozsoft.Platform.DbMigrator/Seeds/ListFormSeeder_Administration.cs +++ b/api/src/Sozsoft.Platform.DbMigrator/Seeds/ListFormSeeder_Administration.cs @@ -131,6 +131,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep IsActive = true, AllowSearch = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AbpIdentity.PermissionGroups.Create, AbpIdentity.PermissionGroups.Default, AbpIdentity.PermissionGroups.Update, true, true, false), PivotSettingsJson = DefaultPivotSettingsJson @@ -147,6 +148,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep IsActive = true, AllowSearch = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AbpIdentity.PermissionGroups.Create, AbpIdentity.PermissionGroups.Default, AbpIdentity.PermissionGroups.Update, true, true, false), PivotSettingsJson = DefaultPivotSettingsJson @@ -163,6 +165,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep IsActive = true, AllowSearch = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AbpIdentity.PermissionGroups.Create, AbpIdentity.PermissionGroups.Default, AbpIdentity.PermissionGroups.Update, true, true, false), PivotSettingsJson = DefaultPivotSettingsJson @@ -264,6 +267,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep IsActive = true, AllowSearch = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AbpIdentity.Permissions.Create, AbpIdentity.Permissions.Default, AbpIdentity.Permissions.Update, true, true, false), PivotSettingsJson = DefaultPivotSettingsJson @@ -310,6 +314,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep ValueExpr = "Key", LookupQuery = LookupQueryValues.PermissionGroupValues }), + ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AbpIdentity.Permissions.Create, AbpIdentity.Permissions.Default, AbpIdentity.Permissions.Update, true, true, false), PivotSettingsJson = DefaultPivotSettingsJson @@ -375,6 +380,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep new () { Key=3, Name="Both" }, }), }), + ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AbpIdentity.Permissions.Create, AbpIdentity.Permissions.Default, AbpIdentity.Permissions.Update, true, true, false), PivotSettingsJson = DefaultPivotSettingsJson @@ -397,6 +403,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep ValueExpr = "key", LookupQuery = LookupQueryValues.MenuGroupValues }), + ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AbpIdentity.Permissions.Create, AbpIdentity.Permissions.Default, AbpIdentity.Permissions.Update, true, true, false), PivotSettingsJson = DefaultPivotSettingsJson @@ -441,7 +448,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep ColumnOptionJson = DefaultColumnOptionJson(), PermissionJson = DefaultPermissionJson(listFormName), PagerOptionJson = DefaultPagerOptionJson, - EditingOptionJson = DefaultEditingOptionJson(listFormName, 500, 500, true, true, true, true, false), + EditingOptionJson = DefaultEditingOptionJson(listFormName, 500, 650, true, true, true, true, false), EditingFormJson = JsonSerializer.Serialize(new List() { new() { Order=1, ColCount=1, ColSpan=1, ItemType="group", Items =[ @@ -504,6 +511,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep IsActive = true, AllowSearch = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson @@ -532,6 +540,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep new () { Key=3, Name="DateTime" }, }), }), + ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson @@ -1217,7 +1226,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Guid, FieldName = "Id", - CaptionName = "App.Listform.ListformField.Id", + CaptionName = "App.Listform.ListformField.Id", Width = 0, ListOrderNo = 1, Visible = false, @@ -1232,7 +1241,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "HttpStatusCode", - CaptionName = "App.Listform.ListformField.HttpStatusCode", + CaptionName = "App.Listform.ListformField.HttpStatusCode", Width = 0, ListOrderNo = 2, Visible = true, @@ -1676,6 +1685,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep Visible = false, IsActive = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson @@ -1897,6 +1907,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep Visible = true, IsActive = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson, @@ -1913,6 +1924,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep Visible = true, IsActive = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson, @@ -3219,6 +3231,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep new () { Key= "yes-no", Name= "Yes/No" }, }), }), + ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson @@ -3442,6 +3455,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep } } } + }), + FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] + { + new() { FieldName = "CreationTime", FieldDbType = DbType.DateTime, Value = "@NOW", CustomValueType = FieldCustomValueTypeEnum.CustomKey } }) }, autoSave: true ); @@ -3513,6 +3530,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep Visible = true, IsActive = true, AllowSearch = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson @@ -4311,6 +4329,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep ListOrderNo = 6, Visible = true, IsActive = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson @@ -4349,6 +4368,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep ValueExpr = "Key", LookupQuery = LookupQueryValues.UserValues }), + ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson @@ -4531,7 +4551,6 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep ListOrderNo = 3, Visible = false, IsActive = true, - ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson diff --git a/api/src/Sozsoft.Platform.DbMigrator/Seeds/ListFormSeeder_DefaultJsons.cs b/api/src/Sozsoft.Platform.DbMigrator/Seeds/ListFormSeeder_DefaultJsons.cs index 41a494f..267751a 100644 --- a/api/src/Sozsoft.Platform.DbMigrator/Seeds/ListFormSeeder_DefaultJsons.cs +++ b/api/src/Sozsoft.Platform.DbMigrator/Seeds/ListFormSeeder_DefaultJsons.cs @@ -132,6 +132,7 @@ public static class ListFormSeeder_DefaultJsons public static readonly string DefaultValidationRuleEmailRequiredJson = JsonSerializer.Serialize(new ValidationRuleDto[] { new() { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.email) }, + new() { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.required) } }); public static string DefaultPermissionJson(string c, string r, string u, string d, string e, string i, string a) { diff --git a/api/src/Sozsoft.Platform.DbMigrator/Seeds/ListFormSeeder_Saas.cs b/api/src/Sozsoft.Platform.DbMigrator/Seeds/ListFormSeeder_Saas.cs index 3af46b4..7e9b1f7 100644 --- a/api/src/Sozsoft.Platform.DbMigrator/Seeds/ListFormSeeder_Saas.cs +++ b/api/src/Sozsoft.Platform.DbMigrator/Seeds/ListFormSeeder_Saas.cs @@ -90,20 +90,20 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency ColumnOptionJson = DefaultColumnOptionJson(), PermissionJson = DefaultPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, TenantManagementPermissions.Tenants.Delete, TenantManagementPermissions.Tenants.Default + ".Export", TenantManagementPermissions.Tenants.Default + ".Import", TenantManagementPermissions.Tenants.Default + ".Note"), PagerOptionJson = DefaultPagerOptionJson, - EditingOptionJson = DefaultEditingOptionJson(TenantManagementPermissions.Tenants.Default, 950, 700, true, true, true, true, false, true), + EditingOptionJson = DefaultEditingOptionJson(TenantManagementPermissions.Tenants.Default, 950, 750, true, true, true, true, false, true), EditingFormJson = JsonSerializer.Serialize(new List() { new() { Order=1, ColCount=3, ColSpan=1, ItemType="group", Items = [ - new EditingFormItemDto { Order=1, DataField = "Name", ColSpan=1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order=2, DataField = "OrganizationName", ColSpan=1, EditorType2=EditorTypes.dxTextBox }, + new EditingFormItemDto { Order=1, DataField = "OrganizationName", ColSpan=1, EditorType2=EditorTypes.dxTextBox }, + new EditingFormItemDto { Order=2, DataField = "Name", ColSpan=1, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=3, DataField = "Founder", ColSpan=1, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=4, DataField = "VknTckn", ColSpan=1, EditorType2=EditorTypes.dxNumberBox }, new EditingFormItemDto { Order=5, DataField = "TaxOffice", ColSpan=1, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=6, DataField = "MobileNumber", ColSpan=1, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, new EditingFormItemDto { Order=7, DataField = "PhoneNumber", ColSpan=1, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, new EditingFormItemDto { Order=8, DataField = "FaxNumber", ColSpan=1, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, - new EditingFormItemDto { Order=9, DataField = "IsActive", ColSpan=1, EditorType2=EditorTypes.dxCheckBox }, + new EditingFormItemDto { Order=9, DataField = "MenuGroup", ColSpan=1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, ] }, new() { Order=2, ColCount=3, ColSpan=1, ItemType="group", Items = @@ -113,12 +113,12 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency new EditingFormItemDto { Order=3, DataField = "District", ColSpan=1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order=4, DataField = "Township", ColSpan=1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order=5, DataField = "PostalCode", ColSpan=1, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order=6, DataField = "Address1", ColSpan=1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order=7, DataField = "Address2", ColSpan=1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order=8, DataField = "Email", ColSpan=1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order=9, DataField = "Website", ColSpan=1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order=10, DataField = "MenuGroup", ColSpan=1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order=11, DataField = "MaxConcurrentUsers", ColSpan=1, EditorType2=EditorTypes.dxNumberBox }, + new EditingFormItemDto { Order=6, DataField = "Email", ColSpan=1, EditorType2=EditorTypes.dxTextBox }, + new EditingFormItemDto { Order=7, DataField = "Website", ColSpan=1, EditorType2=EditorTypes.dxTextBox }, + new EditingFormItemDto { Order=8, DataField = "MaxConcurrentUsers", ColSpan=1, EditorType2=EditorTypes.dxNumberBox }, + new EditingFormItemDto { Order=9, DataField = "IsActive", ColSpan=1, EditorType2=EditorTypes.dxCheckBox }, + new EditingFormItemDto { Order=10, DataField = "Address1", ColSpan=3, EditorType2=EditorTypes.dxTextArea }, + new EditingFormItemDto { Order=11, DataField = "Address2", ColSpan=3, EditorType2=EditorTypes.dxTextArea }, ] } }), @@ -597,12 +597,12 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency ColumnOptionJson = DefaultColumnOptionJson(), PermissionJson = DefaultPermissionJson(listFormName), PagerOptionJson = DefaultPagerOptionJson, - EditingOptionJson = DefaultEditingOptionJson(listFormName, 800, 600, true, true, true, true, false), + EditingOptionJson = DefaultEditingOptionJson(listFormName, 950, 750, true, true, true, true, false), EditingFormJson = JsonSerializer.Serialize(new List() { - new() { Order=1, ColCount=2, ColSpan=1, ItemType="group", Items = + new() { Order=1, ColCount=3, ColSpan=1, ItemType="group", Items = [ - new EditingFormItemDto { Order=1, DataField = "TenantId", ColSpan=1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, + new EditingFormItemDto { Order=1, DataField = "TenantId", ColSpan=3, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order=2, DataField = "Code", ColSpan=1, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=3, DataField = "Name", ColSpan=1, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=4, DataField = "VknTckn", ColSpan=1, EditorType2=EditorTypes.dxNumberBox }, @@ -610,20 +610,20 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency new EditingFormItemDto { Order=6, DataField = "MobileNumber", ColSpan=1, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, new EditingFormItemDto { Order=7, DataField = "PhoneNumber", ColSpan=1, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, new EditingFormItemDto { Order=8, DataField = "FaxNumber", ColSpan=1, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, - new EditingFormItemDto { Order=9, DataField = "IsActive", ColSpan=1, EditorType2=EditorTypes.dxCheckBox }, - new EditingFormItemDto { Order=10, DataField = "PostalCode", ColSpan=1, EditorType2=EditorTypes.dxTextBox }, + new EditingFormItemDto { Order=9, DataField = "PostalCode", ColSpan=1, EditorType2=EditorTypes.dxTextBox }, + new EditingFormItemDto { Order=10, DataField = "IsActive", ColSpan=1, EditorType2=EditorTypes.dxCheckBox }, ] }, - new() { Order=2, ColCount=2, ColSpan=1, ItemType="group", Items = + new() { Order=2, ColCount=3, ColSpan=1, ItemType="group", Items = [ new EditingFormItemDto { Order=1, DataField = "Country", ColSpan=1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order=2, DataField = "City", ColSpan=1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order=3, DataField = "District", ColSpan=1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order=4, DataField = "Township", ColSpan=1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order=5, DataField = "Address1", ColSpan=2, EditorType2=EditorTypes.dxTextArea }, - new EditingFormItemDto { Order=6, DataField = "Address2", ColSpan=2, EditorType2=EditorTypes.dxTextArea }, - new EditingFormItemDto { Order=7, DataField = "Email", ColSpan=1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order=8, DataField = "Website", ColSpan=1, EditorType2=EditorTypes.dxTextBox }, + new EditingFormItemDto { Order=5, DataField = "Email", ColSpan=1, EditorType2=EditorTypes.dxTextBox }, + new EditingFormItemDto { Order=6, DataField = "Website", ColSpan=1, EditorType2=EditorTypes.dxTextBox }, + new EditingFormItemDto { Order=7, DataField = "Address1", ColSpan=3, EditorType2=EditorTypes.dxTextArea }, + new EditingFormItemDto { Order=8, DataField = "Address2", ColSpan=3, EditorType2=EditorTypes.dxTextArea }, ] } }), @@ -697,6 +697,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency Visible = true, IsActive = true, AllowSearch = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson @@ -712,8 +713,9 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency ListOrderNo = 3, Visible = true, IsActive = true, - AllowSearch = true, + + ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson @@ -730,6 +732,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency Visible = true, IsActive = true, AllowSearch = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson @@ -746,6 +749,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency Visible = true, IsActive = true, AllowSearch = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson @@ -771,6 +775,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency LookupQuery = LookupQueryValues.CountryValues, CascadeEmptyFields = "City,District,Township" }), + ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson @@ -788,6 +793,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency IsActive = true, AllowSearch = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, LookupJson = JsonSerializer.Serialize(new LookupDto { DataSourceType = UiLookupDataSourceTypeEnum.Query, @@ -816,6 +822,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency IsActive = true, AllowSearch = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, LookupJson = JsonSerializer.Serialize(new LookupDto { DataSourceType = UiLookupDataSourceTypeEnum.Query, @@ -844,6 +851,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency IsActive = true, AllowSearch = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, LookupJson = JsonSerializer.Serialize(new LookupDto { DataSourceType = UiLookupDataSourceTypeEnum.Query, @@ -922,7 +930,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency IsActive = true, AllowSearch = true, - ValidationRuleJson = DefaultValidationRuleEmailJson, + ValidationRuleJson = DefaultValidationRuleEmailRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson @@ -940,6 +948,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency IsActive = true, AllowSearch = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson @@ -957,6 +966,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency IsActive = true, AllowSearch = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, EditorOptions = EditorOptionValues.PhoneEditorOptions, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), @@ -1104,6 +1114,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency Visible = true, IsActive = true, AllowSearch = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson @@ -1119,6 +1130,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency Visible = true, IsActive = true, AllowSearch = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson @@ -1140,6 +1152,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency ValueExpr = "Key", LookupQuery = LookupQueryValues.LanguageKeyValues }), + ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson @@ -1149,12 +1162,13 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Url", - CaptionName = "App.Listform.ListformField.Url", + CaptionName = "App.Listform.ListformField.Url", Width = 0, ListOrderNo = 5, Visible = true, IsActive = true, AllowSearch = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson @@ -1164,12 +1178,13 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Single, FieldName = "Weight", - CaptionName = "App.Listform.ListformField.Weight", + CaptionName = "App.Listform.ListformField.Weight", Width = 0, ListOrderNo = 6, Visible = true, IsActive = true, AllowSearch = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson @@ -1283,6 +1298,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency Visible = true, IsActive = true, AllowSearch = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson @@ -1314,7 +1330,6 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency Visible = true, IsActive = true, AllowSearch = true, - ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson @@ -1476,7 +1491,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency DeleteFieldsDefaultValueJson = DefaultDeleteFieldsDefaultValueJson(), InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson(DbType.String, "Name"), PagerOptionJson = DefaultPagerOptionJson, - EditingOptionJson = DefaultEditingOptionJson(listFormName, 500, 350, true, true, true, true, false), + EditingOptionJson = DefaultEditingOptionJson(listFormName, 500, 450, true, true, true, true, false), EditingFormJson = JsonSerializer.Serialize(new List { new() { @@ -1489,6 +1504,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency ] } }), + FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] + { + new() { FieldName = "IsActive", FieldDbType = DbType.Boolean, Value = "true", CustomValueType = FieldCustomValueTypeEnum.Value } + }) }); #region Currency Fields @@ -1728,7 +1747,9 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency } }), FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { - new() { FieldName = "Currency", FieldDbType = DbType.String, Value = "TRY", CustomValueType = FieldCustomValueTypeEnum.Value } + new() { FieldName = "Currency", FieldDbType = DbType.String, Value = "TRY", CustomValueType = FieldCustomValueTypeEnum.Value }, + new() { FieldName = "ZipRequired", FieldDbType = DbType.Boolean, Value = "false", CustomValueType = FieldCustomValueTypeEnum.Value }, + new() { FieldName = "StateRequired", FieldDbType = DbType.Boolean, Value = "false", CustomValueType = FieldCustomValueTypeEnum.Value } }) }); @@ -1796,6 +1817,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency IsActive = true, AllowSearch = false, + ValidationRuleJson = DefaultValidationRuleRequiredJson, LookupJson = LookupQueryValues.DefaultLookupQueryJson(nameof(TableNameEnum.Currency), "Id", "Name"), ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), @@ -1813,6 +1835,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency IsActive = true, AllowSearch = false, + ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), }, @@ -2042,7 +2065,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency DeleteCommand = DefaultDeleteCommand(nameof(TableNameEnum.District)), DeleteFieldsDefaultValueJson = DefaultDeleteFieldsDefaultValueJson(), PagerOptionJson = DefaultPagerOptionJson, - EditingOptionJson = DefaultEditingOptionJson(listFormName, 500, 350, true, true, true, true, false), + EditingOptionJson = DefaultEditingOptionJson(listFormName, 500, 450, true, true, true, true, false), EditingFormJson = JsonSerializer.Serialize(new List { new() { @@ -2314,7 +2337,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency DeleteFieldsDefaultValueJson = DefaultDeleteFieldsDefaultValueJson(), InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson(DbType.String, "Name"), PagerOptionJson = DefaultPagerOptionJson, - EditingOptionJson = DefaultEditingOptionJson(listFormName, 600, 550, true, true, true, false, false), + EditingOptionJson = DefaultEditingOptionJson(listFormName, 600, 500, true, true, true, false, false), EditingFormJson = JsonSerializer.Serialize(new List() { new() { Order=1, ColCount=1, ColSpan=1, ItemType="group", Items=[ @@ -2452,7 +2475,6 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency IsActive = true, AllowSearch = true, - ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson @@ -2630,7 +2652,6 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency IsActive = true, Alignment = "center", AllowSearch = true, - ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson @@ -2684,7 +2705,6 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency IsActive = true, AllowSearch = true, - ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson @@ -2747,7 +2767,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CaptionName = "App.Listform.ListformField.LastPeriodKey", Width = 0, ListOrderNo = 11, - Visible = true, + Visible = true, IsActive = true, AllowSearch = true, @@ -2764,9 +2784,9 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CaptionName = "App.Listform.ListformField.FormatTemplate", Width = 0, ListOrderNo = 12, - Visible = true, + Visible = true, IsActive = true, - PlaceHolder="{Prefix}-{yyyy}{MM}{dd}-{Number}-{Suffix}", + PlaceHolder="{Prefix}-{yyyy}{MM}{dd}-{Number}-{Suffix}", AllowSearch = true, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), @@ -2934,7 +2954,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency DeleteFieldsDefaultValueJson = DefaultDeleteFieldsDefaultValueJson(DbType.String), PagerOptionJson = DefaultPagerOptionJson, InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson(DbType.String, "Name"), - EditingOptionJson = DefaultEditingOptionJson(listFormName, 600, 300, true, true, true, true, false), + EditingOptionJson = DefaultEditingOptionJson(listFormName, 500, 450, true, true, true, true, false), EditingFormJson = JsonSerializer.Serialize(new List() { new() { Order=1, ColCount=1, ColSpan=1, ItemType="group", Items= [ @@ -3080,7 +3100,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency DeleteFieldsDefaultValueJson = DefaultDeleteFieldsDefaultValueJson(DbType.String), PagerOptionJson = DefaultPagerOptionJson, InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson(DbType.String, "Name"), - EditingOptionJson = DefaultEditingOptionJson(AppCodes.Definitions.SkillLevel, 600, 300, true, true, true, true, false), + EditingOptionJson = DefaultEditingOptionJson(AppCodes.Definitions.SkillLevel, 500, 250, true, true, true, true, false), EditingFormJson = JsonSerializer.Serialize(new List() { new() { Order=1, ColCount=1, ColSpan=1, ItemType="group", Items=[ new EditingFormItemDto { Order = 1, DataField = "Name", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, @@ -3573,7 +3593,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency PermissionJson = DefaultPermissionJson(listFormName), PagerOptionJson = DefaultPagerOptionJson, InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson(), - EditingOptionJson = DefaultEditingOptionJson(listFormName, 600, 300, true, true, true, true, false, true), + EditingOptionJson = DefaultEditingOptionJson(listFormName, 600, 450, true, true, true, true, false, true), EditingFormJson = JsonSerializer.Serialize(new List() { new() { Order=1, ColCount=1, ColSpan=1, ItemType="group", Items= [ @@ -4687,12 +4707,6 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency AllowSearch = true, LookupJson = LookupQueryValues.DefaultLookupQueryJson(nameof(TableNameEnum.NotificationType), "Id", "Name"), - // LookupJson = JsonSerializer.Serialize(new LookupDto { - // DataSourceType = UiLookupDataSourceTypeEnum.WebService, - // DisplayExpr = "Name", - // ValueExpr = "Key", - // LookupQuery = "GET;notification-rule/notification-types;{};a;a;null", - // }), ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), @@ -4756,6 +4770,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency IsActive = true, AllowSearch = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, LookupJson = JsonSerializer.Serialize(new LookupDto { DataSourceType = UiLookupDataSourceTypeEnum.StaticData, @@ -5094,7 +5109,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency DeleteCommand = $"UPDATE \"{FullNameTable(TableNameEnum.BackgroundWorker)}\" SET \"DeleterId\"=@DeleterId, \"DeletionTime\"=CURRENT_TIMESTAMP, \"IsDeleted\"='true' WHERE \"Id\"=@Id", DeleteFieldsDefaultValueJson = DefaultDeleteFieldsDefaultValueJson(), PagerOptionJson = DefaultPagerOptionJson, - EditingOptionJson = DefaultEditingOptionJson(listFormName, 800, 550, true, true, true, true, false), + EditingOptionJson = DefaultEditingOptionJson(listFormName, 800, 700, true, true, true, true, false), EditingFormJson = JsonSerializer.Serialize(new List() { new() { Order=1, ColCount=2, ColSpan=1, ItemType="group",Items=[ new EditingFormItemDto { Order = 1, DataField = "Name", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, @@ -5688,7 +5703,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency ColumnOptionJson = DefaultColumnOptionJson(), PermissionJson = DefaultPermissionJson(listFormName), PagerOptionJson = DefaultPagerOptionJson, - EditingOptionJson = DefaultEditingOptionJson(listFormName, 500, 350, true, true, true, true, false), + EditingOptionJson = DefaultEditingOptionJson(listFormName, 500, 250, true, true, true, true, false), EditingFormJson = JsonSerializer.Serialize(new List { new() { Order = 1, ColCount = 1, ColSpan = 1, ItemType = "group", Items = @@ -5918,6 +5933,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency IsActive = true, AllowSearch = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson @@ -6096,17 +6112,17 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency DeleteCommand = $"UPDATE \"{FullNameTable(TableNameEnum.CustomEndpoint)}\" SET \"DeleterId\"=@DeleterId, \"DeletionTime\"=CURRENT_TIMESTAMP, \"IsDeleted\"='true' WHERE \"Id\"=@Id", DeleteFieldsDefaultValueJson = DefaultDeleteFieldsDefaultValueJson(), PagerOptionJson = DefaultPagerOptionJson, - EditingOptionJson = DefaultEditingOptionJson(listFormName, 800, 500, true, true, true, true, false), + EditingOptionJson = DefaultEditingOptionJson(listFormName, 900, 700, true, true, true, true, false), EditingFormJson = JsonSerializer.Serialize(new List() { - new() { Order=1,ColCount=1,ColSpan=1,ItemType="group", Items=[ + new() { Order=1,ColCount=2,ColSpan=1,ItemType="group", Items=[ new EditingFormItemDto { Order = 1, DataField = "Name", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 2, DataField = "Url", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 3, DataField = "Method", ColSpan = 1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 4, DataField = "DataSourceCode", ColSpan = 1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 5, DataField = "Sql", ColSpan = 1, EditorType2=EditorTypes.dxTextArea, EditorOptions="{ \"height\" : 60 }" }, - new EditingFormItemDto { Order = 6, DataField = "ParametersJson", ColSpan = 1, EditorType2=EditorTypes.dxTextArea, EditorOptions="{ \"height\" : 60 }" }, - new EditingFormItemDto { Order = 7, DataField = "PermissionsJson", ColSpan = 1, EditorType2=EditorTypes.dxTextArea, EditorOptions="{ \"height\" : 60 }" }, - new EditingFormItemDto { Order = 8, DataField = "Description", ColSpan = 1, EditorType2=EditorTypes.dxTextArea, EditorOptions="{\"height\":200}" }, + new EditingFormItemDto { Order = 5, DataField = "Sql", ColSpan = 2, EditorType2=EditorTypes.dxTextArea, EditorOptions="{ \"height\" : 60 }" }, + new EditingFormItemDto { Order = 6, DataField = "ParametersJson", ColSpan = 2, EditorType2=EditorTypes.dxTextArea, EditorOptions="{ \"height\" : 60 }" }, + new EditingFormItemDto { Order = 7, DataField = "PermissionsJson", ColSpan = 2, EditorType2=EditorTypes.dxTextArea, EditorOptions="{ \"height\" : 60 }" }, + new EditingFormItemDto { Order = 8, DataField = "Description", ColSpan = 2, EditorType2=EditorTypes.dxTextArea, EditorOptions="{\"height\":100}" }, ]} }), InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson(), @@ -6152,6 +6168,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency IsActive = true, AllowSearch = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson @@ -6184,6 +6201,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency IsActive = true, AllowSearch = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson @@ -6229,6 +6247,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency IsActive = true, AllowSearch = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), LookupJson = LookupQueryValues.DefaultLookupQueryJson(nameof(TableNameEnum.DataSource), "Code", "Code"), @@ -6325,7 +6344,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency DeleteCommand = DefaultDeleteCommand(nameof(TableNameEnum.Product)), DeleteFieldsDefaultValueJson = DefaultDeleteFieldsDefaultValueJson(), PagerOptionJson = DefaultPagerOptionJson, - EditingOptionJson = DefaultEditingOptionJson(listFormName, 500, 500, true, true, true, true, false), + EditingOptionJson = DefaultEditingOptionJson(listFormName, 500, 700, true, true, true, true, false), EditingFormJson = JsonSerializer.Serialize(new List { new() { Order = 1, ColCount = 1, ColSpan = 1, ItemType = "group", Items = @@ -6444,6 +6463,26 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency PivotSettingsJson = DefaultPivotSettingsJson, }, new() + { + ListFormCode = listForm.ListFormCode, + CultureName = LanguageCodes.En, + SourceDbType = DbType.Int32, + FieldName = "Order", + CaptionName = "App.Listform.ListformField.Order", + Alignment = "center", + Width = 0, + ListOrderNo = 5, + Visible = true, + IsActive = true, + + AllowSearch = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, + ColumnCustomizationJson = DefaultColumnCustomizationJson, + PermissionJson = DefaultFieldPermissionJson(listForm.Name), + PivotSettingsJson = DefaultPivotSettingsJson, + EditorOptions=EditorOptionValues.NumberStandartFormat() + }, + new() { ListFormCode = listForm.ListFormCode, CultureName = LanguageCodes.En, @@ -6452,7 +6491,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CaptionName = "App.Listform.ListformField.MonthlyPrice", Alignment = "right", Width = 0, - ListOrderNo = 5, + ListOrderNo = 6, Visible = true, IsActive = true, @@ -6628,6 +6667,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency IsActive = true, AllowSearch = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson, @@ -6780,6 +6820,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency IsActive = true, AllowSearch = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson, @@ -7294,6 +7335,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency IsActive = true, AllowSearch = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson, @@ -7311,6 +7353,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency IsActive = true, AllowSearch = true, + ValidationRuleJson = DefaultValidationRuleEmailRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson, @@ -7526,7 +7569,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency DeleteCommand = DefaultDeleteCommand(nameof(TableNameEnum.BlogCategory)), DeleteFieldsDefaultValueJson = DefaultDeleteFieldsDefaultValueJson(), PagerOptionJson = DefaultPagerOptionJson, - EditingOptionJson = DefaultEditingOptionJson(listFormName, 600, 450, true, true, true, true, false), + EditingOptionJson = DefaultEditingOptionJson(listFormName, 600, 550, true, true, true, true, false), EditingFormJson = JsonSerializer.Serialize(new List { new() { Order = 1, ColCount = 1, ColSpan = 1, ItemType = "group", Items = @@ -8080,7 +8123,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency ColumnOptionJson = DefaultColumnOptionJson(), PermissionJson = DefaultPermissionJson(listFormName), PagerOptionJson = DefaultPagerOptionJson, - EditingOptionJson = DefaultEditingOptionJson(listFormName, 500, 500, true, true, true, true, false), + EditingOptionJson = DefaultEditingOptionJson(listFormName, 500, 750, true, true, true, true, false), EditingFormJson = JsonSerializer.Serialize(new List { new() { diff --git a/api/src/Sozsoft.Platform.Domain.Shared/WizardConsts.cs b/api/src/Sozsoft.Platform.Domain.Shared/WizardConsts.cs index 9087515..a557c49 100644 --- a/api/src/Sozsoft.Platform.Domain.Shared/WizardConsts.cs +++ b/api/src/Sozsoft.Platform.Domain.Shared/WizardConsts.cs @@ -164,6 +164,7 @@ public static class WizardConsts public static readonly string DefaultValidationRuleEmailRequiredJson = JsonSerializer.Serialize(new[] { new { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.email) }, + new { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.required) } }); public static string DefaultLookupJson(UiLookupDataSourceTypeEnum dataSourceType, string displayExpr = "name", string valueExpr = "key", string lookupQuery = "") => JsonSerializer.Serialize(new diff --git a/ui/src/views/admin/listForm/edit/form-fields/FormFieldEdit.tsx b/ui/src/views/admin/listForm/edit/form-fields/FormFieldEdit.tsx index b2d3bf2..3b4550a 100644 --- a/ui/src/views/admin/listForm/edit/form-fields/FormFieldEdit.tsx +++ b/ui/src/views/admin/listForm/edit/form-fields/FormFieldEdit.tsx @@ -37,20 +37,16 @@ function FormFieldEdit({ return ( <> - + {translate('::ListForms.ListFormEdit.TabDetails')} {translate('::ListForms.ListFormFieldEdit.TabOptions')} - - {translate('::Abp.Identity.Permissions')} - + {translate('::Abp.Identity.Permissions')} {translate('::ListForms.ListFormFieldEdit.TabLookup')} {translate('::ListForms.ListFormEdit.TabCustomization')} - - {translate('::ListForms.ListFormEdit.TabFiltering')} - + {translate('::ListForms.ListFormEdit.TabFiltering')} {translate('::ListForms.ListFormFieldEdit.TabHeadering')}