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 d8b7106..17ec987 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Dto/ColumnFormatDto.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Dto/ColumnFormatDto.cs @@ -10,6 +10,11 @@ namespace Sozsoft.Platform.ListForms; public class ColumnFormatDto : AuditedEntityDto { + private static readonly JsonSerializerOptions EditorOptionsSerializerOptions = new() + { + PropertyNameCaseInsensitive = true + }; + public ColumnFormatDto() { } public string FieldName { get; set; } @@ -239,7 +244,42 @@ public class ColumnFormatDto : AuditedEntityDto } public string Alignment { get; set; } - public string Format { get; set; } - public string EditorOptions { get; set; } + public string Format { get; set; } + + public int? EditOrderNo { get; set; } + public int? EditGroupOrderNo { get; set; } + public string EditorType2 { get; set; } + public int? ColSpan { get; set; } + + public string EditorOptions { get; set; } + public GridBoxOptionsDto GridBoxOptions => + DeserializeEditorOptions(PlatformConsts.EditorTypes.dxGridBox); + public TagBoxOptionsDto TagBoxOptions => + DeserializeEditorOptions(PlatformConsts.EditorTypes.dxTagBox); + public ImageUploadOptionsDto ImageUploadOptions => + DeserializeEditorOptions( + PlatformConsts.EditorTypes.dxImageUpload, + PlatformConsts.EditorTypes.dxImageViewer); + public string EditorScript { get; set; } + + private T DeserializeEditorOptions(params string[] editorTypes) where T : class + { + if (!Array.Exists( + editorTypes, + editorType => string.Equals(EditorType2, editorType, StringComparison.OrdinalIgnoreCase)) || + string.IsNullOrWhiteSpace(EditorOptions)) + { + return null; + } + + try + { + return JsonSerializer.Deserialize(EditorOptions, EditorOptionsSerializerOptions); + } + catch (JsonException) + { + return null; + } + } } diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/GridOptionsDto/EditingFormDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/GridOptionsDto/EditingFormDto.cs index 9e62922..1788a40 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/GridOptionsDto/EditingFormDto.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/GridOptionsDto/EditingFormDto.cs @@ -16,35 +16,5 @@ public class EditingFormDto public string Caption { get; set; } public int ColCount { get; set; } = 2; public int ColSpan { get; set; } = 2; - /// Type: Array - /// Bu kisma suan sadece string olarak doldurulacak - /// items: ['FirstName', 'LastName', - /// { dataField: 'Notes', editorType: 'dxTextArea', colSpan: 2, editorOptions: { height: 100, }, } - /// ], - /// - //[TextArea] - //public string[] Items { get; set; } - public EditingFormItemDto[] Items { get; set; } -} - -public class EditingFormItemDto -{ - /// - /// DataField Accepted Values: 'dxAutocomplete' | 'dxCalendar' | 'dxCheckBox' | 'dxColorBox' | 'dxDateBox' | 'dxDateRangeBox' | 'dxDropDownBox' | 'dxHtmlEditor' | 'dxLookup' | 'dxNumberBox' | 'dxRadioGroup' | 'dxRangeSlider' | 'dxSelectBox' | 'dxSlider' | 'dxSwitch' | 'dxTagBox' | 'dxTextArea' | 'dxTextBox' | 'dxImageViewer' | 'dxImageUpload'; - /// - [JsonPropertyName("order")] - public int Order { get; set; } - [JsonPropertyName("dataField")] - public string DataField { get; set; } - [JsonPropertyName("editorType2")] - public string EditorType2 { get; set; } - [JsonPropertyName("colSpan")] - public int ColSpan { get; set; } - [JsonPropertyName("editorOptions")] - public string EditorOptions { get; set; } - public GridBoxOptionsDto GridBoxOptions { get; set; } - public TagBoxOptionsDto TagBoxOptions { get; set; } - [JsonPropertyName("editorScript")] - public string EditorScript { get; set; } } diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/GridOptionsDto/ImageUploadOptionsDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/GridOptionsDto/ImageUploadOptionsDto.cs new file mode 100644 index 0000000..715a0d3 --- /dev/null +++ b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/GridOptionsDto/ImageUploadOptionsDto.cs @@ -0,0 +1,11 @@ +namespace Sozsoft.Platform.ListForms; + +public class ImageUploadOptionsDto +{ + public string UploadUrl { get; set; } + public string Accept { get; set; } + public bool? Multiple { get; set; } + public long? MaxFileSize { get; set; } + public int? Width { get; set; } + public int? Height { get; set; } +} diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Wizard/WizardColumnItemInputDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Wizard/WizardColumnItemInputDto.cs index d203562..1f3a0a3 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Wizard/WizardColumnItemInputDto.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Wizard/WizardColumnItemInputDto.cs @@ -5,7 +5,7 @@ namespace Sozsoft.Platform.ListForms; public class WizardColumnItemInputDto { - public string DataField { get; set; } + public string FieldName { get; set; } public string CaptionName { get; set; } public string EditorType { get; set; } public string EditorOptions { get; set; } diff --git a/api/src/Sozsoft.Platform.Application/ListForms/Administration/ListFormFieldsAppService.cs b/api/src/Sozsoft.Platform.Application/ListForms/Administration/ListFormFieldsAppService.cs index 5da7ae3..895cbcb 100644 --- a/api/src/Sozsoft.Platform.Application/ListForms/Administration/ListFormFieldsAppService.cs +++ b/api/src/Sozsoft.Platform.Application/ListForms/Administration/ListFormFieldsAppService.cs @@ -47,26 +47,33 @@ public class ListFormFieldsAppService : CrudAppService< protected override void MapToEntity(ColumnFormatEditDto updateInput, ListFormField entity) { + entity.CultureName = updateInput.CultureName; entity.RoleId = updateInput.RoleId; entity.ListFormCode = updateInput.ListFormCode; entity.FieldName = updateInput.FieldName; - entity.CultureName = updateInput.CultureName; entity.CaptionName = updateInput.CaptionName; entity.PlaceHolder = updateInput.PlaceHolder; entity.BandName = updateInput.BandName; entity.IsActive = updateInput.IsActive; entity.Visible = updateInput.Visible; entity.AllowSearch = updateInput.AllowSearch; - entity.AllowEditing = updateInput.AllowEditing; - entity.AllowAdding = updateInput.AllowAdding; - entity.ListOrderNo = updateInput.ListOrderNo; entity.SourceDbType = updateInput.SourceDbType; + entity.Alignment = updateInput.Alignment; + entity.Format = updateInput.Format; + entity.EditorOptions = updateInput.EditorOptions; + entity.EditorScript = updateInput.EditorScript; + entity.ListOrderNo = updateInput.ListOrderNo; entity.Width = updateInput.Width; entity.SortDirection = updateInput.SortDirection; entity.SortIndex = updateInput.SortIndex; - entity.Format = updateInput.Format; - entity.Alignment = updateInput.Alignment; - entity.EditorOptions = updateInput.EditorOptions; + entity.EditOrderNo = updateInput.EditOrderNo; + entity.EditGroupOrderNo = updateInput.EditGroupOrderNo; + entity.ColSpan = updateInput.ColSpan; + entity.EditorType2 = updateInput.EditorType2; + entity.AllowEditing = updateInput.AllowEditing; + entity.AllowAdding = updateInput.AllowAdding; + entity.PermissionJson = JsonSerializer.Serialize(updateInput.PermissionDto); + entity.LookupJson = JsonSerializer.Serialize(updateInput.LookupDto); entity.ColumnCustomizationJson = JsonSerializer.Serialize(updateInput.ColumnCustomizationDto); entity.ColumnFilterJson = JsonSerializer.Serialize(updateInput.ColumnFilterDto); entity.ColumnHeaderJson = JsonSerializer.Serialize(updateInput.ColumnHeaderDto); @@ -74,12 +81,10 @@ public class ListFormFieldsAppService : CrudAppService< entity.GroupSummaryJson = updateInput.ColumnGroupSummaryDto.SummaryType.IsNullOrEmpty() ? "" : JsonSerializer.Serialize(updateInput.ColumnGroupSummaryDto); entity.TotalSummaryJson = updateInput.ColumnTotalSummaryDto.SummaryType.IsNullOrEmpty() ? "" : JsonSerializer.Serialize(updateInput.ColumnTotalSummaryDto); entity.JoinTableJson = JsonSerializer.Serialize(updateInput.ColumnJoinTableDto); - entity.LookupJson = JsonSerializer.Serialize(updateInput.LookupDto); entity.ColumnCssClass = updateInput.ColumnCssClass; entity.ColumnCssValue = updateInput.ColumnCssValue; entity.ValidationRuleJson = JsonSerializer.Serialize(updateInput.ValidationRuleDto); entity.ColumnStylingJson = JsonSerializer.Serialize(updateInput.ColumnStylingDto); - entity.PermissionJson = JsonSerializer.Serialize(updateInput.PermissionDto); entity.PivotSettingsJson = JsonSerializer.Serialize(updateInput.PivotSettingsDto); } @@ -136,6 +141,9 @@ public class ListFormFieldsAppService : CrudAppService< item.Alignment = input.Alignment; item.Format = input.Format; item.EditorOptions = input.EditorOptions; + item.IsActive = input.IsActive; + item.Visible = input.Visible; + item.AllowSearch = input.AllowSearch; } else if (input.EditType == ListFormFieldEditTabs.PermissionsForm) { @@ -152,6 +160,11 @@ public class ListFormFieldsAppService : CrudAppService< item.AllowSearch = input.AllowSearch; item.AllowEditing = input.AllowEditing; item.AllowAdding = input.AllowAdding; + item.EditGroupOrderNo = input.EditGroupOrderNo; + item.EditOrderNo = input.EditOrderNo; + item.ColSpan = input.ColSpan; + item.EditorType2 = input.EditorType2; + item.EditorScript = input.EditorScript; } else if (input.EditType == ListFormFieldEditTabs.CustomizationForm) { @@ -257,6 +270,9 @@ public class ListFormFieldsAppService : CrudAppService< field.CaptionName = sourceField.CaptionName; field.PlaceHolder = sourceField.PlaceHolder; field.SourceDbType = sourceField.SourceDbType; + field.Alignment = sourceField.Alignment; + field.Format = sourceField.Format; + field.EditorOptions = sourceField.EditorOptions; } if (input.CopiedFields.All || input.CopiedFields.Options) { @@ -269,35 +285,40 @@ public class ListFormFieldsAppService : CrudAppService< field.AllowSearch = sourceField.AllowSearch; field.AllowEditing = sourceField.AllowEditing; field.AllowAdding = sourceField.AllowAdding; + field.EditGroupOrderNo = sourceField.EditGroupOrderNo; + field.EditOrderNo = sourceField.EditOrderNo; + field.ColSpan = sourceField.ColSpan; + field.EditorType2 = sourceField.EditorType2; + field.EditorScript = sourceField.EditorScript; } - else if (input.CopiedFields.All || input.CopiedFields.Permission) + if (input.CopiedFields.All || input.CopiedFields.Permission) { field.PermissionJson = sourceField.PermissionJson; } - else if (input.CopiedFields.All || input.CopiedFields.Customization) + if (input.CopiedFields.All || input.CopiedFields.Customization) field.ColumnCustomizationJson = sourceField.ColumnCustomizationJson; - else if (input.CopiedFields.All || input.CopiedFields.Filtering) + if (input.CopiedFields.All || input.CopiedFields.Filtering) field.ColumnFilterJson = sourceField.ColumnFilterJson; - else if (input.CopiedFields.All || input.CopiedFields.Headering) + if (input.CopiedFields.All || input.CopiedFields.Headering) field.ColumnHeaderJson = sourceField.ColumnHeaderJson; - else if (input.CopiedFields.All || input.CopiedFields.Grouping) + if (input.CopiedFields.All || input.CopiedFields.Grouping) field.GroupingJson = sourceField.GroupingJson; - else if (input.CopiedFields.All || input.CopiedFields.GroupSummary) + if (input.CopiedFields.All || input.CopiedFields.GroupSummary) field.GroupSummaryJson = sourceField.GroupSummaryJson; - else if (input.CopiedFields.All || input.CopiedFields.TotalSummary) + if (input.CopiedFields.All || input.CopiedFields.TotalSummary) field.TotalSummaryJson = sourceField.TotalSummaryJson; - else if (input.CopiedFields.All || input.CopiedFields.JoinOptions) + if (input.CopiedFields.All || input.CopiedFields.JoinOptions) field.JoinTableJson = sourceField.JoinTableJson; - else if (input.CopiedFields.All || input.CopiedFields.CssOptions) + if (input.CopiedFields.All || input.CopiedFields.CssOptions) { field.ColumnCssClass = sourceField.ColumnCssClass; field.ColumnCssValue = sourceField.ColumnCssValue; } - else if (input.CopiedFields.All || input.CopiedFields.ValidationRules) + if (input.CopiedFields.All || input.CopiedFields.ValidationRules) field.ValidationRuleJson = sourceField.ValidationRuleJson; - else if (input.CopiedFields.All || input.CopiedFields.Formatting) + if (input.CopiedFields.All || input.CopiedFields.Formatting) field.ColumnStylingJson = sourceField.ColumnStylingJson; - else if (input.CopiedFields.All || input.CopiedFields.PivotSetting) + if (input.CopiedFields.All || input.CopiedFields.PivotSetting) field.PivotSettingsJson = sourceField.PivotSettingsJson; await Repository.InsertAsync(field); diff --git a/api/src/Sozsoft.Platform.Application/ListForms/ListFormWizardAppService.cs b/api/src/Sozsoft.Platform.Application/ListForms/ListFormWizardAppService.cs index fcb1498..97b125b 100644 --- a/api/src/Sozsoft.Platform.Application/ListForms/ListFormWizardAppService.cs +++ b/api/src/Sozsoft.Platform.Application/ListForms/ListFormWizardAppService.cs @@ -230,21 +230,9 @@ public class ListFormWizardAppService( Caption = g.Caption, ColCount = g.ColCount, ColSpan = g.ColCount, - ItemType = "group", - Items = g.Items - .Where(i => i.IncludeInEditingForm && i.DataField != input.KeyFieldName) - .Select((it, ii) => new EditingFormItemDto - { - Order = ii + 1, - DataField = it.DataField, - EditorType2 = it.EditorType, - ColSpan = it.ColSpan, - EditorOptions = string.IsNullOrWhiteSpace(it.EditorOptions) ? null : it.EditorOptions, - EditorScript = string.IsNullOrWhiteSpace(it.EditorScript) ? null : it.EditorScript, - }) - .ToArray() + ItemType = "group" }) - .Where(g => g.Items.Length > 0) + .Where((_, index) => input.Groups[index].Items.Any(i => i.IncludeInEditingForm && i.FieldName != input.KeyFieldName)) .ToList(); //ListForm - varsa sil, yeniden ekle @@ -371,21 +359,34 @@ public class ListFormWizardAppService( // ListFormField - each item in each group becomes a visible field record var fieldOrder = 0; + var editGroupOrder = 0; foreach (var group in input.Groups) { + editGroupOrder++; + var editOrder = 0; foreach (var item in group.Items) { fieldOrder++; + if (item.IncludeInEditingForm && item.FieldName != input.KeyFieldName) + { + editOrder++; + } await repoListFormField.InsertAsync(new ListFormField { ListFormCode = input.ListFormCode, - FieldName = item.DataField, + FieldName = item.FieldName, CaptionName = item.CaptionName, - Visible = item.DataField != input.KeyFieldName, + Visible = item.FieldName != input.KeyFieldName, IsActive = true, AllowSearch = true, Width = 0, ListOrderNo = fieldOrder, + EditGroupOrderNo = item.IncludeInEditingForm ? editGroupOrder : null, + EditOrderNo = item.IncludeInEditingForm && item.FieldName != input.KeyFieldName ? editOrder : null, + EditorType2 = item.IncludeInEditingForm ? item.EditorType : null, + ColSpan = item.IncludeInEditingForm ? item.ColSpan : null, + EditorOptions = string.IsNullOrWhiteSpace(item.EditorOptions) ? null : item.EditorOptions, + EditorScript = string.IsNullOrWhiteSpace(item.EditorScript) ? null : item.EditorScript, SourceDbType = item.DbSourceType, CultureName = PlatformConsts.DefaultLanguage, PermissionJson = WizardConsts.DefaultFieldPermissionJson(code), diff --git a/api/src/Sozsoft.Platform.DbMigrator/Seeds/LanguagesData.json b/api/src/Sozsoft.Platform.DbMigrator/Seeds/LanguagesData.json index 9ee9394..262dbb0 100644 --- a/api/src/Sozsoft.Platform.DbMigrator/Seeds/LanguagesData.json +++ b/api/src/Sozsoft.Platform.DbMigrator/Seeds/LanguagesData.json @@ -4686,6 +4686,12 @@ "en": "Scheduler Layout", "tr": "Zamanlayıcı Düzeni" }, + { + "resourceName": "Platform", + "key": "ListForms.ListFormEdit.DetailsLayoutDto.TodoLayout", + "en": "Todo Layout", + "tr": "İşler Düzeni" + }, { "resourceName": "Platform", "key": "ListForms.ListFormEdit.DetailsLayoutDto.GanttLayout", @@ -5186,15 +5192,15 @@ }, { "resourceName": "Platform", - "key": "ListForms.ListFormEdit.EditingFormFormFields", - "en": "Editing Form Fields", - "tr": "Düzenleme Form Alanları" + "key": "ListForms.ListFormEdit.EditingFormFormGroups", + "en": "Editing Form Groups", + "tr": "Düzenleme Form Grupları" }, { "resourceName": "Platform", - "key": "ListForms.ListFormEdit.EditingFormFormFieldsDescription", - "en": "Edit formunda çıkacak field'lar", - "tr": "Form Sütunları" + "key": "ListForms.ListFormEdit.EditingFormFormGroupsDescription", + "en": "Groups that will appear in Edit form", + "tr": "Düzenleme formunda çıkacak gruplar" }, { "resourceName": "Platform", @@ -5916,6 +5922,30 @@ "en": "Field Name", "tr": "Alan Adı" }, + { + "resourceName": "Platform", + "key": "ListForms.ListFormFieldEdit.EditorType", + "en": "Editor Type", + "tr": "Editör Tipi" + }, + { + "resourceName": "Platform", + "key": "ListForms.ListFormFieldEdit.EditFormGroup", + "en": "Edit Form Group", + "tr": "Düzenleme Form Grubu" + }, + { + "resourceName": "Platform", + "key": "ListForms.ListFormFieldEdit.EditFormOrderNo", + "en": "Edit Order No", + "tr": "Düzenleme Sıra No" + }, + { + "resourceName": "Platform", + "key": "ListForms.ListFormFieldEdit.EditFormColSpan", + "en": "Edit Col Span", + "tr": "Düzenleme Col Span" + }, { "resourceName": "Platform", "key": "ListForms.ListFormFieldEdit.PlaceHolder", diff --git a/api/src/Sozsoft.Platform.DbMigrator/Seeds/ListFormSeeder_Administration.cs b/api/src/Sozsoft.Platform.DbMigrator/Seeds/ListFormSeeder_Administration.cs index 0bd822f..95f0889 100644 --- a/api/src/Sozsoft.Platform.DbMigrator/Seeds/ListFormSeeder_Administration.cs +++ b/api/src/Sozsoft.Platform.DbMigrator/Seeds/ListFormSeeder_Administration.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Data; using System.Text.Json; @@ -90,13 +90,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep EditingOptionJson = DefaultEditingOptionJson(listFormName, 600, 350, 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 }, - new EditingFormItemDto { Order=2, DataField="DisplayName", ColSpan=1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order=3, DataField="ExtraProperties", ColSpan=1, EditorType2=EditorTypes.dxTextBox }, - ] - } + new() { Order=1, ColCount=1, ColSpan=1, ItemType="group" }, }), FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { new() { FieldName = "ExtraProperties", FieldDbType = DbType.String, Value = "{}", CustomValueType = FieldCustomValueTypeEnum.Value }, @@ -127,6 +121,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Name", Width = 0, ListOrderNo = 2, @@ -144,6 +142,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "DisplayName", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.DisplayName", Width = 0, ListOrderNo = 3, @@ -161,6 +163,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "ExtraProperties", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.ExtraProperties", Width = 0, ListOrderNo = 4, @@ -221,16 +227,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep EditingFormJson = JsonSerializer.Serialize(new List() { new() { - Order=1, ColCount=1, ColSpan=1, ItemType="group", Items = - [ - new EditingFormItemDto { Order=1, DataField="GroupName", ColSpan=1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order=2, DataField="ParentName", ColSpan=1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order=3, DataField="Name", ColSpan=1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order=4, DataField="DisplayName", ColSpan=1, EditorType2=EditorTypes.dxAutocomplete, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order=5, DataField="IsEnabled", ColSpan=1, EditorType2=EditorTypes.dxCheckBox }, - new EditingFormItemDto { Order=6, DataField="MultiTenancySide", ColSpan=1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order=7, DataField="MenuGroup", ColSpan=1, EditorType2=EditorTypes.dxTagBox }, - ]} + Order=1, ColCount=1, ColSpan=1, ItemType="group" }, }), FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { new() { FieldName = "IsEnabled", FieldDbType = DbType.Boolean, Value = "true", CustomValueType = FieldCustomValueTypeEnum.Value }, @@ -262,6 +259,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Name", Width = 0, ListOrderNo = 2, @@ -279,6 +280,11 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "ParentName", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.ParentName", Width = 0, ListOrderNo = 3, @@ -301,6 +307,11 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "GroupName", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.GroupName", Width = 0, ListOrderNo = 4, @@ -326,6 +337,11 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "DisplayName", + EditGroupOrderNo = 1, + EditOrderNo = 4, + EditorType2 = EditorTypes.dxAutocomplete, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.DisplayName", Width = 0, ListOrderNo = 5, @@ -349,6 +365,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "IsEnabled", + EditGroupOrderNo = 1, + EditOrderNo = 5, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.IsEnabled", Width = 0, ListOrderNo = 6, @@ -364,6 +384,11 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Int16, FieldName = "MultiTenancySide", + EditGroupOrderNo = 1, + EditOrderNo = 6, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.MultiTenancySide", Width = 0, ListOrderNo = 7, @@ -392,6 +417,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "MenuGroup", + EditGroupOrderNo = 1, + EditOrderNo = 7, + EditorType2 = EditorTypes.dxTagBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.MenuGroup", Width = 0, ListOrderNo = 8, @@ -453,15 +482,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep 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 =[ - new EditingFormItemDto { Order=1, DataField="Name", ColSpan=1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order=2, DataField="ValueType", ColSpan=1, EditorType2=EditorTypes.dxSelectBox, EditorOptions = EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order=3, DataField="Required", ColSpan=1, EditorType2=EditorTypes.dxCheckBox }, - new EditingFormItemDto { Order=4, DataField="IsStatic", ColSpan=1, EditorType2=EditorTypes.dxCheckBox }, - new EditingFormItemDto { Order=5, DataField="Regex", ColSpan=1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order=6, DataField="RegexDescription", ColSpan=1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order=7, DataField="Description", ColSpan=1, EditorType2=EditorTypes.dxTextArea }, - ]} + new() { Order=1, ColCount=1, ColSpan=1, ItemType="group" }, }), DeleteCommand = "DELETE FROM \"AbpClaimTypes\" WHERE \"Id\"=@Id", DeleteFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { @@ -506,6 +527,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Name", Width = 0, ListOrderNo = 1, @@ -524,6 +549,11 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Int16, FieldName = "ValueType", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.ValueType", Width = 0, ListOrderNo = 2, @@ -553,6 +583,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "Required", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Required", Width = 0, ListOrderNo = 3, @@ -569,6 +603,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "IsStatic", + EditGroupOrderNo = 1, + EditOrderNo = 4, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.IsStatic", Width = 0, ListOrderNo = 4, @@ -585,6 +623,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Regex", + EditGroupOrderNo = 1, + EditOrderNo = 5, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Regex", Width = 0, ListOrderNo = 5, @@ -602,6 +644,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "RegexDescription", + EditGroupOrderNo = 1, + EditOrderNo = 6, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.RegexDescription", Width = 0, ListOrderNo = 6, @@ -619,6 +665,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Description", + EditGroupOrderNo = 1, + EditOrderNo = 7, + EditorType2 = EditorTypes.dxTextArea, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Description", Width = 0, ListOrderNo = 7, @@ -671,11 +721,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep PermissionJson = DefaultPermissionJson(PlatformConsts.IdentityPermissions.Roles.Create, listFormName, PlatformConsts.IdentityPermissions.Roles.Update, PlatformConsts.IdentityPermissions.Roles.Delete, PlatformConsts.IdentityPermissions.Roles.Export, PlatformConsts.IdentityPermissions.Roles.Import, PlatformConsts.IdentityPermissions.Roles.Note), EditingOptionJson = DefaultEditingOptionJson(listFormName, 500, 300, 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 }, - new EditingFormItemDto { Order = 2, DataField = "IsDefault", ColSpan = 1, EditorType2=EditorTypes.dxCheckBox }, - new EditingFormItemDto { Order = 3, DataField = "IsPublic", ColSpan = 1, EditorType2=EditorTypes.dxCheckBox }, - ]} + new() { Order=1, ColCount=1, ColSpan=1, ItemType="group" }, }), DeleteCommand = "DELETE FROM \"AbpRoles\" WHERE \"Id\"=@Id", DeleteFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { @@ -718,6 +764,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Name", Width = 0, ListOrderNo = 1, @@ -739,6 +789,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "IsDefault", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.IsDefault", Width = 0, ListOrderNo = 2, @@ -756,6 +810,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "IsPublic", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.IsPublic", Width = 0, ListOrderNo = 3, @@ -810,18 +868,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep DeleteFieldsDefaultValueJson = DefaultDeleteFieldsDefaultValueJson(), EditingOptionJson = DefaultEditingOptionJson(listFormName, 500, 575, 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="Avatar", ColSpan=2, EditorType2=EditorTypes.dxImageUpload, EditorOptions=EditorOptionValues.ImageUploadOptions(false) }, - new EditingFormItemDto { Order=2, DataField="Email", ColSpan=1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order=3, DataField="Name", ColSpan=1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order=4, DataField="Surname", ColSpan=1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order=5, DataField="PhoneNumber", ColSpan=1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order=6, DataField="WorkHour", ColSpan=1, EditorType2=EditorTypes.dxSelectBox, EditorOptions = EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order=7, DataField="DepartmentId", ColSpan=1, EditorType2=EditorTypes.dxSelectBox, EditorOptions = EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order=8, DataField="JobPositionId", ColSpan=1, EditorType2=EditorTypes.dxSelectBox, EditorOptions = EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order=9, DataField="Password", ColSpan=1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order=10, DataField="IsActive", ColSpan=1, EditorType2=EditorTypes.dxCheckBox }, - ]} + new () { Order=1,ColCount=2,ColSpan=1,ItemType="group" }, }), InsertServiceAddress = "list-form-dynamic-api/user-insert", UpdateServiceAddress = "list-form-dynamic-api/user-update", @@ -925,6 +972,11 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Avatar", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxImageUpload, + ColSpan = 2, + EditorOptions = EditorOptionValues.ImageUploadOptions(false), CaptionName = "App.Listform.ListformField.Avatar", Width = 0, ListOrderNo = 1, @@ -944,6 +996,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Email", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "Abp.Account.EmailAddress", Width = 0, ListOrderNo = 2, @@ -964,6 +1020,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Name", Width = 0, ListOrderNo = 3, @@ -984,6 +1044,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Surname", + EditGroupOrderNo = 1, + EditOrderNo = 4, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Surname", Width = 0, ListOrderNo = 4, @@ -1004,6 +1068,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "PhoneNumber", + EditGroupOrderNo = 1, + EditOrderNo = 5, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "Abp.Identity.User.UserInformation.PhoneNumber", Width = 0, ListOrderNo = 5, @@ -1025,6 +1093,11 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "WorkHour", + EditGroupOrderNo = 1, + EditOrderNo = 6, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.WorkHour", Width = 0, ListOrderNo = 7, @@ -1047,6 +1120,11 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Guid, FieldName = "DepartmentId", + EditGroupOrderNo = 1, + EditOrderNo = 7, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.DepartmentId", Width = 0, ListOrderNo = 8, @@ -1075,6 +1153,11 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Guid, FieldName = "JobPositionId", + EditGroupOrderNo = 1, + EditOrderNo = 8, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.JobPositionId", Width = 0, ListOrderNo = 9, @@ -1105,6 +1188,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "IsActive", + EditGroupOrderNo = 1, + EditOrderNo = 10, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.IsActive", Width = 0, ListOrderNo = 10, @@ -1177,6 +1264,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Password", + EditGroupOrderNo = 1, + EditOrderNo = 9, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Password", Width = 0, ListOrderNo = 14, @@ -1431,12 +1522,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep 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 }, - new EditingFormItemDto { Order = 2, DataField = "Description", ColSpan = 1, EditorType2 = EditorTypes.dxTextArea }, - new EditingFormItemDto { Order = 3, DataField = "Icon", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - ]} + Order = 1, ColCount = 1, ColSpan = 1, ItemType = "group" }, }), DeleteCommand = $"UPDATE \"{FullNameTable(TableNameEnum.ReportCategory)}\" SET \"DeleterId\"=@DeleterId, \"DeletionTime\"=CURRENT_TIMESTAMP, \"IsDeleted\"='true' WHERE \"Id\"=@Id", DeleteFieldsDefaultValueJson = DefaultDeleteFieldsDefaultValueJson(), @@ -1445,8 +1531,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep #region Report Categories Fields await _listFormFieldRepository.InsertManyAsync([ - new() - { + new() { ListFormCode = listForm.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.Guid, @@ -1468,6 +1553,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Name", Width = 0, ListOrderNo = 2, @@ -1486,6 +1575,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Description", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxTextArea, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Description", Width = 0, ListOrderNo = 3, @@ -1503,6 +1596,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Icon", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Icon", Width = 0, ListOrderNo = 4, @@ -1561,14 +1658,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep 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 }, - new EditingFormItemDto { Order = 2, DataField = "Description", ColSpan = 1, EditorType2 = EditorTypes.dxTextArea }, - new EditingFormItemDto { Order = 3, DataField = "CategoryId", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, - new EditingFormItemDto { Order = 4, DataField = "Status", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, - new EditingFormItemDto { Order = 5, DataField = "HtmlContent", ColSpan = 1, EditorType2 = EditorTypes.dxHtmlEditor, EditorOptions = EditorOptionValues.HtmlEditorOptions }, - ]} + Order = 1, ColCount = 1, ColSpan = 1, ItemType = "group" }, }), InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson(), FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { @@ -1643,6 +1733,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Name", Width = 0, ListOrderNo = 2, @@ -1662,6 +1756,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Guid, FieldName = "CategoryId", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.CategoryId", Width = 0, ListOrderNo = 3, @@ -1679,6 +1777,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Status", + EditGroupOrderNo = 1, + EditOrderNo = 4, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Status", Width = 0, ListOrderNo = 4, @@ -1705,6 +1807,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Description", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxTextArea, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Description", Width = 0, ListOrderNo = 5, @@ -1721,6 +1827,11 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "HtmlContent", + EditGroupOrderNo = 1, + EditOrderNo = 5, + EditorType2 = EditorTypes.dxHtmlEditor, + ColSpan = 1, + EditorOptions = EditorOptionValues.HtmlEditorOptions, CaptionName = "App.Listform.ListformField.HtmlContent", Width = 0, ListOrderNo = 6, @@ -1780,18 +1891,13 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep 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 } - ] - } + Order = 1, ColCount = 1, ColSpan = 1, ItemType = "group" }, }), }); #region Sector Fields await _listFormFieldRepository.InsertManyAsync([ - new() - { + new() { ListFormCode = listForm.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.Guid, @@ -1812,6 +1918,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Name", Width = 0, ListOrderNo = 2, @@ -1873,19 +1983,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep EditingOptionJson = DefaultEditingOptionJson(listFormName, 600, 600, true, true, true, true, false), EditingFormJson = JsonSerializer.Serialize(new List() { new() { - Order = 1, ColCount = 2, ColSpan = 2, ItemType = "group", - Items =[ - new EditingFormItemDto { Order = 1, DataField = "Name", ColSpan = 2, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 2, DataField = "StartTime", ColSpan = 1, EditorType2 = EditorTypes.dxDateBox, EditorOptions = EditorOptionValues.TimeSpanOptions }, - new EditingFormItemDto { Order = 3, DataField = "EndTime", ColSpan = 1, EditorType2 = EditorTypes.dxDateBox, EditorOptions = EditorOptionValues.TimeSpanOptions }, - new EditingFormItemDto { Order = 4, DataField = "Monday", ColSpan = 1, EditorType2 = EditorTypes.dxCheckBox }, - new EditingFormItemDto { Order = 5, DataField = "Tuesday", ColSpan = 1, EditorType2 = EditorTypes.dxCheckBox }, - new EditingFormItemDto { Order = 6, DataField = "Wednesday", ColSpan = 1, EditorType2 = EditorTypes.dxCheckBox }, - new EditingFormItemDto { Order = 7, DataField = "Thursday", ColSpan = 1, EditorType2 = EditorTypes.dxCheckBox }, - new EditingFormItemDto { Order = 8, DataField = "Friday", ColSpan = 1, EditorType2 = EditorTypes.dxCheckBox }, - new EditingFormItemDto { Order = 9, DataField = "Saturday", ColSpan = 1, EditorType2 = EditorTypes.dxCheckBox }, - new EditingFormItemDto { Order = 10, DataField = "Sunday", ColSpan = 1, EditorType2 = EditorTypes.dxCheckBox }, - ]} + Order = 1, ColCount = 2, ColSpan = 2, ItemType = "group" }, }), FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { new() { FieldName = "Monday", FieldDbType = DbType.Boolean, Value = "true", CustomValueType = FieldCustomValueTypeEnum.Value }, @@ -1923,6 +2021,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 2, CaptionName = "App.Listform.ListformField.Name", Width = 0, ListOrderNo = 2, @@ -1943,6 +2045,11 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Date, FieldName = "StartTime", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxDateBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.TimeSpanOptions, CaptionName = "App.Listform.ListformField.StartTime", Width = 0, ListOrderNo = 3, @@ -1953,13 +2060,17 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson, - EditorOptions = EditorOptionValues.TimeSpanOptions }, new() { ListFormCode = listForm.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.Date, FieldName = "EndTime", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxDateBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.TimeSpanOptions, CaptionName = "App.Listform.ListformField.EndTime", Width = 0, ListOrderNo = 4, @@ -1970,7 +2081,6 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson, - EditorOptions = EditorOptionValues.TimeSpanOptions }, // Günlük kolonlar new() @@ -1979,6 +2089,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "Monday", + EditGroupOrderNo = 1, + EditOrderNo = 4, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Monday", Width = 0, ListOrderNo = 5, @@ -1995,6 +2109,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "Tuesday", + EditGroupOrderNo = 1, + EditOrderNo = 5, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Tuesday", Width = 0, ListOrderNo = 6, @@ -2011,6 +2129,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "Wednesday", + EditGroupOrderNo = 1, + EditOrderNo = 6, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Wednesday", Width = 0, ListOrderNo = 7, @@ -2027,6 +2149,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "Thursday", + EditGroupOrderNo = 1, + EditOrderNo = 7, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Thursday", Width = 0, ListOrderNo = 8, @@ -2043,6 +2169,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "Friday", + EditGroupOrderNo = 1, + EditOrderNo = 8, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Friday", Width = 0, ListOrderNo = 9, @@ -2059,6 +2189,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "Saturday", + EditGroupOrderNo = 1, + EditOrderNo = 9, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Saturday", Width = 0, ListOrderNo = 10, @@ -2075,6 +2209,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "Sunday", + EditGroupOrderNo = 1, + EditOrderNo = 10, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Sunday", Width = 0, ListOrderNo = 11, @@ -2131,12 +2269,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep EditingOptionJson = DefaultEditingOptionJson(listFormName, 500, 350, 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 = "ResourceType", ColSpan = 1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 2, DataField = "ResourceId", ColSpan = 1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 3, DataField = "IP", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - ]} + Order=1, ColCount=1, ColSpan=1, ItemType="group" }, }), InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson(), } @@ -2164,6 +2297,11 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "ResourceType", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.ResourceType", Width = 0, ListOrderNo = 2, @@ -2194,6 +2332,11 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "ResourceId", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.ResourceId", Width = 0, ListOrderNo = 3, @@ -2217,6 +2360,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "IP", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.IP", Width = 0, ListOrderNo = 4, @@ -2471,19 +2618,13 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep 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 }, - new EditingFormItemDto { Order = 2, DataField = "ParentId", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton } - ] - } + Order = 1, ColCount = 1, ColSpan = 1, ItemType = "group" }, }), }); #region Department Fields await _listFormFieldRepository.InsertManyAsync([ - new() - { + new() { ListFormCode = listForm.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.Guid, @@ -2503,6 +2644,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Name", Width = 0, ListOrderNo = 2, @@ -2522,6 +2667,11 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Guid, FieldName = "ParentId", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.ParentId", Width = 0, ListOrderNo = 3, @@ -2587,20 +2737,13 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep EditingFormJson = JsonSerializer.Serialize(new List { new() { - Order = 1, ColCount = 1, ColSpan = 1, ItemType = "group", Items = - [ - new EditingFormItemDto { Order = 1, DataField = "DepartmentId", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 2, DataField = "Name", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 3, DataField = "ParentId", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - ] - } + Order = 1, ColCount = 1, ColSpan = 1, ItemType = "group" }, }), }); #region JobPosition Fields await _listFormFieldRepository.InsertManyAsync([ - new() - { + new() { ListFormCode = listForm.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.Guid, @@ -2620,6 +2763,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Name", Width = 0, ListOrderNo = 2, @@ -2639,6 +2786,11 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Guid, FieldName = "ParentId", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.ParentId", Width = 0, ListOrderNo = 3, @@ -2664,6 +2816,11 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Guid, FieldName = "DepartmentId", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.DepartmentId", Width = 0, ListOrderNo = 4, @@ -2730,17 +2887,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep EditingFormJson = JsonSerializer.Serialize(new List() { new() { - Order=1, ColCount=2, ColSpan=1, ItemType="group", Items =[ - new EditingFormItemDto { Order = 1, DataField = "Title", ColSpan=1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 2, DataField = "Excerpt", ColSpan=1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 3, DataField = "Content", ColSpan=2, EditorType2 = EditorTypes.dxHtmlEditor, EditorOptions = EditorOptionValues.HtmlEditorOptions }, - new EditingFormItemDto { Order = 4, DataField = "Category", ColSpan=1, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 5, DataField = "UserId", ColSpan=1, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 6, DataField = "PublishDate", ColSpan=1, EditorType2 = EditorTypes.dxDateBox }, - new EditingFormItemDto { Order = 7, DataField = "ExpiryDate", ColSpan=1, EditorType2 = EditorTypes.dxDateBox }, - new EditingFormItemDto { Order = 8, DataField = "IsPinned", ColSpan=1, EditorType2 = EditorTypes.dxCheckBox }, - new EditingFormItemDto { Order = 9, DataField = "ImageUrl", ColSpan=1, EditorType2 = EditorTypes.dxImageUpload, EditorOptions = EditorOptionValues.ImageUploadOptions()}, - ]} + Order=1, ColCount=2, ColSpan=1, ItemType="group" }, }), FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { @@ -2799,6 +2946,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Title", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Title", Width = 0, ListOrderNo = 2, @@ -2815,6 +2966,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Excerpt", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Excerpt", Width = 0, ListOrderNo = 3, @@ -2831,6 +2986,11 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Content", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxHtmlEditor, + ColSpan = 2, + EditorOptions = EditorOptionValues.HtmlEditorOptions, CaptionName = "App.Listform.ListformField.Content", Width = 0, ListOrderNo = 4, @@ -2847,6 +3007,11 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Category", + EditGroupOrderNo = 1, + EditOrderNo = 4, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.Category", Width = 0, ListOrderNo = 5, @@ -2875,6 +3040,11 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Guid, FieldName = "UserId", + EditGroupOrderNo = 1, + EditOrderNo = 5, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.UserId", Width = 0, ListOrderNo = 6, @@ -2897,6 +3067,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.DateTime, FieldName = "PublishDate", + EditGroupOrderNo = 1, + EditOrderNo = 6, + EditorType2 = EditorTypes.dxDateBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.PublishDate", Width = 0, ListOrderNo = 7, @@ -2913,6 +3087,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.DateTime, FieldName = "ExpiryDate", + EditGroupOrderNo = 1, + EditOrderNo = 7, + EditorType2 = EditorTypes.dxDateBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.ExpiryDate", Width = 0, ListOrderNo = 8, @@ -2928,6 +3106,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "IsPinned", + EditGroupOrderNo = 1, + EditOrderNo = 8, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.IsPinned", Width = 0, ListOrderNo = 9, @@ -2943,6 +3125,11 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "ImageUrl", + EditGroupOrderNo = 1, + EditOrderNo = 9, + EditorType2 = EditorTypes.dxImageUpload, + ColSpan = 1, + EditorOptions = EditorOptionValues.ImageUploadOptions(), CaptionName = "App.Listform.ListformField.ImageUrl", Width = 0, ListOrderNo = 10, @@ -2998,9 +3185,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep PagerOptionJson = DefaultPagerOptionJson, 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=[ - new EditingFormItemDto { Order = 1, DataField = "UserId", ColSpan = 1, EditorType2=EditorTypes.dxSelectBox }, - ]} + new() { Order=1, ColCount=1, ColSpan=1, ItemType="group" }, }), InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson(), } @@ -3028,6 +3213,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Guid, FieldName = "UserId", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.UserId", Width = 0, ListOrderNo = 2, @@ -3104,10 +3293,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep PagerOptionJson = DefaultPagerOptionJson, 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=[ - new EditingFormItemDto { Order = 1, DataField = "UserId", ColSpan = 1, EditorType2=EditorTypes.dxSelectBox }, - new EditingFormItemDto { Order = 2, DataField = "Content", ColSpan = 1, EditorType2=EditorTypes.dxTextArea }, - ]} + new() { Order=1, ColCount=1, ColSpan=1, ItemType="group" }, }), InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson(), } @@ -3135,6 +3321,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Guid, FieldName = "UserId", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.UserId", Width = 0, ListOrderNo = 2, @@ -3157,6 +3347,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Content", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxTextArea, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Content", Width = 0, ListOrderNo = 3, @@ -3229,12 +3423,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep EditingFormJson = JsonSerializer.Serialize(new List() { new() { - Order=1, ColCount=3, ColSpan=1, ItemType="group", Items =[ - new EditingFormItemDto { Order = 1, DataField = "Title", ColSpan=3, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 2, DataField = "Deadline", ColSpan=1, EditorType2 = EditorTypes.dxDateBox }, - new EditingFormItemDto { Order = 3, DataField = "Status", ColSpan=1, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 4, DataField = "IsAnonymous", ColSpan=1, EditorType2 = EditorTypes.dxCheckBox }, - ]} + Order=1, ColCount=3, ColSpan=1, ItemType="group" }, }), FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { @@ -3293,6 +3482,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Title", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 3, CaptionName = "App.Listform.ListformField.Title", Width = 0, ListOrderNo = 2, @@ -3309,6 +3502,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Date, FieldName = "Deadline", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxDateBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Deadline", Width = 0, ListOrderNo = 3, @@ -3340,6 +3537,11 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Status", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.Status", Width = 0, ListOrderNo = 5, @@ -3366,6 +3568,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "IsAnonymous", + EditGroupOrderNo = 1, + EditOrderNo = 4, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.IsAnonymous", Width = 0, ListOrderNo = 6, @@ -3424,13 +3630,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep EditingFormJson = JsonSerializer.Serialize(new List() { new() { - Order=1, ColCount=3, ColSpan=1, ItemType="group", Items = - [ - new EditingFormItemDto { Order = 1, DataField = "QuestionText", ColSpan=3, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 2, DataField = "Order", ColSpan=1, EditorType2 = EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 3, DataField = "Type", ColSpan=1, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 4, DataField = "IsRequired", ColSpan=1, EditorType2 = EditorTypes.dxCheckBox } - ]} + Order=1, ColCount=3, ColSpan=1, ItemType="group" }, }), FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { @@ -3476,6 +3676,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Int32, FieldName = "Order", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Order", Width = 0, ListOrderNo = 2, @@ -3492,6 +3696,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "QuestionText", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 3, CaptionName = "App.Listform.ListformField.QuestionText", Width = 0, ListOrderNo = 3, @@ -3508,6 +3716,11 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Type", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.Type", Width = 0, ListOrderNo = 4, @@ -3537,6 +3750,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "IsRequired", + EditGroupOrderNo = 1, + EditOrderNo = 4, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.IsRequired", Width = 0, ListOrderNo = 5, @@ -3610,11 +3827,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep EditingFormJson = JsonSerializer.Serialize(new List() { new() { - Order=1, ColCount=1, ColSpan=1, ItemType="group", Items = - [ - new EditingFormItemDto { Order = 1, DataField = "Order", ColSpan=1, EditorType2 = EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 2, DataField = "Text", ColSpan=1, EditorType2 = EditorTypes.dxTextBox }, - ]} + Order=1, ColCount=1, ColSpan=1, ItemType="group" }, }), }, autoSave: true ); @@ -3642,6 +3855,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Int32, FieldName = "Order", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Order", Width = 0, ListOrderNo = 2, @@ -3658,6 +3875,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Text", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Text", Width = 0, ListOrderNo = 3, @@ -3732,10 +3953,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep EditingFormJson = JsonSerializer.Serialize(new List() { new() { - Order=1, ColCount=1, ColSpan=1, ItemType="group", Items =[ - new EditingFormItemDto { Order = 1, DataField = "UserId", ColSpan=1, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 2, DataField = "SubmissionTime", ColSpan=1, EditorType2 = EditorTypes.dxDateBox }, - ]} + Order=1, ColCount=1, ColSpan=1, ItemType="group" }, }), SubFormsJson = JsonSerializer.Serialize(new List() { new { @@ -3777,6 +3995,11 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Guid, FieldName = "UserId", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.UserId", Width = 0, ListOrderNo = 2, @@ -3799,6 +4022,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.DateTime, FieldName = "SubmissionTime", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxDateBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.SubmissionTime", Width = 0, ListOrderNo = 3, @@ -3874,11 +4101,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep EditingFormJson = JsonSerializer.Serialize(new List() { new() { - Order=1, ColCount=1, ColSpan=1, ItemType="group", Items = - [ - new EditingFormItemDto { Order = 1, DataField = "QuestionId", ColSpan=1, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 2, DataField = "Value", ColSpan=1, EditorType2 = EditorTypes.dxTextBox }, - ]} + Order=1, ColCount=1, ColSpan=1, ItemType="group" }, }), }, autoSave: true ); @@ -3906,6 +4129,11 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Guid, FieldName = "QuestionId", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.QuestionId", Width = 0, ListOrderNo = 2, @@ -3928,6 +4156,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Value", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Value", Width = 0, ListOrderNo = 3, @@ -4002,13 +4234,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep EditingFormJson = JsonSerializer.Serialize(new List() { new() { - Order=1, ColCount=2, ColSpan=1, ItemType="group", Items = [ - new EditingFormItemDto { Order = 1, DataField = "UserId", ColSpan=1, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 2, DataField = "LikeCount", ColSpan=1, EditorType2 = EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 3, DataField = "IsLiked", ColSpan=1, EditorType2 = EditorTypes.dxCheckBox }, - new EditingFormItemDto { Order = 4, DataField = "IsOwnPost", ColSpan=1, EditorType2 = EditorTypes.dxCheckBox }, - new EditingFormItemDto { Order = 5, DataField = "Content", ColSpan=2, EditorType2 = EditorTypes.dxHtmlEditor, EditorOptions = EditorOptionValues.HtmlEditorOptions }, - ]} + Order=1, ColCount=2, ColSpan=1, ItemType="group" }, }), FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { @@ -4068,6 +4294,11 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Guid, FieldName = "UserId", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.UserId", Width = 0, ListOrderNo = 2, @@ -4090,6 +4321,11 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Content", + EditGroupOrderNo = 1, + EditOrderNo = 5, + EditorType2 = EditorTypes.dxHtmlEditor, + ColSpan = 2, + EditorOptions = EditorOptionValues.HtmlEditorOptions, CaptionName = "App.Listform.ListformField.Content", Width = 0, ListOrderNo = 3, @@ -4100,13 +4336,16 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson, - EditorOptions = EncodeHtmlJson(false) }, new() { ListFormCode = listForm.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.Int32, FieldName = "LikeCount", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.LikeCount", Width = 0, ListOrderNo = 4, @@ -4122,6 +4361,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "IsLiked", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.IsLiked", Width = 0, ListOrderNo = 5, @@ -4137,6 +4380,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "IsOwnPost", + EditGroupOrderNo = 1, + EditOrderNo = 4, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.IsOwnPost", Width = 0, ListOrderNo = 6, @@ -4192,10 +4439,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep PagerOptionJson = DefaultPagerOptionJson, 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=[ - new EditingFormItemDto { Order = 1, DataField = "Content", ColSpan = 1, EditorType2=EditorTypes.dxTextArea }, - new EditingFormItemDto { Order = 2, DataField = "SocialPostId", ColSpan = 1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - ]} + new() { Order=1, ColCount=1, ColSpan=1, ItemType="group" }, }), InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson(), } @@ -4223,6 +4467,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Content", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxTextArea, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Content", Width = 0, ListOrderNo = 2, @@ -4241,6 +4489,11 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Guid, FieldName = "SocialPostId", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.SocialPostId", Width = 0, ListOrderNo = 3, @@ -4297,9 +4550,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep PagerOptionJson = DefaultPagerOptionJson, 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=[ - new EditingFormItemDto { Order = 1, DataField = "UserId", ColSpan = 1, EditorType2=EditorTypes.dxSelectBox }, - ]} + new() { Order=1, ColCount=1, ColSpan=1, ItemType="group" }, }), InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson(), } @@ -4327,6 +4578,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Guid, FieldName = "UserId", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.UserId", Width = 0, ListOrderNo = 2, @@ -4405,9 +4660,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep PagerOptionJson = DefaultPagerOptionJson, 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=[ - new EditingFormItemDto { Order = 1, DataField = "Name", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - ]} + new() { Order=1, ColCount=1, ColSpan=1, ItemType="group" }, }), InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson(), } @@ -4435,6 +4688,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Name", Width = 0, ListOrderNo = 2, @@ -4493,9 +4750,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep PagerOptionJson = DefaultPagerOptionJson, 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=[ - new EditingFormItemDto { Order = 1, DataField = "Name", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - ]} + new() { Order=1, ColCount=1, ColSpan=1,ItemType="group" }, }), InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson(), } @@ -4523,6 +4778,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Name", Width = 0, ListOrderNo = 2, @@ -4583,19 +4842,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep EditingFormJson = JsonSerializer.Serialize(new List() { new() { - Order = 1, ColCount = 3, ColSpan = 1, ItemType = "group", Items = - [ - new EditingFormItemDto { Order = 1, DataField = "CategoryId", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 2, DataField = "TypeId", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 3, DataField = "Date", ColSpan = 1, EditorType2 = EditorTypes.dxDateBox }, - new EditingFormItemDto { Order = 4, DataField = "Name", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 5, DataField = "Place", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 6, DataField = "UserId", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 7, DataField = "Status", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 8, DataField = "ParticipantsCount", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 9, DataField = "Description", ColSpan = 2, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 10, DataField = "Photos", ColSpan = 1, EditorType2 = EditorTypes.dxImageUpload, EditorOptions = EditorOptionValues.ImageUploadOptions() }, - ]} + Order = 1, ColCount = 3, ColSpan = 1, ItemType = "group" }, }), InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson(), FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { @@ -4658,6 +4905,11 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Guid, FieldName = "CategoryId", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.CategoryId", Width = 0, ListOrderNo = 2, @@ -4676,6 +4928,11 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Guid, FieldName = "TypeId", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.TypeId", Width = 0, ListOrderNo = 3, @@ -4694,6 +4951,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Date, FieldName = "Date", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxDateBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Date", Width = 0, ListOrderNo = 4, @@ -4712,6 +4973,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", + EditGroupOrderNo = 1, + EditOrderNo = 4, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Name", Width = 0, ListOrderNo = 5, @@ -4732,6 +4997,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Place", + EditGroupOrderNo = 1, + EditOrderNo = 5, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Place", Width = 0, ListOrderNo = 6, @@ -4749,6 +5018,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Description", + EditGroupOrderNo = 1, + EditOrderNo = 9, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 2, CaptionName = "App.Listform.ListformField.Description", Width = 0, ListOrderNo = 7, @@ -4765,6 +5038,11 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Guid, FieldName = "UserId", + EditGroupOrderNo = 1, + EditOrderNo = 6, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.UserId", Width = 0, ListOrderNo = 8, @@ -4788,6 +5066,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Int32, FieldName = "ParticipantsCount", + EditGroupOrderNo = 1, + EditOrderNo = 8, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.ParticipantsCount", Width = 0, Alignment = "right", @@ -4822,6 +5104,11 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Status", + EditGroupOrderNo = 1, + EditOrderNo = 7, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.Status", Width = 0, ListOrderNo = 11, @@ -4848,6 +5135,11 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Photos", + EditGroupOrderNo = 1, + EditOrderNo = 10, + EditorType2 = EditorTypes.dxImageUpload, + ColSpan = 1, + EditorOptions = EditorOptionValues.ImageUploadOptions(), CaptionName = "App.Listform.ListformField.Photos", Width = 0, ListOrderNo = 12, @@ -4902,9 +5194,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep PagerOptionJson = DefaultPagerOptionJson, 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=[ - new EditingFormItemDto { Order = 1, DataField = "UserId", ColSpan = 1, EditorType2=EditorTypes.dxSelectBox }, - ]} + new() { Order=1, ColCount=1, ColSpan=1, ItemType="group" }, }), InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson(), } @@ -4932,6 +5222,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Guid, FieldName = "UserId", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.UserId", Width = 0, ListOrderNo = 2, @@ -5008,10 +5302,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep PagerOptionJson = DefaultPagerOptionJson, 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=[ - new EditingFormItemDto { Order = 1, DataField = "UserId", ColSpan = 1, EditorType2=EditorTypes.dxSelectBox }, - new EditingFormItemDto { Order = 2, DataField = "Content", ColSpan = 1, EditorType2=EditorTypes.dxTextArea }, - ]} + new() { Order=1, ColCount=1, ColSpan=1, ItemType="group" }, }), InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson(), } @@ -5039,6 +5330,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Guid, FieldName = "UserId", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.UserId", Width = 0, ListOrderNo = 2, @@ -5061,6 +5356,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Content", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxTextArea, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Content", Width = 0, ListOrderNo = 3, @@ -5129,18 +5428,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep EditingOptionJson = DefaultEditingOptionJson(listFormName, 900, 500, false, false, false, false, false, false), EditingFormJson = JsonSerializer.Serialize(new List() { - new() { Order=1, ColCount=4, ColSpan=1, ItemType="group", Items = - [ - 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 = "PhoneNumber", ColSpan=1, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, - new EditingFormItemDto { Order=7, DataField = "Email", ColSpan=1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order=8, DataField = "Website", ColSpan=1, EditorType2=EditorTypes.dxTextBox }, - ] - } + new() { Order=1, ColCount=4, ColSpan=1, ItemType="group" }, }), SubFormsJson = JsonSerializer.Serialize(new List() { new { @@ -5182,6 +5470,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Name", Width = 0, ListOrderNo = 2, @@ -5199,6 +5491,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "OrganizationName", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.OrganizationName", Width = 0, ListOrderNo = 3, @@ -5216,6 +5512,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Founder", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Founder", Width = 0, ListOrderNo = 4, @@ -5233,6 +5533,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Int64, FieldName = "VknTckn", + EditGroupOrderNo = 1, + EditOrderNo = 4, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.VknTckn", Width = 0, ListOrderNo = 5, @@ -5250,6 +5554,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "TaxOffice", + EditGroupOrderNo = 1, + EditOrderNo = 5, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.TaxOffice", Width = 0, ListOrderNo = 6, @@ -5267,6 +5575,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Email", + EditGroupOrderNo = 1, + EditOrderNo = 7, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Email", Width = 0, ListOrderNo = 7, @@ -5284,6 +5596,10 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Website", + EditGroupOrderNo = 1, + EditOrderNo = 8, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Website", Width = 0, ListOrderNo = 8, @@ -5301,13 +5617,17 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "PhoneNumber", + EditGroupOrderNo = 1, + EditOrderNo = 6, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.PhoneEditorOptions, CaptionName = "Abp.Identity.User.UserInformation.PhoneNumber", Width = 0, ListOrderNo = 9, Visible = true, IsActive = true, AllowSearch = true, - EditorOptions = EditorOptionValues.PhoneEditorOptions, ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), diff --git a/api/src/Sozsoft.Platform.DbMigrator/Seeds/ListFormSeeder_Saas.cs b/api/src/Sozsoft.Platform.DbMigrator/Seeds/ListFormSeeder_Saas.cs index 82b983d..ad6fc08 100644 --- a/api/src/Sozsoft.Platform.DbMigrator/Seeds/ListFormSeeder_Saas.cs +++ b/api/src/Sozsoft.Platform.DbMigrator/Seeds/ListFormSeeder_Saas.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Data; using System.Text.Json; @@ -96,29 +96,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency EditingOptionJson = DefaultEditingOptionJson(TenantManagementPermissions.Tenants.Default, 950, 750, true, true, true, true, false, true), EditingFormJson = JsonSerializer.Serialize(new List() { - new() { Order=1, ColCount=4, ColSpan=1, ItemType="group", Items = - [ - new EditingFormItemDto { Order=1, DataField = "OrganizationName", ColSpan=4, 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 = "MenuGroup", ColSpan=1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order=10, DataField = "Email", ColSpan=1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order=11, DataField = "Website", ColSpan=1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order=12, DataField = "IsActive", ColSpan=1, EditorType2=EditorTypes.dxCheckBox }, - new EditingFormItemDto { Order=13, DataField = "Country", ColSpan=1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order=14, DataField = "City", ColSpan=1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order=15, DataField = "District", ColSpan=1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order=16, DataField = "Township", ColSpan=1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton, EditorScript = PlatformConsts.EditorScriptValues.SourceFieldItemWritetoDestination("Township", "Group", "PostalCode") }, - new EditingFormItemDto { Order=17, DataField = "PostalCode", ColSpan=1, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order=18, DataField = "Address1", ColSpan=4, EditorType2=EditorTypes.dxTextArea }, - new EditingFormItemDto { Order=19, DataField = "Address2", ColSpan=4, EditorType2=EditorTypes.dxTextArea }, - ] - } + new() { Order=1, ColCount=4, ColSpan=1, ItemType="group" }, }), CommandColumnJson = JsonSerializer.Serialize(new CommandColumnDto[] { new() { @@ -175,370 +153,453 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency PivotSettingsJson = DefaultPivotSettingsJson }, new ListFormField - { - ListFormCode = listForm.ListFormCode, - CultureName = LanguageCodes.En, - SourceDbType = DbType.String, - FieldName = "Name", - CaptionName = "App.Listform.ListformField.Name", - Width = 0, - ListOrderNo = 2, - Visible = true, - IsActive = true, - AllowSearch = true, - ValidationRuleJson = DefaultValidationRuleRequiredJson, - ColumnCustomizationJson = DefaultColumnCustomizationJson, - PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), - PivotSettingsJson = DefaultPivotSettingsJson - }, + { + ListFormCode = listForm.ListFormCode, + CultureName = LanguageCodes.En, + SourceDbType = DbType.String, + FieldName = "Name", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, + CaptionName = "App.Listform.ListformField.Name", + Width = 0, + ListOrderNo = 2, + Visible = true, + IsActive = true, + AllowSearch = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, + ColumnCustomizationJson = DefaultColumnCustomizationJson, + PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), + PivotSettingsJson = DefaultPivotSettingsJson + }, new ListFormField - { - ListFormCode = listForm.ListFormCode, - CultureName = LanguageCodes.En, - SourceDbType = DbType.String, - FieldName = "OrganizationName", - CaptionName = "App.Listform.ListformField.OrganizationName", - Width = 0, - ListOrderNo = 3, - Visible = true, - IsActive = true, - AllowSearch = true, - ValidationRuleJson = DefaultValidationRuleRequiredJson, - ColumnCustomizationJson = DefaultColumnCustomizationJson, - PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), - PivotSettingsJson = DefaultPivotSettingsJson - }, + { + ListFormCode = listForm.ListFormCode, + CultureName = LanguageCodes.En, + SourceDbType = DbType.String, + FieldName = "OrganizationName", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 4, + CaptionName = "App.Listform.ListformField.OrganizationName", + Width = 0, + ListOrderNo = 3, + Visible = true, + IsActive = true, + AllowSearch = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, + ColumnCustomizationJson = DefaultColumnCustomizationJson, + PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), + PivotSettingsJson = DefaultPivotSettingsJson + }, new ListFormField - { - ListFormCode = listForm.ListFormCode, - CultureName = LanguageCodes.En, - SourceDbType = DbType.String, - FieldName = "Founder", - CaptionName = "App.Listform.ListformField.Founder", - Width = 0, - ListOrderNo = 4, - Visible = true, - IsActive = true, - AllowSearch = true, - ValidationRuleJson = DefaultValidationRuleRequiredJson, - ColumnCustomizationJson = DefaultColumnCustomizationJson, - PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), - PivotSettingsJson = DefaultPivotSettingsJson - }, + { + ListFormCode = listForm.ListFormCode, + CultureName = LanguageCodes.En, + SourceDbType = DbType.String, + FieldName = "Founder", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, + CaptionName = "App.Listform.ListformField.Founder", + Width = 0, + ListOrderNo = 4, + Visible = true, + IsActive = true, + AllowSearch = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, + ColumnCustomizationJson = DefaultColumnCustomizationJson, + PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), + PivotSettingsJson = DefaultPivotSettingsJson + }, new ListFormField - { - ListFormCode = listForm.ListFormCode, - CultureName = LanguageCodes.En, - SourceDbType = DbType.Int64, - FieldName = "VknTckn", - CaptionName = "App.Listform.ListformField.VknTckn", - Width = 0, - ListOrderNo = 5, - Visible = true, - IsActive = true, - AllowSearch = true, - ValidationRuleJson = DefaultValidationRuleRequiredJson, - ColumnCustomizationJson = DefaultColumnCustomizationJson, - PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), - PivotSettingsJson = DefaultPivotSettingsJson - }, + { + ListFormCode = listForm.ListFormCode, + CultureName = LanguageCodes.En, + SourceDbType = DbType.Int64, + FieldName = "VknTckn", + EditGroupOrderNo = 1, + EditOrderNo = 4, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, + CaptionName = "App.Listform.ListformField.VknTckn", + Width = 0, + ListOrderNo = 5, + Visible = true, + IsActive = true, + AllowSearch = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, + ColumnCustomizationJson = DefaultColumnCustomizationJson, + PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), + PivotSettingsJson = DefaultPivotSettingsJson + }, new ListFormField - { - ListFormCode = listForm.ListFormCode, - CultureName = LanguageCodes.En, - SourceDbType = DbType.String, - FieldName = "TaxOffice", - CaptionName = "App.Listform.ListformField.TaxOffice", - Width = 0, - ListOrderNo = 6, - Visible = true, - IsActive = true, - AllowSearch = true, - ValidationRuleJson = DefaultValidationRuleRequiredJson, - ColumnCustomizationJson = DefaultColumnCustomizationJson, - PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), - PivotSettingsJson = DefaultPivotSettingsJson - }, + { + ListFormCode = listForm.ListFormCode, + CultureName = LanguageCodes.En, + SourceDbType = DbType.String, + FieldName = "TaxOffice", + EditGroupOrderNo = 1, + EditOrderNo = 5, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, + CaptionName = "App.Listform.ListformField.TaxOffice", + Width = 0, + ListOrderNo = 6, + Visible = true, + IsActive = true, + AllowSearch = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, + ColumnCustomizationJson = DefaultColumnCustomizationJson, + PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), + PivotSettingsJson = DefaultPivotSettingsJson + }, new ListFormField + { + ListFormCode = listForm.ListFormCode, + CultureName = LanguageCodes.En, + SourceDbType = DbType.String, + FieldName = "Country", + EditGroupOrderNo = 1, + EditOrderNo = 13, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, + CaptionName = "App.Listform.ListformField.Country", + Width = 0, + ListOrderNo = 7, + Visible = true, + IsActive = true, + AllowSearch = true, + LookupJson = JsonSerializer.Serialize(new LookupDto { - ListFormCode = listForm.ListFormCode, - CultureName = LanguageCodes.En, - SourceDbType = DbType.String, - FieldName = "Country", - CaptionName = "App.Listform.ListformField.Country", - Width = 0, - ListOrderNo = 7, - Visible = true, - IsActive = true, - AllowSearch = true, - LookupJson = JsonSerializer.Serialize(new LookupDto - { - DataSourceType = UiLookupDataSourceTypeEnum.Query, - DisplayExpr = "Name", - ValueExpr = "Key", - LookupQuery = LookupQueryValues.CountryValues, - CascadeEmptyFields = "City,District,Township" - }), - ValidationRuleJson = DefaultValidationRuleRequiredJson, - ColumnCustomizationJson = DefaultColumnCustomizationJson, - PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), - PivotSettingsJson = DefaultPivotSettingsJson - }, + DataSourceType = UiLookupDataSourceTypeEnum.Query, + DisplayExpr = "Name", + ValueExpr = "Key", + LookupQuery = LookupQueryValues.CountryValues, + CascadeEmptyFields = "City,District,Township" + }), + ValidationRuleJson = DefaultValidationRuleRequiredJson, + ColumnCustomizationJson = DefaultColumnCustomizationJson, + PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), + PivotSettingsJson = DefaultPivotSettingsJson + }, new ListFormField + { + ListFormCode = listForm.ListFormCode, + CultureName = LanguageCodes.En, + SourceDbType = DbType.String, + FieldName = "City", + EditGroupOrderNo = 1, + EditOrderNo = 14, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, + CaptionName = "App.Listform.ListformField.City", + Width = 0, + ListOrderNo = 8, + Visible = true, + IsActive = true, + AllowSearch = true, + LookupJson = JsonSerializer.Serialize(new LookupDto { - ListFormCode = listForm.ListFormCode, - CultureName = LanguageCodes.En, - SourceDbType = DbType.String, - FieldName = "City", - CaptionName = "App.Listform.ListformField.City", - Width = 0, - ListOrderNo = 8, - Visible = true, - IsActive = true, - AllowSearch = true, - LookupJson = JsonSerializer.Serialize(new LookupDto - { - DataSourceType = UiLookupDataSourceTypeEnum.Query, - DisplayExpr = "Name", - ValueExpr = "Key", - LookupQuery = LookupQueryValues.CityValues, - CascadeRelationField = "Country", - CascadeFilterOperator="=", - CascadeParentFields = "Country", - CascadeEmptyFields = "District,Township" - }), - ValidationRuleJson = DefaultValidationRuleRequiredJson, - ColumnCustomizationJson = DefaultColumnCustomizationJson, - PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), - PivotSettingsJson = DefaultPivotSettingsJson - }, + DataSourceType = UiLookupDataSourceTypeEnum.Query, + DisplayExpr = "Name", + ValueExpr = "Key", + LookupQuery = LookupQueryValues.CityValues, + CascadeRelationField = "Country", + CascadeFilterOperator="=", + CascadeParentFields = "Country", + CascadeEmptyFields = "District,Township" + }), + ValidationRuleJson = DefaultValidationRuleRequiredJson, + ColumnCustomizationJson = DefaultColumnCustomizationJson, + PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), + PivotSettingsJson = DefaultPivotSettingsJson + }, new ListFormField + { + ListFormCode = listForm.ListFormCode, + CultureName = LanguageCodes.En, + SourceDbType = DbType.String, + FieldName = "District", + EditGroupOrderNo = 1, + EditOrderNo = 15, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, + CaptionName = "App.Listform.ListformField.District", + Width = 0, + ListOrderNo = 9, + Visible = true, + IsActive = true, + AllowSearch = true, + LookupJson = JsonSerializer.Serialize(new LookupDto { - ListFormCode = listForm.ListFormCode, - CultureName = LanguageCodes.En, - SourceDbType = DbType.String, - FieldName = "District", - CaptionName = "App.Listform.ListformField.District", - Width = 0, - ListOrderNo = 9, - Visible = true, - IsActive = true, - AllowSearch = true, - LookupJson = JsonSerializer.Serialize(new LookupDto - { - DataSourceType = UiLookupDataSourceTypeEnum.Query, - DisplayExpr = "Name", - ValueExpr = "Key", - LookupQuery = LookupQueryValues.DistrictValues, - CascadeRelationField = "City", - CascadeFilterOperator="=", - CascadeParentFields = "Country,City", - CascadeEmptyFields = "Township", - }), - ValidationRuleJson = DefaultValidationRuleRequiredJson, - ColumnCustomizationJson = DefaultColumnCustomizationJson, - PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), - PivotSettingsJson = DefaultPivotSettingsJson - }, + DataSourceType = UiLookupDataSourceTypeEnum.Query, + DisplayExpr = "Name", + ValueExpr = "Key", + LookupQuery = LookupQueryValues.DistrictValues, + CascadeRelationField = "City", + CascadeFilterOperator="=", + CascadeParentFields = "Country,City", + CascadeEmptyFields = "Township", + }), + ValidationRuleJson = DefaultValidationRuleRequiredJson, + ColumnCustomizationJson = DefaultColumnCustomizationJson, + PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), + PivotSettingsJson = DefaultPivotSettingsJson + }, new ListFormField + { + ListFormCode = listForm.ListFormCode, + CultureName = LanguageCodes.En, + SourceDbType = DbType.String, + FieldName = "Township", + EditGroupOrderNo = 1, + EditOrderNo = 16, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, + EditorScript = PlatformConsts.EditorScriptValues.SourceFieldItemWritetoDestination("Township", "Group", "PostalCode"), + CaptionName = "App.Listform.ListformField.Township", + Width = 0, + ListOrderNo = 10, + Visible = true, + IsActive = true, + AllowSearch = true, + LookupJson = JsonSerializer.Serialize(new LookupDto { - ListFormCode = listForm.ListFormCode, - CultureName = LanguageCodes.En, - SourceDbType = DbType.String, - FieldName = "Township", - CaptionName = "App.Listform.ListformField.Township", - Width = 0, - ListOrderNo = 10, - Visible = true, - IsActive = true, - AllowSearch = true, - LookupJson = JsonSerializer.Serialize(new LookupDto - { - DataSourceType = UiLookupDataSourceTypeEnum.Query, - DisplayExpr = "Name", - ValueExpr = "Key", - LookupQuery = LookupQueryValues.TownshipValues, - CascadeRelationField = "District", - CascadeFilterOperator="=", - CascadeParentFields = "Country,City,District" - }), - ValidationRuleJson = DefaultValidationRuleRequiredJson, - ColumnCustomizationJson = DefaultColumnCustomizationJson, - PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), - PivotSettingsJson = DefaultPivotSettingsJson - }, + DataSourceType = UiLookupDataSourceTypeEnum.Query, + DisplayExpr = "Name", + ValueExpr = "Key", + LookupQuery = LookupQueryValues.TownshipValues, + CascadeRelationField = "District", + CascadeFilterOperator="=", + CascadeParentFields = "Country,City,District" + }), + ValidationRuleJson = DefaultValidationRuleRequiredJson, + ColumnCustomizationJson = DefaultColumnCustomizationJson, + PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), + PivotSettingsJson = DefaultPivotSettingsJson + }, new ListFormField - { - ListFormCode = listForm.ListFormCode, - CultureName = LanguageCodes.En, - SourceDbType = DbType.String, - FieldName = "Address1", - CaptionName = "App.Listform.ListformField.Address1", - Width = 0, - ListOrderNo = 11, - Visible = true, - IsActive = true, - AllowSearch = true, - ValidationRuleJson = DefaultValidationRuleRequiredJson, - ColumnCustomizationJson = DefaultColumnCustomizationJson, - PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), - PivotSettingsJson = DefaultPivotSettingsJson - }, + { + ListFormCode = listForm.ListFormCode, + CultureName = LanguageCodes.En, + SourceDbType = DbType.String, + FieldName = "Address1", + EditGroupOrderNo = 1, + EditOrderNo = 18, + EditorType2 = EditorTypes.dxTextArea, + ColSpan = 4, + CaptionName = "App.Listform.ListformField.Address1", + Width = 0, + ListOrderNo = 11, + Visible = true, + IsActive = true, + AllowSearch = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, + ColumnCustomizationJson = DefaultColumnCustomizationJson, + PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), + PivotSettingsJson = DefaultPivotSettingsJson + }, new ListFormField - { - ListFormCode = listForm.ListFormCode, - CultureName = LanguageCodes.En, - SourceDbType = DbType.String, - FieldName = "Address2", - CaptionName = "App.Listform.ListformField.Address2", - Width = 0, - ListOrderNo = 12, - Visible = true, - IsActive = true, - AllowSearch = true, - ColumnCustomizationJson = DefaultColumnCustomizationJson, - PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), - PivotSettingsJson = DefaultPivotSettingsJson - }, + { + ListFormCode = listForm.ListFormCode, + CultureName = LanguageCodes.En, + SourceDbType = DbType.String, + FieldName = "Address2", + EditGroupOrderNo = 1, + EditOrderNo = 19, + EditorType2 = EditorTypes.dxTextArea, + ColSpan = 4, + CaptionName = "App.Listform.ListformField.Address2", + Width = 0, + ListOrderNo = 12, + Visible = true, + IsActive = true, + AllowSearch = true, + ColumnCustomizationJson = DefaultColumnCustomizationJson, + PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), + PivotSettingsJson = DefaultPivotSettingsJson + }, new ListFormField - { - ListFormCode = listForm.ListFormCode, - CultureName = LanguageCodes.En, - SourceDbType = DbType.String, - FieldName = "PostalCode", - CaptionName = "App.Listform.ListformField.PostalCode", - Width = 0, - ListOrderNo = 13, - Visible = true, - IsActive = true, - AllowSearch = true, - ColumnCustomizationJson = DefaultColumnCustomizationJson, - PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), - PivotSettingsJson = DefaultPivotSettingsJson - }, + { + ListFormCode = listForm.ListFormCode, + CultureName = LanguageCodes.En, + SourceDbType = DbType.String, + FieldName = "PostalCode", + EditGroupOrderNo = 1, + EditOrderNo = 17, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, + CaptionName = "App.Listform.ListformField.PostalCode", + Width = 0, + ListOrderNo = 13, + Visible = true, + IsActive = true, + AllowSearch = true, + ColumnCustomizationJson = DefaultColumnCustomizationJson, + PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), + PivotSettingsJson = DefaultPivotSettingsJson + }, new ListFormField - { - ListFormCode = listForm.ListFormCode, - CultureName = LanguageCodes.En, - SourceDbType = DbType.String, - FieldName = "Email", - CaptionName = "App.Listform.ListformField.Email", - Width = 0, - ListOrderNo = 14, - Visible = true, - IsActive = true, - AllowSearch = true, - ValidationRuleJson = DefaultValidationRuleEmailRequiredJson, - ColumnCustomizationJson = DefaultColumnCustomizationJson, - PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), - PivotSettingsJson = DefaultPivotSettingsJson - }, + { + ListFormCode = listForm.ListFormCode, + CultureName = LanguageCodes.En, + SourceDbType = DbType.String, + FieldName = "Email", + EditGroupOrderNo = 1, + EditOrderNo = 10, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, + CaptionName = "App.Listform.ListformField.Email", + Width = 0, + ListOrderNo = 14, + Visible = true, + IsActive = true, + AllowSearch = true, + ValidationRuleJson = DefaultValidationRuleEmailRequiredJson, + ColumnCustomizationJson = DefaultColumnCustomizationJson, + PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), + PivotSettingsJson = DefaultPivotSettingsJson + }, new ListFormField - { - ListFormCode = listForm.ListFormCode, - CultureName = LanguageCodes.En, - SourceDbType = DbType.String, - FieldName = "Website", - CaptionName = "App.Listform.ListformField.Website", - Width = 0, - ListOrderNo = 15, - Visible = true, - IsActive = true, - AllowSearch = true, - ValidationRuleJson = DefaultValidationRuleRequiredJson, - ColumnCustomizationJson = DefaultColumnCustomizationJson, - PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), - PivotSettingsJson = DefaultPivotSettingsJson - }, + { + ListFormCode = listForm.ListFormCode, + CultureName = LanguageCodes.En, + SourceDbType = DbType.String, + FieldName = "Website", + EditGroupOrderNo = 1, + EditOrderNo = 11, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, + CaptionName = "App.Listform.ListformField.Website", + Width = 0, + ListOrderNo = 15, + Visible = true, + IsActive = true, + AllowSearch = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, + ColumnCustomizationJson = DefaultColumnCustomizationJson, + PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), + PivotSettingsJson = DefaultPivotSettingsJson + }, new ListFormField - { - ListFormCode = listForm.ListFormCode, - CultureName = LanguageCodes.En, - SourceDbType = DbType.String, - FieldName = "PhoneNumber", - CaptionName = "Abp.Identity.User.UserInformation.PhoneNumber", - Width = 0, - ListOrderNo = 16, - Visible = true, - IsActive = true, - AllowSearch = true, - EditorOptions = EditorOptionValues.PhoneEditorOptions, - ValidationRuleJson = DefaultValidationRuleRequiredJson, - ColumnCustomizationJson = DefaultColumnCustomizationJson, - PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), - PivotSettingsJson = DefaultPivotSettingsJson - }, + { + ListFormCode = listForm.ListFormCode, + CultureName = LanguageCodes.En, + SourceDbType = DbType.String, + FieldName = "PhoneNumber", + EditGroupOrderNo = 1, + EditOrderNo = 7, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.PhoneEditorOptions, + CaptionName = "Abp.Identity.User.UserInformation.PhoneNumber", + Width = 0, + ListOrderNo = 16, + Visible = true, + IsActive = true, + AllowSearch = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, + ColumnCustomizationJson = DefaultColumnCustomizationJson, + PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), + PivotSettingsJson = DefaultPivotSettingsJson + }, new ListFormField - { - ListFormCode = listForm.ListFormCode, - CultureName = LanguageCodes.En, - SourceDbType = DbType.String, - FieldName = "MobileNumber", - CaptionName = "App.Listform.ListformField.MobileNumber", - Width = 0, - ListOrderNo = 17, - Visible = true, - IsActive = true, - AllowSearch = true, - EditorOptions = EditorOptionValues.PhoneEditorOptions, - ColumnCustomizationJson = DefaultColumnCustomizationJson, - PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), - PivotSettingsJson = DefaultPivotSettingsJson - }, + { + ListFormCode = listForm.ListFormCode, + CultureName = LanguageCodes.En, + SourceDbType = DbType.String, + FieldName = "MobileNumber", + EditGroupOrderNo = 1, + EditOrderNo = 6, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.PhoneEditorOptions, + CaptionName = "App.Listform.ListformField.MobileNumber", + Width = 0, + ListOrderNo = 17, + Visible = true, + IsActive = true, + AllowSearch = true, + ColumnCustomizationJson = DefaultColumnCustomizationJson, + PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), + PivotSettingsJson = DefaultPivotSettingsJson + }, new ListFormField - { - ListFormCode = listForm.ListFormCode, - CultureName = LanguageCodes.En, - SourceDbType = DbType.Int64, - FieldName = "FaxNumber", - CaptionName = "App.Listform.ListformField.FaxNumber", - Width = 0, - ListOrderNo = 18, - Visible = true, - IsActive = true, - AllowSearch = true, - EditorOptions = EditorOptionValues.PhoneEditorOptions, - ColumnCustomizationJson = DefaultColumnCustomizationJson, - PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), - PivotSettingsJson = DefaultPivotSettingsJson - }, + { + ListFormCode = listForm.ListFormCode, + CultureName = LanguageCodes.En, + SourceDbType = DbType.Int64, + FieldName = "FaxNumber", + EditGroupOrderNo = 1, + EditOrderNo = 8, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.PhoneEditorOptions, + CaptionName = "App.Listform.ListformField.FaxNumber", + Width = 0, + ListOrderNo = 18, + Visible = true, + IsActive = true, + AllowSearch = true, + ColumnCustomizationJson = DefaultColumnCustomizationJson, + PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), + PivotSettingsJson = DefaultPivotSettingsJson + }, new ListFormField - { - ListFormCode = listForm.ListFormCode, - CultureName = LanguageCodes.En, - SourceDbType = DbType.Boolean, - FieldName = "IsActive", - CaptionName = "App.Listform.ListformField.IsActive", - Width = 0, - ListOrderNo = 19, - Visible = true, - IsActive = true, - ColumnCustomizationJson = DefaultColumnCustomizationJson, - PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), - PivotSettingsJson = DefaultPivotSettingsJson - }, + { + ListFormCode = listForm.ListFormCode, + CultureName = LanguageCodes.En, + SourceDbType = DbType.Boolean, + FieldName = "IsActive", + EditGroupOrderNo = 1, + EditOrderNo = 12, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, + CaptionName = "App.Listform.ListformField.IsActive", + Width = 0, + ListOrderNo = 19, + Visible = true, + IsActive = true, + ColumnCustomizationJson = DefaultColumnCustomizationJson, + PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), + PivotSettingsJson = DefaultPivotSettingsJson + }, new ListFormField - { - ListFormCode = listForm.ListFormCode, - CultureName = LanguageCodes.En, - SourceDbType = DbType.String, - FieldName = "MenuGroup", - CaptionName = "App.Listform.ListformField.MenuGroup", - Width = 0, - ListOrderNo = 20, - Visible = true, - IsActive = true, - LookupJson = JsonSerializer.Serialize(new LookupDto { - DataSourceType = UiLookupDataSourceTypeEnum.Query, - DisplayExpr = "name", - ValueExpr = "key", - LookupQuery = LookupQueryValues.MenuGroupValues, - }), - ValidationRuleJson = DefaultValidationRuleRequiredJson, - ColumnCustomizationJson = DefaultColumnCustomizationJson, - PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), - PivotSettingsJson = DefaultPivotSettingsJson - }, + { + ListFormCode = listForm.ListFormCode, + CultureName = LanguageCodes.En, + SourceDbType = DbType.String, + FieldName = "MenuGroup", + EditGroupOrderNo = 1, + EditOrderNo = 9, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, + CaptionName = "App.Listform.ListformField.MenuGroup", + Width = 0, + ListOrderNo = 20, + Visible = true, + IsActive = true, + LookupJson = JsonSerializer.Serialize(new LookupDto { + DataSourceType = UiLookupDataSourceTypeEnum.Query, + DisplayExpr = "name", + ValueExpr = "key", + LookupQuery = LookupQueryValues.MenuGroupValues, + }), + ValidationRuleJson = DefaultValidationRuleRequiredJson, + ColumnCustomizationJson = DefaultColumnCustomizationJson, + PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), + PivotSettingsJson = DefaultPivotSettingsJson + }, ], autoSave: true); #endregion } @@ -583,32 +644,8 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency EditingOptionJson = DefaultEditingOptionJson(listFormName, 950, 750, true, true, true, true, false), EditingFormJson = JsonSerializer.Serialize(new List() { - new() { Order=1, ColCount=3, ColSpan=1, ItemType="group", Items = - [ - 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 }, - 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 = "PostalCode", ColSpan=1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order=10, DataField = "IsActive", ColSpan=1, EditorType2=EditorTypes.dxCheckBox }, - ] - }, - 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 = "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 }, - ] - } + new() { Order=1, ColCount=3, ColSpan=1, ItemType="group" }, + new() { Order=2, ColCount=3, ColSpan=1, ItemType="group" }, }), DeleteCommand = DefaultDeleteCommand(nameof(TableNameEnum.Branch)), DeleteFieldsDefaultValueJson = DefaultDeleteFieldsDefaultValueJson(), @@ -653,6 +690,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Guid, FieldName = "TenantId", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 3, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.TenantId", Width = 0, ListOrderNo = 1, @@ -674,6 +716,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Code", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Platform.Code", Width = 0, ListOrderNo = 2, @@ -691,6 +737,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Name", Width = 0, ListOrderNo = 3, @@ -709,6 +759,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Int64, FieldName = "VknTckn", + EditGroupOrderNo = 1, + EditOrderNo = 4, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.VknTckn", Width = 0, ListOrderNo = 4, @@ -726,6 +780,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "TaxOffice", + EditGroupOrderNo = 1, + EditOrderNo = 5, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.TaxOffice", Width = 0, ListOrderNo = 5, @@ -743,6 +801,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Country", + EditGroupOrderNo = 2, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.Country", Width = 0, ListOrderNo = 6, @@ -769,6 +832,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "City", + EditGroupOrderNo = 2, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.City", Width = 0, ListOrderNo = 7, @@ -798,6 +866,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "District", + EditGroupOrderNo = 2, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.District", Width = 0, ListOrderNo = 8, @@ -827,6 +900,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Township", + EditGroupOrderNo = 2, + EditOrderNo = 4, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.Township", Width = 0, ListOrderNo = 9, @@ -855,6 +933,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Address1", + EditGroupOrderNo = 2, + EditOrderNo = 7, + EditorType2 = EditorTypes.dxTextArea, + ColSpan = 3, CaptionName = "App.Listform.ListformField.Address1", Width = 0, ListOrderNo = 10, @@ -872,6 +954,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Address2", + EditGroupOrderNo = 2, + EditOrderNo = 8, + EditorType2 = EditorTypes.dxTextArea, + ColSpan = 3, CaptionName = "App.Listform.ListformField.Address2", Width = 0, ListOrderNo = 11, @@ -889,6 +975,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "PostalCode", + EditGroupOrderNo = 1, + EditOrderNo = 9, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.PostalCode", Width = 0, ListOrderNo = 12, @@ -906,6 +996,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Email", + EditGroupOrderNo = 2, + EditOrderNo = 5, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "Abp.Account.EmailAddress", Width = 0, ListOrderNo = 13, @@ -924,6 +1018,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Website", + EditGroupOrderNo = 2, + EditOrderNo = 6, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Website", Width = 0, ListOrderNo = 14, @@ -942,6 +1040,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "PhoneNumber", + EditGroupOrderNo = 1, + EditOrderNo = 7, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.PhoneEditorOptions, CaptionName = "Abp.Identity.User.UserInformation.PhoneNumber", Width = 0, ListOrderNo = 15, @@ -949,7 +1052,6 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency IsActive = true, AllowSearch = true, - EditorOptions = EditorOptionValues.PhoneEditorOptions, ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), @@ -961,6 +1063,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "MobileNumber", + EditGroupOrderNo = 1, + EditOrderNo = 6, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.PhoneEditorOptions, CaptionName = "App.Listform.ListformField.MobileNumber", Width = 0, ListOrderNo = 16, @@ -968,7 +1075,6 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency IsActive = true, AllowSearch = true, - EditorOptions = EditorOptionValues.PhoneEditorOptions, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson @@ -979,6 +1085,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Int64, FieldName = "FaxNumber", + EditGroupOrderNo = 1, + EditOrderNo = 8, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.PhoneEditorOptions, CaptionName = "App.Listform.ListformField.FaxNumber", Width = 0, ListOrderNo = 17, @@ -986,7 +1097,6 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency IsActive = true, AllowSearch = true, - EditorOptions = EditorOptionValues.PhoneEditorOptions, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson @@ -997,6 +1107,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "IsActive", + EditGroupOrderNo = 1, + EditOrderNo = 10, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.IsActive", Width = 0, ListOrderNo = 18, @@ -1057,13 +1171,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency 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 = [ - new EditingFormItemDto { Order=1, DataField="System", ColSpan=1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order=2, DataField="Group", ColSpan=1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order=3, DataField="Term", ColSpan=1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order=4, DataField="Url", ColSpan=1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order=5, DataField="Weight", ColSpan=1, EditorType2=EditorTypes.dxNumberBox, EditorOptions=EditorOptionValues.NumberStandartFormat() }, - ]} + new() { Order=1, ColCount=1, ColSpan=1, ItemType="group" }, }), FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { new() { FieldName = "System", FieldDbType = DbType.String, Value = "Platform", CustomValueType = FieldCustomValueTypeEnum.Value }, @@ -1094,6 +1202,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "System", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.System", Width = 0, ListOrderNo = 2, @@ -1110,6 +1222,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Group", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Group", Width = 0, ListOrderNo = 3, @@ -1126,6 +1242,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Term", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.Term", Width = 0, ListOrderNo = 4, @@ -1148,6 +1269,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Url", + EditGroupOrderNo = 1, + EditOrderNo = 4, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Url", Width = 0, ListOrderNo = 5, @@ -1164,6 +1289,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Single, FieldName = "Weight", + EditGroupOrderNo = 1, + EditOrderNo = 5, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.NumberStandartFormat(), CaptionName = "App.Listform.ListformField.Weight", Width = 0, ListOrderNo = 6, @@ -1225,13 +1355,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency EditingOptionJson = DefaultEditingOptionJson(listFormName, 500, 650, 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 }, - new EditingFormItemDto { Order=2, DataField="IsActive", ColSpan=1, EditorType2=EditorTypes.dxCheckBox }, - new EditingFormItemDto { Order=3, DataField="ApiUrl", ColSpan=2, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order=4, DataField="Tenants", ColSpan=2, EditorType2=EditorTypes.dxTagBox }, - new EditingFormItemDto { Order=5, DataField="Description", ColSpan=2, EditorType2=EditorTypes.dxHtmlEditor, EditorOptions=EditorOptionValues.HtmlEditorOptions }, - ]} + new() { Order=1, ColCount=2, ColSpan=1, ItemType="group" }, }), FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { @@ -1263,6 +1387,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Name", Width = 0, ListOrderNo = 2, @@ -1279,6 +1407,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "IsActive", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.IsActive", Width = 0, ListOrderNo = 3, @@ -1294,6 +1426,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "ApiUrl", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 2, CaptionName = "App.Listform.ListformField.ApiUrl", Width = 0, ListOrderNo = 4, @@ -1310,6 +1446,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Description", + EditGroupOrderNo = 1, + EditOrderNo = 5, + EditorType2 = EditorTypes.dxHtmlEditor, + ColSpan = 2, + EditorOptions = EditorOptionValues.HtmlEditorOptions, CaptionName = "App.Listform.ListformField.Description", Width = 0, ListOrderNo = 5, @@ -1327,6 +1468,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Tenants", + EditGroupOrderNo = 1, + EditOrderNo = 4, + EditorType2 = EditorTypes.dxTagBox, + ColSpan = 2, CaptionName = "App.Listform.ListformField.Tenants", Width = 0, ListOrderNo = 6, @@ -1390,20 +1535,14 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency EditingFormJson = JsonSerializer.Serialize(new List { new() { - Order = 1, ColCount = 1, ColSpan = 1, ItemType = "group", Items = - [ - new EditingFormItemDto { Order = 1, DataField = "Title", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 2, DataField = "Abbreviation", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox } - ] - } + Order = 1, ColCount = 1, ColSpan = 1, ItemType = "group" }, }), InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson(), }); #region ContactTitle Fields await _listFormFieldRepository.InsertManyAsync([ - new() - { + new() { ListFormCode = listForm.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.Guid, @@ -1424,14 +1563,16 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Title", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Title", Width = 0, ListOrderNo = 2, Visible = true, IsActive = true, - SortIndex = 1, - SortDirection = GridColumnOptions.SortOrderAsc, AllowSearch = true, ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, @@ -1444,6 +1585,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Abbreviation", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Abbreviation", Width = 0, ListOrderNo = 3, @@ -1504,14 +1649,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency 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 }, - new EditingFormItemDto { Order = 2, DataField = "Symbol", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 3, DataField = "Rate", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 4, DataField = "IsActive", ColSpan = 1, EditorType2 = EditorTypes.dxCheckBox } - ] - } + Order = 1, ColCount = 1, ColSpan = 1, ItemType = "group" }, }), FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { @@ -1542,6 +1680,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Symbol", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Symbol", Width = 0, ListOrderNo = 3, @@ -1559,6 +1701,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Name", Width = 0, ListOrderNo = 4, @@ -1576,6 +1722,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Decimal, FieldName = "Rate", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Rate", Alignment = "right", Width = 0, @@ -1595,6 +1745,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "IsActive", + EditGroupOrderNo = 1, + EditOrderNo = 4, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.IsActive", Width = 0, ListOrderNo = 6, @@ -1653,18 +1807,13 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency EditingFormJson = JsonSerializer.Serialize(new List { new() { - Order = 1, ColCount = 1, ColSpan = 1, ItemType = "group", Items = - [ - new EditingFormItemDto { Order = 1, ColSpan = 1, DataField = "Name", EditorType2 = EditorTypes.dxTextBox } - ] - } + Order = 1, ColCount = 1, ColSpan = 1, ItemType = "group" }, }), }); #region CountryGroup Fields await _listFormFieldRepository.InsertManyAsync([ - new() - { + new() { ListFormCode = listForm.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.String, @@ -1684,6 +1833,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Name", Width = 0, ListOrderNo = 2, @@ -1743,20 +1896,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency EditingFormJson = JsonSerializer.Serialize(new List { new() { - Order = 1, ColCount = 1, ColSpan = 1, ItemType = "group", Items = - [ - new EditingFormItemDto { Order = 2, DataField = "Name", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 3, DataField = "GroupName", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 4, DataField = "Currency", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 5, DataField = "PhoneCode", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 6, DataField = "PhoneNumberMinLength", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 7, DataField = "PhoneNumberMaxLength", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 8, DataField = "PhoneNumberFormat", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 9, DataField = "TaxLabel", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 10, DataField = "ZipRequired", ColSpan = 1, EditorType2 = EditorTypes.dxCheckBox }, - new EditingFormItemDto { Order = 11, DataField = "StateRequired", ColSpan = 1, EditorType2 = EditorTypes.dxCheckBox } - ] - } + Order = 1, ColCount = 1, ColSpan = 1, ItemType = "group" }, }), FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { new() { FieldName = "Currency", FieldDbType = DbType.String, Value = "TRY", CustomValueType = FieldCustomValueTypeEnum.Value }, @@ -1788,6 +1928,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Name", Width = 0, ListOrderNo = 3, @@ -1805,6 +1949,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "GroupName", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.GroupName", Width = 0, ListOrderNo = 4, @@ -1822,6 +1971,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Currency", + EditGroupOrderNo = 1, + EditOrderNo = 4, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.Currency", Width = 0, ListOrderNo = 5, @@ -1840,6 +1994,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Int32, FieldName = "PhoneCode", + EditGroupOrderNo = 1, + EditOrderNo = 5, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.PhoneCode", Width = 0, ListOrderNo = 6, @@ -1857,6 +2015,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Int32, FieldName = "PhoneNumberMinLength", + EditGroupOrderNo = 1, + EditOrderNo = 6, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.PhoneNumberMinLength", Width = 0, ListOrderNo = 7, @@ -1874,6 +2036,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Int32, FieldName = "PhoneNumberMaxLength", + EditGroupOrderNo = 1, + EditOrderNo = 7, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.PhoneNumberMaxLength", Width = 0, ListOrderNo = 8, @@ -1891,6 +2057,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "PhoneNumberFormat", + EditGroupOrderNo = 1, + EditOrderNo = 8, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.PhoneNumberFormat", Width = 0, ListOrderNo = 9, @@ -1908,6 +2078,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "TaxLabel", + EditGroupOrderNo = 1, + EditOrderNo = 9, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.TaxLabel", Width = 0, ListOrderNo = 10, @@ -1924,6 +2098,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "ZipRequired", + EditGroupOrderNo = 1, + EditOrderNo = 10, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.ZipRequired", Width = 0, ListOrderNo = 11, @@ -1939,6 +2117,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "StateRequired", + EditGroupOrderNo = 1, + EditOrderNo = 11, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.StateRequired", Width = 0, ListOrderNo = 12, @@ -1996,13 +2178,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency EditingFormJson = JsonSerializer.Serialize(new List { new() { - Order = 1, ColCount = 1, ColSpan = 1, ItemType = "group", Items = - [ - new EditingFormItemDto { Order = 1, DataField = "Country", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 2, DataField = "Name", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 4, DataField = "PlateCode", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox } - ] - } + Order = 1, ColCount = 1, ColSpan = 1, ItemType = "group" }, }), InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson(), FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { @@ -2033,6 +2209,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Country", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.Country", Width = 0, ListOrderNo = 2, @@ -2057,6 +2238,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Name", Width = 0, ListOrderNo = 3, @@ -2074,6 +2259,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "PlateCode", + EditGroupOrderNo = 1, + EditOrderNo = 4, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.PlateCode", Width = 0, ListOrderNo = 5, @@ -2132,15 +2321,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency EditingFormJson = JsonSerializer.Serialize(new List { new() { - Order = 1, ColCount = 1, 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 = "Name", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 4, DataField = "Township", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 5, DataField = "PostalCode", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - ] - } + Order = 1, ColCount = 1, ColSpan = 1, ItemType = "group" }, }), InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson(), FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { @@ -2171,6 +2352,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Country", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.Country", Width = 0, ListOrderNo = 2, @@ -2196,6 +2382,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "City", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.City", Width = 0, ListOrderNo = 3, @@ -2223,6 +2414,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Name", Width = 0, ListOrderNo = 4, @@ -2240,6 +2435,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Township", + EditGroupOrderNo = 1, + EditOrderNo = 4, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Township", Width = 0, ListOrderNo = 5, @@ -2257,6 +2456,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "PostalCode", + EditGroupOrderNo = 1, + EditOrderNo = 5, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.PostalCode", Width = 0, ListOrderNo = 6, @@ -2316,11 +2519,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency 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 } - ] - } + Order = 1, ColCount = 1, ColSpan = 1, ItemType = "group" }, }), SubFormsJson = JsonSerializer.Serialize(new List() { new { @@ -2340,8 +2539,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency #region UomCategory Fields await _listFormFieldRepository.InsertManyAsync([ - new() - { + new() { ListFormCode = listForm.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.String, @@ -2362,6 +2560,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Name", Width = 0, ListOrderNo = 2, @@ -2421,13 +2623,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency 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=[ - new EditingFormItemDto { Order = 1, DataField = "Name", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 2, DataField = "Type", ColSpan = 1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 3, DataField = "Ratio", ColSpan = 1, EditorType2=EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 4, DataField = "Rounding", ColSpan = 1, EditorType2=EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 5, DataField = "IsActive", ColSpan = 1, EditorType2=EditorTypes.dxCheckBox }, - ]} + Order=1, ColCount=1, ColSpan=1, ItemType="group" }, }), FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { new() { FieldName = "IsActive", FieldDbType = DbType.Boolean, Value = "true", CustomValueType = FieldCustomValueTypeEnum.Value } @@ -2449,7 +2645,6 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency Visible = false, IsActive = true, - SortIndex = 0, ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), @@ -2461,6 +2656,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Name", Width = 0, ListOrderNo = 2, @@ -2481,6 +2680,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Type", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.Type", Width = 0, ListOrderNo = 3, @@ -2509,6 +2713,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Decimal, FieldName = "Ratio", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Ratio", Alignment = "right", Width = 0, @@ -2529,6 +2737,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Decimal, FieldName = "Rounding", + EditGroupOrderNo = 1, + EditOrderNo = 4, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Rounding", Alignment = "right", Width = 0, @@ -2549,6 +2761,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "IsActive", + EditGroupOrderNo = 1, + EditOrderNo = 5, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.IsActive", Width = 0, ListOrderNo = 6, @@ -2623,19 +2839,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency 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 }, - new EditingFormItemDto { Order = 2, DataField = "IsActive", ColSpan = 1, EditorType2 = EditorTypes.dxCheckBox }, - new EditingFormItemDto { Order = 3, DataField = "Prefix", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 4, DataField = "Suffix", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 5, DataField = "PaddingSize", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 6, DataField = "IncrementStep", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 7, DataField = "ResetPeriod", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox, EditorOptions = EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 8, DataField = "StartNumber", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 9, DataField = "FormatTemplate", ColSpan = 2, EditorType2 = EditorTypes.dxTextBox }, - ] - } + Order = 1, ColCount = 2, ColSpan = 1, ItemType = "group" }, }), InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson(), FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { @@ -2672,6 +2876,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Name", Width = 0, ListOrderNo = 2, @@ -2692,6 +2900,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Prefix", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Prefix", Width = 0, ListOrderNo = 3, @@ -2709,6 +2921,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Suffix", + EditGroupOrderNo = 1, + EditOrderNo = 4, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Suffix", Width = 0, ListOrderNo = 4, @@ -2726,6 +2942,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "IsActive", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.IsActive", Width = 0, ListOrderNo = 5, @@ -2743,6 +2963,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Int32, FieldName = "PaddingSize", + EditGroupOrderNo = 1, + EditOrderNo = 5, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.PaddingSize", Width = 0, ListOrderNo = 6, @@ -2761,6 +2985,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Int32, FieldName = "IncrementStep", + EditGroupOrderNo = 1, + EditOrderNo = 6, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.IncrementStep", Width = 0, ListOrderNo = 7, @@ -2796,6 +3024,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Int32, FieldName = "ResetPeriod", + EditGroupOrderNo = 1, + EditOrderNo = 7, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.ResetPeriod", Width = 0, ListOrderNo = 9, @@ -2827,6 +3060,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Int32, FieldName = "StartNumber", + EditGroupOrderNo = 1, + EditOrderNo = 8, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.StartNumber", Width = 0, ListOrderNo = 10, @@ -2862,6 +3099,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "FormatTemplate", + EditGroupOrderNo = 1, + EditOrderNo = 9, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 2, CaptionName = "App.Listform.ListformField.FormatTemplate", Width = 0, ListOrderNo = 12, @@ -2921,11 +3162,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency 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 } - ] - } + Order = 1, ColCount = 1, ColSpan = 1, ItemType = "group" }, }), SubFormsJson = JsonSerializer.Serialize(new List() { new { @@ -2957,8 +3194,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency #region SkillType Fields await _listFormFieldRepository.InsertManyAsync([ - new() - { + new() { ListFormCode = listForm.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.String, @@ -2979,6 +3215,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Name", Width = 0, ListOrderNo = 2, @@ -3037,13 +3277,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson(DbType.String, "Name"), 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= - [ - new EditingFormItemDto { Order = 1, DataField = "Name", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 2, DataField = "Progress", ColSpan = 1, EditorType2=EditorTypes.dxSlider, EditorOptions=EditorOptionValues.SliderOptions }, - new EditingFormItemDto { Order = 3, DataField = "IsDefault", ColSpan = 1, EditorType2=EditorTypes.dxCheckBox }, - ] - } + new() { Order=1, ColCount=1, ColSpan=1, ItemType="group" }, }), FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { new() { FieldName = "IsDefault", FieldDbType = DbType.Boolean, Value = "true", CustomValueType = FieldCustomValueTypeEnum.Value } @@ -3075,6 +3309,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Name", Width = 0, ListOrderNo = 2, @@ -3094,6 +3332,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Int32, FieldName = "Progress", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxSlider, + ColSpan = 1, + EditorOptions = EditorOptionValues.SliderOptions, CaptionName = "App.Listform.ListformField.Progress", Width = 0, ListOrderNo = 3, @@ -3110,6 +3353,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "IsDefault", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.IsDefault", Width = 0, ListOrderNo = 4, @@ -3183,9 +3430,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson(DbType.String, "Name"), 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 }, - ]} + new() { Order=1, ColCount=1, ColSpan=1, ItemType="group" }, }), }, autoSave: true ); @@ -3214,6 +3459,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Name", Width = 0, ListOrderNo = 2, @@ -3289,22 +3538,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency PagerOptionJson = DefaultPagerOptionJson, EditingOptionJson = DefaultEditingOptionJson(listFormName, 800, 600, 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 = "MainGroupKey", ColSpan = 1, EditorType2=EditorTypes.dxAutocomplete, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 2, DataField = "SubGroupKey", ColSpan = 1, EditorType2=EditorTypes.dxAutocomplete, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 3, DataField = "Code", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 4, DataField = "NameKey", ColSpan = 1, EditorType2=EditorTypes.dxAutocomplete, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 5, DataField = "DescriptionKey", ColSpan = 1, EditorType2=EditorTypes.dxAutocomplete, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 6, DataField = "DefaultValue", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 7, DataField = "IsVisibleToClients", ColSpan = 1, EditorType2=EditorTypes.dxCheckBox }, - new EditingFormItemDto { Order = 8, DataField = "Providers", ColSpan = 1, EditorType2=EditorTypes.dxTagBox }, - new EditingFormItemDto { Order = 9, DataField = "IsInherited", ColSpan = 1, EditorType2=EditorTypes.dxCheckBox }, - new EditingFormItemDto { Order = 10, DataField = "IsEncrypted", ColSpan = 1, EditorType2=EditorTypes.dxCheckBox }, - new EditingFormItemDto { Order = 11, DataField = "RequiredPermissionName", ColSpan = 1, EditorType2=EditorTypes.dxAutocomplete, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 12, DataField = "DataType", ColSpan = 1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 13, DataField = "SelectOptions", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 14, DataField = "Order", ColSpan = 1, EditorType2=EditorTypes.dxNumberBox }, - ]} + new() { Order=1, ColCount=2, ColSpan=1, ItemType="group" }, }), InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson(), FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { @@ -3339,6 +3573,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Code", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Platform.Code", Width = 0, ListOrderNo = 4, @@ -3359,6 +3597,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "MainGroupKey", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxAutocomplete, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.MainGroupKey", Width = 0, ListOrderNo = 2, @@ -3384,6 +3627,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "SubGroupKey", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxAutocomplete, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.SubGroupKey", Width = 0, ListOrderNo = 3, @@ -3409,6 +3657,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Int32, FieldName = "Order", + EditGroupOrderNo = 1, + EditOrderNo = 14, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Order", Width = 0, ListOrderNo = 5, @@ -3426,6 +3678,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "NameKey", + EditGroupOrderNo = 1, + EditOrderNo = 4, + EditorType2 = EditorTypes.dxAutocomplete, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.NameKey", Width = 0, ListOrderNo = 6, @@ -3450,6 +3707,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "DescriptionKey", + EditGroupOrderNo = 1, + EditOrderNo = 5, + EditorType2 = EditorTypes.dxAutocomplete, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.DescriptionKey", Width = 0, ListOrderNo = 7, @@ -3474,6 +3736,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "RequiredPermissionName", + EditGroupOrderNo = 1, + EditOrderNo = 11, + EditorType2 = EditorTypes.dxAutocomplete, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.RequiredPermissionName", Width = 0, ListOrderNo = 8, @@ -3498,6 +3765,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Providers", + EditGroupOrderNo = 1, + EditOrderNo = 8, + EditorType2 = EditorTypes.dxTagBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Providers", Width = 0, ListOrderNo = 9, @@ -3528,6 +3799,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "DefaultValue", + EditGroupOrderNo = 1, + EditOrderNo = 6, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.DefaultValue", Width = 0, ListOrderNo = 10, @@ -3545,6 +3820,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "DataType", + EditGroupOrderNo = 1, + EditOrderNo = 12, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.DataType", Width = 0, ListOrderNo = 11, @@ -3576,6 +3856,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "SelectOptions", + EditGroupOrderNo = 1, + EditOrderNo = 13, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.SelectOptions", Width = 0, ListOrderNo = 12, @@ -3593,6 +3877,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "IsVisibleToClients", + EditGroupOrderNo = 1, + EditOrderNo = 7, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.IsVisibleToClients", Width = 0, ListOrderNo = 13, @@ -3609,6 +3897,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "IsInherited", + EditGroupOrderNo = 1, + EditOrderNo = 9, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.IsInherited", Width = 0, ListOrderNo = 14, @@ -3625,6 +3917,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "IsEncrypted", + EditGroupOrderNo = 1, + EditOrderNo = 10, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.IsEncrypted", Width = 0, ListOrderNo = 15, @@ -3679,12 +3975,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency EditingOptionJson = DefaultEditingOptionJson(listFormName, 600, 450, true, true, true, true, false, true), EditingFormJson = JsonSerializer.Serialize(new List() { new() { - Order=1, ColCount=2, ColSpan=1, ItemType="group", Items= [ - new EditingFormItemDto { Order = 1, DataField = "CultureName", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 2, DataField = "UiCultureName", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 3, DataField = "DisplayName", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 4, DataField = "IsEnabled", ColSpan = 1, EditorType2=EditorTypes.dxCheckBox }, - ]} + Order=1, ColCount=2, ColSpan=1, ItemType="group" }, }), FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { new() { FieldName = "IsEnabled", FieldDbType = DbType.Boolean, Value = "true", CustomValueType = FieldCustomValueTypeEnum.Value } @@ -3730,6 +4021,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "CultureName", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.CultureName", Width = 0, ListOrderNo = 2, @@ -3749,6 +4044,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "UiCultureName", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.UiCultureName", Width = 0, ListOrderNo = 3, @@ -3766,6 +4065,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "DisplayName", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.DisplayName", Width = 0, ListOrderNo = 4, @@ -3783,6 +4086,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "IsEnabled", + EditGroupOrderNo = 1, + EditOrderNo = 4, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.IsEnabled", Width = 0, ListOrderNo = 5, @@ -3835,14 +4142,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency PagerOptionJson = DefaultPagerOptionJson, EditingOptionJson = DefaultEditingOptionJson(listFormName, 600, 400, 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 = "CultureName", ColSpan = 1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 2, DataField = "ResourceName", ColSpan = 1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 3, DataField = "Key", ColSpan = 1, EditorType2=EditorTypes.dxAutocomplete, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 4, DataField = "Value", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - ] - }}), + new() { Order=1, ColCount=1, ColSpan=1, ItemType="group" },}), InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson(), CommandColumnJson = JsonSerializer.Serialize(new CommandColumnDto[] { new() { @@ -3884,6 +4184,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "CultureName", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.CultureName", Width = 0, ListOrderNo = 2, @@ -3903,6 +4208,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "ResourceName", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.ResourceName", Width = 0, ListOrderNo = 3, @@ -3931,6 +4241,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Key", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxAutocomplete, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.Key", Width = 0, ListOrderNo = 4, @@ -3955,6 +4270,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Value", + EditGroupOrderNo = 1, + EditOrderNo = 4, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Value", Width = 0, ListOrderNo = 5, @@ -4013,12 +4332,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency PagerOptionJson = DefaultPagerOptionJson, EditingOptionJson = DefaultEditingOptionJson(listFormName, 600, 500, 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 = "Code", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 2, DataField = "DataSourceType", ColSpan = 1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 3, DataField = "ConnectionString", ColSpan = 1, EditorType2=EditorTypes.dxTextArea, EditorOptions="{\"height\":200}" }, - ]} + new() { Order=1, ColCount=1, ColSpan=1, ItemType="group" }, }), InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson(), } @@ -4048,6 +4362,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Code", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Platform.Code", Width = 0, ListOrderNo = 2, @@ -4068,6 +4386,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Int32, FieldName = "DataSourceType", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.DataSourceType", Width = 0, ListOrderNo = 3, @@ -4093,6 +4416,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "ConnectionString", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxTextArea, + ColSpan = 1, + EditorOptions = "{\"height\":200}", CaptionName = "App.Listform.ListformField.ConnectionString", Width = 0, ListOrderNo = 5, @@ -4147,33 +4475,9 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency PagerOptionJson = DefaultPagerOptionJson, EditingOptionJson = DefaultEditingOptionJson(listFormName, 950, 650, true, true, true, true, false), EditingFormJson = JsonSerializer.Serialize(new List() { - new() { Order=1, ColCount=3, ColSpan=1, ItemType="group", Items=[ - new EditingFormItemDto { Order = 1, DataField = "CultureName", ColSpan = 1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 2, DataField = "Name", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 3, DataField = "ListFormCode", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 4, DataField = "ListFormType", ColSpan = 1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 5, DataField = "SelectCommandType", ColSpan = 1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 6, DataField = "SelectCommand", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 7, DataField = "TableName", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 8, DataField = "KeyFieldName", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 9, DataField = "KeyFieldDbSourceType", ColSpan = 1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 10, DataField = "Description", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 11, DataField = "Title", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 12, DataField = "SortMode", ColSpan = 1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 13, DataField = "DeleteServiceAddress", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 14, DataField = "InsertServiceAddress", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 15, DataField = "UpdateServiceAddress", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 16, DataField = "IsTenant", ColSpan = 1, EditorType2=EditorTypes.dxCheckBox }, - new EditingFormItemDto { Order = 17, DataField = "IsOrganizationUnit", ColSpan = 1, EditorType2=EditorTypes.dxCheckBox }, - new EditingFormItemDto { Order = 18, DataField = "IsSubForm", ColSpan = 1, EditorType2=EditorTypes.dxCheckBox }, - ]}, + new() { Order=1, ColCount=3, ColSpan=1, ItemType="group" }, new() { - Order=2,ColCount=2,ColSpan=1,ItemType="group", Items= [ - new EditingFormItemDto { Order = 1, DataField = "PermissionJson:C", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 2, DataField = "PermissionJson:R", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 3, DataField = "PermissionJson:U", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 4, DataField = "PermissionJson:D", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - ]} + Order=2,ColCount=2,ColSpan=1,ItemType="group" }, }), InsertFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { @@ -4220,6 +4524,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "CultureName", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.CultureName", Width = 0, ListOrderNo = 1, @@ -4239,6 +4548,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Name", Width = 0, ListOrderNo = 2, @@ -4256,6 +4569,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Description", + EditGroupOrderNo = 1, + EditOrderNo = 10, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Description", Width = 0, ListOrderNo = 3, @@ -4272,6 +4589,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "ListFormCode", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.ListFormCode", Width = 0, ListOrderNo = 4, @@ -4291,6 +4612,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "ListFormType", + EditGroupOrderNo = 1, + EditOrderNo = 4, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.ListFormType", Width = 0, ListOrderNo = 5, @@ -4318,6 +4644,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Int32, FieldName = "SelectCommandType", + EditGroupOrderNo = 1, + EditOrderNo = 5, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.SelectCommandType", Width = 0, ListOrderNo = 6, @@ -4347,6 +4678,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "SelectCommand", + EditGroupOrderNo = 1, + EditOrderNo = 6, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.SelectCommand", Width = 0, ListOrderNo = 7, @@ -4364,6 +4699,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "TableName", + EditGroupOrderNo = 1, + EditOrderNo = 7, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.TableName", Width = 0, ListOrderNo = 8, @@ -4380,6 +4719,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "KeyFieldName", + EditGroupOrderNo = 1, + EditOrderNo = 8, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.KeyFieldName", Width = 0, ListOrderNo = 9, @@ -4397,6 +4740,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Int32, FieldName = "KeyFieldDbSourceType", + EditGroupOrderNo = 1, + EditOrderNo = 9, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.KeyFieldDbSourceType", Width = 0, ListOrderNo = 10, @@ -4448,6 +4796,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Title", + EditGroupOrderNo = 1, + EditOrderNo = 11, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Title", Width = 0, ListOrderNo = 11, @@ -4464,6 +4816,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "SortMode", + EditGroupOrderNo = 1, + EditOrderNo = 12, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.SortMode", Width = 0, ListOrderNo = 12, @@ -4490,6 +4847,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "IsTenant", + EditGroupOrderNo = 1, + EditOrderNo = 16, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.IsTenant", Width = 0, ListOrderNo = 13, @@ -4506,6 +4867,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "IsOrganizationUnit", + EditGroupOrderNo = 1, + EditOrderNo = 17, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.IsOrganizationUnit", Width = 0, ListOrderNo = 14, @@ -4522,6 +4887,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "IsSubForm", + EditGroupOrderNo = 1, + EditOrderNo = 18, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.IsSubForm", Width = 0, ListOrderNo = 15, @@ -4554,6 +4923,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "DeleteServiceAddress", + EditGroupOrderNo = 1, + EditOrderNo = 13, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.DeleteServiceAddress", Width = 0, ListOrderNo = 17, @@ -4570,6 +4943,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "InsertServiceAddress", + EditGroupOrderNo = 1, + EditOrderNo = 14, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.InsertServiceAddress", Width = 0, ListOrderNo = 18, @@ -4586,6 +4963,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "UpdateServiceAddress", + EditGroupOrderNo = 1, + EditOrderNo = 15, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.UpdateServiceAddress", Width = 0, ListOrderNo = 19, @@ -4596,6 +4977,70 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson }, + new ListFormField + { + ListFormCode = listForm.ListFormCode, + CultureName = LanguageCodes.En, + SourceDbType = DbType.String, + FieldName = "PermissionJson:C", + CaptionName = "PermissionJson:C", + EditGroupOrderNo = 2, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, + Visible = false, + IsActive = false, + ListOrderNo = 20, + PermissionJson = DefaultFieldPermissionJson(listForm.Name), + }, + new ListFormField + { + ListFormCode = listForm.ListFormCode, + CultureName = LanguageCodes.En, + SourceDbType = DbType.String, + FieldName = "PermissionJson:R", + CaptionName = "PermissionJson:R", + EditGroupOrderNo = 2, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, + Visible = false, + IsActive = false, + ListOrderNo = 21, + PermissionJson = DefaultFieldPermissionJson(listForm.Name), + }, + new ListFormField + { + ListFormCode = listForm.ListFormCode, + CultureName = LanguageCodes.En, + SourceDbType = DbType.String, + FieldName = "PermissionJson:U", + CaptionName = "PermissionJson:U", + EditGroupOrderNo = 2, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, + Visible = false, + IsActive = false, + ListOrderNo = 22, + PermissionJson = DefaultFieldPermissionJson(listForm.Name), + }, + new ListFormField + { + ListFormCode = listForm.ListFormCode, + CultureName = LanguageCodes.En, + SourceDbType = DbType.String, + FieldName = "PermissionJson:D", + CaptionName = "PermissionJson:D", + EditGroupOrderNo = 2, + EditOrderNo = 4, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, + Visible = false, + IsActive = false, + ListOrderNo = 23, + PermissionJson = DefaultFieldPermissionJson(listForm.Name), + }, ]); #endregion } @@ -4644,18 +5089,13 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency EditingFormJson = JsonSerializer.Serialize(new List { new() { - Order = 1, ColCount = 1, ColSpan = 1, ItemType = "group", Items = - [ - new EditingFormItemDto { Order = 1, ColSpan = 1, DataField = "Name", EditorType2 = EditorTypes.dxTextBox } - ] - } + Order = 1, ColCount = 1, ColSpan = 1, ItemType = "group" }, }), }); #region Notification Type Fields await _listFormFieldRepository.InsertManyAsync([ - new() - { + new() { ListFormCode = listForm.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.Guid, @@ -4675,6 +5115,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Name", Width = 0, ListOrderNo = 2, @@ -4731,15 +5175,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency PagerOptionJson = DefaultPagerOptionJson, EditingOptionJson = DefaultEditingOptionJson(listFormName, 500, 550, 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 = "NotificationTypeId", ColSpan = 1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 2, DataField = "RecipientType", ColSpan = 1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 3, DataField = "Channel", ColSpan = 1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 4, DataField = "RecipientId", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 5, DataField = "IsActive", ColSpan = 1, EditorType2=EditorTypes.dxCheckBox }, - new EditingFormItemDto { Order = 6, DataField = "IsFixed", ColSpan = 1, EditorType2=EditorTypes.dxCheckBox }, - new EditingFormItemDto { Order = 7, DataField = "IsCustomized", ColSpan = 1, EditorType2=EditorTypes.dxCheckBox }, - ]} + new() { Order=1, ColCount=1, ColSpan=1, ItemType="group" }, }), InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson(), FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { @@ -4783,6 +5219,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Guid, FieldName = "NotificationTypeId", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.NotificationTypeId", Width = 0, ListOrderNo = 2, @@ -4801,6 +5242,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "RecipientType", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.RecipientType", Width = 0, ListOrderNo = 3, @@ -4830,6 +5276,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "RecipientId", + EditGroupOrderNo = 1, + EditOrderNo = 4, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.RecipientId", Width = 0, ListOrderNo = 4, @@ -4847,6 +5297,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Channel", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.Channel", Width = 0, ListOrderNo = 5, @@ -4881,6 +5336,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "IsActive", + EditGroupOrderNo = 1, + EditOrderNo = 5, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.IsActive", Width = 0, ListOrderNo = 6, @@ -4897,6 +5356,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "IsFixed", + EditGroupOrderNo = 1, + EditOrderNo = 6, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.IsFixed", Width = 0, ListOrderNo = 7, @@ -4913,6 +5376,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "IsCustomized", + EditGroupOrderNo = 1, + EditOrderNo = 7, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.IsCustomized", Width = 0, ListOrderNo = 8, @@ -4923,6 +5390,67 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson }, + new() { + ListFormCode = listForm.ListFormCode, + CultureName = LanguageCodes.En, + SourceDbType = DbType.String, + FieldName = "Options:MailType", + CaptionName = "Options:MailType", + EditGroupOrderNo = 2, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, + Visible = false, + IsActive = false, + ListOrderNo = 9, + PermissionJson = DefaultFieldPermissionJson(listForm.Name), + }, + new() { + ListFormCode = listForm.ListFormCode, + CultureName = LanguageCodes.En, + SourceDbType = DbType.String, + FieldName = "Options:MailSubject", + CaptionName = "Options:MailSubject", + EditGroupOrderNo = 2, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, + Visible = false, + IsActive = false, + ListOrderNo = 10, + PermissionJson = DefaultFieldPermissionJson(listForm.Name), + }, + new() { + ListFormCode = listForm.ListFormCode, + CultureName = LanguageCodes.En, + SourceDbType = DbType.String, + FieldName = "Options:MailTemplate", + CaptionName = "Options:MailTemplate", + EditGroupOrderNo = 2, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxHtmlEditor, + ColSpan = 2, + EditorOptions = EditorOptionValues.HtmlEditorOptions, + Visible = false, + IsActive = false, + ListOrderNo = 11, + PermissionJson = DefaultFieldPermissionJson(listForm.Name), + }, + new() { + ListFormCode = listForm.ListFormCode, + CultureName = LanguageCodes.En, + SourceDbType = DbType.String, + FieldName = "Options:TableName", + CaptionName = "Options:TableName", + EditGroupOrderNo = 2, + EditOrderNo = 4, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 2, + Visible = false, + IsActive = false, + ListOrderNo = 12, + PermissionJson = DefaultFieldPermissionJson(listForm.Name), + }, ]); #endregion } @@ -5025,6 +5553,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Guid, FieldName = "NotificationTypeId", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.NotificationTypeId", Width = 0, ListOrderNo = 4, @@ -5198,21 +5731,8 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency PagerOptionJson = DefaultPagerOptionJson, 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 }, - new EditingFormItemDto { Order = 2, DataField = "Cron", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 3, DataField = "WorkerType", ColSpan = 1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 4, DataField = "IsActive", ColSpan = 1, EditorType2=EditorTypes.dxCheckBox }, - new EditingFormItemDto { Order = 5, DataField = "BeforeSp", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 6, DataField = "AfterSp", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - ] - }, - new() { Order=2,ColCount=2,ColSpan=1,ItemType="group",Items= [ - new EditingFormItemDto { Order = 1, DataField = "Options:MailType", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 2, DataField = "Options:MailSubject", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 3, DataField = "Options:MailTemplate", ColSpan = 2, EditorType2=EditorTypes.dxHtmlEditor, EditorOptions=EditorOptionValues.HtmlEditorOptions }, - new EditingFormItemDto { Order = 4, DataField = "Options:TableName", ColSpan = 2, EditorType2=EditorTypes.dxTextBox }, - ]} + new() { Order=1, ColCount=2, ColSpan=1, ItemType="group" }, + new() { Order=2, ColCount=2, ColSpan=1, ItemType="group" }, }), InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson(), FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { @@ -5243,6 +5763,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Name", Width = 0, ListOrderNo = 2, @@ -5262,6 +5786,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Cron", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Cron", Width = 0, ListOrderNo = 3, @@ -5279,6 +5807,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Int32, FieldName = "WorkerType", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.WorkerType", Width = 0, ListOrderNo = 4, @@ -5307,6 +5840,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "BeforeSp", + EditGroupOrderNo = 1, + EditOrderNo = 5, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.BeforeSp", Width = 0, ListOrderNo = 5, @@ -5323,6 +5860,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "AfterSp", + EditGroupOrderNo = 1, + EditOrderNo = 6, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.AfterSp", Width = 0, ListOrderNo = 6, @@ -5355,6 +5896,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "IsActive", + EditGroupOrderNo = 1, + EditOrderNo = 4, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.IsActive", Width = 0, ListOrderNo = 8, @@ -5587,16 +6132,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency EditingFormJson = JsonSerializer.Serialize(new List { new() { - Order = 1, ColCount = 1, ColSpan = 1, ItemType = "group", Items = - [ - new EditingFormItemDto { Order = 1, DataField = "Key", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 2, DataField = "Path", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 3, DataField = "ComponentType", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, - new EditingFormItemDto { Order = 4, DataField = "ComponentPath", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 5, DataField = "RouteType", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 6, DataField = "Authority", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton } - ] - } + Order = 1, ColCount = 1, ColSpan = 1, ItemType = "group" }, }), InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson(), FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { @@ -5627,6 +6163,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Key", + EditGroupOrderNo = 2, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Key", Width = 0, ListOrderNo = 2, @@ -5644,6 +6184,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Path", + EditGroupOrderNo = 2, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Path", Width = 0, ListOrderNo = 3, @@ -5661,6 +6205,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "ComponentType", + EditGroupOrderNo = 2, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.ComponentType", Width = 0, ListOrderNo = 5, @@ -5688,6 +6236,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "ComponentPath", + EditGroupOrderNo = 2, + EditOrderNo = 4, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.ComponentPath", Width = 0, ListOrderNo = 5, @@ -5705,6 +6257,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "RouteType", + EditGroupOrderNo = 2, + EditOrderNo = 5, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.RouteType", Width = 0, ListOrderNo = 6, @@ -5733,6 +6290,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Authority", + EditGroupOrderNo = 2, + EditOrderNo = 6, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.Authority", Width = 0, ListOrderNo = 7, @@ -5793,19 +6355,14 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency 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 = - [ - new EditingFormItemDto { Order = 1, DataField = "Name", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - ] - } + new() { Order = 1, ColCount = 1, ColSpan = 1, ItemType = "group" }, }), InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson(DbType.String, "Name"), }); #region MenuGroup Fields await _listFormFieldRepository.InsertManyAsync([ - new() - { + new() { ListFormCode = listForm.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.String, @@ -5827,6 +6384,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Name", Width = 0, ListOrderNo = 2, @@ -5882,21 +6443,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency TreeOptionJson = DefaultTreeOptionJson("Code", "ParentCode", true), EditingOptionJson = DefaultEditingOptionJson(listFormName, 800, 550, 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 = "Code", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 2, DataField = "DisplayName", ColSpan = 1, EditorType2=EditorTypes.dxAutocomplete, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 3, DataField = "Order", ColSpan = 1, EditorType2=EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 4, DataField = "Url", ColSpan = 1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 5, DataField = "Icon", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 6, DataField = "ParentCode", ColSpan = 1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 7, DataField = "CssClass", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 8, DataField = "RequiredPermissionName", ColSpan = 1, EditorType2=EditorTypes.dxAutocomplete, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 9, DataField = "Target", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 10, DataField = "IsDisabled", ColSpan = 1, EditorType2=EditorTypes.dxCheckBox }, - new EditingFormItemDto { Order = 11, DataField = "ElementId", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 12, DataField = "ShortName", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - ]} + new() { Order=1, ColCount=2, ColSpan=1, ItemType="group" }, }), InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson(DbType.String, "Code"), FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { @@ -5929,6 +6476,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Code", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Platform.Code", Width = 0, ListOrderNo = 2, @@ -5949,6 +6500,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "DisplayName", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxAutocomplete, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.DisplayName", Width = 0, ListOrderNo = 3, @@ -5973,6 +6529,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Int32, FieldName = "Order", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Order", Width = 0, ListOrderNo = 4, @@ -5990,6 +6550,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Url", + EditGroupOrderNo = 1, + EditOrderNo = 4, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.Path", Width = 0, ListOrderNo = 5, @@ -6013,6 +6578,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Icon", + EditGroupOrderNo = 1, + EditOrderNo = 5, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Icon", Width = 0, ListOrderNo = 6, @@ -6031,6 +6600,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "ParentCode", + EditGroupOrderNo = 1, + EditOrderNo = 6, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.ParentCode", Width = 0, ListOrderNo = 7, @@ -6054,6 +6628,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "CssClass", + EditGroupOrderNo = 1, + EditOrderNo = 7, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.CssClass", Width = 0, ListOrderNo = 9, @@ -6071,6 +6649,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "RequiredPermissionName", + EditGroupOrderNo = 1, + EditOrderNo = 8, + EditorType2 = EditorTypes.dxAutocomplete, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.RequiredPermissionName", Width = 0, ListOrderNo = 8, @@ -6094,6 +6677,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Target", + EditGroupOrderNo = 1, + EditOrderNo = 9, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Target", Width = 0, ListOrderNo = 10, @@ -6111,6 +6698,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "IsDisabled", + EditGroupOrderNo = 1, + EditOrderNo = 10, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.IsDisabled", Width = 0, ListOrderNo = 11, @@ -6127,6 +6718,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "ElementId", + EditGroupOrderNo = 1, + EditOrderNo = 11, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.ElementId", Width = 0, ListOrderNo = 12, @@ -6144,6 +6739,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "ShortName", + EditGroupOrderNo = 1, + EditOrderNo = 12, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.ShortName", Width = 0, ListOrderNo = 13, @@ -6201,16 +6800,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency PagerOptionJson = DefaultPagerOptionJson, EditingOptionJson = DefaultEditingOptionJson(listFormName, 900, 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 }, - 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 = 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}" }, - ]} + new() { Order=1, ColCount=2, ColSpan=1, ItemType="group" }, }), InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson(), CommandColumnJson = JsonSerializer.Serialize(new CommandColumnDto[] { @@ -6249,6 +6839,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Name", Width = 0, ListOrderNo = 2, @@ -6266,6 +6860,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Description", + EditGroupOrderNo = 1, + EditOrderNo = 8, + EditorType2 = EditorTypes.dxTextArea, + ColSpan = 2, + EditorOptions = "{\"height\":100}", CaptionName = "App.Listform.ListformField.Description", Width = 0, ListOrderNo = 3, @@ -6282,6 +6881,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Url", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Url", Width = 0, ListOrderNo = 4, @@ -6299,6 +6902,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Method", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.Method", Width = 0, ListOrderNo = 5, @@ -6328,6 +6936,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "DataSourceCode", + EditGroupOrderNo = 1, + EditOrderNo = 4, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.DataSourceCode", Width = 0, ListOrderNo = 6, @@ -6346,6 +6959,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Sql", + EditGroupOrderNo = 1, + EditOrderNo = 5, + EditorType2 = EditorTypes.dxTextArea, + ColSpan = 2, + EditorOptions = "{ \"height\" : 60 }", CaptionName = "App.Listform.ListformField.Sql", Width = 0, ListOrderNo = 7, @@ -6362,6 +6980,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "ParametersJson", + EditGroupOrderNo = 1, + EditOrderNo = 6, + EditorType2 = EditorTypes.dxTextArea, + ColSpan = 2, + EditorOptions = "{ \"height\" : 60 }", CaptionName = "App.Listform.ListformField.ParametersJson", Width = 0, ListOrderNo = 8, @@ -6378,6 +7001,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "PermissionsJson", + EditGroupOrderNo = 1, + EditOrderNo = 7, + EditorType2 = EditorTypes.dxTextArea, + ColSpan = 2, + EditorOptions = "{ \"height\" : 60 }", CaptionName = "App.Listform.ListformField.PermissionsJson", Width = 0, ListOrderNo = 9, @@ -6435,19 +7063,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency 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 = - [ - new EditingFormItemDto { Order = 1, DataField = "Name", ColSpan = 1, EditorType2 = EditorTypes.dxAutocomplete, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 2, DataField = "Description", ColSpan = 1, EditorType2 = EditorTypes.dxAutocomplete, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 3, DataField = "Category", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 4, DataField = "Order", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 5, DataField = "MonthlyPrice", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox, EditorOptions=EditorOptionValues.NumberStandartFormat() }, - new EditingFormItemDto { Order = 6, DataField = "YearlyPrice", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox, EditorOptions=EditorOptionValues.NumberStandartFormat() }, - new EditingFormItemDto { Order = 7, DataField = "VatRate", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox, EditorOptions=EditorOptionValues.NumberStandartFormat() }, - new EditingFormItemDto { Order = 8, DataField = "IsQuantityBased", ColSpan = 1, EditorType2 = EditorTypes.dxCheckBox }, - new EditingFormItemDto { Order = 9, DataField = "ImageUrl", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - ] - } + new() { Order = 1, ColCount = 1, ColSpan = 1, ItemType = "group" }, }), InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson(), FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { @@ -6480,6 +7096,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxAutocomplete, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.Name", Width = 0, ListOrderNo = 2, @@ -6505,6 +7126,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Description", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxAutocomplete, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.Description", Width = 0, ListOrderNo = 3, @@ -6529,6 +7155,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Category", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.Category", Width = 0, ListOrderNo = 4, @@ -6558,6 +7189,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Int32, FieldName = "Order", + EditGroupOrderNo = 1, + EditOrderNo = 4, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Order", Alignment = "center", Width = 0, @@ -6578,6 +7213,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Decimal, FieldName = "MonthlyPrice", + EditGroupOrderNo = 1, + EditOrderNo = 5, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.NumberStandartFormat(), CaptionName = "App.Listform.ListformField.MonthlyPrice", Alignment = "right", Width = 0, @@ -6590,7 +7230,6 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson, - EditorOptions=EditorOptionValues.NumberStandartFormat() }, new() { @@ -6598,6 +7237,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Decimal, FieldName = "YearlyPrice", + EditGroupOrderNo = 1, + EditOrderNo = 6, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.NumberStandartFormat(), CaptionName = "App.Listform.ListformField.YearlyPrice", Alignment = "right", Width = 0, @@ -6610,7 +7254,6 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson, - EditorOptions=EditorOptionValues.NumberStandartFormat() }, new() { @@ -6618,6 +7261,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Decimal, FieldName = "VatRate", + EditGroupOrderNo = 1, + EditOrderNo = 7, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.NumberStandartFormat(), CaptionName = "App.Listform.ListformField.VatRate", Alignment = "right", Width = 0, @@ -6630,7 +7278,6 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson, - EditorOptions=EditorOptionValues.NumberStandartFormat() }, new() { @@ -6638,6 +7285,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "IsQuantityBased", + EditGroupOrderNo = 1, + EditOrderNo = 8, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.IsQuantityBased", Width = 0, ListOrderNo = 9, @@ -6655,6 +7306,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "ImageUrl", + EditGroupOrderNo = 1, + EditOrderNo = 9, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.ImageUrl", Width = 0, ListOrderNo = 10, @@ -6710,13 +7365,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency EditingOptionJson = DefaultEditingOptionJson(listFormName, 500, 350, 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 }, - new EditingFormItemDto { Order = 2, DataField = "Commission", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox, EditorOptions=EditorOptionValues.NumberStandartFormat() }, - new EditingFormItemDto { Order = 3, DataField = "Logo", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - ] - } + new() { Order = 1, ColCount = 1, ColSpan = 1, ItemType = "group" }, }), DeleteCommand = DefaultDeleteCommand(nameof(TableNameEnum.PaymentMethod)), DeleteFieldsDefaultValueJson = DefaultDeleteFieldsDefaultValueJson(), @@ -6751,6 +7400,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Name", Width = 0, ListOrderNo = 2, @@ -6769,6 +7422,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Decimal, FieldName = "Commission", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.NumberStandartFormat(), CaptionName = "App.Listform.ListformField.Commission", Alignment = "right", Width = 0, @@ -6781,7 +7439,6 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson, - EditorOptions=EditorOptionValues.NumberStandartFormat() }, new() { @@ -6789,6 +7446,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Logo", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Logo", Width = 0, ListOrderNo = 4, @@ -6845,13 +7506,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency EditingOptionJson = DefaultEditingOptionJson(listFormName, 500, 350, 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 = "Installment", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 2, DataField = "Name", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 3, DataField = "Commission", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox, EditorOptions=EditorOptionValues.NumberStandartFormat() }, - ] - } + new() { Order = 1, ColCount = 1, ColSpan = 1, ItemType = "group" }, }), DeleteCommand = DefaultDeleteCommand(nameof(TableNameEnum.InstallmentOption)), DeleteFieldsDefaultValueJson = DefaultDeleteFieldsDefaultValueJson(), @@ -6886,6 +7541,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Installment", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Installment", Width = 0, ListOrderNo = 2, @@ -6904,6 +7563,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Name", Width = 0, ListOrderNo = 3, @@ -6922,6 +7585,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Decimal, FieldName = "Commission", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.NumberStandartFormat(), CaptionName = "App.Listform.ListformField.Commission", Alignment = "right", Width = 0, @@ -6934,7 +7602,6 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson, - EditorOptions=EditorOptionValues.NumberStandartFormat() }, ]); #endregion @@ -6995,42 +7662,8 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency }), EditingFormJson = JsonSerializer.Serialize(new List { - new() { Order=1, ColCount=4, ColSpan=1, ItemType="group", Items = - [ - new EditingFormItemDto { Order = 1, DataField = "TenantId", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 2, DataField = "IsExisting", ColSpan = 1, EditorType2 = EditorTypes.dxCheckBox }, - new EditingFormItemDto { Order = 3, DataField = "OrganizationName", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 4, DataField = "Founder", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 5, DataField = "VknTckn", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 6, DataField = "TaxOffice", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 7, DataField = "Address1", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 8, DataField = "Address2", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 9, DataField = "Country", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 10, DataField = "City", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 11, DataField = "District", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 12, DataField = "Township", ColSpan=1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton, EditorScript = PlatformConsts.EditorScriptValues.SourceFieldItemWritetoDestination("Township", "Group", "PostalCode") }, - new EditingFormItemDto { Order = 13, DataField = "PostalCode", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 14, DataField = "PhoneNumber", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, - new EditingFormItemDto { Order = 15, DataField = "MobileNumber", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, - new EditingFormItemDto { Order = 16, DataField = "FaxNumber", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, - ] - }, - new() { Order=2, ColCount=4, ColSpan=1, ItemType="group", Items = - [ - new EditingFormItemDto { Order = 1, DataField = "PaymentMethodId", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 2, DataField = "Installment", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 3, DataField = "LicenseStartTime", ColSpan = 1, EditorType2 = EditorTypes.dxDateBox }, - new EditingFormItemDto { Order = 4, DataField = "BillingCycle", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 5, DataField = "Period", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 6, DataField = "LicenseEndTime", ColSpan = 1, EditorType2 = EditorTypes.dxDateBox }, - 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 = 9, DataField = "Subtotal", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox, EditorOptions=EditorOptionValues.NumberStandartFormat() }, - new EditingFormItemDto { Order = 10, DataField = "VatTotal", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox, EditorOptions=EditorOptionValues.NumberStandartFormat() }, - new EditingFormItemDto { Order = 11, DataField = "Commission", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox, EditorOptions=EditorOptionValues.NumberStandartFormat() }, - new EditingFormItemDto { Order = 12, DataField = "Total", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox, EditorOptions=EditorOptionValues.NumberStandartFormat() }, - ] - } + new() { Order=1, ColCount=4, ColSpan=1, ItemType="group" }, + new() { Order=2, ColCount=4, ColSpan=1, ItemType="group" }, }), InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson(), FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { @@ -7099,6 +7732,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Guid, FieldName = "TenantId", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.TenantId", Width = 0, ListOrderNo = 2, @@ -7121,6 +7759,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "OrganizationName", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.OrganizationName", Width = 0, ListOrderNo = 3, @@ -7139,6 +7781,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Founder", + EditGroupOrderNo = 1, + EditOrderNo = 4, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Founder", Width = 0, ListOrderNo = 4, @@ -7157,6 +7803,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "IsExisting", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.IsExisting", Width = 0, ListOrderNo = 5, @@ -7174,6 +7824,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "BillingCycle", + EditGroupOrderNo = 2, + EditOrderNo = 4, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.BillingCycle", Width = 0, ListOrderNo = 6, @@ -7200,6 +7855,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Int32, FieldName = "Period", + EditGroupOrderNo = 2, + EditOrderNo = 5, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Period", Width = 0, ListOrderNo = 7, @@ -7217,6 +7876,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.DateTime, FieldName = "LicenseStartTime", + EditGroupOrderNo = 2, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxDateBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.LicenseStartTime", Width = 0, ListOrderNo = 8, @@ -7234,6 +7897,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.DateTime, FieldName = "LicenseEndTime", + EditGroupOrderNo = 2, + EditOrderNo = 6, + EditorType2 = EditorTypes.dxDateBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.LicenseEndTime", Width = 0, ListOrderNo = 9, @@ -7251,6 +7918,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Int64, FieldName = "VknTckn", + EditGroupOrderNo = 1, + EditOrderNo = 5, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.VknTckn", Width = 0, ListOrderNo = 10, @@ -7269,6 +7940,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "TaxOffice", + EditGroupOrderNo = 1, + EditOrderNo = 6, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.TaxOffice", Width = 0, ListOrderNo = 11, @@ -7287,6 +7962,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Address1", + EditGroupOrderNo = 1, + EditOrderNo = 7, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Address1", Width = 0, ListOrderNo = 12, @@ -7305,6 +7984,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Address2", + EditGroupOrderNo = 1, + EditOrderNo = 8, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Address2", Width = 0, ListOrderNo = 13, @@ -7322,6 +8005,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Country", + EditGroupOrderNo = 1, + EditOrderNo = 9, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.Country", Width = 0, ListOrderNo = 14, @@ -7348,6 +8036,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "City", + EditGroupOrderNo = 1, + EditOrderNo = 10, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.City", Width = 0, ListOrderNo = 15, @@ -7377,6 +8070,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "District", + EditGroupOrderNo = 1, + EditOrderNo = 11, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.District", Width = 0, ListOrderNo = 16, @@ -7406,6 +8104,12 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Township", + EditGroupOrderNo = 1, + EditOrderNo = 12, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, + EditorScript = PlatformConsts.EditorScriptValues.SourceFieldItemWritetoDestination("Township", "Group", "PostalCode"), CaptionName = "App.Listform.ListformField.Township", Width = 0, ListOrderNo = 17, @@ -7433,6 +8137,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "PhoneNumber", + EditGroupOrderNo = 1, + EditOrderNo = 14, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.PhoneEditorOptions, CaptionName = "Abp.Identity.User.UserInformation.PhoneNumber", Width = 0, ListOrderNo = 18, @@ -7440,7 +8149,6 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency IsActive = true, AllowSearch = true, - EditorOptions = EditorOptionValues.PhoneEditorOptions, ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), @@ -7452,6 +8160,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "MobileNumber", + EditGroupOrderNo = 1, + EditOrderNo = 15, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.PhoneEditorOptions, CaptionName = "App.Listform.ListformField.MobileNumber", Width = 0, ListOrderNo = 19, @@ -7459,7 +8172,6 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency IsActive = true, AllowSearch = true, - EditorOptions = EditorOptionValues.PhoneEditorOptions, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson, @@ -7470,6 +8182,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Int64, FieldName = "FaxNumber", + EditGroupOrderNo = 1, + EditOrderNo = 16, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.PhoneEditorOptions, CaptionName = "App.Listform.ListformField.FaxNumber", Width = 0, ListOrderNo = 20, @@ -7477,7 +8194,6 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency IsActive = true, AllowSearch = true, - EditorOptions = EditorOptionValues.PhoneEditorOptions, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson, @@ -7488,6 +8204,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Website", + EditGroupOrderNo = 2, + EditOrderNo = 8, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Website", Width = 0, ListOrderNo = 21, @@ -7506,6 +8226,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Decimal, FieldName = "Subtotal", + EditGroupOrderNo = 2, + EditOrderNo = 9, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.NumberStandartFormat(), CaptionName = "App.Listform.ListformField.Subtotal", Alignment = "right", Width = 0, @@ -7518,7 +8243,6 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson, - EditorOptions=EditorOptionValues.NumberStandartFormat() }, new() { @@ -7526,6 +8250,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Decimal, FieldName = "VatTotal", + EditGroupOrderNo = 2, + EditOrderNo = 10, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.NumberStandartFormat(), CaptionName = "App.Listform.ListformField.VatTotal", Alignment = "right", Width = 0, @@ -7538,7 +8267,6 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson, - EditorOptions=EditorOptionValues.NumberStandartFormat() }, new() { @@ -7546,6 +8274,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Decimal, FieldName = "Commission", + EditGroupOrderNo = 2, + EditOrderNo = 11, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.NumberStandartFormat(), CaptionName = "App.Listform.ListformField.Commission", Alignment = "right", Width = 0, @@ -7558,7 +8291,6 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson, - EditorOptions=EditorOptionValues.NumberStandartFormat() }, new() { @@ -7566,6 +8298,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Decimal, FieldName = "Total", + EditGroupOrderNo = 2, + EditOrderNo = 12, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.NumberStandartFormat(), CaptionName = "App.Listform.ListformField.Total", Alignment = "right", Width = 0, @@ -7578,7 +8315,6 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson, - EditorOptions=EditorOptionValues.NumberStandartFormat() }, new() { @@ -7586,6 +8322,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "PaymentMethodId", + EditGroupOrderNo = 2, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.PaymentMethodId", Width = 0, ListOrderNo = 26, @@ -7605,6 +8346,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Int32, FieldName = "Installment", + EditGroupOrderNo = 2, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.Installment", Width = 0, ListOrderNo = 27, @@ -7643,6 +8389,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "PostalCode", + EditGroupOrderNo = 1, + EditOrderNo = 13, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.PostalCode", Width = 0, ListOrderNo = 29, @@ -7661,6 +8411,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Email", + EditGroupOrderNo = 2, + EditOrderNo = 7, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Email", Width = 0, ListOrderNo = 30, @@ -7788,16 +8542,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency EditingOptionJson = DefaultEditingOptionJson(listFormName, 600, 450, true, true, true, false, false), EditingFormJson = JsonSerializer.Serialize(new List() { new() { - Order=1, ColCount=1, ColSpan=1, ItemType="group", Items=[ - new EditingFormItemDto { Order = 1, DataField = "ProductId", ColSpan = 1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 2, DataField = "BillingCycle", ColSpan = 1, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 3, DataField = "Quantity", ColSpan = 1, EditorType2=EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 4, DataField = "Price", ColSpan = 1, EditorType2=EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 5, DataField = "Period", ColSpan = 1, EditorType2=EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 6, DataField = "VatRate", ColSpan = 1, EditorType2=EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 7, DataField = "VatAmount", ColSpan = 1, EditorType2=EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 8, DataField = "TotalPrice", ColSpan = 1, EditorType2=EditorTypes.dxNumberBox }, - ]} + Order=1, ColCount=1, ColSpan=1, ItemType="group" }, }), }, autoSave: true ); @@ -7828,6 +8573,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Guid, FieldName = "ProductId", + EditGroupOrderNo = 2, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.ProductId", Width = 0, ListOrderNo = 2, @@ -7852,6 +8602,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "BillingCycle", + EditGroupOrderNo = 2, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.BillingCycle", Width = 0, ListOrderNo = 3, @@ -7879,6 +8634,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Int32, FieldName = "Quantity", + EditGroupOrderNo = 2, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Quantity", Alignment = "right", Width = 0, @@ -7899,6 +8658,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Decimal, FieldName = "Price", + EditGroupOrderNo = 2, + EditOrderNo = 4, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Price", Alignment = "right", Width = 0, @@ -7919,6 +8682,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Int32, FieldName = "Period", + EditGroupOrderNo = 2, + EditOrderNo = 5, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Period", Alignment = "right", Width = 0, @@ -7939,6 +8706,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Decimal, FieldName = "VatRate", + EditGroupOrderNo = 2, + EditOrderNo = 6, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.VatRate", Alignment = "right", Width = 0, @@ -7959,6 +8730,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Decimal, FieldName = "VatAmount", + EditGroupOrderNo = 2, + EditOrderNo = 7, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.VatAmount", Alignment = "right", Width = 0, @@ -7980,6 +8755,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Decimal, FieldName = "TotalPrice", + EditGroupOrderNo = 2, + EditOrderNo = 8, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.TotalPrice", Alignment = "right", Width = 0, @@ -7995,8 +8774,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency EditorOptions=EditorOptionValues.NumberStandartFormat(), TotalSummaryJson = DefaultColumnTotalSummaryJson("TotalPrice") }, - new() - { + new() { ListFormCode = listForm.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.Guid, @@ -8058,16 +8836,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency 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 = - [ - new EditingFormItemDto { Order = 1, DataField = "Name", ColSpan = 1, EditorType2 = EditorTypes.dxAutocomplete, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 2, DataField = "Slug", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 3, DataField = "Description", ColSpan = 1, EditorType2 = EditorTypes.dxAutocomplete, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 4, DataField = "Icon", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 5, DataField = "DisplayOrder", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 6, DataField = "IsActive", ColSpan = 1, EditorType2 = EditorTypes.dxCheckBox } - ] - } + new() { Order = 1, ColCount = 1, ColSpan = 1, ItemType = "group" }, }), InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson(), FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { @@ -8099,6 +8868,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxAutocomplete, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.Name", Width = 0, ListOrderNo = 2, @@ -8124,6 +8898,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Slug", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Slug", Width = 0, ListOrderNo = 3, @@ -8142,6 +8920,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Description", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxAutocomplete, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.Description", Width = 0, ListOrderNo = 4, @@ -8167,6 +8950,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Icon", + EditGroupOrderNo = 1, + EditOrderNo = 4, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Icon", Width = 0, ListOrderNo = 5, @@ -8184,6 +8971,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "DisplayOrder", + EditGroupOrderNo = 1, + EditOrderNo = 5, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.DisplayOrder", Width = 0, ListOrderNo = 6, @@ -8202,6 +8993,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "IsActive", + EditGroupOrderNo = 1, + EditOrderNo = 6, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.IsActive", Width = 0, ListOrderNo = 7, @@ -8259,24 +9054,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency EditingOptionJson = DefaultEditingOptionJson(listFormName, 1000, 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 = "Title", ColSpan = 1, EditorType2 = EditorTypes.dxAutocomplete, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 2, DataField = "Slug", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 3, DataField = "Summary", ColSpan = 1, EditorType2 = EditorTypes.dxAutocomplete, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 4, DataField = "CoverImage", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 5, DataField = "ReadTime", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 6, DataField = "CategoryId", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 7, DataField = "Author", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 8, DataField = "ViewCount", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox, EditorOptions=EditorOptionValues.NumberStandartFormat() }, - new EditingFormItemDto { Order = 9, DataField = "LikeCount", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox, EditorOptions=EditorOptionValues.NumberStandartFormat() }, - new EditingFormItemDto { Order = 10, DataField = "CommentCount", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox, EditorOptions=EditorOptionValues.NumberStandartFormat() }, - new EditingFormItemDto { Order = 11, DataField = "IsPublished", ColSpan = 1, EditorType2 = EditorTypes.dxCheckBox }, - new EditingFormItemDto { Order = 12, DataField = "PublishedAt", ColSpan = 1, EditorType2 = EditorTypes.dxDateBox }, - new EditingFormItemDto { Order = 13, DataField = "ContentTr", ColSpan = 2, EditorType2 = EditorTypes.dxHtmlEditor, EditorOptions=EditorOptionValues.HtmlEditorOptions }, - new EditingFormItemDto { Order = 14, DataField = "ContentEn", ColSpan = 2, EditorType2 = EditorTypes.dxHtmlEditor, EditorOptions=EditorOptionValues.HtmlEditorOptions } - ] - } + new() { Order = 1, ColCount = 2, ColSpan = 1, ItemType = "group" }, }), InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson(), FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { @@ -8312,6 +9090,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Title", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxAutocomplete, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.Title", Width = 0, ListOrderNo = 2, @@ -8337,6 +9120,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Slug", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Slug", Width = 0, ListOrderNo = 3, @@ -8355,6 +9142,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Summary", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxAutocomplete, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.Summary", Width = 0, ListOrderNo = 4, @@ -8380,6 +9172,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "CoverImage", + EditGroupOrderNo = 1, + EditOrderNo = 4, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.CoverImage", Width = 0, ListOrderNo = 5, @@ -8398,6 +9194,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.DateTime, FieldName = "ReadTime", + EditGroupOrderNo = 1, + EditOrderNo = 5, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.ReadTime", Width = 0, ListOrderNo = 6, @@ -8416,6 +9216,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Guid, FieldName = "CategoryId", + EditGroupOrderNo = 1, + EditOrderNo = 6, + EditorType2 = EditorTypes.dxSelectBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.ShowClearButton, CaptionName = "App.Listform.ListformField.CategoryId", Width = 0, ListOrderNo = 7, @@ -8435,6 +9240,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Author", + EditGroupOrderNo = 1, + EditOrderNo = 7, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Author", Width = 0, ListOrderNo = 8, @@ -8453,6 +9262,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Int32, FieldName = "ViewCount", + EditGroupOrderNo = 1, + EditOrderNo = 8, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.NumberStandartFormat(), CaptionName = "App.Listform.ListformField.ViewCount", Width = 0, ListOrderNo = 9, @@ -8470,6 +9284,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Int32, FieldName = "LikeCount", + EditGroupOrderNo = 1, + EditOrderNo = 9, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.NumberStandartFormat(), CaptionName = "App.Listform.ListformField.LikeCount", Width = 0, ListOrderNo = 10, @@ -8487,6 +9306,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Int32, FieldName = "CommentCount", + EditGroupOrderNo = 1, + EditOrderNo = 10, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.NumberStandartFormat(), CaptionName = "App.Listform.ListformField.CommentCount", Width = 0, ListOrderNo = 11, @@ -8504,6 +9328,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, FieldName = "IsPublished", + EditGroupOrderNo = 1, + EditOrderNo = 11, + EditorType2 = EditorTypes.dxCheckBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.IsPublished", Width = 0, ListOrderNo = 12, @@ -8521,6 +9349,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.DateTime, FieldName = "PublishedAt", + EditGroupOrderNo = 1, + EditOrderNo = 12, + EditorType2 = EditorTypes.dxDateBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.PublishedAt", Width = 0, ListOrderNo = 13, @@ -8538,6 +9370,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "ContentTr", + EditGroupOrderNo = 1, + EditOrderNo = 13, + EditorType2 = EditorTypes.dxHtmlEditor, + ColSpan = 2, + EditorOptions = EditorOptionValues.HtmlEditorOptions, CaptionName = "App.Listform.ListformField.ContentTr", Width = 0, ListOrderNo = 14, @@ -8556,6 +9393,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "ContentEn", + EditGroupOrderNo = 1, + EditOrderNo = 14, + EditorType2 = EditorTypes.dxHtmlEditor, + ColSpan = 2, + EditorOptions = EditorOptionValues.HtmlEditorOptions, CaptionName = "App.Listform.ListformField.ContentEn", Width = 0, ListOrderNo = 15, @@ -8613,18 +9455,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency EditingFormJson = JsonSerializer.Serialize(new List { new() { - Order = 1, ColCount = 1, ColSpan = 1, ItemType = "group", Items = - [ - 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 = "Email", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 4, DataField = "PhoneNumber", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, - new EditingFormItemDto { Order = 5, DataField = "Address", ColSpan = 1, EditorType2 = EditorTypes.dxTextArea }, - new EditingFormItemDto { Order = 6, DataField = "NumberOfBranches", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 7, DataField = "NumberOfUsers", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 8, DataField = "Message", ColSpan = 1, EditorType2 = EditorTypes.dxTextArea }, - ] - } + Order = 1, ColCount = 1, ColSpan = 1, ItemType = "group" }, }), DeleteCommand = DefaultDeleteCommand(nameof(TableNameEnum.Demo)), DeleteFieldsDefaultValueJson = DefaultDeleteFieldsDefaultValueJson(), @@ -8660,6 +9491,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "OrganizationName", + EditGroupOrderNo = 1, + EditOrderNo = 1, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.OrganizationName", Width = 0, ListOrderNo = 2, @@ -8678,6 +9513,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", + EditGroupOrderNo = 1, + EditOrderNo = 2, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Name", Width = 0, ListOrderNo = 3, @@ -8696,6 +9535,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Email", + EditGroupOrderNo = 1, + EditOrderNo = 3, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, CaptionName = "Abp.Account.EmailAddress", Width = 0, ListOrderNo = 4, @@ -8714,6 +9557,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "PhoneNumber", + EditGroupOrderNo = 1, + EditOrderNo = 4, + EditorType2 = EditorTypes.dxTextBox, + ColSpan = 1, + EditorOptions = EditorOptionValues.PhoneEditorOptions, CaptionName = "Abp.Identity.User.UserInformation.PhoneNumber", Width = 0, ListOrderNo = 5, @@ -8722,7 +9570,6 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency AllowSearch = true, ValidationRuleJson = DefaultValidationRuleRequiredJson, - EditorOptions = EditorOptionValues.PhoneEditorOptions, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson, @@ -8733,6 +9580,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Address", + EditGroupOrderNo = 1, + EditOrderNo = 5, + EditorType2 = EditorTypes.dxTextArea, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Address", Width = 0, ListOrderNo = 6, @@ -8751,6 +9602,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Int32, FieldName = "NumberOfBranches", + EditGroupOrderNo = 1, + EditOrderNo = 6, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.NumberOfBranches", Width = 0, ListOrderNo = 7, @@ -8769,6 +9624,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Int32, FieldName = "NumberOfUsers", + EditGroupOrderNo = 1, + EditOrderNo = 7, + EditorType2 = EditorTypes.dxNumberBox, + ColSpan = 1, CaptionName = "App.Listform.ListformField.NumberOfUsers", Width = 0, ListOrderNo = 8, @@ -8787,6 +9646,10 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Message", + EditGroupOrderNo = 1, + EditOrderNo = 8, + EditorType2 = EditorTypes.dxTextArea, + ColSpan = 1, CaptionName = "App.Listform.ListformField.Message", Width = 0, ListOrderNo = 9, diff --git a/api/src/Sozsoft.Platform.DbMigrator/Seeds/SqlData/Adm_D_Todos.sql b/api/src/Sozsoft.Platform.DbMigrator/Seeds/SqlData/Adm_D_Todos.sql deleted file mode 100644 index 8ca4581..0000000 --- a/api/src/Sozsoft.Platform.DbMigrator/Seeds/SqlData/Adm_D_Todos.sql +++ /dev/null @@ -1,21 +0,0 @@ -IF OBJECT_ID(N'[dbo].[Adm_D_Todos]', 'U') IS NULL -BEGIN - CREATE TABLE [dbo].[Adm_D_Todos] - ( - [Id] uniqueidentifier NOT NULL DEFAULT NEWID(), - [Title] nvarchar(300) NOT NULL, - [Status] nvarchar(50) NOT NULL DEFAULT N'Inbox', - [Description] nvarchar(MAX) NULL, - [DueDate] datetime2 NULL, - [Tags] nvarchar(500) NULL, - [Assignees] nvarchar(500) NULL, - [Priority] nvarchar(50) NULL, - [Completed] bit NOT NULL DEFAULT 0, - [SortOrder] int NOT NULL DEFAULT 0, - CONSTRAINT [PK_Table] PRIMARY KEY NONCLUSTERED - ( - [Id] ASC - )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY] - ) ON [PRIMARY] -END -GO \ No newline at end of file diff --git a/api/src/Sozsoft.Platform.DbMigrator/Seeds/WizardData/202607161522_Todos.json b/api/src/Sozsoft.Platform.DbMigrator/Seeds/WizardData/202607161522_Todos.json deleted file mode 100644 index 03275b7..0000000 --- a/api/src/Sozsoft.Platform.DbMigrator/Seeds/WizardData/202607161522_Todos.json +++ /dev/null @@ -1,278 +0,0 @@ -{ - "Wizard": { - "WizardName": "Todos", - "ListFormCode": "App.Wizard.Todos", - "MenuCode": "App.Wizard.Todos", - "IsTenant": false, - "IsBranch": false, - "IsOrganizationUnit": false, - "AllowAdding": true, - "AllowUpdating": true, - "AllowDeleting": true, - "AllowDetail": false, - "ConfirmDelete": true, - "DefaultLayout": "grid", - "Grid": true, - "Card": true, - "Pivot": true, - "Tree": true, - "Chart": true, - "Gantt": true, - "Scheduler": true, - "Todo": true, - "LanguageTextMenuEn": "Todos", - "LanguageTextMenuTr": "Todos", - "LanguageTextTitleEn": "Todos", - "LanguageTextTitleTr": "Todos", - "LanguageTextDescEn": "Todos", - "LanguageTextDescTr": "Todos", - "LanguageTextMenuParentEn": "", - "LanguageTextMenuParentTr": "", - "PermissionGroupName": "App.Administration", - "MenuParentCode": "App.Administration", - "MenuParentIcon": "FcOrganization", - "MenuIcon": "FcAndroidOs", - "DataSourceCode": "Default", - "DataSourceConnectionString": "", - "SelectCommandType": 1, - "SelectCommand": "Adm_D_Todos", - "KeyFieldName": "Id", - "KeyFieldDbSourceType": 9, - "TreeKeyExpr": "", - "TreeParentIdExpr": "", - "TreeAutoExpandAll": false, - "GanttKeyExpr": "", - "GanttParentIdExpr": "", - "GanttAutoExpandAll": false, - "GanttTitleExpr": "", - "GanttStartExpr": "", - "GanttEndExpr": "", - "GanttProgressExpr": "", - "SchedulerTextExpr": "", - "SchedulerStartDateExpr": "", - "SchedulerEndDateExpr": "", - "TodoTitleExpr": "Title", - "TodoStatusExpr": "Status", - "TodoDescriptionExpr": "Description", - "TodoDueDateExpr": "DueDate", - "TodoTagExpr": "Tags", - "TodoAssigneeExpr": "Assignees", - "TodoPriorityExpr": "Priority", - "TodoCompletedExpr": "Completed", - "TodoOrderExpr": "SortOrder", - "TodoStatusOrder": "Inbox, Today, This Week, This Month, Later, Done", - "TodoAllowDragging": true, - "ApprovalUserFieldName": "", - "ApprovalDateFieldName": "", - "ApprovalStatusFieldName": "", - "ApprovalDescriptionFieldName": "", - "ApprovalIsFilterUserName": false, - "Criteria": [], - "Groups": [ - { - "Caption": "", - "ColCount": 1, - "Items": [ - { - "DataField": "Id", - "CaptionName": "App.Listform.ListformField.Id", - "EditorType": "dxTextBox", - "EditorOptions": "", - "EditorScript": "", - "ColSpan": 1, - "IsRequired": true, - "IncludeInEditingForm": true, - "DbSourceType": 9, - "TurkishCaption": "Id", - "EnglishCaption": "Id", - "LookupDataSourceType": 1, - "ValueExpr": "Key", - "DisplayExpr": "Name", - "LookupQuery": "" - }, - { - "DataField": "Title", - "CaptionName": "App.Listform.ListformField.Title", - "EditorType": "dxTextBox", - "EditorOptions": "", - "EditorScript": "", - "ColSpan": 1, - "IsRequired": true, - "IncludeInEditingForm": true, - "DbSourceType": 16, - "TurkishCaption": "Title", - "EnglishCaption": "Title", - "LookupDataSourceType": 1, - "ValueExpr": "Key", - "DisplayExpr": "Name", - "LookupQuery": "" - }, - { - "DataField": "Status", - "CaptionName": "App.Listform.ListformField.Status", - "EditorType": "dxTextBox", - "EditorOptions": "", - "EditorScript": "", - "ColSpan": 1, - "IsRequired": true, - "IncludeInEditingForm": false, - "DbSourceType": 16, - "TurkishCaption": "Status", - "EnglishCaption": "Status", - "LookupDataSourceType": 1, - "ValueExpr": "Key", - "DisplayExpr": "Name", - "LookupQuery": "" - }, - { - "DataField": "Description", - "CaptionName": "App.Listform.ListformField.Description", - "EditorType": "dxTextBox", - "EditorOptions": "", - "EditorScript": "", - "ColSpan": 1, - "IsRequired": false, - "IncludeInEditingForm": false, - "DbSourceType": 16, - "TurkishCaption": "Description", - "EnglishCaption": "Description", - "LookupDataSourceType": 1, - "ValueExpr": "Key", - "DisplayExpr": "Name", - "LookupQuery": "" - }, - { - "DataField": "DueDate", - "CaptionName": "App.Listform.ListformField.DueDate", - "EditorType": "dxDateBox", - "EditorOptions": "", - "EditorScript": "", - "ColSpan": 1, - "IsRequired": false, - "IncludeInEditingForm": false, - "DbSourceType": 6, - "TurkishCaption": "Due Date", - "EnglishCaption": "Due Date", - "LookupDataSourceType": 1, - "ValueExpr": "Key", - "DisplayExpr": "Name", - "LookupQuery": "" - }, - { - "DataField": "Tags", - "CaptionName": "App.Listform.ListformField.Tags", - "EditorType": "dxTextBox", - "EditorOptions": "", - "EditorScript": "", - "ColSpan": 1, - "IsRequired": false, - "IncludeInEditingForm": false, - "DbSourceType": 16, - "TurkishCaption": "Tags", - "EnglishCaption": "Tags", - "LookupDataSourceType": 1, - "ValueExpr": "Key", - "DisplayExpr": "Name", - "LookupQuery": "" - }, - { - "DataField": "Assignees", - "CaptionName": "App.Listform.ListformField.Assignees", - "EditorType": "dxTextBox", - "EditorOptions": "", - "EditorScript": "", - "ColSpan": 1, - "IsRequired": false, - "IncludeInEditingForm": false, - "DbSourceType": 16, - "TurkishCaption": "Assignees", - "EnglishCaption": "Assignees", - "LookupDataSourceType": 1, - "ValueExpr": "Key", - "DisplayExpr": "Name", - "LookupQuery": "" - }, - { - "DataField": "Priority", - "CaptionName": "App.Listform.ListformField.Priority", - "EditorType": "dxTextBox", - "EditorOptions": "", - "EditorScript": "", - "ColSpan": 1, - "IsRequired": false, - "IncludeInEditingForm": false, - "DbSourceType": 16, - "TurkishCaption": "Priority", - "EnglishCaption": "Priority", - "LookupDataSourceType": 1, - "ValueExpr": "Key", - "DisplayExpr": "Name", - "LookupQuery": "" - }, - { - "DataField": "Completed", - "CaptionName": "App.Listform.ListformField.Completed", - "EditorType": "dxCheckBox", - "EditorOptions": "", - "EditorScript": "", - "ColSpan": 1, - "IsRequired": true, - "IncludeInEditingForm": false, - "DbSourceType": 3, - "TurkishCaption": "Completed", - "EnglishCaption": "Completed", - "LookupDataSourceType": 1, - "ValueExpr": "Key", - "DisplayExpr": "Name", - "LookupQuery": "" - }, - { - "DataField": "SortOrder", - "CaptionName": "App.Listform.ListformField.SortOrder", - "EditorType": "dxNumberBox", - "EditorOptions": "", - "EditorScript": "", - "ColSpan": 1, - "IsRequired": true, - "IncludeInEditingForm": false, - "DbSourceType": 11, - "TurkishCaption": "Sort Order", - "EnglishCaption": "Sort Order", - "LookupDataSourceType": 1, - "ValueExpr": "Key", - "DisplayExpr": "Name", - "LookupQuery": "" - } - ] - } - ], - "SubForms": [], - "Widgets": [] - }, - "IsDeletedField": false, - "IsCreatedField": false, - "InsertedRecords": { - "LanguageKeys": [ - "App.Wizard.Todos", - "App.Wizard.Todos.Title", - "App.Wizard.Todos.Desc", - "App.Listform.ListformField.Assignees", - "App.Listform.ListformField.Completed", - "App.Listform.ListformField.SortOrder" - ], - "PermissionGroupNames": [], - "PermissionNames": [ - "App.Wizard.Todos", - "App.Wizard.Todos.Create", - "App.Wizard.Todos.Update", - "App.Wizard.Todos.Delete", - "App.Wizard.Todos.Export", - "App.Wizard.Todos.Import", - "App.Wizard.Todos.Note" - ], - "MenuCodes": [ - "App.Wizard.Todos" - ], - "DataSourceCodes": [] - } -} \ No newline at end of file diff --git a/api/src/Sozsoft.Platform.DbMigrator/Seeds/WizardDataSeeder.cs b/api/src/Sozsoft.Platform.DbMigrator/Seeds/WizardDataSeeder.cs index 414d792..5d61b8a 100644 --- a/api/src/Sozsoft.Platform.DbMigrator/Seeds/WizardDataSeeder.cs +++ b/api/src/Sozsoft.Platform.DbMigrator/Seeds/WizardDataSeeder.cs @@ -302,21 +302,9 @@ public class WizardDataSeeder : IDataSeedContributor, ITransientDependency Caption = g.Caption, ColCount = g.ColCount, ColSpan = g.ColCount, - ItemType = "group", - Items = g.Items - .Where(i => i.IncludeInEditingForm && i.DataField != input.KeyFieldName) - .Select((it, ii) => new EditingFormItemDto - { - Order = ii + 1, - DataField = it.DataField, - EditorType2 = it.EditorType, - ColSpan = it.ColSpan, - EditorOptions = string.IsNullOrWhiteSpace(it.EditorOptions) ? null : it.EditorOptions, - EditorScript = string.IsNullOrWhiteSpace(it.EditorScript) ? null : it.EditorScript, - }) - .ToArray() + ItemType = "group" }) - .Where(g => g.Items.Length > 0) + .Where((_, index) => input.Groups[index].Items.Any(i => i.IncludeInEditingForm && i.FieldName != input.KeyFieldName)) .ToList(); // ListForm - varsa sil, yeniden ekle @@ -341,8 +329,8 @@ public class WizardDataSeeder : IDataSeedContributor, ITransientDependency // EditingForm'da required olan alanları tespit et, ValidationRuleJson eklemek için var editingFormFieldNames = input.Groups .SelectMany(g => g.Items) - .Where(i => i.IncludeInEditingForm && i.DataField != input.KeyFieldName) - .Select(i => new { FieldName = i.DataField, Isrequired = i.IsRequired }) + .Where(i => i.IncludeInEditingForm && i.FieldName != input.KeyFieldName) + .Select(i => new { FieldName = i.FieldName, Isrequired = i.IsRequired }) .ToList(); // Heigth ve Width hesaplama @@ -350,7 +338,7 @@ public class WizardDataSeeder : IDataSeedContributor, ITransientDependency .Select(g => { var items = g.Items - .Where(i => i.IncludeInEditingForm && i.DataField != input.KeyFieldName) + .Where(i => i.IncludeInEditingForm && i.FieldName != input.KeyFieldName) .ToList(); var columnCount = g.ColCount; @@ -454,21 +442,34 @@ public class WizardDataSeeder : IDataSeedContributor, ITransientDependency // ListFormFields var fieldOrder = 0; + var editGroupOrder = 0; foreach (var group in input.Groups) { + editGroupOrder++; + var editOrder = 0; foreach (var item in group.Items) { fieldOrder++; + if (item.IncludeInEditingForm && item.FieldName != input.KeyFieldName) + { + editOrder++; + } await _repoListFormField.InsertAsync(new ListFormField { ListFormCode = input.ListFormCode, - FieldName = item.DataField, + FieldName = item.FieldName, CaptionName = item.CaptionName, - Visible = item.DataField != input.KeyFieldName, + Visible = item.FieldName != input.KeyFieldName, IsActive = true, Width = 0, //Fit columns için hepsine sıfır veriyorum. AllowSearch = true, ListOrderNo = fieldOrder, + EditGroupOrderNo = item.IncludeInEditingForm ? editGroupOrder : null, + EditOrderNo = item.IncludeInEditingForm && item.FieldName != input.KeyFieldName ? editOrder : null, + EditorType2 = item.IncludeInEditingForm ? item.EditorType : null, + ColSpan = item.IncludeInEditingForm ? item.ColSpan : null, + EditorOptions = string.IsNullOrWhiteSpace(item.EditorOptions) ? null : item.EditorOptions, + EditorScript = string.IsNullOrWhiteSpace(item.EditorScript) ? null : item.EditorScript, SourceDbType = item.DbSourceType, CultureName = PlatformConsts.DefaultLanguage, PermissionJson = WizardConsts.DefaultFieldPermissionJson(code), @@ -478,7 +479,7 @@ public class WizardDataSeeder : IDataSeedContributor, ITransientDependency LookupJson = !string.IsNullOrWhiteSpace(item.LookupQuery) ? WizardConsts.DefaultLookupJson(item.LookupDataSourceType, item.DisplayExpr, item.ValueExpr, item.LookupQuery) : null, - ValidationRuleJson = editingFormFieldNames.Any(f => f.FieldName == item.DataField && f.Isrequired) + ValidationRuleJson = editingFormFieldNames.Any(f => f.FieldName == item.FieldName && f.Isrequired) ? WizardConsts.DefaultValidationRuleRequiredJson : null }, autoSave: true); diff --git a/api/src/Sozsoft.Platform.Domain.Shared/PlatformConsts.cs b/api/src/Sozsoft.Platform.Domain.Shared/PlatformConsts.cs index 79ce919..083ba29 100644 --- a/api/src/Sozsoft.Platform.Domain.Shared/PlatformConsts.cs +++ b/api/src/Sozsoft.Platform.Domain.Shared/PlatformConsts.cs @@ -758,6 +758,7 @@ public static class PlatformConsts public const string dxDateBox = "dxDateBox"; public const string dxDateRangeBox = "dxDateRangeBox"; public const string dxDropDownBox = "dxDropDownBox"; + public const string dxGridBox = "dxGridBox"; public const string dxHtmlEditor = "dxHtmlEditor"; public const string dxLookup = "dxHtmlEdidxLookuptor"; public const string dxNumberBox = "dxNumberBox"; 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 9509f24..b56fd52 100644 --- a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/ListForm/ListFormField.cs +++ b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/ListForm/ListFormField.cs @@ -53,7 +53,13 @@ public class ListFormField : Entity public string Alignment { get; set; } = "left"; // Sütunun Sağa, sola veya ortalama gösterimi public string Format { get; set; } // Cell bazında sütunun formatlanması - public string EditorOptions { get; set; } //Sütunun ekstra özellikleri yönetilmesi + + public int? EditOrderNo { get; set; } + public int? EditGroupOrderNo { get; set; } + public string EditorType2 { get; set; } + public int? ColSpan { get; set; } + public string EditorScript { get; set; } //Sütunun ekstra javascript ile yönetilmesi + public string EditorOptions { get; set; } //Sütunun ekstra özellikleri yönetilmesi } diff --git a/api/src/Sozsoft.Platform.Domain/Queries/EditingForm.cs b/api/src/Sozsoft.Platform.Domain/Queries/EditingForm.cs deleted file mode 100644 index d96b902..0000000 --- a/api/src/Sozsoft.Platform.Domain/Queries/EditingForm.cs +++ /dev/null @@ -1,58 +0,0 @@ -using System.Collections.Generic; -using System.Text.Json.Serialization; -using Volo.Abp.Domain.Values; - -namespace Sozsoft.Platform.Queries; - -// public class EditingForm : ValueObject -// { -// public int Order { get; set; } -// public string ItemType { get; set; } -// public string Caption { get; set; } -// public int ColCount { get; set; } -// public int ColSpan { get; set; } -// /// Type: Array -// /// Bu kisma suan sadece string olarak doldurulacak -// /// items: ['FirstName', 'LastName', -// /// { dataField: 'Notes', editorType: 'dxTextArea', colSpan: 2, editorOptions: { height: 100, }, } -// /// ], -// /// -// //[TextArea] -// //public string[] Items { get; set; } -// public EditingFormItem[] Items { get; set; } - -// protected override IEnumerable GetAtomicValues() -// { -// yield return ItemType; -// yield return Caption; -// yield return ColCount; -// yield return ColSpan; -// yield return Items; -// } -// } - -// public class EditingFormItem : ValueObject -// { -// [JsonPropertyName("order")] -// public int Order { get; set; } -// [JsonPropertyName("dataField")] -// public string DataField { get; set; } -// [JsonPropertyName("editorType2")] -// public string EditorType2 { get; set; } -// [JsonPropertyName("colSpan")] -// public int ColSpan { get; set; } -// [JsonPropertyName("editorOptions")] -// public string EditorOptions { get; set; } -// [JsonPropertyName("isRequired")] -// public bool IsRequired { get; set; } - -// protected override IEnumerable GetAtomicValues() -// { -// yield return DataField; -// yield return EditorType2; -// yield return ColSpan; -// yield return EditorOptions; -// yield return IsRequired; -// } -// } - diff --git a/api/src/Sozsoft.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs b/api/src/Sozsoft.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs index 0f05c53..b3176ed 100644 --- a/api/src/Sozsoft.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs +++ b/api/src/Sozsoft.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs @@ -455,6 +455,8 @@ public class PlatformDbContext : b.Property(a => a.Alignment).HasMaxLength(20).HasDefaultValue("left"); b.Property(a => a.Format).HasMaxLength(128); b.Property(a => a.EditorOptions).HasColumnType("text"); + b.Property(a => a.EditorType2).HasMaxLength(64); + b.Property(a => a.EditorScript).HasColumnType("text"); b.HasIndex(x => new { x.ListFormCode, x.UserId, x.RoleId, x.CultureName, x.FieldName }).IsUnique().HasFilter(null); }); diff --git a/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260716120523_Initial.Designer.cs b/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260717065637_Initial.Designer.cs similarity index 99% rename from api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260716120523_Initial.Designer.cs rename to api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260717065637_Initial.Designer.cs index d828e90..270bc25 100644 --- a/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260716120523_Initial.Designer.cs +++ b/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260717065637_Initial.Designer.cs @@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore; namespace Sozsoft.Platform.Migrations { [DbContext(typeof(PlatformDbContext))] - [Migration("20260716120523_Initial")] + [Migration("20260717065637_Initial")] partial class Initial { /// @@ -3415,6 +3415,9 @@ namespace Sozsoft.Platform.Migrations .HasMaxLength(256) .HasColumnType("nvarchar(256)"); + b.Property("ColSpan") + .HasColumnType("int"); + b.Property("ColumnCssClass") .HasMaxLength(128) .HasColumnType("nvarchar(128)"); @@ -3440,9 +3443,22 @@ namespace Sozsoft.Platform.Migrations .HasMaxLength(10) .HasColumnType("nvarchar(10)"); + b.Property("EditGroupOrderNo") + .HasColumnType("int"); + + b.Property("EditOrderNo") + .HasColumnType("int"); + b.Property("EditorOptions") .HasColumnType("text"); + b.Property("EditorScript") + .HasColumnType("text"); + + b.Property("EditorType2") + .HasMaxLength(64) + .HasColumnType("nvarchar(64)"); + b.Property("FieldName") .IsRequired() .HasMaxLength(128) diff --git a/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260716120523_Initial.cs b/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260717065637_Initial.cs similarity index 99% rename from api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260716120523_Initial.cs rename to api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260717065637_Initial.cs index d6c3013..a2a6922 100644 --- a/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260716120523_Initial.cs +++ b/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260717065637_Initial.cs @@ -2791,6 +2791,11 @@ namespace Sozsoft.Platform.Migrations PivotSettingsJson = table.Column(type: "text", nullable: true), Alignment = table.Column(type: "nvarchar(20)", maxLength: 20, nullable: true, defaultValue: "left"), Format = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: true), + EditOrderNo = table.Column(type: "int", nullable: true), + EditGroupOrderNo = table.Column(type: "int", nullable: true), + EditorType2 = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: true), + ColSpan = table.Column(type: "int", nullable: true), + EditorScript = table.Column(type: "text", nullable: true), EditorOptions = table.Column(type: "text", nullable: true) }, constraints: table => diff --git a/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs b/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs index d3e3cad..71262fb 100644 --- a/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs +++ b/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs @@ -3412,6 +3412,9 @@ namespace Sozsoft.Platform.Migrations .HasMaxLength(256) .HasColumnType("nvarchar(256)"); + b.Property("ColSpan") + .HasColumnType("int"); + b.Property("ColumnCssClass") .HasMaxLength(128) .HasColumnType("nvarchar(128)"); @@ -3437,9 +3440,22 @@ namespace Sozsoft.Platform.Migrations .HasMaxLength(10) .HasColumnType("nvarchar(10)"); + b.Property("EditGroupOrderNo") + .HasColumnType("int"); + + b.Property("EditOrderNo") + .HasColumnType("int"); + b.Property("EditorOptions") .HasColumnType("text"); + b.Property("EditorScript") + .HasColumnType("text"); + + b.Property("EditorType2") + .HasMaxLength(64) + .HasColumnType("nvarchar(64)"); + b.Property("FieldName") .IsRequired() .HasMaxLength(128) diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicFormReport.cs b/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicFormReport.cs index 57e0cb7..9e1b4bf 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicFormReport.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicFormReport.cs @@ -542,14 +542,16 @@ public class DynamicFormReport : XtraReport .Where(x => x.IsActive != false) .ToDictionary(x => x.FieldName, StringComparer.OrdinalIgnoreCase); - var formItems = GetEditingFormItems(listForm) - .Where(x => !string.IsNullOrWhiteSpace(x.DataField)) + var editFields = fields + .Where(x => x.EditOrderNo.HasValue) + .OrderBy(x => x.EditGroupOrderNo ?? 1) + .ThenBy(x => x.EditOrderNo) .ToList(); - var orderedFields = formItems.Count > 0 - ? formItems - .Where(x => fieldsByName.ContainsKey(x.DataField)) - .Select(x => new FieldWithEditor(fieldsByName[x.DataField], x.EditorType2, x.ColSpan)) + var orderedFields = editFields.Count > 0 + ? editFields + .Where(x => fieldsByName.ContainsKey(x.FieldName)) + .Select(x => new FieldWithEditor(x, x.EditorType2, x.ColSpan ?? 1)) .ToList() : fields .Where(x => !string.IsNullOrWhiteSpace(x.FieldName) && x.FieldName != "undefined") @@ -582,10 +584,9 @@ public class DynamicFormReport : XtraReport var usedFields = new HashSet(StringComparer.OrdinalIgnoreCase); foreach (var group in groups) { - var groupFields = (group.Items ?? []) - .OrderBy(x => x.Order) - .Where(x => !string.IsNullOrWhiteSpace(x.DataField) && fieldsByName.ContainsKey(x.DataField)) - .Select(x => fieldsByName[x.DataField]) + var groupFields = fields + .Where(x => (x.Field.EditGroupOrderNo ?? 1) == group.Order) + .OrderBy(x => x.Field.EditOrderNo ?? int.MaxValue) .ToList(); foreach (var field in groupFields) @@ -625,13 +626,6 @@ public class DynamicFormReport : XtraReport } } - private static IEnumerable GetEditingFormItems(ListForm listForm) - { - return GetEditingFormGroups(listForm) - .OrderBy(x => x.Order) - .SelectMany(x => (x.Items ?? []).OrderBy(i => i.Order)); - } - private static IEnumerable<(SubFormDto Form, string Filter)> GetListSubForms( ListForm listForm, IDictionary row) diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicGridReport.cs b/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicGridReport.cs index 9bece30..e506dea 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicGridReport.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicGridReport.cs @@ -107,7 +107,7 @@ public class DynamicGridReport : XtraReport await selectQueryManager.PrepareQueriesAsync(listForm, fields, dataSourceType, customizations, queryParams); var selectFieldsByName = DynamicReportImageHelper.CreateSelectFieldMap(selectQueryManager.SelectFields); - var editorTypesByField = DynamicReportImageHelper.CreateEditorTypeMap(listForm); + var editorTypesByField = DynamicReportImageHelper.CreateEditorTypeMap(fields); var availableFields = fields .Where(x => !string.IsNullOrWhiteSpace(x.FieldName) && x.FieldName != "undefined") diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicReportImageHelper.cs b/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicReportImageHelper.cs index 82244cf..5b9839e 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicReportImageHelper.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicReportImageHelper.cs @@ -73,28 +73,16 @@ internal static class DynamicReportImageHelper return map; } - public static Dictionary CreateEditorTypeMap(ListForm listForm) + public static Dictionary CreateEditorTypeMap(IEnumerable fields) { var map = new Dictionary(StringComparer.OrdinalIgnoreCase); - if (string.IsNullOrWhiteSpace(listForm?.EditingFormJson)) + foreach (var field in fields ?? []) { - return map; - } - - try - { - var groups = JsonSerializer.Deserialize>(listForm.EditingFormJson) ?? []; - foreach (var item in groups.SelectMany(x => x.Items ?? [])) + if (!string.IsNullOrWhiteSpace(field.FieldName) && !string.IsNullOrWhiteSpace(field.EditorType2)) { - if (!string.IsNullOrWhiteSpace(item.DataField)) - { - map[item.DataField] = item.EditorType2; - } + map[field.FieldName] = field.EditorType2; } } - catch (JsonException) - { - } return map; } @@ -452,25 +440,16 @@ internal static class DynamicReportImageHelper return editorType is PlatformConsts.EditorTypes.dxImageUpload or PlatformConsts.EditorTypes.dxImageViewer; } - public static bool HasImageEditor(ListForm listForm, string fieldName) + public static bool HasImageEditor(IEnumerable fields, string fieldName) { - if (string.IsNullOrWhiteSpace(listForm?.EditingFormJson) || string.IsNullOrWhiteSpace(fieldName)) + if (string.IsNullOrWhiteSpace(fieldName)) { return false; } - try - { - var groups = JsonSerializer.Deserialize>(listForm.EditingFormJson) ?? []; - return groups - .SelectMany(x => x.Items ?? []) - .Any(x => string.Equals(x.DataField, fieldName, StringComparison.OrdinalIgnoreCase) && - IsImageEditor(x.EditorType2)); - } - catch (JsonException) - { - return false; - } + return (fields ?? []).Any(x => + string.Equals(x.FieldName, fieldName, StringComparison.OrdinalIgnoreCase) && + IsImageEditor(x.EditorType2)); } public static float GetGridImageHeight() => DefaultGridImageHeight; diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicTreeReport.cs b/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicTreeReport.cs index 07b261e..588b47a 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicTreeReport.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicTreeReport.cs @@ -114,7 +114,7 @@ public class DynamicTreeReport : XtraReport await selectQueryManager.PrepareQueriesAsync(listForm, fields, dataSourceType, customizations, queryParams); var selectFieldsByName = DynamicReportImageHelper.CreateSelectFieldMap(selectQueryManager.SelectFields); - var editorTypesByField = DynamicReportImageHelper.CreateEditorTypeMap(listForm); + var editorTypesByField = DynamicReportImageHelper.CreateEditorTypeMap(fields); var availableFields = fields .Where(x => !string.IsNullOrWhiteSpace(x.FieldName) && x.FieldName != "undefined") diff --git a/ui/src/proxy/form/models.ts b/ui/src/proxy/form/models.ts index d107bec..7828376 100644 --- a/ui/src/proxy/form/models.ts +++ b/ui/src/proxy/form/models.ts @@ -15,7 +15,6 @@ import type { StartEditAction, StateStoreType, } from 'devextreme/ui/data_grid_types' -import type { FormItemComponent } from 'devextreme/ui/form' import { AuditedEntityDto } from '../abp' import { EditorType2, RowMode } from '../../views/form/types' import { @@ -195,7 +194,7 @@ export interface ColumnFilterDto { } export interface ColumnFormatDto extends AuditedEntityDto { - fieldName?: string + fieldName: string captionName?: string placeHolder?: string readOnly: boolean @@ -245,6 +244,14 @@ export interface ColumnFormatDto extends AuditedEntityDto { alignment?: HorizontalAlignment format?: string editorOptions?: string + editOrderNo?: number + editGroupOrderNo?: number + editorType2: EditorType2 + colSpan?: number + gridBoxOptions?: GridBoxOptionsDto + tagBoxOptions?: TagBoxOptionsDto + imageUploadOptions?: ImageUploadOptionsDto + editorScript?: string } export enum AuthorizationTypeEnum { @@ -492,20 +499,6 @@ export interface EditingFormDto { caption?: string colCount: number colSpan: number - items?: EditingFormItemDto[] -} - -export interface EditingFormItemDto { - order: number - dataField: string - editorType: FormItemComponent - editorType2: EditorType2 - colSpan?: number - editorOptions?: string - gridBoxOptions?: GridBoxOptionsDto - tagBoxOptions?: TagBoxOptionsDto - imageUploadOptions?: ImageUploadOptionsDto - editorScript?: string } export interface GridEditingPopupDto { diff --git a/ui/src/views/admin/listForm/edit/FormEdit.tsx b/ui/src/views/admin/listForm/edit/FormEdit.tsx index 0d2079d..5cd49e5 100644 --- a/ui/src/views/admin/listForm/edit/FormEdit.tsx +++ b/ui/src/views/admin/listForm/edit/FormEdit.tsx @@ -300,6 +300,9 @@ const FormEdit = () => { {translate('::ListForms.ListFormEdit.ExtraFilters')} )} + {visibleTabs.includes('editForm') && ( + {translate('::ListForms.ListFormEdit.EditingForm')} + )} {visibleTabs.includes('fields') && ( {translate('::ListForms.ListFormEdit.TabFields')} )} @@ -308,9 +311,6 @@ const FormEdit = () => { {translate('::ListForms.ListFormEdit.TabCustomization')} )} - {visibleTabs.includes('editForm') && ( - {translate('::ListForms.ListFormEdit.EditingForm')} - )} {visibleTabs.includes('pivots') && ( {translate('::ListForms.ListFormEdit.TabPivot')} )} @@ -464,6 +464,7 @@ const FormEdit = () => { - + {translate('::ListForms.ListFormEdit.DetailsTitle')} {translate('::ListForms.ListFormEdit.EditingFormColumnCount')} {translate('::ListForms.ListFormEdit.EditingFormColumnSpan')} - {translate('::ListForms.ListFormEdit.EditingFormItems')} @@ -109,13 +108,6 @@ function FormTabEditForm(props: { listFormCode: string }) { {row.caption} {row.colCount} {row.colSpan} - -
    - {row.items?.map((i, idx) => ( -
  • {i.dataField}
    • - ))} -
- ))} 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 45c2d17..91347be 100644 --- a/ui/src/views/admin/listForm/edit/form-fields/FormFieldEdit.tsx +++ b/ui/src/views/admin/listForm/edit/form-fields/FormFieldEdit.tsx @@ -20,14 +20,17 @@ import FormFieldTabTotalSummary from './FormFieldTabTotalSummary' import FormFieldTabValidationRules from './FormFieldTabValidationRules' import { FormFieldEditProps } from './FormFields' import FormFieldTabPivotSetting from './FormFieldTabPivotSetting' +import type { EditingFormDto } from '@/proxy/form/models' function FormFieldEdit({ item, onSubmit, fields, + editingFormGroups, }: { item: ColumnFormatEditDto | null fields: ColumnFormatEditDto[] + editingFormGroups: EditingFormDto[] } & FormFieldEditProps) { const { translate } = useLocalization() @@ -72,13 +75,18 @@ function FormFieldEdit({ {translate('::ListForms.ListFormFieldEdit.TabPivotSettings')} - +
- + @@ -96,18 +104,10 @@ function FormFieldEdit({ - + - + diff --git a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabDetails.tsx b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabDetails.tsx index f662d4e..2a683dc 100644 --- a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabDetails.tsx +++ b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabDetails.tsx @@ -1,11 +1,11 @@ -import { Button, Card, FormItem, Input, Select } from '@/components/ui' +import { Button, Card, Checkbox, FormItem, Input, Select } from '@/components/ui' import { ColumnFormatEditDto, ListFormFieldEditTabs } from '@/proxy/admin/list-form-field/models' import { SelectBoxOption } from '@/types/shared' import { useLocalization } from '@/utils/hooks/useLocalization' import { Field, FieldProps, Form, Formik } from 'formik' import { useState } from 'react' import { FaSlidersH } from 'react-icons/fa' -import { number, object, string } from 'yup' +import { bool, number, object, string } from 'yup' import { dbSourceTypeOptions, listFormAlignmentOptions } from '../options' import EditorOptionsBuilderDialog from '../json-row-operations/EditorOptionsBuilderDialog' import { FormFieldEditProps } from './FormFields' @@ -16,10 +16,13 @@ const schema = object().shape({ captionName: string(), placeHolder: string(), bandName: string(), + isActive: bool().required(), + visible: bool().required(), + allowSearch: bool().required(), sourceDbType: number().required(), alignment: string(), format: string(), - editorOptions: string().max(1000), + editorOptions: string(), }) function FormFieldTabDetails({ @@ -72,6 +75,32 @@ function FormFieldTabDetails({ > +
+ + + + + + + + + + + +
@@ -132,7 +161,7 @@ function FormFieldTabDetails({ type="text" name="editorOptions" component={Input} - rows={4} + rows={3} textArea={true} /> 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 4c85f0f..42e2ed4 100644 --- a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabOptions.tsx +++ b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabOptions.tsx @@ -4,29 +4,50 @@ import { SelectBoxOption } from '@/types/shared' import { useLocalization } from '@/utils/hooks/useLocalization' import { Field, FieldProps, Form, Formik } from 'formik' import { bool, number, object, string } from 'yup' -import { sortDirectionOptions } from '../options' +import { columnEditorTypeListOptions, sortDirectionOptions } from '../options' import { FormFieldEditProps } from './FormFields' -import { SortDirectionEnum } from '@/proxy/form/models' +import { EditingFormDto, SortDirectionEnum } from '@/proxy/form/models' +import { FaCode } from 'react-icons/fa' +import { useState } from 'react' +import EditorScriptBuilderDialog from '../json-row-operations/EditorScriptBuilderDialog' const schema = object().shape({ listOrderNo: number(), width: number(), sortDirection: string().oneOf(Object.values(SortDirectionEnum) as string[]), sortIndex: number(), - isActive: bool().required(), - visible: bool().required(), - allowSearch: bool().required(), + editGroupOrderNo: number().nullable(), + editOrderNo: number().nullable(), + colSpan: number().nullable(), allowEditing: bool().required(), allowAdding: bool().required(), + editorScript: string(), }) function FormFieldTabOptions({ initialValues, + editingFormGroups, + fields, onSubmit, }: { initialValues: ColumnFormatEditDto + editingFormGroups: EditingFormDto[] + fields: ColumnFormatEditDto[] } & FormFieldEditProps) { const { translate } = useLocalization() + const [isEditorScriptDialogOpen, setIsEditorScriptDialogOpen] = useState(false) + const editingFormGroupOptions: SelectBoxOption[] = [...editingFormGroups] + .sort((left, right) => left.order - right.order) + .map((group) => ({ + value: String(group.order), + label: `${group.order} - ${group.caption || translate('::ListForms.ListFormFieldEdit.EditFormGroup')}`, + })) + const editorScriptFields: SelectBoxOption[] = fields + .filter((field) => field.fieldName) + .map((field) => ({ + value: field.fieldName, + label: field.captionName || field.fieldName, + })) return ( - {({ touched, errors, isSubmitting, values }) => ( + {({ touched, errors, isSubmitting, values, setFieldValue }) => (
@@ -82,25 +103,7 @@ function FormFieldTabOptions({ > - - - - - - - - - - - + @@ -108,9 +111,100 @@ function FormFieldTabOptions({ + + + + {({ field, form }: FieldProps) => ( + Number(option.value) === Number(field.value), + )} + onChange={(option) => + form.setFieldValue( + field.name, + option?.value == null ? null : Number(option.value), + ) + } + /> + )} + + + + + + + + + +
+ +
+ +
- -
diff --git a/ui/src/views/admin/listForm/edit/form-fields/FormFields.tsx b/ui/src/views/admin/listForm/edit/form-fields/FormFields.tsx index f90ca12..dcf38f5 100644 --- a/ui/src/views/admin/listForm/edit/form-fields/FormFields.tsx +++ b/ui/src/views/admin/listForm/edit/form-fields/FormFields.tsx @@ -43,6 +43,7 @@ import { dbSourceTypeOptions, sqlDataTypeToDbType } from '../options' import { IdentityRoleDto, IdentityUserDto } from '@/proxy/admin/models' import { sqlObjectManagerService } from '@/services/sql-query-manager.service' import type { DatabaseColumnDto } from '@/proxy/sql-query-manager/models' +import type { EditingFormDto } from '@/proxy/form/models' export interface FormFieldEditProps { onSubmit: ( @@ -71,12 +72,14 @@ const copyFieldSchema = object().shape({ function FormFields({ listFormCode, + editingFormGroups, langOptions, roleList, userList, columns, }: { listFormCode: string + editingFormGroups: EditingFormDto[] langOptions: SelectBoxOption[] roleList: SelectBoxOption[] userList: SelectBoxOption[] @@ -219,42 +222,45 @@ function FormFields({ await getFields() } - const getFields = useCallback(async (cultureName?: string, roleId?: string, userId?: string) => { - if (!listFormCode) { - return - } + const getFields = useCallback( + async (cultureName?: string, roleId?: string, userId?: string) => { + if (!listFormCode) { + return + } - try { - const resp = await getListFormFields({ - listFormCode, - cultureName, - roleId, - userId, - sorting: 'ListOrderNo', - maxResultCount: 1000, - }) - setNull(resp?.data?.items) - setFields(resp?.data?.items) - if (resp.data?.items) { - setFieldList( - resp?.data?.items.map((f: ColumnFormatEditDto) => ({ - value: f.fieldName, - label: f.fieldName, - })), + try { + const resp = await getListFormFields({ + listFormCode, + cultureName, + roleId, + userId, + sorting: 'ListOrderNo', + maxResultCount: 1000, + }) + setNull(resp?.data?.items) + setFields(resp?.data?.items) + if (resp.data?.items) { + setFieldList( + resp?.data?.items.map((f: ColumnFormatEditDto) => ({ + value: f.fieldName, + label: f.fieldName, + })), + ) + } + } catch (error: any) { + toast.push( + + Alanlar getirilemedi + {error.toString()} + , + { + placement: 'bottom-end', + }, ) } - } catch (error: any) { - toast.push( - - Alanlar getirilemedi - {error.toString()} - , - { - placement: 'bottom-end', - }, - ) - } - }, [listFormCode]) + }, + [listFormCode], + ) useEffect(() => { getFields() @@ -405,7 +411,7 @@ function FormFields({ - - +
+
{field.fieldName} + {field.fieldName}
- +
diff --git a/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogEditForm.tsx b/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogEditForm.tsx index 5c2b7cb..58f0357 100644 --- a/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogEditForm.tsx +++ b/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogEditForm.tsx @@ -1,67 +1,28 @@ -import { - Button, - Card, - Checkbox, - Dialog, - FormItem, - Input, - Notification, - Select, - toast, -} from '@/components/ui' - -import { ListFormJsonRowDto } from '@/proxy/admin/list-form/models' -import { SelectBoxOption } from '@/types/shared' +import { Button, Dialog, FormItem, Input, Notification, Select, toast } from '@/components/ui' +import type { ListFormJsonRowDto } from '@/proxy/admin/list-form/models' import { useStoreActions } from '@/store' import { useLocalization } from '@/utils/hooks/useLocalization' -import { Field, FieldArray, FieldProps, Form, Formik } from 'formik' -import groupBy from 'lodash/groupBy' -import { Dispatch, SetStateAction, useCallback, useEffect, useState } from 'react' -import { FaBolt, FaCalendarMinus, FaCalendarPlus, FaSlidersH, FaTag } from 'react-icons/fa' +import { Field, type FieldProps, Form, Formik } from 'formik' +import type { Dispatch, SetStateAction } from 'react' import { number, object, string } from 'yup' -import { - columnEditorTypeListOptions, - columnLookupTagBoxApplyValueModeListOptions, - itemTypeOptions, - selectionModeOptions, -} from '../options' -import { JsonRowDialogData } from './types' -import CreatableSelect from 'react-select/creatable' -import { getListFormFields } from '@/services/admin/list-form-field.service' +import { itemTypeOptions } from '../options' import { deleteListFormJsonRow, getListFormJsonRow, postListFormJsonRow, putListFormJsonRow, } from '@/services/admin/list-form.service' -import { EditingFormItemDto, PlatformEditorTypes } from '@/proxy/form/models' -import EditorOptionsBuilderDialog from './EditorOptionsBuilderDialog' -import EditorScriptBuilderDialog from './EditorScriptBuilderDialog' +import type { JsonRowDialogData } from './types' -const schema = object().shape({ +const schema = object({ + order: number().required(), itemType: string().required(), caption: string().notRequired(), colCount: number().required(), colSpan: number().required(), }) -// gridBoxOptions: object().shape({ -// columns: string(), -// columnsString: string(), -// height: number(), -// width: number(), -// selectionMode: string().oneOf(Object.values(SingleMultipleOrNoneEnum) as string[]), -// filterRowVisible: bool(), -// }), -// tagBoxOptions: object().shape({ -// showSelectionControls: bool(), -// maxDisplayedTags: number(), -// showMultiTagOnly: bool(), -// applyValueMode: string(), -// searchEnabled: bool(), -// }), function JsonRowOpDialogEditForm({ - listFormCode, isOpen, setIsOpen, data, @@ -70,878 +31,80 @@ function JsonRowOpDialogEditForm({ listFormCode: string isOpen: boolean setIsOpen: Dispatch> - data: JsonRowDialogData | undefined + data?: JsonRowDialogData setData: Dispatch> }) { - const { setJsonValue } = useStoreActions((a) => a.admin.lists) + const { setJsonValue } = useStoreActions((actions) => actions.admin.lists) const { translate } = useLocalization() - const [fieldList, setFieldList] = useState([]) - const [isOpenOptionsDialog, setIsOpenOptionsDialog] = useState>({}) - const [optionsBuilderIndex, setOptionsBuilderIndex] = useState(null) - const [scriptBuilderIndex, setScriptBuilderIndex] = useState(null) - const [isHelperOpen, setIsHelperOpen] = useState(false) - - const getFields = useCallback(async () => { - if (!listFormCode) { - return - } - - try { - const resp = await getListFormFields({ - listFormCode, - sorting: 'ListOrderNo', - maxResultCount: 1000, - }) - if (resp.data?.items) { - const fieldNames = groupBy(resp?.data?.items, 'fieldName') - setFieldList( - Object.keys(fieldNames).map((a) => ({ - value: a, - label: a, - })), - ) - } - } catch (error: any) { - toast.push( - - Alanlar getirilemedi - {error.toString()} - , - { - placement: 'bottom-end', - }, - ) - } - }, [listFormCode]) - - const handleClose = async (e?: any) => { - if (e) { - e.preventDefault() - } - + const handleClose = async () => { if (data) { - const resp = await getListFormJsonRow(data.id, data.tabName) - setJsonValue({ field: 'editingFormDto', data: resp.data }) + const response = await getListFormJsonRow(data.id, data.tabName) + setJsonValue({ field: 'editingFormDto', data: response.data }) } - setData(undefined) setIsOpen(false) } - useEffect(() => { - if (isOpen && data) { - getFields() - } - }, [isOpen, data, getFields]) - - if (!data || !fieldList?.length) { - return null - } + if (!data) return null return ( - - {(data.operation === 'create' || data.operation === 'update') && ( - { - setSubmitting(true) - try { - const input: ListFormJsonRowDto = { - index: data.index, - fieldName: data.tabName, - itemEditingForm: values, - } - - if (data.index === -1) { - await postListFormJsonRow(data.id, input) - } else { - await putListFormJsonRow(data.id, input) - } - toast.push( - - {data.index === -1 ? 'Kayıt eklendi' : 'Kayıt güncellendi'} - , - { placement: 'bottom-end' }, - ) - handleClose() - } catch (error: any) { - toast.push( - - Hata - {error} - , - { placement: 'bottom-end' }, - ) - } finally { - setSubmitting(false) - } - }} - > - {({ touched, errors, values, isSubmitting }) => ( -
- -
{data.index === -1 ? 'Add' : 'Update'}
-
-
- - - - - - {({ field, form }: FieldProps) => ( - - option.value === - values.items?.at(index)?.dataField, - ) - : null - } - menuPlacement="auto" - maxMenuHeight={150} - onChange={(option) => - form.setFieldValue(field.name, option?.value) - } - /> - )} - -
-
- - {({ field, form }: FieldProps) => ( - - option.value === - values.items?.at(index)?.gridBoxOptions - ?.selectionMode, - )} - onChange={(option) => - form.setFieldValue(field.name, option?.value) - } - /> - )} - - - -
- - )} - {item.editorType2 === 'dxTagBox' && ( - <> - - + + + )} diff --git a/ui/src/views/form/useFormData.tsx b/ui/src/views/form/useFormData.tsx index 471a56b..9afb142 100644 --- a/ui/src/views/form/useFormData.tsx +++ b/ui/src/views/form/useFormData.tsx @@ -9,9 +9,9 @@ import type { GroupItem } from 'devextreme/ui/form' import { useEffect, useRef, useState } from 'react' import { useLocation, useNavigate, useSearchParams } from 'react-router-dom' import { GridColumnData } from '../list/GridColumnData' -import { addCss, addJs } from '../list/Utils' +import { addCss, addJs, getEditingFormGroups } from '../list/Utils' import { PermissionResults, RowMode, SimpleItemWithColData } from './types' -import { EditingFormItemDto, GridDto, PlatformEditorTypes } from '@/proxy/form/models' +import { ColumnFormatDto, GridDto, PlatformEditorTypes } from '@/proxy/form/models' import { getAccessDeniedPath } from '@/utils/routing' import { ROUTES_ENUM } from '@/routes/route.constant' import { useLookupDataSource } from './useLookupDataSource' @@ -218,10 +218,7 @@ const useGridData = (props: { ) setDataSource(dataSource) - const items = gridDto?.gridOptions.editingFormDto - ?.sort((a: any, b: any) => { - return a.order >= b.order ? 1 : -1 - }) + const items = getEditingFormGroups(gridDto) .map((e: any) => { return { itemType: e.itemType, @@ -230,12 +227,12 @@ const useGridData = (props: { caption: e.caption, items: e.items ?.sort((a: any, b: any) => { - return a.order >= b.order ? 1 : -1 + return (a.editOrderNo ?? 0) >= (b.editOrderNo ?? 0) ? 1 : -1 }) - .map((i: EditingFormItemDto) => { + .map((i: ColumnFormatDto) => { let editorOptions: Record = {} let parsedEditorOptions: Record = {} - const colData = gridDto.columnFormats.find((x) => x.fieldName === i.dataField) + const colData = i parsedEditorOptions = i.editorOptions ? JSON.parse(i.editorOptions) : {} const lookupEditorOptions = colData?.lookupDto?.dataSourceType @@ -250,26 +247,14 @@ const useGridData = (props: { ...parsedEditorOptions, } const item: SimpleItemWithColData = { - canRead: - gridDto.columnFormats.find((x: any) => x.fieldName === i.dataField)?.canRead ?? - false, - canUpdate: - gridDto.columnFormats.find((x: any) => x.fieldName === i.dataField)?.canUpdate ?? - false, - canCreate: - gridDto.columnFormats.find((x: any) => x.fieldName === i.dataField)?.canCreate ?? - false, - canExport: - gridDto.columnFormats.find((x: any) => x.fieldName === i.dataField)?.canExport ?? - false, - allowEditing: - gridDto.columnFormats.find((x: any) => x.fieldName === i.dataField) - ?.allowEditing ?? true, - allowAdding: - gridDto.columnFormats.find((x: any) => x.fieldName === i.dataField) - ?.allowAdding ?? true, - dataField: i.dataField, - name: i.dataField, + canRead: i.canRead ?? false, + canUpdate: i.canUpdate ?? false, + canCreate: i.canCreate ?? false, + canExport: i.canExport ?? false, + allowEditing: i.allowEditing ?? true, + allowAdding: i.allowAdding ?? true, + dataField: i.fieldName, + name: i.fieldName, editorType2: i.editorType2, editorType: i.editorType2 == PlatformEditorTypes.dxGridBox @@ -286,8 +271,8 @@ const useGridData = (props: { imageUploadOptions: i.imageUploadOptions, editorScript: i.editorScript, } - if (i.dataField.indexOf(':') >= 0) { - item.label = { text: captionize(i.dataField.split(':')[1]) } + if (i.fieldName?.indexOf(':') >= 0) { + item.label = { text: captionize(i.fieldName.split(':')[1]) } } if ((mode == 'edit' && !item.canUpdate) || (mode == 'new' && !item.canCreate)) { item.editorOptions = { @@ -348,7 +333,7 @@ const useGridData = (props: { const updateItems = (items: any[] = []): any[] => items.map((item) => { - const colData = gridDto.columnFormats.find((x) => x.fieldName === item.dataField) + const colData = item.colData if (colData?.lookupDto?.dataSourceType && shouldRefreshLookup(item)) { const currentDataSource = item.editorOptions?.dataSource const keepCustomDataSource = diff --git a/ui/src/views/list/CardView.tsx b/ui/src/views/list/CardView.tsx index 8205b91..31d4c78 100644 --- a/ui/src/views/list/CardView.tsx +++ b/ui/src/views/list/CardView.tsx @@ -4,8 +4,8 @@ import { ImportDashboard } from '@/components/importManager/ImportDashboard' import { Dialog, Notification, toast } from '@/components/ui' import { APP_NAME, DX_CLASSNAMES } from '@/constants/app.constant' import { + ColumnFormatDto, DbTypeEnum, - EditingFormItemDto, GridDto, PlatformEditorTypes, SubFormTabTypeEnum, @@ -41,7 +41,12 @@ import GridFilterDialogs from './GridFilterDialogs' import { GridExtraFilterToolbar } from './GridExtraFilterToolbar' import { ImageUploadEditorComponent } from './editors/ImageUploadEditorComponent' import { ImageViewerEditorComponent } from './editors/ImageViewerEditorComponent' -import { extractSearchParamsFields, GridExtraFilterState, safeJsonParse } from './Utils' +import { + extractSearchParamsFields, + getEditingFormGroups, + GridExtraFilterState, + safeJsonParse, +} from './Utils' import { useFilters } from './useFilters' import { useListFormColumns } from './useListFormColumns' import { useListFormCustomDataSource } from './useListFormCustomDataSource' @@ -788,12 +793,9 @@ const CardView = (props: CardViewProps) => { }, [filterToolbarData, toolbarData]) const mapEditingFormItem = useCallback( - (item: EditingFormItemDto) => { - const fieldName = item.dataField.split(':')[0] - const column = gridDto?.columnFormats.find( - (candidate) => candidate.fieldName?.toLowerCase() === fieldName.toLowerCase(), - ) - if (!column) return undefined + (item: ColumnFormatDto) => { + const fieldName = item.fieldName! + const column = item if ( mode === 'new' && fieldName.toLowerCase() === gridDto?.gridOptions.keyFieldName?.toLowerCase() @@ -813,7 +815,7 @@ const CardView = (props: CardViewProps) => { try { editorOptions = item.editorOptions ? JSON.parse(item.editorOptions) : {} } catch (error) { - console.error('EditorOptions parse error:', item.dataField, error) + console.error('EditorOptions parse error:', item.fieldName, error) } if (column.sourceDbType === DbTypeEnum.Date) { @@ -862,8 +864,8 @@ const CardView = (props: CardViewProps) => { name: fieldName, colSpan: item.colSpan, label: { - text: item.dataField.includes(':') - ? item.dataField.split(':')[1] + text: item.fieldName!.includes(':') + ? item.fieldName!.split(':')[1] : translate('::' + (column.captionName || column.fieldName)), }, editorType: @@ -888,7 +890,7 @@ const CardView = (props: CardViewProps) => { const editingFormItems = useMemo(() => { if (!gridDto || mode === 'view') return [] - const groups = [...(gridDto.gridOptions.editingFormDto ?? [])].sort( + const groups = [...(getEditingFormGroups(gridDto) ?? [])].sort( (left, right) => left.order - right.order, ) const tabbedGroups = groups.filter((group) => group.itemType === 'tabbed') @@ -896,7 +898,7 @@ const CardView = (props: CardViewProps) => { groups.forEach((group) => { const items = [...(group.items ?? [])] - .sort((left, right) => left.order - right.order) + .sort((left, right) => (left.editOrderNo ?? 0) - (right.editOrderNo ?? 0)) .map(mapEditingFormItem) .filter(Boolean) @@ -918,7 +920,7 @@ const CardView = (props: CardViewProps) => { title: tab.caption, colCount: useMobileEditPopup ? 1 : tab.colCount || 1, items: [...(tab.items ?? [])] - .sort((left, right) => left.order - right.order) + .sort((left, right) => (left.editOrderNo ?? 0) - (right.editOrderNo ?? 0)) .map(mapEditingFormItem) .filter(Boolean), })) diff --git a/ui/src/views/list/Grid.tsx b/ui/src/views/list/Grid.tsx index dd10a30..3327032 100644 --- a/ui/src/views/list/Grid.tsx +++ b/ui/src/views/list/Grid.tsx @@ -3,8 +3,8 @@ import '@/utils/registerDevExtremeEditors' import { Dialog, Notification, toast } from '@/components/ui' import { APP_NAME, DX_CLASSNAMES } from '@/constants/app.constant' import { + ColumnFormatDto, DbTypeEnum, - EditingFormItemDto, FieldCustomValueTypeEnum, GridDto, PlatformEditorTypes, @@ -53,6 +53,8 @@ import { autoNumber, controlStyleCondition, extractSearchParamsFields, + getEditingFormFields, + getEditingFormGroups, GridExtraFilterState, safeJsonParse, setFormEditingExtraItemValues, @@ -218,13 +220,6 @@ const getActiveEditingForm = (component: any) => { return editForm?.getEditor || editForm?.itemOption ? editForm : undefined } -const flattenEditingFormItems = (items: any[] = []): EditingFormItemDto[] => - items.flatMap((item) => [ - ...(item?.dataField ? [item] : []), - ...flattenEditingFormItems(item?.items || []), - ...(item?.tabs || []).flatMap((tab: any) => flattenEditingFormItems(tab?.items || [])), - ]) - const getValueByField = (data: Record = {}, field?: string) => { if (!field) return undefined if (Object.prototype.hasOwnProperty.call(data, field)) return data[field] @@ -725,11 +720,10 @@ const Grid = (props: GridProps) => { const onEditorPreparing = useCallback( (editor: DataGridTypes.EditorPreparingEvent) => { if (editor.parentType === 'dataRow' && editor.dataField && gridDto) { - const formItem = gridDto.gridOptions.editingFormDto - .flatMap((group) => flattenEditingFormItems([group])) - .find((i) => i.dataField === editor.dataField) - const fieldName = editor.dataField.split(':')[0] - const columnFormat = gridDto.columnFormats.find((column) => column.fieldName === fieldName) + const columnFormat = gridDto.columnFormats.find( + (column) => column.fieldName === editor.dataField, + ) + const formItem = columnFormat?.editOrderNo != null ? columnFormat : undefined const isNewRow = Boolean((editor as any).row?.isNewRow) || mode === 'new' const hasReadOnlyEditorOption = editor.editorOptions?.readOnly === true @@ -786,9 +780,9 @@ const Grid = (props: GridProps) => { (pf: string) => !rowData[pf], ) try { - const childFormItem = gridDto.gridOptions.editingFormDto - .flatMap((group) => flattenEditingFormItems([group])) - .find((i) => i.dataField === childFieldName) + const childFormItem = gridDto.columnFormats.find( + (column) => column.fieldName === childFieldName, + ) const childEditorOptions = childFormItem?.editorOptions ? JSON.parse(childFormItem.editorOptions) : {} @@ -858,7 +852,7 @@ const Grid = (props: GridProps) => { setFormData, }) } catch (err) { - console.error('Script exec error', formItem.dataField, err) + console.error('Script exec error', formItem.fieldName, err) } } } @@ -1136,7 +1130,7 @@ const Grid = (props: GridProps) => { // Form items mapper'ı memoize et - popup açılışını hızlandırır const mapFormItem = useCallback( - (i: EditingFormItemDto) => { + (i: ColumnFormatDto) => { let editorOptions: EditorOptionsWithButtons = {} let parsedEditorOptions: EditorOptionsWithButtons = {} const forcedEditorOptions: EditorOptionsWithButtons = {} @@ -1148,10 +1142,10 @@ const Grid = (props: GridProps) => { const parsed = JSON.parse(rawFilter) const filters = extractSearchParamsFields(parsed) - const hasFilter = filters.some(([field]) => field === i.dataField) + const hasFilter = filters.some(([field]) => field === i.fieldName) if (hasFilter) { - const existsInExtra = extraFilters.some((f) => f.fieldName === i.dataField && !!f.value) + const existsInExtra = extraFilters.some((f) => f.fieldName === i.fieldName && !!f.value) if (!existsInExtra) { forcedEditorOptions.readOnly = true @@ -1159,11 +1153,11 @@ const Grid = (props: GridProps) => { } } } catch (err) { - console.error('EditorOptions parse error:', i.dataField, err) + console.error('EditorOptions parse error:', i.fieldName, err) } - const fieldName = i.dataField.split(':')[0] - const listFormField = gridDto?.columnFormats.find((x: any) => x.fieldName === fieldName) + const fieldName = i.fieldName! + const listFormField = i const defaultEditorOptions: EditorOptionsWithButtons = {} @@ -1221,8 +1215,8 @@ const Grid = (props: GridProps) => { canExport: listFormField?.canExport ?? false, allowEditing: listFormField?.allowEditing ?? true, allowAdding: listFormField?.allowAdding ?? true, - dataField: i.dataField, - name: i.dataField, + dataField: i.fieldName, + name: i.fieldName, editorType2: i.editorType2, editorType: i.editorType2 == PlatformEditorTypes.dxGridBox @@ -1240,12 +1234,12 @@ const Grid = (props: GridProps) => { item.template = 'cellEditImageViewer' item.editorOptions = { ...item.editorOptions, - value: getValueByField(editingFormDataRef.current, i.dataField), + value: getValueByField(editingFormDataRef.current, i.fieldName), } } - if (i.dataField.indexOf(':') >= 0) { - item.label = { text: captionize(i.dataField.split(':')[1]) } + if (i.fieldName?.indexOf(':') >= 0) { + item.label = { text: captionize(i.fieldName.split(':')[1]) } } if ((mode == 'edit' && !item.canUpdate) || (mode == 'new' && !item.canCreate)) { @@ -1614,9 +1608,7 @@ const Grid = (props: GridProps) => { } const runReadOnlyScripts = () => { - const formItems = gridDto.gridOptions.editingFormDto.flatMap((group) => - flattenEditingFormItems([group]), - ) + const formItems = getEditingFormFields(gridDto) const scriptItems = formItems.filter((formItem) => shouldRunEditorScriptOnContentReady(formItem.editorScript), ) @@ -1627,9 +1619,9 @@ const Grid = (props: GridProps) => { const editorValues = formItems.reduce>( (values, formItem) => { - const editorInstance = form?.getEditor?.(formItem.dataField) + const editorInstance = form?.getEditor?.(formItem.fieldName) if (editorInstance?.option) { - values[formItem.dataField] = editorInstance.option('value') + values[formItem.fieldName!] = editorInstance.option('value') } return values }, @@ -1644,17 +1636,17 @@ const Grid = (props: GridProps) => { scriptItems.forEach((formItem) => { try { - const editorInstance = form?.getEditor?.(formItem.dataField) + const editorInstance = form?.getEditor?.(formItem.fieldName) const editorValue = editorInstance?.option?.('value') ?? - getValueByField(formData, formItem.dataField) + getValueByField(formData, formItem.fieldName) const editor = { - dataField: formItem.dataField, + dataField: formItem.fieldName, component: grid, } const e = { component: form, - dataField: formItem.dataField, + dataField: formItem.fieldName, scriptEvent: 'contentReady', value: editorValue, } @@ -1669,7 +1661,7 @@ const Grid = (props: GridProps) => { } catch (err) { console.error( 'Script exec error on contentReady', - formItem.dataField, + formItem.fieldName!, err, ) } @@ -1685,11 +1677,10 @@ const Grid = (props: GridProps) => { ...(e.component?.option?.('formData') || {}), } - const formItem = gridDto.gridOptions.editingFormDto - .flatMap((group) => flattenEditingFormItems([group])) + const formItem = getEditingFormFields(gridDto) .find( (i) => - String(i.dataField || '').toLowerCase() === + String(i.fieldName || '').toLowerCase() === String(e.dataField || '').toLowerCase(), ) if (formItem?.editorScript) { @@ -1732,9 +1723,9 @@ const Grid = (props: GridProps) => { } }, items: - gridDto.gridOptions.editingFormDto?.length > 0 + getEditingFormGroups(gridDto)?.length > 0 ? (() => { - const sortedFormDto = gridDto.gridOptions.editingFormDto + const sortedFormDto = getEditingFormGroups(gridDto) .slice() .sort((a: any, b: any) => (a.order >= b.order ? 1 : -1)) @@ -1756,7 +1747,9 @@ const Grid = (props: GridProps) => { colSpan: effectiveColSpan, caption: e.caption, // Group'larda caption olmalı items: e.items - ?.sort((a: any, b: any) => (a.order >= b.order ? 1 : -1)) + ?.sort((a: any, b: any) => + (a.editOrderNo ?? 0) >= (b.editOrderNo ?? 0) ? 1 : -1, + ) .map(mapFormItem) .filter((a: any) => { if (mode === 'view') { @@ -1785,7 +1778,9 @@ const Grid = (props: GridProps) => { title: tabbedItem.caption, // Her tab'ın title'ı colCount: effectiveColCount, items: tabbedItem.items - ?.sort((a: any, b: any) => (a.order >= b.order ? 1 : -1)) + ?.sort((a: any, b: any) => + (a.editOrderNo ?? 0) >= (b.editOrderNo ?? 0) ? 1 : -1, + ) .map(mapFormItem) .filter((a: any) => { if (mode === 'view') { diff --git a/ui/src/views/list/GridColumnData.ts b/ui/src/views/list/GridColumnData.ts index 657f61e..7ec72f5 100644 --- a/ui/src/views/list/GridColumnData.ts +++ b/ui/src/views/list/GridColumnData.ts @@ -10,7 +10,7 @@ interface IGridColumnData extends DataGridTypes.Column { colData?: ColumnFormatDto extras?: { multiValue: boolean - editorOptions?: string + editorOptions?: Record tagBoxOptions?: TagBoxOptionsDto gridBoxOptions?: GridBoxOptionsDto imageUploadOptions?: ImageUploadOptionsDto diff --git a/ui/src/views/list/SchedulerView.tsx b/ui/src/views/list/SchedulerView.tsx index 35954e7..cc018a8 100644 --- a/ui/src/views/list/SchedulerView.tsx +++ b/ui/src/views/list/SchedulerView.tsx @@ -2,11 +2,11 @@ import Container from '@/components/shared/Container' import '@/utils/registerDevExtremeEditors' import { APP_NAME, DX_CLASSNAMES } from '@/constants/app.constant' import { + ColumnFormatDto, DbTypeEnum, GridDto, PlatformEditorTypes, UiLookupDataSourceTypeEnum, - EditingFormItemDto, } from '@/proxy/form/models' import { useLocalization } from '@/utils/hooks/useLocalization' import Scheduler, { @@ -21,7 +21,12 @@ import { useCallback, useEffect, useRef, useState } from 'react' import { Helmet } from 'react-helmet' import { getList } from '@/services/form.service' import { useListFormCustomDataSource } from './useListFormCustomDataSource' -import { addCss, addJs, autoNumber } from './Utils' +import { + addCss, + addJs, + autoNumber, + getEditingFormGroups, +} from './Utils' import { layoutTypes } from '../admin/listForm/edit/types' import WidgetGroup from '@/components/ui/Widget/WidgetGroup' import { ROUTES_ENUM } from '@/routes/route.constant' @@ -289,11 +294,11 @@ const SchedulerView = (props: SchedulerViewProps) => { }, ]) - // EditingFormDto'dan form items oluştur + // Grup düzenini EditingFormDto'dan, alanları ColumnFormatDto'dan oluştur. const result: any[] = [] - if (gridDto.gridOptions.editingFormDto?.length > 0) { - const sortedFormDto = gridDto.gridOptions.editingFormDto + if (getEditingFormGroups(gridDto)?.length > 0) { + const sortedFormDto = getEditingFormGroups(gridDto) .slice() .sort((a: any, b: any) => (a.order >= b.order ? 1 : -1)) @@ -301,7 +306,7 @@ const SchedulerView = (props: SchedulerViewProps) => { const tabbedItems = sortedFormDto.filter((e: any) => e.itemType === 'tabbed') // Ortak item mapper fonksiyonu - hem group hem tab için kullanılır - const mapFormItem = (i: EditingFormItemDto) => { + const mapFormItem = (i: ColumnFormatDto) => { let editorOptions: any = {} try { if (i.editorOptions) { @@ -311,8 +316,8 @@ const SchedulerView = (props: SchedulerViewProps) => { console.log(err) } - const fieldName = i.dataField.split(':')[0] - const listFormField = gridDto.columnFormats.find((x: any) => x.fieldName === fieldName) + const fieldName = i.fieldName! + const listFormField = i if (listFormField?.sourceDbType === DbTypeEnum.Date) { editorOptions = { @@ -351,7 +356,7 @@ const SchedulerView = (props: SchedulerViewProps) => { } // EditorType belirleme - let editorType: any = i.editorType2 || i.editorType + let editorType: any = i.editorType2 if (i.editorType2 === PlatformEditorTypes.dxGridBox) { editorType = 'dxDropDownBox' } else if (i.editorType2) { @@ -409,8 +414,8 @@ const SchedulerView = (props: SchedulerViewProps) => { canExport: listFormField?.canExport ?? false, allowEditing: listFormField?.allowEditing ?? true, allowAdding: listFormField?.allowAdding ?? true, - dataField: i.dataField, - name: i.dataField, + dataField: i.fieldName, + name: i.fieldName, editorType2: i.editorType2, editorType: i.editorType2 == PlatformEditorTypes.dxGridBox @@ -424,8 +429,8 @@ const SchedulerView = (props: SchedulerViewProps) => { editorScript: i.editorScript, } - if (i.dataField.indexOf(':') >= 0) { - item.label = { text: captionize(i.dataField.split(':')[1]) } + if (i.fieldName?.indexOf(':') >= 0) { + item.label = { text: captionize(i.fieldName.split(':')[1]) } } if ( @@ -445,7 +450,9 @@ const SchedulerView = (props: SchedulerViewProps) => { // Items'ları da order'a göre sırala const sortedItems = (e.items || []) .slice() - .sort((a: any, b: any) => (a.order >= b.order ? 1 : -1)) + .sort((a: any, b: any) => + (a.editOrderNo ?? 0) >= (b.editOrderNo ?? 0) ? 1 : -1, + ) const groupItems = sortedItems.map(mapFormItem) @@ -467,7 +474,9 @@ const SchedulerView = (props: SchedulerViewProps) => { title: tabbedItem.caption, // Her tab'ın title'ı colCount: effectiveColCount, items: tabbedItem.items - ?.sort((a: any, b: any) => (a.order >= b.order ? 1 : -1)) + ?.sort((a: any, b: any) => + (a.editOrderNo ?? 0) >= (b.editOrderNo ?? 0) ? 1 : -1, + ) .map(mapFormItem) .filter((a: any) => { if (currentMode === 'new') { @@ -490,11 +499,11 @@ const SchedulerView = (props: SchedulerViewProps) => { // Form'u tamamen yeniden baştan yapılandır e.form.option( 'colCount', - hasTabbedItems ? 1 : gridDto.gridOptions.editingFormDto?.[0]?.colCount || 2, + hasTabbedItems ? 1 : getEditingFormGroups(gridDto)?.[0]?.colCount || 2, ) e.form.option( 'colCount', - hasTabbedItems ? 1 : gridDto.gridOptions.editingFormDto?.[0]?.colCount || 2, + hasTabbedItems ? 1 : getEditingFormGroups(gridDto)?.[0]?.colCount || 2, ) e.form.option('showValidationSummary', false) e.form.option('items', result) diff --git a/ui/src/views/list/Tree.tsx b/ui/src/views/list/Tree.tsx index 39112c9..f58a474 100644 --- a/ui/src/views/list/Tree.tsx +++ b/ui/src/views/list/Tree.tsx @@ -4,8 +4,8 @@ import { Dialog, Notification, toast } from '@/components/ui' import { APP_NAME, DX_CLASSNAMES } from '@/constants/app.constant' import { executeEditorScript } from '@/utils/editorScriptRuntime' import { + ColumnFormatDto, DbTypeEnum, - EditingFormItemDto, GridDto, PlatformEditorTypes, SubFormTabTypeEnum, @@ -44,6 +44,8 @@ import { addJs, autoNumber, controlStyleCondition, + getEditingFormFields, + getEditingFormGroups, GridExtraFilterState, safeJsonParse, setFormEditingExtraItemValues, @@ -206,13 +208,6 @@ const getActiveEditingForm = (component: any) => { return editForm?.getEditor || editForm?.itemOption ? editForm : undefined } -const flattenEditingFormItems = (items: any[] = []): EditingFormItemDto[] => - items.flatMap((item) => [ - ...(item?.dataField ? [item] : []), - ...flattenEditingFormItems(item?.items || []), - ...(item?.tabs || []).flatMap((tab: any) => flattenEditingFormItems(tab?.items || [])), - ]) - const getValueByField = (data: Record = {}, field?: string) => { if (!field) return undefined if (Object.prototype.hasOwnProperty.call(data, field)) return data[field] @@ -664,11 +659,10 @@ const Tree = (props: TreeProps) => { function onEditorPreparing(editor: TreeListTypes.EditorPreparingEvent) { if (editor.parentType === 'dataRow' && editor.dataField && gridDto) { - const formItem = gridDto.gridOptions.editingFormDto - .flatMap((group) => flattenEditingFormItems([group])) - .find((i) => i.dataField === editor.dataField) - const fieldName = editor.dataField.split(':')[0] - const columnFormat = gridDto.columnFormats.find((column) => column.fieldName === fieldName) + const columnFormat = gridDto.columnFormats.find( + (column) => column.fieldName === editor.dataField, + ) + const formItem = columnFormat?.editOrderNo != null ? columnFormat : undefined const isNewRow = Boolean((editor as any).row?.isNewRow) || mode === 'new' const hasReadOnlyEditorOption = editor.editorOptions?.readOnly === true @@ -689,7 +683,7 @@ const Tree = (props: TreeProps) => { } // Cascade disabled mantığı - const colFormat = gridDto.columnFormats.find((c) => c.fieldName === editor.dataField) + const colFormat = columnFormat if (colFormat?.lookupDto?.cascadeParentFields) { const parentFields = colFormat.lookupDto.cascadeParentFields .split(',') @@ -733,11 +727,8 @@ const Tree = (props: TreeProps) => { try { const editorInstance = formInstance.getEditor(col.fieldName!) if (editorInstance) { - const formItem = gridDto.gridOptions.editingFormDto - .flatMap((group) => flattenEditingFormItems([group])) - .find((i) => i.dataField === col.fieldName) - const editorOptions = formItem?.editorOptions - ? JSON.parse(formItem.editorOptions) + const editorOptions = col.editorOptions + ? JSON.parse(col.editorOptions) : {} editorInstance.option( @@ -804,7 +795,7 @@ const Tree = (props: TreeProps) => { setFormData, }) } catch (err) { - console.error('Script exec error', formItem.dataField, err) + console.error('Script exec error', formItem.fieldName, err) } } } @@ -1269,9 +1260,7 @@ const Tree = (props: TreeProps) => { } const runReadOnlyScripts = () => { - const formItems = gridDto.gridOptions.editingFormDto.flatMap((group) => - flattenEditingFormItems([group]), - ) + const formItems = getEditingFormFields(gridDto) const scriptItems = formItems.filter((formItem) => shouldRunEditorScriptOnContentReady(formItem.editorScript), ) @@ -1282,9 +1271,9 @@ const Tree = (props: TreeProps) => { const editorValues = formItems.reduce>( (values, formItem) => { - const editorInstance = form?.getEditor?.(formItem.dataField) + const editorInstance = form?.getEditor?.(formItem.fieldName) if (editorInstance?.option) { - values[formItem.dataField] = editorInstance.option('value') + values[formItem.fieldName!] = editorInstance.option('value') } return values }, @@ -1299,17 +1288,17 @@ const Tree = (props: TreeProps) => { scriptItems.forEach((formItem) => { try { - const editorInstance = form?.getEditor?.(formItem.dataField) + const editorInstance = form?.getEditor?.(formItem.fieldName) const editorValue = editorInstance?.option?.('value') ?? - getValueByField(formData, formItem.dataField) + getValueByField(formData, formItem.fieldName) const editor = { - dataField: formItem.dataField, + dataField: formItem.fieldName, component: grid, } const e = { component: form, - dataField: formItem.dataField, + dataField: formItem.fieldName, scriptEvent: 'contentReady', value: editorValue, } @@ -1324,7 +1313,7 @@ const Tree = (props: TreeProps) => { } catch (err) { console.error( 'Script exec error on contentReady', - formItem.dataField, + formItem.fieldName!, err, ) } @@ -1340,11 +1329,10 @@ const Tree = (props: TreeProps) => { ...(e.component?.option?.('formData') || {}), } - const formItem = gridDto.gridOptions.editingFormDto - .flatMap((group) => flattenEditingFormItems([group])) + const formItem = getEditingFormFields(gridDto) .find( (i) => - String(i.dataField || '').toLowerCase() === + String(i.fieldName || '').toLowerCase() === String(e.dataField || '').toLowerCase(), ) if (formItem?.editorScript) { @@ -1387,9 +1375,9 @@ const Tree = (props: TreeProps) => { } }, items: - gridDto.gridOptions.editingFormDto?.length > 0 + getEditingFormGroups(gridDto)?.length > 0 ? (() => { - const sortedFormDto = gridDto.gridOptions.editingFormDto + const sortedFormDto = getEditingFormGroups(gridDto) .slice() .sort((a: any, b: any) => (a.order >= b.order ? 1 : -1)) @@ -1400,7 +1388,7 @@ const Tree = (props: TreeProps) => { const result: any[] = [] // Helper function: item mapper - const mapFormItem = (i: EditingFormItemDto) => { + const mapFormItem = (i: ColumnFormatDto) => { let editorOptions: EditorOptionsWithButtons = {} let parsedEditorOptions: EditorOptionsWithButtons = {} const forcedEditorOptions: EditorOptionsWithButtons = {} @@ -1415,12 +1403,12 @@ const Tree = (props: TreeProps) => { const filters = extractSearchParamsFields(parsed) const hasFilter = filters.some( - ([field, op, val]) => field === i.dataField, + ([field, op, val]) => field === i.fieldName, ) if (hasFilter) { const existsInExtra = extraFilters.some( - (f) => f.fieldName === i.dataField && !!f.value, + (f) => f.fieldName === i.fieldName && !!f.value, ) if (!existsInExtra) { @@ -1429,13 +1417,11 @@ const Tree = (props: TreeProps) => { } } } catch (err){ - console.error('EditorOptions parse error:', i.dataField, err) + console.error('EditorOptions parse error:', i.fieldName, err) } - const fieldName = i.dataField.split(':')[0] - const listFormField = gridDto.columnFormats.find( - (x: any) => x.fieldName === fieldName, - ) + const fieldName = i.fieldName! + const listFormField = i const defaultEditorOptions: EditorOptionsWithButtons = {} @@ -1484,8 +1470,8 @@ const Tree = (props: TreeProps) => { canExport: listFormField?.canExport ?? false, allowEditing: listFormField?.allowEditing ?? true, allowAdding: listFormField?.allowAdding ?? true, - dataField: i.dataField, - name: i.dataField, + dataField: i.fieldName, + name: i.fieldName, editorType2: i.editorType2, editorType: i.editorType2 == PlatformEditorTypes.dxGridBox @@ -1503,12 +1489,12 @@ const Tree = (props: TreeProps) => { item.template = 'cellEditImageViewer' item.editorOptions = { ...item.editorOptions, - value: getValueByField(editingFormDataRef.current, i.dataField), + value: getValueByField(editingFormDataRef.current, i.fieldName), } } - if (i.dataField.indexOf(':') >= 0) { - item.label = { text: captionize(i.dataField.split(':')[1]) } + if (i.fieldName?.indexOf(':') >= 0) { + item.label = { text: captionize(i.fieldName.split(':')[1]) } } if ( @@ -1532,7 +1518,9 @@ const Tree = (props: TreeProps) => { colSpan: e.colSpan, caption: e.caption, // Group'larda caption olmalı items: e.items - ?.sort((a: any, b: any) => (a.order >= b.order ? 1 : -1)) + ?.sort((a: any, b: any) => + (a.editOrderNo ?? 0) >= (b.editOrderNo ?? 0) ? 1 : -1, + ) .map(mapFormItem) .filter((a: any) => { if (mode === 'view') { @@ -1561,7 +1549,9 @@ const Tree = (props: TreeProps) => { title: tabbedItem.caption, // Her tab'ın title'ı colCount: effectiveColCount, items: tabbedItem.items - ?.sort((a: any, b: any) => (a.order >= b.order ? 1 : -1)) + ?.sort((a: any, b: any) => + (a.editOrderNo ?? 0) >= (b.editOrderNo ?? 0) ? 1 : -1, + ) .map(mapFormItem) .filter((a: any) => { if (mode === 'view') { diff --git a/ui/src/views/list/Utils.ts b/ui/src/views/list/Utils.ts index 71a2c88..ca2fa03 100644 --- a/ui/src/views/list/Utils.ts +++ b/ui/src/views/list/Utils.ts @@ -2,6 +2,24 @@ import type { DataType } from 'devextreme/common' import type { PivotGridDataType } from 'devextreme/ui/pivot_grid/data_source' import { MULTIVALUE_DELIMITER } from '../../constants/app.constant' import { ChartSeriesDto } from '@/proxy/admin/charts/models' +import type { GridDto } from '@/proxy/form/models' + +/** EditingFormDto gruplarını ColumnFormatDto alanlarıyla DevExtreme için birleştirir. */ +export const getEditingFormFields = (gridDto: GridDto) => + gridDto.columnFormats + .filter((field) => field.editOrderNo != null && field.fieldName) + .sort((left, right) => left.editOrderNo! - right.editOrderNo!) + +export const getEditingFormGroups = (gridDto: GridDto) => { + const fields = getEditingFormFields(gridDto) + + return [...(gridDto.gridOptions.editingFormDto ?? [])] + .sort((left, right) => left.order - right.order) + .map((group) => ({ + ...group, + items: fields.filter((field) => (field.editGroupOrderNo ?? 1) === group.order), + })) +} export interface GridExtraFilterState { fieldName: string diff --git a/ui/src/views/list/useListFormColumns.ts b/ui/src/views/list/useListFormColumns.ts index cf6135e..f771c6f 100644 --- a/ui/src/views/list/useListFormColumns.ts +++ b/ui/src/views/list/useListFormColumns.ts @@ -11,13 +11,12 @@ import { dynamicFetch } from '@/services/form.service' import { GridColumnData } from './GridColumnData' import { ColumnFormatDto, - EditingFormItemDto, GridDto, PlatformEditorTypes, UiCommandButtonPositionTypeEnum, UiLookupDataSourceTypeEnum, } from '@/proxy/form/models' -import { addCss } from './Utils' +import { addCss, getEditingFormFields } from './Utils' const NO_IMAGE = '/img/others/no-image.png' @@ -926,12 +925,11 @@ const useListFormColumns = ({ // #region lookup ayarlari if (colData.lookupDto?.dataSourceType) { // UiColumnEditorTemplateTypeEnum : None:0, Table:1, TagBox:2 - const allItems = gridDto.gridOptions.editingFormDto.flatMap((group) => group.items) - const formItem = allItems.find((a) => a?.dataField === colData.fieldName) + const formItem = colData.editOrderNo != null ? colData : undefined if (formItem?.editorType2 === PlatformEditorTypes.dxTagBox) { column.extras = { multiValue: true, - editorOptions: formItem.editorOptions, + editorOptions, tagBoxOptions: formItem.tagBoxOptions, } column.editCellTemplate = 'cellEditTagBox' @@ -940,7 +938,7 @@ const useListFormColumns = ({ } else if (formItem?.editorType2 === PlatformEditorTypes.dxGridBox) { column.extras = { multiValue: false, - editorOptions: formItem.editorOptions, + editorOptions, gridBoxOptions: formItem.gridBoxOptions, } column.editCellTemplate = 'cellEditGridBox' @@ -976,8 +974,7 @@ const useListFormColumns = ({ // #region image upload editor if (!colData.lookupDto?.dataSourceType) { - const allFormItems = gridDto.gridOptions.editingFormDto.flatMap((group) => group.items) - const imageFormItem = allFormItems.find((a) => a?.dataField === colData.fieldName) + const imageFormItem = colData.editOrderNo != null ? colData : undefined const isImageUploadEditor = imageFormItem?.editorType2 === PlatformEditorTypes.dxImageUpload const isImageViewerEditor = @@ -1006,7 +1003,7 @@ const useListFormColumns = ({ } column.extras = { multiValue: imageUploadOptions?.multiple ?? false, - editorOptions: imageFormItem?.editorOptions ?? colData.editorOptions, + editorOptions, imageUploadOptions: imageUploadOptions, } if (isImageUploadEditor) { @@ -1091,25 +1088,19 @@ const useListFormColumns = ({ } } - // FormEditingExtraItem - // Devexpress Gridde kaydete basılınca - // formda gözükecek olan EditingFormDto.Items elemanları gelmiyor - // Sadece grid'de tanımlanmış columnları getiriyor. - // Bu elemanları da getirmesi için aşağıdaki şekilde, - // columns'da olmayan alanları da gizli olarak ekliyoruz + // Formda kullanılan fakat listede görünmeyen ColumnFormatDto alanlarını + // DevExtreme'in düzenleme modeline gizli kolon olarak ekliyoruz. if (columns?.length) { - gridDto.gridOptions.editingFormDto.forEach((group) => { - group.items?.forEach((item: EditingFormItemDto) => { - if (!columns.some((a) => a.dataField === item.dataField)) { - columns.push({ - dataField: item.dataField, - visible: false, - showInColumnChooser: false, - allowSearch: false - }) - insertedColumns.push(item.dataField) - } - }) + getEditingFormFields(gridDto).forEach((item: ColumnFormatDto) => { + if (!columns.some((a) => a.dataField === item.fieldName)) { + columns.push({ + dataField: item.fieldName, + visible: false, + showInColumnChooser: false, + allowSearch: false, + }) + insertedColumns.push(item.fieldName) + } }) }