sozsoft/erp-platform
1
0
Fork 0
Code Issues 6 Pull requests Projects 3 Releases Packages Wiki Activity Actions

format ve mask işlemleri için güncellemeler

Browse source
This commit is contained in:
Sedat ÖZTÜRK 2025-10-09 12:44:28 +03:00
parent 00627b21a9
commit 21284b652f
14 changed files with 375 additions and 280 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
api/src/Kurs.Platform.Application.Contracts/Banks/BankDto.cs
View file

@ -14,7 +14,6 @@ public class BankDto : AuditedEntityDto<Guid>
public string City { get; set; } public string City { get; set; }
public string PostalCode { get; set; } public string PostalCode { get; set; }
public string Country { get; set; } public string Country { get; set; }
public string Phone { get; set; } public string Phone { get; set; }
public string Email { get; set; } public string Email { get; set; }
} }

6
api/src/Kurs.Platform.Application.Contracts/ListForms/DynamicApi/CreateUpdateTenantInput.cs
View file

@ -22,9 +22,9 @@ public class CreateUpdateTenantInput
public string Address { get; set; } public string Address { get; set; }
public string Address2 { get; set; } public string Address2 { get; set; }
public string PostalCode { get; set; } public string PostalCode { get; set; }
public long Phone { get; set; } public string Phone { get; set; }
public long Mobile { get; set; } public string Mobile { get; set; }
public long Fax { get; set; } public string Fax { get; set; }
public string Email { get; set; } public string Email { get; set; }
public string Website { get; set; } public string Website { get; set; }
} }

6
api/src/Kurs.Platform.Application.Contracts/Tenants/CustomTenantDto.cs
View file

@ -19,9 +19,9 @@ public class CustomTenantDto
public string Address { get; set; } public string Address { get; set; }
public string Address2 { get; set; } public string Address2 { get; set; }
public string PostalCode { get; set; } public string PostalCode { get; set; }
public long Phone { get; set; } public string Phone { get; set; }
public long Mobile { get; set; } public string Mobile { get; set; }
public long Fax { get; set; } public string Fax { get; set; }
public string Email { get; set; } public string Email { get; set; }
public string Website { get; set; } public string Website { get; set; }
} }

113
api/src/Kurs.Platform.DbMigrator/Seeds/PlatformListFormsSeeder.cs
View file

@ -169,8 +169,9 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc
$"FROM \"{SelectCommandByTableName("InstallmentOption", Prefix.DbTableWeb)}\" " + $"FROM \"{SelectCommandByTableName("InstallmentOption", Prefix.DbTableWeb)}\" " +
$"ORDER BY \"{SelectCommandByTableName("InstallmentOption", Prefix.DbTableWeb)}\".\"Installment\";"; $"ORDER BY \"{SelectCommandByTableName("InstallmentOption", Prefix.DbTableWeb)}\".\"Installment\";";
var htmlEditorOptions = "{\"toolbar\": {\"multiline\": true, \"items\": [{\"name\": \"undo\"},{\"name\": \"redo\"},{\"name\": \"separator\"},{\"name\": \"size\",\"acceptedValues\": [\"8pt\",\"10pt\",\"12pt\",\"14pt\",\"18pt\",\"24pt\",\"36pt\"],\"options\": {\"inputAttr\": {\"aria-label\": \"Font size\"}}},{\"name\": \"font\",\"acceptedValues\": [\"Arial\",\"Courier New\",\"Georgia\",\"Impact\",\"Lucida Console\",\"Tahoma\",\"Times New Roman\",\"Verdana\"],\"options\": {\"inputAttr\": {\"aria-label\": \"Font family\"}}},{\"name\": \"separator\"},{\"name\": \"bold\"},{\"name\": \"italic\"},{\"name\": \"strike\"},{\"name\": \"underline\"},{\"name\": \"separator\"},{\"name\": \"alignLeft\"},{\"name\": \"alignCenter\"},{\"name\": \"alignRight\"},{\"name\": \"alignJustify\"},{\"name\": \"separator\"},{\"name\": \"orderedList\"},{\"name\": \"bulletList\"},{\"name\": \"separator\"},{\"name\": \"header\",\"acceptedValues\": [false,1,2,3,4,5],\"options\": {\"inputAttr\": {\"aria-label\": \"Font family\"}}},{\"name\": \"separator\"},{\"name\": \"color\"},{\"name\": \"background\"},{\"name\": \"separator\"},{\"name\": \"link\"},{\"name\": \"image\"},{\"name\": \"separator\"},{\"name\": \"clear\"},{\"name\": \"codeBlock\"},{\"name\": \"blockquote\"},{\"name\": \"separator\"},{\"name\": \"insertTable\"},{\"name\": \"deleteTable\"},{\"name\": \"insertRowAbove\"},{\"name\": \"insertRowBelow\"},{\"name\": \"deleteRow\"},{\"name\": \"insertColumnLeft\"},{\"name\": \"insertColumnRight\"},{\"name\": \"deleteColumn\"}]}}";
var showClearButton = "{ \"showClearButton\" : true }"; var showClearButton = "{ \"showClearButton\" : true }";
var htmlEditorOptions = "{\"toolbar\": {\"multiline\": true, \"items\": [{\"name\": \"undo\"},{\"name\": \"redo\"},{\"name\": \"separator\"},{\"name\": \"size\",\"acceptedValues\": [\"8pt\",\"10pt\",\"12pt\",\"14pt\",\"18pt\",\"24pt\",\"36pt\"],\"options\": {\"inputAttr\": {\"aria-label\": \"Font size\"}}},{\"name\": \"font\",\"acceptedValues\": [\"Arial\",\"Courier New\",\"Georgia\",\"Impact\",\"Lucida Console\",\"Tahoma\",\"Times New Roman\",\"Verdana\"],\"options\": {\"inputAttr\": {\"aria-label\": \"Font family\"}}},{\"name\": \"separator\"},{\"name\": \"bold\"},{\"name\": \"italic\"},{\"name\": \"strike\"},{\"name\": \"underline\"},{\"name\": \"separator\"},{\"name\": \"alignLeft\"},{\"name\": \"alignCenter\"},{\"name\": \"alignRight\"},{\"name\": \"alignJustify\"},{\"name\": \"separator\"},{\"name\": \"orderedList\"},{\"name\": \"bulletList\"},{\"name\": \"separator\"},{\"name\": \"header\",\"acceptedValues\": [false,1,2,3,4,5],\"options\": {\"inputAttr\": {\"aria-label\": \"Font family\"}}},{\"name\": \"separator\"},{\"name\": \"color\"},{\"name\": \"background\"},{\"name\": \"separator\"},{\"name\": \"link\"},{\"name\": \"image\"},{\"name\": \"separator\"},{\"name\": \"clear\"},{\"name\": \"codeBlock\"},{\"name\": \"blockquote\"},{\"name\": \"separator\"},{\"name\": \"insertTable\"},{\"name\": \"deleteTable\"},{\"name\": \"insertRowAbove\"},{\"name\": \"insertRowBelow\"},{\"name\": \"deleteRow\"},{\"name\": \"insertColumnLeft\"},{\"name\": \"insertColumnRight\"},{\"name\": \"deleteColumn\"}]}}";
var phoneEditorOptions = "{\"format\": \"phoneGlobal\", \"mask\":\"(000) 000-0000\", \"maskInvalidMessage\":\"Lütfen geçerli bir telefon numarası girin\", \"useMaskedValue\":false, \"maskRules\": { \"X\": \"[1-9]\" }, \"placeholder\": \"(555) 123-4567\" }";
#region Form #region Form
@ -886,8 +887,9 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc
new EditingFormItemDto { Order = 8, DataField = "City", ColSpan = 1, IsRequired = true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton }, new EditingFormItemDto { Order = 8, DataField = "City", ColSpan = 1, IsRequired = true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton },
new EditingFormItemDto { Order = 9, DataField = "District", ColSpan = 1, IsRequired = true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton }, new EditingFormItemDto { Order = 9, DataField = "District", ColSpan = 1, IsRequired = true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton },
new EditingFormItemDto { Order = 10, DataField = "PostalCode", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 10, DataField = "PostalCode", ColSpan = 1, EditorType2=EditorTypes.dxTextBox },
new EditingFormItemDto { Order = 11, DataField = "Phone", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 11, DataField = "Phone", ColSpan = 1, EditorType2=EditorTypes.dxTextBox, EditorOptions=phoneEditorOptions },
new EditingFormItemDto { Order = 12, DataField = "Email", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, ] new EditingFormItemDto { Order = 12, DataField = "Email", ColSpan = 1, EditorType2=EditorTypes.dxTextBox },
]
} }
}), }),
InsertFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { InsertFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] {
@ -1273,6 +1275,10 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc
IsActive = true, IsActive = true,
IsDeleted = false, IsDeleted = false,
AllowSearch = true, AllowSearch = true,
ValidationRuleJson = JsonSerializer.Serialize(new ValidationRuleDto[]
{
new ValidationRuleDto() { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.email) }
}),
PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto
{ {
C = AppCodes.Definitions.Bank + ".Create", C = AppCodes.Definitions.Bank + ".Create",
@ -1407,9 +1413,9 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc
new EditingFormItemDto { Order=3, DataField="Founder", ColSpan=1, IsRequired=true, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=3, DataField="Founder", ColSpan=1, IsRequired=true, EditorType2=EditorTypes.dxTextBox },
new EditingFormItemDto { Order=4, DataField="VknTckn", ColSpan=1, IsRequired=true, EditorType2=EditorTypes.dxNumberBox }, new EditingFormItemDto { Order=4, DataField="VknTckn", ColSpan=1, IsRequired=true, EditorType2=EditorTypes.dxNumberBox },
new EditingFormItemDto { Order=5, DataField="TaxOffice", ColSpan=1, IsRequired=true, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=5, DataField="TaxOffice", ColSpan=1, IsRequired=true, EditorType2=EditorTypes.dxTextBox },
new EditingFormItemDto { Order=6, DataField="Mobile", ColSpan=1, IsRequired=true, EditorType2=EditorTypes.dxNumberBox }, new EditingFormItemDto { Order=6, DataField="Mobile", ColSpan=1, IsRequired=true, EditorType2=EditorTypes.dxTextBox, EditorOptions=phoneEditorOptions },
new EditingFormItemDto { Order=7, DataField="Phone", ColSpan=1, IsRequired=false, EditorType2=EditorTypes.dxNumberBox }, new EditingFormItemDto { Order=7, DataField="Phone", ColSpan=1, IsRequired=false, EditorType2=EditorTypes.dxTextBox, EditorOptions=phoneEditorOptions },
new EditingFormItemDto { Order=8, DataField="Fax", ColSpan=1, IsRequired=false, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=8, DataField="Fax", ColSpan=1, IsRequired=false, EditorType2=EditorTypes.dxTextBox, EditorOptions=phoneEditorOptions },
new EditingFormItemDto { Order=9, DataField="IsActive", ColSpan=1, IsRequired=false, EditorType2=EditorTypes.dxCheckBox }, new EditingFormItemDto { Order=9, DataField="IsActive", ColSpan=1, IsRequired=false, EditorType2=EditorTypes.dxCheckBox },
] ]
}, },
@ -1417,8 +1423,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc
[ [
new EditingFormItemDto { Order=1, DataField="Country", ColSpan=1, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton }, new EditingFormItemDto { Order=1, DataField="Country", ColSpan=1, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton },
new EditingFormItemDto { Order=2, DataField="City", ColSpan=1, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton }, new EditingFormItemDto { Order=2, DataField="City", ColSpan=1, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton },
new EditingFormItemDto { Order=3, DataField="District", ColSpan=1, IsRequired=false, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton }, new EditingFormItemDto { Order=3, DataField="District", ColSpan=1, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton },
new EditingFormItemDto { Order=4, DataField="Street", ColSpan=1, IsRequired=false, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton }, new EditingFormItemDto { Order=4, DataField="Street", ColSpan=1, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton },
new EditingFormItemDto { Order=5, DataField="PostalCode", ColSpan=1, IsRequired=false, EditorType2=EditorTypes.dxTextBox, EditorOptions=showClearButton }, new EditingFormItemDto { Order=5, DataField="PostalCode", ColSpan=1, IsRequired=false, EditorType2=EditorTypes.dxTextBox, EditorOptions=showClearButton },
new EditingFormItemDto { Order=6, DataField="Address", ColSpan=1, IsRequired=false, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=6, DataField="Address", ColSpan=1, IsRequired=false, EditorType2=EditorTypes.dxTextBox },
new EditingFormItemDto { Order=7, DataField="Address2", ColSpan=1, IsRequired=false, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=7, DataField="Address2", ColSpan=1, IsRequired=false, EditorType2=EditorTypes.dxTextBox },
@ -1880,6 +1886,10 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc
IsActive = true, IsActive = true,
IsDeleted = false, IsDeleted = false,
AllowSearch = true, AllowSearch = true,
ValidationRuleJson = JsonSerializer.Serialize(new ValidationRuleDto[]
{
new ValidationRuleDto() { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.email) }
}),
PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto
{ {
C = TenantManagementPermissions.Tenants.Create, C = TenantManagementPermissions.Tenants.Create,
@ -2148,9 +2158,9 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc
new EditingFormItemDto { Order=3, DataField="Founder", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=3, DataField="Founder", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxTextBox },
new EditingFormItemDto { Order=4, DataField="VknTckn", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxNumberBox }, new EditingFormItemDto { Order=4, DataField="VknTckn", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxNumberBox },
new EditingFormItemDto { Order=5, DataField="TaxOffice", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=5, DataField="TaxOffice", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxTextBox },
new EditingFormItemDto { Order=6, DataField="Mobile", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxNumberBox }, new EditingFormItemDto { Order=6, DataField="Mobile", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxTextBox, EditorOptions=phoneEditorOptions },
new EditingFormItemDto { Order=7, DataField="Phone", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxNumberBox }, new EditingFormItemDto { Order=7, DataField="Phone", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox, EditorOptions=phoneEditorOptions },
new EditingFormItemDto { Order=8, DataField="Fax", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=8, DataField="Fax", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox, EditorOptions=phoneEditorOptions },
new EditingFormItemDto { Order=9, DataField="IsActive", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxCheckBox }, new EditingFormItemDto { Order=9, DataField="IsActive", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxCheckBox },
] ]
}, },
@ -2158,8 +2168,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc
[ [
new EditingFormItemDto { Order=1, DataField="Country", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton }, new EditingFormItemDto { Order=1, DataField="Country", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton },
new EditingFormItemDto { Order=2, DataField="City", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton }, new EditingFormItemDto { Order=2, DataField="City", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton },
new EditingFormItemDto { Order=3, DataField="District", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton }, new EditingFormItemDto { Order=3, DataField="District", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton },
new EditingFormItemDto { Order=4, DataField="Street", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton }, new EditingFormItemDto { Order=4, DataField="Street", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton },
new EditingFormItemDto { Order=5, DataField="PostalCode", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox, EditorOptions=showClearButton }, new EditingFormItemDto { Order=5, DataField="PostalCode", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox, EditorOptions=showClearButton },
new EditingFormItemDto { Order=6, DataField="Address", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=6, DataField="Address", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox },
new EditingFormItemDto { Order=7, DataField="Address2", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=7, DataField="Address2", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox },
@ -2627,6 +2637,10 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc
IsActive = true, IsActive = true,
IsDeleted = false, IsDeleted = false,
AllowSearch = true, AllowSearch = true,
ValidationRuleJson = JsonSerializer.Serialize(new ValidationRuleDto[]
{
new ValidationRuleDto() { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.email) }
}),
PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto
{ {
C = TenantManagementPermissions.Tenants.Create, C = TenantManagementPermissions.Tenants.Create,
@ -2892,9 +2906,9 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc
new EditingFormItemDto { Order=3, DataField="Name", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=3, DataField="Name", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxTextBox },
new EditingFormItemDto { Order=4, DataField="VknTckn", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxNumberBox }, new EditingFormItemDto { Order=4, DataField="VknTckn", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxNumberBox },
new EditingFormItemDto { Order=5, DataField="TaxOffice", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=5, DataField="TaxOffice", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxTextBox },
new EditingFormItemDto { Order=6, DataField="Mobile", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxNumberBox }, new EditingFormItemDto { Order=6, DataField="Mobile", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxTextBox, EditorOptions=phoneEditorOptions },
new EditingFormItemDto { Order=7, DataField="Phone", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxNumberBox }, new EditingFormItemDto { Order=7, DataField="Phone", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox, EditorOptions=phoneEditorOptions },
new EditingFormItemDto { Order=8, DataField="Fax", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=8, DataField="Fax", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox, EditorOptions=phoneEditorOptions },
new EditingFormItemDto { Order=9, DataField="IsActive", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxCheckBox }, new EditingFormItemDto { Order=9, DataField="IsActive", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxCheckBox },
] ]
}, },
@ -2902,8 +2916,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc
[ [
new EditingFormItemDto { Order=1, DataField="Country", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton }, new EditingFormItemDto { Order=1, DataField="Country", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton },
new EditingFormItemDto { Order=2, DataField="City", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton }, new EditingFormItemDto { Order=2, DataField="City", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton },
new EditingFormItemDto { Order=3, DataField="District", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton }, new EditingFormItemDto { Order=3, DataField="District", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton },
new EditingFormItemDto { Order=4, DataField="Street", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton }, new EditingFormItemDto { Order=4, DataField="Street", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton },
new EditingFormItemDto { Order=5, DataField="Address", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=5, DataField="Address", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox },
new EditingFormItemDto { Order=6, DataField="Address2", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=6, DataField="Address2", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox },
new EditingFormItemDto { Order=7, DataField="PostalCode", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=7, DataField="PostalCode", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox },
@ -3376,6 +3390,10 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc
IsActive = true, IsActive = true,
IsDeleted = false, IsDeleted = false,
AllowSearch = true, AllowSearch = true,
ValidationRuleJson = JsonSerializer.Serialize(new ValidationRuleDto[]
{
new ValidationRuleDto() { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.email) }
}),
PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto
{ {
C = AppCodes.Branches + ".Create", C = AppCodes.Branches + ".Create",
@ -4530,8 +4548,10 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc
IsActive = true, IsActive = true,
IsDeleted = false, IsDeleted = false,
AllowSearch = true, AllowSearch = true,
ValidationRuleJson = JsonSerializer.Serialize(new ValidationRuleDto[] { ValidationRuleJson = JsonSerializer.Serialize(new ValidationRuleDto[]
new ValidationRuleDto() { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.required)} {
new ValidationRuleDto() { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.email) },
new ValidationRuleDto() { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.required) }
}), }),
PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto
{ {
@ -12737,27 +12757,25 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc
}), }),
EditingFormJson = JsonSerializer.Serialize(new List<EditingFormDto> EditingFormJson = JsonSerializer.Serialize(new List<EditingFormDto>
{ {
new() new() { Order=1, ColCount=1, ColSpan=1, ItemType="group", Items =
{
Order = 1,
ColCount = 2,
ColSpan = 2,
ItemType = "group",
Items =
[ [
new EditingFormItemDto { Order = 1, DataField = "OrganizationName", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 1, DataField = "OrganizationName", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox },
new EditingFormItemDto { Order = 2, DataField = "Founder", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 2, DataField = "Founder", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox },
new EditingFormItemDto { Order = 3, DataField = "VknTckn", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox }, new EditingFormItemDto { Order = 3, DataField = "VknTckn", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox },
new EditingFormItemDto { Order = 4, DataField = "TaxOffice", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 4, DataField = "TaxOffice", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox },
new EditingFormItemDto { Order = 5, DataField = "Address", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox },
new EditingFormItemDto { Order = 6, DataField = "Address2", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox },
new EditingFormItemDto { Order = 7, DataField = "Country", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=showClearButton }, new EditingFormItemDto { Order = 7, DataField = "Country", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=showClearButton },
new EditingFormItemDto { Order = 8, DataField = "City", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=showClearButton }, new EditingFormItemDto { Order = 8, DataField = "City", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=showClearButton },
new EditingFormItemDto { Order = 9, DataField = "District", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=showClearButton }, new EditingFormItemDto { Order = 9, DataField = "District", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=showClearButton },
new EditingFormItemDto { Order = 5, DataField = "Address", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox },
new EditingFormItemDto { Order = 6, DataField = "Address2", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox },
new EditingFormItemDto { Order = 10, DataField = "PostalCode", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 10, DataField = "PostalCode", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox },
new EditingFormItemDto { Order = 11, DataField = "Phone", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox }, ]
new EditingFormItemDto { Order = 12, DataField = "Mobile", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox }, },
new EditingFormItemDto { Order = 13, DataField = "Fax", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox }, new() { Order=2, ColCount=1, ColSpan=1, ItemType="group", Items =
[
new EditingFormItemDto { Order = 11, DataField = "Phone", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox, EditorOptions=phoneEditorOptions },
new EditingFormItemDto { Order = 12, DataField = "Mobile", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox, EditorOptions=phoneEditorOptions },
new EditingFormItemDto { Order = 13, DataField = "Fax", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox, EditorOptions=phoneEditorOptions },
new EditingFormItemDto { Order = 14, DataField = "Email", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 14, DataField = "Email", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox },
new EditingFormItemDto { Order = 15, DataField = "Website", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 15, DataField = "Website", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox },
new EditingFormItemDto { Order = 16, DataField = "Subtotal", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox }, new EditingFormItemDto { Order = 16, DataField = "Subtotal", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox },
@ -13060,7 +13078,7 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc
{ {
ListFormCode = listFormPurchaseOrder.ListFormCode, ListFormCode = listFormPurchaseOrder.ListFormCode,
CultureName = LanguageCodes.En, CultureName = LanguageCodes.En,
SourceDbType = DbType.Int64, SourceDbType = DbType.String,
FieldName = "Phone", FieldName = "Phone",
Width = 100, Width = 100,
ListOrderNo = 11, ListOrderNo = 11,
@ -14220,7 +14238,7 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc
new EditingFormItemDto { Order = 1, DataField = "OrganizationName", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 1, DataField = "OrganizationName", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxTextBox },
new EditingFormItemDto { Order = 2, DataField = "FullName", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 2, DataField = "FullName", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxTextBox },
new EditingFormItemDto { Order = 3, DataField = "Email", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 3, DataField = "Email", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxTextBox },
new EditingFormItemDto { Order = 4, DataField = "Phone", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 4, DataField = "Phone", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxTextBox, EditorOptions=phoneEditorOptions },
new EditingFormItemDto { Order = 5, DataField = "Address", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxTextArea }, new EditingFormItemDto { Order = 5, DataField = "Address", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxTextArea },
new EditingFormItemDto { Order = 6, DataField = "NumberOfBranches", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox }, new EditingFormItemDto { Order = 6, DataField = "NumberOfBranches", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox },
new EditingFormItemDto { Order = 7, DataField = "NumberOfUsers", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox }, new EditingFormItemDto { Order = 7, DataField = "NumberOfUsers", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox },
@ -14352,6 +14370,10 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc
IsActive = true, IsActive = true,
IsDeleted = false, IsDeleted = false,
AllowSearch = true, AllowSearch = true,
ValidationRuleJson = JsonSerializer.Serialize(new ValidationRuleDto[]
{
new ValidationRuleDto() { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.email) },
}),
PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto
{ {
C = AppCodes.Demos + ".Create", C = AppCodes.Demos + ".Create",
@ -14574,7 +14596,7 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc
Items = Items =
[ [
new EditingFormItemDto { Order = 1, DataField = "Address", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton }, new EditingFormItemDto { Order = 1, DataField = "Address", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton },
new EditingFormItemDto { Order = 2, DataField = "Phone", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 2, DataField = "Phone", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxTextBox, EditorOptions=phoneEditorOptions },
new EditingFormItemDto { Order = 3, DataField = "Email", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 3, DataField = "Email", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxTextBox },
new EditingFormItemDto { Order = 4, DataField = "Location", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 4, DataField = "Location", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxTextBox },
new EditingFormItemDto { Order = 5, DataField = "TaxNumber", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 5, DataField = "TaxNumber", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxTextBox },
@ -14714,9 +14736,10 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc
IsActive = true, IsActive = true,
IsDeleted = false, IsDeleted = false,
AllowSearch = true, AllowSearch = true,
ValidationRuleJson = JsonSerializer.Serialize(new[] ValidationRuleJson = JsonSerializer.Serialize(new ValidationRuleDto[]
{ {
new ValidationRuleDto { Type = "required" } new ValidationRuleDto() { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.required) },
new ValidationRuleDto() { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.email) },
}), }),
PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto
{ {
@ -22982,7 +23005,7 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc
Items = Items =
[ [
new EditingFormItemDto { Order = 1, DataField = "Name", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 1, DataField = "Name", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox },
new EditingFormItemDto { Order = 2, DataField = "Phone", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 2, DataField = "Phone", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox, EditorOptions=phoneEditorOptions },
new EditingFormItemDto { Order = 3, DataField = "Email", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 3, DataField = "Email", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox },
new EditingFormItemDto { Order = 4, DataField = "Address", ColSpan = 2, EditorType2 = EditorTypes.dxTextArea }, new EditingFormItemDto { Order = 4, DataField = "Address", ColSpan = 2, EditorType2 = EditorTypes.dxTextArea },
new EditingFormItemDto { Order = 5, DataField = "Status", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, new EditingFormItemDto { Order = 5, DataField = "Status", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox },
@ -23120,6 +23143,10 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc
Visible = true, Visible = true,
IsActive = true, IsActive = true,
IsDeleted = false, IsDeleted = false,
ValidationRuleJson = JsonSerializer.Serialize(new ValidationRuleDto[]
{
new ValidationRuleDto() { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.email) }
}),
PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto
{ {
C = AppCodes.Definitions.Psychologist + ".Create", C = AppCodes.Definitions.Psychologist + ".Create",
@ -23428,6 +23455,10 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc
Visible = true, Visible = true,
IsActive = true, IsActive = true,
IsDeleted = false, IsDeleted = false,
ValidationRuleJson = JsonSerializer.Serialize(new ValidationRuleDto[]
{
new ValidationRuleDto() { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.email) }
}),
PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto
{ {
C = AppCodes.Definitions.Lawyer + ".Create", C = AppCodes.Definitions.Lawyer + ".Create",
@ -26786,7 +26817,7 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc
new EditingFormItemDto { Order = 8, DataField = "City", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton }, new EditingFormItemDto { Order = 8, DataField = "City", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton },
new EditingFormItemDto { Order = 9, DataField = "District", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton }, new EditingFormItemDto { Order = 9, DataField = "District", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton },
new EditingFormItemDto { Order = 10, DataField = "PostalCode", ColSpan = 2, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 10, DataField = "PostalCode", ColSpan = 2, EditorType2=EditorTypes.dxTextBox },
new EditingFormItemDto { Order = 11, DataField = "Phone", ColSpan = 2, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 11, DataField = "Phone", ColSpan = 2, EditorType2=EditorTypes.dxTextBox, EditorOptions=phoneEditorOptions },
new EditingFormItemDto { Order = 12, DataField = "Email", ColSpan = 2, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 12, DataField = "Email", ColSpan = 2, EditorType2=EditorTypes.dxTextBox },
] ]
} }
@ -27184,6 +27215,10 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc
IsActive = true, IsActive = true,
IsDeleted = false, IsDeleted = false,
AllowSearch = true, AllowSearch = true,
ValidationRuleJson = JsonSerializer.Serialize(new ValidationRuleDto[]
{
new ValidationRuleDto() { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.email) }
}),
PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto
{ {
C = AppCodes.Definitions.Bank + ".Create", C = AppCodes.Definitions.Bank + ".Create",

6
api/src/Kurs.Platform.Domain/Entities/Tenant/Branch.cs
View file

@ -19,9 +19,9 @@ public class Branch : FullAuditedEntity<Guid>
public string Address { get; set; } public string Address { get; set; }
public string Address2 { get; set; } public string Address2 { get; set; }
public string PostalCode { get; set; } public string PostalCode { get; set; }
public long? Phone { get; set; } public string Phone { get; set; }
public long Mobile { get; set; } public string Mobile { get; set; }
public long? Fax { get; set; } public string Fax { get; set; }
public string Email { get; set; } public string Email { get; set; }
public string Website { get; set; } public string Website { get; set; }
public bool? IsActive { get; set; } public bool? IsActive { get; set; }

6
api/src/Kurs.Platform.Domain/Entities/Tenant/Public/Order.cs
View file

@ -19,9 +19,9 @@ public class Order : FullAuditedEntity<Guid>, IMultiTenant
public string Country { get; set; } public string Country { get; set; }
public string City { get; set; } public string City { get; set; }
public string PostalCode { get; set; } public string PostalCode { get; set; }
public long Phone { get; set; } public string Phone { get; set; }
public long Mobile { get; set; } public string Mobile { get; set; }
public long Fax { get; set; } public string Fax { get; set; }
public string Email { get; set; } public string Email { get; set; }
public string Website { get; set; } public string Website { get; set; }

18
api/src/Kurs.Platform.Domain/Extensions/AbpTenantExtensions.cs
View file

@ -112,31 +112,31 @@ public static class AbpTenantExtensions
return tenant.GetProperty<string>(PlatformConsts.Tenants.PostalCode); return tenant.GetProperty<string>(PlatformConsts.Tenants.PostalCode);
} }
public static void SetPhone(this Tenant tenant, long phone) public static void SetPhone(this Tenant tenant, string phone)
{ {
tenant.SetProperty(PlatformConsts.Tenants.Phone, phone); tenant.SetProperty(PlatformConsts.Tenants.Phone, phone);
} }
public static long GetPhone(this Tenant tenant) public static string GetPhone(this Tenant tenant)
{ {
return tenant.GetProperty<long>(PlatformConsts.Tenants.Phone); return tenant.GetProperty<string>(PlatformConsts.Tenants.Phone);
} }
public static void SetMobile(this Tenant tenant, long mobile) public static void SetMobile(this Tenant tenant, string mobile)
{ {
tenant.SetProperty(PlatformConsts.Tenants.Mobile, mobile); tenant.SetProperty(PlatformConsts.Tenants.Mobile, mobile);
} }
public static long GetMobile(this Tenant tenant) public static string GetMobile(this Tenant tenant)
{ {
return tenant.GetProperty<long>(PlatformConsts.Tenants.Mobile); return tenant.GetProperty<string>(PlatformConsts.Tenants.Mobile);
} }
public static void SetFax(this Tenant tenant, long fax) public static void SetFax(this Tenant tenant, string fax)
{ {
tenant.SetProperty(PlatformConsts.Tenants.Fax, fax); tenant.SetProperty(PlatformConsts.Tenants.Fax, fax);
} }
public static long GetFax(this Tenant tenant) public static string GetFax(this Tenant tenant)
{ {
return tenant.GetProperty<long>(PlatformConsts.Tenants.Fax); return tenant.GetProperty<string>(PlatformConsts.Tenants.Fax);
} }
public static void SetEmail(this Tenant tenant, string email) public static void SetEmail(this Tenant tenant, string email)

12
api/src/Kurs.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformEfCoreEntityExtensionMappings.cs
View file

@ -155,29 +155,29 @@ public static class PlatformEfCoreEntityExtensionMappings
); );
ObjectExtensionManager.Instance ObjectExtensionManager.Instance
.MapEfCoreProperty<Tenant, long>( .MapEfCoreProperty<Tenant, string>(
PlatformConsts.Tenants.Phone, PlatformConsts.Tenants.Phone,
(entityBuilder, propertyBuilder) => (entityBuilder, propertyBuilder) =>
{ {
propertyBuilder.HasDefaultValue(null); propertyBuilder.HasMaxLength(20).HasDefaultValue(null);
} }
); );
ObjectExtensionManager.Instance ObjectExtensionManager.Instance
.MapEfCoreProperty<Tenant, long>( .MapEfCoreProperty<Tenant, string>(
PlatformConsts.Tenants.Mobile, PlatformConsts.Tenants.Mobile,
(entityBuilder, propertyBuilder) => (entityBuilder, propertyBuilder) =>
{ {
propertyBuilder.HasDefaultValue(null); propertyBuilder.HasMaxLength(20).HasDefaultValue(null);
} }
); );
ObjectExtensionManager.Instance ObjectExtensionManager.Instance
.MapEfCoreProperty<Tenant, long>( .MapEfCoreProperty<Tenant, string>(
PlatformConsts.Tenants.Fax, PlatformConsts.Tenants.Fax,
(entityBuilder, propertyBuilder) => (entityBuilder, propertyBuilder) =>
{ {
propertyBuilder.HasDefaultValue(null); propertyBuilder.HasMaxLength(20).HasDefaultValue(null);
} }
); );

39
api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251008192259_Initial.Designer.cs → api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251009092012_Initial.Designer.cs generated
View file

@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore;
namespace Kurs.Platform.Migrations namespace Kurs.Platform.Migrations
{ {
[DbContext(typeof(PlatformDbContext))] [DbContext(typeof(PlatformDbContext))]
[Migration("20251008192259_Initial")] [Migration("20251009092012_Initial")]
partial class Initial partial class Initial
{ {
/// <inheritdoc /> /// <inheritdoc />
@ -1288,9 +1288,9 @@ namespace Kurs.Platform.Migrations
.HasMaxLength(128) .HasMaxLength(128)
.HasColumnType("nvarchar(128)"); .HasColumnType("nvarchar(128)");
b.Property<long?>("Fax") b.Property<string>("Fax")
.HasMaxLength(20) .HasMaxLength(20)
.HasColumnType("bigint"); .HasColumnType("nvarchar(20)");
b.Property<bool?>("IsActive") b.Property<bool?>("IsActive")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
@ -1311,18 +1311,19 @@ namespace Kurs.Platform.Migrations
.HasColumnType("uniqueidentifier") .HasColumnType("uniqueidentifier")
.HasColumnName("LastModifierId"); .HasColumnName("LastModifierId");
b.Property<long>("Mobile") b.Property<string>("Mobile")
.IsRequired()
.HasMaxLength(20) .HasMaxLength(20)
.HasColumnType("bigint"); .HasColumnType("nvarchar(20)");
b.Property<string>("Name") b.Property<string>("Name")
.IsRequired() .IsRequired()
.HasMaxLength(128) .HasMaxLength(128)
.HasColumnType("nvarchar(128)"); .HasColumnType("nvarchar(128)");
b.Property<long?>("Phone") b.Property<string>("Phone")
.HasMaxLength(20) .HasMaxLength(20)
.HasColumnType("bigint"); .HasColumnType("nvarchar(20)");
b.Property<string>("PostalCode") b.Property<string>("PostalCode")
.HasMaxLength(16) .HasMaxLength(16)
@ -4621,8 +4622,8 @@ namespace Kurs.Platform.Migrations
.HasMaxLength(128) .HasMaxLength(128)
.HasColumnType("nvarchar(128)"); .HasColumnType("nvarchar(128)");
b.Property<long>("Fax") b.Property<string>("Fax")
.HasColumnType("bigint"); .HasColumnType("nvarchar(max)");
b.Property<string>("Founder") b.Property<string>("Founder")
.HasMaxLength(128) .HasMaxLength(128)
@ -4645,8 +4646,8 @@ namespace Kurs.Platform.Migrations
.HasColumnType("uniqueidentifier") .HasColumnType("uniqueidentifier")
.HasColumnName("LastModifierId"); .HasColumnName("LastModifierId");
b.Property<long>("Mobile") b.Property<string>("Mobile")
.HasColumnType("bigint"); .HasColumnType("nvarchar(max)");
b.Property<string>("OrganizationName") b.Property<string>("OrganizationName")
.HasMaxLength(128) .HasMaxLength(128)
@ -4659,8 +4660,8 @@ namespace Kurs.Platform.Migrations
b.Property<Guid>("PaymentMethodId") b.Property<Guid>("PaymentMethodId")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
b.Property<long>("Phone") b.Property<string>("Phone")
.HasColumnType("bigint"); .HasColumnType("nvarchar(max)");
b.Property<string>("PostalCode") b.Property<string>("PostalCode")
.HasMaxLength(16) .HasMaxLength(16)
@ -8434,8 +8435,8 @@ namespace Kurs.Platform.Migrations
.HasColumnType("nvarchar(max)") .HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties"); .HasColumnName("ExtraProperties");
b.Property<long>("Fax") b.Property<string>("Fax")
.HasColumnType("bigint"); .HasColumnType("nvarchar(max)");
b.Property<string>("Founder") b.Property<string>("Founder")
.HasColumnType("nvarchar(max)"); .HasColumnType("nvarchar(max)");
@ -8459,8 +8460,8 @@ namespace Kurs.Platform.Migrations
.HasColumnType("uniqueidentifier") .HasColumnType("uniqueidentifier")
.HasColumnName("LastModifierId"); .HasColumnName("LastModifierId");
b.Property<long>("Mobile") b.Property<string>("Mobile")
.HasColumnType("bigint"); .HasColumnType("nvarchar(max)");
b.Property<string>("Name") b.Property<string>("Name")
.IsRequired() .IsRequired()
@ -8476,8 +8477,8 @@ namespace Kurs.Platform.Migrations
.HasMaxLength(64) .HasMaxLength(64)
.HasColumnType("nvarchar(64)"); .HasColumnType("nvarchar(64)");
b.Property<long>("Phone") b.Property<string>("Phone")
.HasColumnType("bigint"); .HasColumnType("nvarchar(max)");
b.Property<string>("PostalCode") b.Property<string>("PostalCode")
.HasMaxLength(10) .HasMaxLength(10)

18
api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251008192259_Initial.cs → api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251009092012_Initial.cs
View file

@ -346,12 +346,12 @@ namespace Kurs.Platform.Migrations
Country = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true), Country = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
District = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true), District = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
Email = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true), Email = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true),
Fax = table.Column<long>(type: "bigint", nullable: false), Fax = table.Column<string>(type: "nvarchar(max)", nullable: true),
Founder = table.Column<string>(type: "nvarchar(max)", nullable: true), Founder = table.Column<string>(type: "nvarchar(max)", nullable: true),
IsActive = table.Column<bool>(type: "bit", nullable: false, defaultValue: true), IsActive = table.Column<bool>(type: "bit", nullable: false, defaultValue: true),
Mobile = table.Column<long>(type: "bigint", nullable: false), Mobile = table.Column<string>(type: "nvarchar(max)", nullable: true),
OrganizationName = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true), OrganizationName = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
Phone = table.Column<long>(type: "bigint", nullable: false), Phone = table.Column<string>(type: "nvarchar(max)", nullable: true),
PostalCode = table.Column<string>(type: "nvarchar(10)", maxLength: 10, nullable: true), PostalCode = table.Column<string>(type: "nvarchar(10)", maxLength: 10, nullable: true),
Street = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true), Street = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
TaxOffice = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true), TaxOffice = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
@ -1284,9 +1284,9 @@ namespace Kurs.Platform.Migrations
Address = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: true), Address = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: true),
Address2 = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: true), Address2 = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: true),
PostalCode = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: true), PostalCode = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: true),
Phone = table.Column<long>(type: "bigint", maxLength: 20, nullable: true), Phone = table.Column<string>(type: "nvarchar(20)", maxLength: 20, nullable: true),
Mobile = table.Column<long>(type: "bigint", maxLength: 20, nullable: false), Mobile = table.Column<string>(type: "nvarchar(20)", maxLength: 20, nullable: false),
Fax = table.Column<long>(type: "bigint", maxLength: 20, nullable: true), Fax = table.Column<string>(type: "nvarchar(20)", maxLength: 20, nullable: true),
Email = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true), Email = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
Website = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true), Website = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
IsActive = table.Column<bool>(type: "bit", nullable: true, defaultValue: true), IsActive = table.Column<bool>(type: "bit", nullable: true, defaultValue: true),
@ -1925,9 +1925,9 @@ namespace Kurs.Platform.Migrations
Country = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true), Country = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
City = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true), City = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
PostalCode = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: true), PostalCode = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: true),
Phone = table.Column<long>(type: "bigint", nullable: false), Phone = table.Column<string>(type: "nvarchar(max)", nullable: true),
Mobile = table.Column<long>(type: "bigint", nullable: false), Mobile = table.Column<string>(type: "nvarchar(max)", nullable: true),
Fax = table.Column<long>(type: "bigint", nullable: false), Fax = table.Column<string>(type: "nvarchar(max)", nullable: true),
Email = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true), Email = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
Website = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true), Website = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
Subtotal = table.Column<decimal>(type: "decimal(18,2)", precision: 18, scale: 2, nullable: false), Subtotal = table.Column<decimal>(type: "decimal(18,2)", precision: 18, scale: 2, nullable: false),

37
api/src/Kurs.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs
View file

@ -1285,9 +1285,9 @@ namespace Kurs.Platform.Migrations
.HasMaxLength(128) .HasMaxLength(128)
.HasColumnType("nvarchar(128)"); .HasColumnType("nvarchar(128)");
b.Property<long?>("Fax") b.Property<string>("Fax")
.HasMaxLength(20) .HasMaxLength(20)
.HasColumnType("bigint"); .HasColumnType("nvarchar(20)");
b.Property<bool?>("IsActive") b.Property<bool?>("IsActive")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
@ -1308,18 +1308,19 @@ namespace Kurs.Platform.Migrations
.HasColumnType("uniqueidentifier") .HasColumnType("uniqueidentifier")
.HasColumnName("LastModifierId"); .HasColumnName("LastModifierId");
b.Property<long>("Mobile") b.Property<string>("Mobile")
.IsRequired()
.HasMaxLength(20) .HasMaxLength(20)
.HasColumnType("bigint"); .HasColumnType("nvarchar(20)");
b.Property<string>("Name") b.Property<string>("Name")
.IsRequired() .IsRequired()
.HasMaxLength(128) .HasMaxLength(128)
.HasColumnType("nvarchar(128)"); .HasColumnType("nvarchar(128)");
b.Property<long?>("Phone") b.Property<string>("Phone")
.HasMaxLength(20) .HasMaxLength(20)
.HasColumnType("bigint"); .HasColumnType("nvarchar(20)");
b.Property<string>("PostalCode") b.Property<string>("PostalCode")
.HasMaxLength(16) .HasMaxLength(16)
@ -4618,8 +4619,8 @@ namespace Kurs.Platform.Migrations
.HasMaxLength(128) .HasMaxLength(128)
.HasColumnType("nvarchar(128)"); .HasColumnType("nvarchar(128)");
b.Property<long>("Fax") b.Property<string>("Fax")
.HasColumnType("bigint"); .HasColumnType("nvarchar(max)");
b.Property<string>("Founder") b.Property<string>("Founder")
.HasMaxLength(128) .HasMaxLength(128)
@ -4642,8 +4643,8 @@ namespace Kurs.Platform.Migrations
.HasColumnType("uniqueidentifier") .HasColumnType("uniqueidentifier")
.HasColumnName("LastModifierId"); .HasColumnName("LastModifierId");
b.Property<long>("Mobile") b.Property<string>("Mobile")
.HasColumnType("bigint"); .HasColumnType("nvarchar(max)");
b.Property<string>("OrganizationName") b.Property<string>("OrganizationName")
.HasMaxLength(128) .HasMaxLength(128)
@ -4656,8 +4657,8 @@ namespace Kurs.Platform.Migrations
b.Property<Guid>("PaymentMethodId") b.Property<Guid>("PaymentMethodId")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
b.Property<long>("Phone") b.Property<string>("Phone")
.HasColumnType("bigint"); .HasColumnType("nvarchar(max)");
b.Property<string>("PostalCode") b.Property<string>("PostalCode")
.HasMaxLength(16) .HasMaxLength(16)
@ -8431,8 +8432,8 @@ namespace Kurs.Platform.Migrations
.HasColumnType("nvarchar(max)") .HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties"); .HasColumnName("ExtraProperties");
b.Property<long>("Fax") b.Property<string>("Fax")
.HasColumnType("bigint"); .HasColumnType("nvarchar(max)");
b.Property<string>("Founder") b.Property<string>("Founder")
.HasColumnType("nvarchar(max)"); .HasColumnType("nvarchar(max)");
@ -8456,8 +8457,8 @@ namespace Kurs.Platform.Migrations
.HasColumnType("uniqueidentifier") .HasColumnType("uniqueidentifier")
.HasColumnName("LastModifierId"); .HasColumnName("LastModifierId");
b.Property<long>("Mobile") b.Property<string>("Mobile")
.HasColumnType("bigint"); .HasColumnType("nvarchar(max)");
b.Property<string>("Name") b.Property<string>("Name")
.IsRequired() .IsRequired()
@ -8473,8 +8474,8 @@ namespace Kurs.Platform.Migrations
.HasMaxLength(64) .HasMaxLength(64)
.HasColumnType("nvarchar(64)"); .HasColumnType("nvarchar(64)");
b.Property<long>("Phone") b.Property<string>("Phone")
.HasColumnType("bigint"); .HasColumnType("nvarchar(max)");
b.Property<string>("PostalCode") b.Property<string>("PostalCode")
.HasMaxLength(10) .HasMaxLength(10)

29
ui/src/shared/useListFormColumns.ts
View file

@ -17,7 +17,6 @@ import {
UiCommandButtonPositionTypeEnum, UiCommandButtonPositionTypeEnum,
UiLookupDataSourceTypeEnum, UiLookupDataSourceTypeEnum,
} from '../proxy/form/models' } from '../proxy/form/models'
import { css } from 'react-select/dist/declarations/src/components/Control'
const cellTemplateMultiValue = ( const cellTemplateMultiValue = (
cellElement: HTMLElement, cellElement: HTMLElement,
@ -376,7 +375,33 @@ const useListFormColumns = ({
column.alignment = colData.alignment column.alignment = colData.alignment
column.format = colData.format column.format = colData.format
column.editorOptions = { ...(colData.editorOptions as IFormatProps) }
// editorOptions
if (!colData.editorOptions) {
const allFormItems = gridDto.gridOptions.editingFormDto.flatMap((g) => g.items)
const formItem = allFormItems.find((f) => f?.dataField === colData.fieldName)
if (formItem?.editorOptions) {
colData.editorOptions = formItem.editorOptions
}
}
if (colData.editorOptions) {
try {
column.editorOptions =
typeof colData.editorOptions === 'string'
? JSON.parse(colData.editorOptions)
: colData.editorOptions
} catch (err) {
// Eğer JSON değilse, eval fallback
try {
// Örneğin { format: 'phoneGlobal', mask: '+90 (000)...' } gibi string geldiğinde
column.editorOptions = eval('(' + colData.editorOptions + ')')
} catch (e2) {
console.warn('Invalid editorOptions for', colData.fieldName, colData.editorOptions)
column.editorOptions = undefined
}
}
}
// columnCustomizationDto // columnCustomizationDto
column.fixed = colData.columnCustomizationDto?.fixed column.fixed = colData.columnCustomizationDto?.fixed

1
ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogEditForm.tsx
View file

@ -306,6 +306,7 @@ function JsonRowOpDialogEditForm({
<div className="font-bold">● Editor Options</div> <div className="font-bold">● Editor Options</div>
<div className="ml-5 gap-2"> <div className="ml-5 gap-2">
<pre>{`• {"showClearButton":true }`}</pre> <pre>{`• {"showClearButton":true }`}</pre>
<pre>{`• {"format": "phoneGlobal", "mask":"(000) 000-0000", "maskInvalidMessage":"Lütfen geçerli bir telefon numarası girin", "useMaskedValue":false, "maskRules": { "X": "[1-9]" }, "placeholder": "(555) 123-4567" }`}</pre>
<pre>{`• {"height":200}`}</pre> <pre>{`• {"height":200}`}</pre>
<pre> <pre>
{`• { {`• {

39
ui/src/views/list/Grid.tsx
View file

@ -458,6 +458,42 @@ const Grid = (props: GridProps) => {
const cols = getBandedColumns() const cols = getBandedColumns()
setColumnData(cols) setColumnData(cols)
cols?.forEach((col) => {
const eo = col.editorOptions
// Sadece phoneGlobal formatlı kolonlarda çalış
if (eo?.format === 'phoneGlobal') {
// DevExtreme bazen string tipinde formatter'ı çağırmaz
// Bu yüzden her durumda çalışması için customizeText ekleyeceğiz
col.dataType = 'string'
const formatter = (value: any) => {
if (!value) return ''
// string'e dönüştür ve sadece rakamları al
let digits = String(value).replace(/\D/g, '')
// +90, 0090, 0 gibi ülke kodu veya ön ekleri atla
if (digits.startsWith('90') && digits.length > 10) digits = digits.slice(-10)
if (digits.startsWith('0') && digits.length > 10) digits = digits.slice(-10)
if (digits.length > 10) digits = digits.slice(-10)
// 🔒 Eğer 10 haneli değilse geçersiz → boş göster
if (digits.length !== 10) return ''
// (XXX) XXX-XXXX formatında göster
const match = digits.match(/^(\d{3})(\d{3})(\d{4})$/)
return match ? `(${match[1]}) ${match[2]}-${match[3]}` : digits
}
// 1️⃣ Normal format nesnesi
col.format = { formatter }
// 2️⃣ CustomizeText fallback — bazı durumlarda zorunlu
col.customizeText = (cellInfo: any) => formatter(cellInfo?.value)
}
})
const dataSource = createSelectDataSource(gridDto.gridOptions, listFormCode, searchParams, cols) const dataSource = createSelectDataSource(gridDto.gridOptions, listFormCode, searchParams, cols)
setGridDataSource(dataSource) setGridDataSource(dataSource)
}, [gridDto, searchParams]) }, [gridDto, searchParams])
@ -784,9 +820,6 @@ const Grid = (props: GridProps) => {
.find((i) => i.dataField === e.dataField) .find((i) => i.dataField === e.dataField)
if (formItem?.script) { if (formItem?.script) {
try { try {
//setFormData({...formData, Path: e.value});
//UiEvalService.ApiGenerateBackgroundWorkers();
//setFormData({ ...formData, Path: (v => v === '1' ? '1-deneme' : v === '0' ? '0-deneme' : '')(e.value) })
eval(formItem.script) eval(formItem.script)
} catch (err) { } catch (err) {
console.error('Script exec error', err) console.error('Script exec error', err)