From 66f2728c6271f307eabc33cdf91ee1107bcf009a Mon Sep 17 00:00:00 2001 From: masumulu28 Date: Tue, 9 Jan 2024 11:10:50 +0300 Subject: [PATCH 01/11] upd: lerna script in publish-mvc.ps1 file --- npm/publish-mvc.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm/publish-mvc.ps1 b/npm/publish-mvc.ps1 index ee12fc67c3..c9737baeda 100644 --- a/npm/publish-mvc.ps1 +++ b/npm/publish-mvc.ps1 @@ -25,7 +25,7 @@ if ($IsPrerelease) { } $commands = ( - "npm run lerna -- version $Version --yes --no-commit-hooks --skip-git --force-publish", + "npm run lerna -- version $Version --yes --no-commit-hooks --no-git-tag-version --no-push --force-publish", "yarn replace-with-tilde", "cd scripts", "yarn install", From 3031794021f19040e0b89a10c0a1143bceecb614 Mon Sep 17 00:00:00 2001 From: Salih Date: Tue, 9 Jan 2024 15:17:47 +0300 Subject: [PATCH 02/11] Fix DateRangePicker Max/Min Date Problem --- .../AbpDatePickerBaseTagHelperService.cs | 4 ++-- .../date-range-picker-extensions.js | 19 ++++++++++++++----- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerBaseTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerBaseTagHelperService.cs index 9e03ec800c..69ebf0feff 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerBaseTagHelperService.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerBaseTagHelperService.cs @@ -270,12 +270,12 @@ public abstract class AbpDatePickerBaseTagHelperService : AbpTagHelp if (options.MinDate != null) { - attrList.Add("data-min-date", options.MinDate); + attrList.Add("data-min-date", options.MinDate?.ToString("O")); } if (options.MaxDate != null) { - attrList.Add("data-max-date", options.MaxDate); + attrList.Add("data-max-date", options.MaxDate?.ToString("O")); } if (options.MaxSpan != null) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/date-range-picker/date-range-picker-extensions.js b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/date-range-picker/date-range-picker-extensions.js index b5d2dec80d..a67ec1401b 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/date-range-picker/date-range-picker-extensions.js +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/date-range-picker/date-range-picker-extensions.js @@ -205,7 +205,7 @@ var today = moment(); $dateRangePicker.setStartDate(today); $dateRangePicker.setEndDate(today); - + if(options.singleDatePicker && options.autoApply){ $dateRangePicker.clickApply(); }else{ @@ -366,6 +366,14 @@ }); } + if (options.maxDate){ + options.maxDate = convertToMoment(options.maxDate, options); + } + + if (options.minDate){ + options.minDate = convertToMoment(options.minDate, options); + } + if (typeof options.template !== 'string' && !(options.template instanceof $)) options.template = '
' + @@ -433,13 +441,13 @@ return ''; } - + function createInitialAbpDate(date, options) { date = convertToMoment(date, options, undefined, options.isUtc); if (options.isUtc) { date = date.local(); } - + return AbpDate(date, options); } @@ -468,8 +476,9 @@ var singleOpenAndClearButton = options.singleOpenAndClearButton && $clearButton.length > 0 && $openButton.length > 0; var startDate = createInitialAbpDate(options.startDate || options.date || (options.autoUpdateInput ? new Date() : undefined), options); + var oldStartDate = AbpDate(undefined, options); - + var endDate = createInitialAbpDate(options.endDate || (options.autoUpdateInput ? new Date() : undefined), options); var oldEndDate = AbpDate(undefined, options); @@ -583,7 +592,7 @@ }else{ picker.setStartDate(convertToMoment(startDate, options, options.inputDateFormat)); } - + if(singleDatePicker){ picker.setEndDate(picker.startDate); }else if(isEmptyDate(endDate, options)){ From 21c63c0ae6d5dc2a4c005e4eee7d88517d4232d3 Mon Sep 17 00:00:00 2001 From: Engincan VESKE <43685404+EngincanV@users.noreply.github.com> Date: Tue, 9 Jan 2024 21:13:23 +0300 Subject: [PATCH 03/11] CLI: Fix theme selection for blazor-server nolayer template. --- .../Building/Steps/ChangeThemeStep.cs | 35 ++++++++++--------- .../Templates/App/AppNoLayersTemplateBase.cs | 1 + 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs index b6408fb3e2..4a88ada34a 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs @@ -372,7 +372,7 @@ public class ChangeThemeStep : ProjectBuildPipelineStep return; } - lines[lineIndex] = lines[lineIndex].Replace(lines[lineIndex], $"\t"); + lines[lineIndex] = lines[lineIndex].Replace(lines[lineIndex], $"\t\t\n"); file.SetLines(lines); } @@ -568,7 +568,7 @@ public class ChangeThemeStep : ProjectBuildPipelineStep private static void ChangeThemeToBasicForMvcProjects(ProjectBuildContext context, string defaultThemeName) { var projectNames = new[] -{ + { ".Web", ".HttpApi.Host", ".AuthServer", ".Web.Public", ".Web.Public.Host", "" //for app-nolayers-mvc }; @@ -608,45 +608,46 @@ public class ChangeThemeStep : ProjectBuildPipelineStep { var projects = new Dictionary { - {"Blazor", "MyProjectNameBlazorModule"}, - {"Blazor.Server.Tiered", "MyProjectNameBlazorModule"}, - {"Blazor.Server", "MyProjectNameModule"}, - {"Blazor.Server.Mongo", "MyProjectNameModule"} + {".Blazor", "MyProjectNameBlazorModule"}, + {".Blazor.Server.Tiered", "MyProjectNameBlazorModule"}, + {".Blazor.Server", "MyProjectNameModule"}, + {"Blazor.Server.Mongo", "MyProjectNameModule"}, + {"", ""} //for app-nolayers blazor-server }; foreach (var project in projects) { ReplacePackageReferenceWithProjectReference( context, - $"/MyCompanyName.MyProjectName.{project.Key}/MyCompanyName.MyProjectName.{project.Key}.csproj", - $"Volo.Abp.AspNetCore.Components.Server.{defaultThemeName}Theme", - @"..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" + $"/MyCompanyName.MyProjectName{project.Key}/MyCompanyName.MyProjectName{project.Key}.csproj", + $"Volo.Abp.AspNetCore.Components.Server.{defaultThemeName}", + @"..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Components.Server.BasicTheme\Volo.Abp.AspNetCore.Components.Server.BasicTheme.csproj" ); ReplacePackageReferenceWithProjectReference( context, - $"/MyCompanyName.MyProjectName.{project.Key}/MyCompanyName.MyProjectName.{project.Key}.csproj", + $"/MyCompanyName.MyProjectName{project.Key}/MyCompanyName.MyProjectName{project.Key}.csproj", $"Volo.Abp.AspNetCore.Mvc.UI.Theme.{defaultThemeName}", - @"..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Components.Server.BasicTheme\Volo.Abp.AspNetCore.Components.Server.BasicTheme.csproj" + @"..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" ); ReplaceAllKeywords( context, - $"/MyCompanyName.MyProjectName.{project.Key}/Pages/_Host.cshtml", + $"/Pages/_Host.cshtml", $"{defaultThemeName}Theme.Components", Basic ); ReplaceAllKeywords( context, - $"/MyCompanyName.MyProjectName.{project.Key}/{project.Value}.cs", + $"/MyCompanyName.MyProjectName{project.Key}/{project.Value}.cs", defaultThemeName, - Basic + Basic + "Theme" ); ReplaceAllKeywords( context, - $"/MyCompanyName.MyProjectName.{project.Key}/Pages/_Host.cshtml", + $"/Pages/_Host.cshtml", defaultThemeName, Basic ); @@ -682,7 +683,7 @@ public class ChangeThemeStep : ProjectBuildPipelineStep ReplaceAllKeywords( context, - $"/MyCompanyName.MyProjectName.{projectName}/Pages/_Host.cshtml", + $"/Pages/_Host.cshtml", LeptonX, Lepton ); @@ -731,7 +732,7 @@ public class ChangeThemeStep : ProjectBuildPipelineStep ReplaceAllKeywords( context, - $"/MyCompanyName.MyProjectName.{projectName}/Pages/_Host.cshtml", + $"/Pages/_Host.cshtml", LeptonX, Lepton ); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppNoLayersTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppNoLayersTemplateBase.cs index 7bbba5c733..8b9df09ca5 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppNoLayersTemplateBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppNoLayersTemplateBase.cs @@ -346,6 +346,7 @@ public abstract class AppNoLayersTemplateBase : TemplateInfo var blazorServerUiPackageName = isProTemplate ? "@volo/aspnetcore.components.server.leptonxtheme" : "@abp/aspnetcore.components.server.leptonxlitetheme"; var blazorServerPackageJsonFilePaths = new List { + "/MyCompanyName.MyProjectName/package.json", "/MyCompanyName.MyProjectName.Blazor/package.json", "/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json" }; From 8776cf4eaf262e939c02a9ab2191e05059550309 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Wed, 10 Jan 2024 09:52:16 +0800 Subject: [PATCH 04/11] Custom menu component MVC UI --- .../Basic/Components/Menu/Default.cshtml | 41 +++++++++++------ .../Basic/Components/Menu/_MenuItem.cshtml | 45 ++++++++++++------- 2 files changed, 56 insertions(+), 30 deletions(-) diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml index f146878b0f..764cdddcd2 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml @@ -6,9 +6,15 @@ var cssClass = string.IsNullOrEmpty(menuItem.CssClass) ? string.Empty : menuItem.CssClass; var disabled = menuItem.IsDisabled ? "disabled" : string.Empty; var url = string.IsNullOrEmpty(menuItem.Url) ? "#" : Url.IsLocalUrl(menuItem.Url) ? Url.Content(menuItem.Url.EnsureStartsWith('~')) : menuItem.Url; + var customComponentType = menuItem.GetComponentTypeOrDefault(); + if (menuItem.IsLeaf) { - if (menuItem.Url != null) + if (customComponentType != null) + { + @Component.InvokeAsync(customComponentType) + } + else if (menuItem.Url != null) {
  • @@ -28,19 +34,26 @@ {
  • - -
    - @foreach (var childMenuItem in menuItem.Items) - { - @await Html.PartialAsync("~/Themes/Basic/Components/Menu/_MenuItem.cshtml", childMenuItem) - } -
    + @if (customComponentType != null) + { + @Component.InvokeAsync(customComponentType) + } + else + { + +
    + @foreach (var childMenuItem in menuItem.Items) + { + @await Html.PartialAsync("~/Themes/Basic/Components/Menu/_MenuItem.cshtml", childMenuItem) + } +
    + }
    • } diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/_MenuItem.cshtml b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/_MenuItem.cshtml index 2dc72b8e58..9df7f8cc63 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/_MenuItem.cshtml +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/_MenuItem.cshtml @@ -5,10 +5,16 @@ var cssClass = string.IsNullOrEmpty(Model.CssClass) ? string.Empty : Model.CssClass; var disabled = Model.IsDisabled ? "disabled" : string.Empty; var url = string.IsNullOrEmpty(Model.Url) ? "#" : Url.IsLocalUrl(Model.Url) ? Url.Content(Model.Url.EnsureStartsWith('~')) : Model.Url; + var customComponentType = Model.GetComponentTypeOrDefault(); + } @if (Model.IsLeaf) { - if (Model.Url != null) + if (customComponentType != null) + { + @Component.InvokeAsync(customComponentType) + } + else if (Model.Url != null) { @if (Model.Icon != null) @@ -25,20 +31,27 @@ else {
    - -
    - @foreach (var childMenuItem in Model.Items) - { - @await Html.PartialAsync("~/Themes/Basic/Components/Menu/_MenuItem.cshtml", childMenuItem) - } -
    + @if (customComponentType != null) + { + @Component.InvokeAsync(customComponentType) + } + else + { + +
    + @foreach (var childMenuItem in Model.Items) + { + @await Html.PartialAsync("~/Themes/Basic/Components/Menu/_MenuItem.cshtml", childMenuItem) + } +
    + }
    } From 95c3b75eeea3b7cd83930bee84bec9208d9895b3 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Wed, 10 Jan 2024 09:56:20 +0800 Subject: [PATCH 05/11] Update ApplicationMenuExtensions.cs --- .../Volo/Abp/Ui/Navigation/ApplicationMenuExtensions.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/ApplicationMenuExtensions.cs b/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/ApplicationMenuExtensions.cs index 5a755f187a..c8ba277ccc 100644 --- a/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/ApplicationMenuExtensions.cs +++ b/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/ApplicationMenuExtensions.cs @@ -115,6 +115,11 @@ public static class ApplicationMenuExtensions return menuWithGroups; } + public static ApplicationMenuItem UseComponent(this ApplicationMenuItem applicationMenuItem) + { + return applicationMenuItem.UseComponent(typeof(TComponent)); + } + public static ApplicationMenuItem UseComponent(this ApplicationMenuItem applicationMenuItem, Type componentType) { return applicationMenuItem.WithCustomData(CustomDataComponentKey, componentType); From 14e22a4fe9533e81d89d3d9d4746d43b91371b38 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Wed, 10 Jan 2024 11:55:10 +0800 Subject: [PATCH 06/11] Update _MenuItem.cshtml --- .../Themes/Basic/Components/Menu/Default.cshtml | 4 ++-- .../Themes/Basic/Components/Menu/_MenuItem.cshtml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml index 764cdddcd2..19471fecfd 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml @@ -12,7 +12,7 @@ { if (customComponentType != null) { - @Component.InvokeAsync(customComponentType) + @(await Component.InvokeAsync(customComponentType)) } else if (menuItem.Url != null) { @@ -36,7 +36,7 @@
    @if (customComponentType != null) { - @Component.InvokeAsync(customComponentType) + @(await Component.InvokeAsync(customComponentType)) } else { diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/_MenuItem.cshtml b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/_MenuItem.cshtml index 9df7f8cc63..1b5a4badbb 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/_MenuItem.cshtml +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/_MenuItem.cshtml @@ -12,7 +12,7 @@ { if (customComponentType != null) { - @Component.InvokeAsync(customComponentType) + @(await Component.InvokeAsync(customComponentType)) } else if (Model.Url != null) { @@ -33,7 +33,7 @@ else
    @if (customComponentType != null) { - @Component.InvokeAsync(customComponentType) + @(await Component.InvokeAsync(customComponentType)) } else { From 93b3b6e4464ae51c791f3e16481578bac81485b4 Mon Sep 17 00:00:00 2001 From: Salih Date: Wed, 10 Jan 2024 09:58:57 +0300 Subject: [PATCH 07/11] Update en.json --- .../AbpIoLocalization/Www/Localization/Resources/en.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json index 04e75f8614..aa829b0319 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json @@ -446,7 +446,6 @@ "ExperienceYear": "Years of experience", "FullName": "Full name", "CompanySize": "Company size", - "Image": "Your profile picture", "TestimonialTitle": "Let's hear your testimonial", "TestimonialInfo": "What our customers say matters! Tell us about your experience with our product and service.", "Country": "Country", @@ -460,13 +459,14 @@ "SelectCountryPlaceholder": "Your country", "YouAreNotAuthorizedToWriteTestimonial": "To be able to write testimonial letter, you must be sign in.", "UnAuthorizeTestimonialInfo": "Your opinion matters! Log in to share it.", - "TheFileIsTooLargeForImage": "Your profile picture cannot be more than 1 MB", + "TheFileIsTooLargeForImage": "Your profile picture cannot be more than {0} MB", "ThisExtensionIsNotAllowedForImage": "This extension is not allowed.", "FileUploadError": "File upload error", - "TestimonialSend": "Thank you! We've received your testimonial. We'll review and take the next step soon.", + "TestimonialSend": "Thank you! We've received your testimonial.
    We'll review and take the next step soon.", "Title": "Title", "TitlePlaceholder": "Software Developer, CTO etc.", - "Characters": "characters" + "Characters": "characters", + "Testimonial_YourProfilePicture": "Your profile picture (only {0})" } } From 9c1782a4ec161b5d941a4eec74c69d1680c6b99b Mon Sep 17 00:00:00 2001 From: Engincan VESKE Date: Wed, 10 Jan 2024 13:25:11 +0300 Subject: [PATCH 08/11] Update en.json --- .../AbpIoLocalization/Www/Localization/Resources/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json index aa829b0319..7896db82f1 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json @@ -466,7 +466,7 @@ "Title": "Title", "TitlePlaceholder": "Software Developer, CTO etc.", "Characters": "characters", - "Testimonial_YourProfilePicture": "Your profile picture (only {0})" + "Testimonial_YourProfilePicture": "Your profile picture (only {0} formats are allowed)" } } From 85f2da37927a5f43a3c59dec333987dc83abc7ca Mon Sep 17 00:00:00 2001 From: Engincan VESKE Date: Wed, 10 Jan 2024 14:22:35 +0300 Subject: [PATCH 09/11] Update en.json --- .../AbpIoLocalization/Www/Localization/Resources/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json index 7896db82f1..aa829b0319 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json @@ -466,7 +466,7 @@ "Title": "Title", "TitlePlaceholder": "Software Developer, CTO etc.", "Characters": "characters", - "Testimonial_YourProfilePicture": "Your profile picture (only {0} formats are allowed)" + "Testimonial_YourProfilePicture": "Your profile picture (only {0})" } } From 2ebbf01adaaaa5fc41d10e28ff8d3261912eee45 Mon Sep 17 00:00:00 2001 From: maliming Date: Wed, 10 Jan 2024 20:55:09 +0800 Subject: [PATCH 10/11] Get child permissions by parent instead name. --- .../PermissionManagementModal.razor.cs | 34 ++++++++++++++----- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs index 8a5c82e734..4a55b75df8 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs @@ -17,7 +17,7 @@ public partial class PermissionManagementModal [Inject] protected ICurrentApplicationConfigurationCacheResetService CurrentApplicationConfigurationCacheResetService { get; set; } [Inject] protected IOptions LocalizationOptions { get; set; } - + protected Modal _modal; protected string _providerName; @@ -71,7 +71,7 @@ public partial class PermissionManagementModal } } } - + protected Dictionary _permissionDepths = new Dictionary(); public PermissionManagementModal() @@ -137,7 +137,7 @@ public partial class PermissionManagementModal { try { - + var updateDto = new UpdatePermissionsDto { Permissions = _groups @@ -145,7 +145,7 @@ public partial class PermissionManagementModal .Select(p => new UpdatePermissionDto { IsGranted = p.IsGranted, Name = p.Name }) .ToArray() }; - + if (!updateDto.Permissions.Any(x => x.IsGranted)) { if (!await Message.Confirm(L["SaveWithoutAnyPermissionsWarningMessage"].Value)) @@ -182,7 +182,7 @@ public partial class PermissionManagementModal } } } - + protected virtual int GetPermissionDepthOrDefault(string name) { return _permissionDepths.GetValueOrDefault(name, 0); @@ -207,7 +207,7 @@ public partial class PermissionManagementModal { SetParentPermissionGrant(permissionGroup, permission); } - else if (value == false) + else { var childPermissions = GetChildPermissions(permissionGroup, permission); @@ -229,7 +229,7 @@ public partial class PermissionManagementModal SetPermissionGrant(parentPermission, true); SetParentPermissionGrant(permissionGroup, parentPermission); - + } private void SetPermissionGrant(PermissionGrantInfoDto permission, bool value) @@ -260,7 +260,25 @@ public partial class PermissionManagementModal protected List GetChildPermissions(PermissionGroupDto permissionGroup, PermissionGrantInfoDto permission) { - return permissionGroup.Permissions.Where(x => x.Name.StartsWith(permission.Name)).ToList(); + var childPermissions = new List(); + GetChildPermissions(childPermissions, permissionGroup.Permissions, permission); + return childPermissions; + } + + protected void GetChildPermissions(List allChildPermissions, List permissions, PermissionGrantInfoDto permission) + { + var childPermissions = permissions.Where(x => x.ParentName == permission.Name).ToList(); + if (childPermissions.Count == 0) + { + return; + } + + allChildPermissions.AddRange(childPermissions); + + foreach (var childPermission in childPermissions) + { + GetChildPermissions(allChildPermissions, permissions, childPermission); + } } protected bool IsDisabledPermission(PermissionGrantInfoDto permissionGrantInfo) From 1fff116ff3862b0e10317ac55da6864fa8d812ba Mon Sep 17 00:00:00 2001 From: Salih Date: Wed, 10 Jan 2024 18:58:20 +0300 Subject: [PATCH 11/11] Improve daterangepicker validation --- .../AbpDatePickerBaseTagHelperService.cs | 48 +++++++++++-------- .../AbpDatePickerTagHelperService.cs | 5 -- .../AbpDateRangePickerTagHelperService.cs | 19 +------- .../date-range-picker-extensions.js | 23 +++++++++ 4 files changed, 51 insertions(+), 44 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerBaseTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerBaseTagHelperService.cs index 69ebf0feff..2c2011ac1e 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerBaseTagHelperService.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerBaseTagHelperService.cs @@ -68,7 +68,6 @@ public abstract class AbpDatePickerBaseTagHelperService : AbpTagHelp protected readonly IAbpTagHelperLocalizer TagHelperLocalizer; protected virtual string TagName { get; set; } = "abp-date-picker"; protected IStringLocalizer L { get; } - protected InputTagHelper InputTagHelper { get; set; } protected abstract TagHelperOutput TagHelperOutput { get; set; } protected AbpDatePickerBaseTagHelperService(IJsonSerializer jsonSerializer, IHtmlGenerator generator, @@ -81,8 +80,6 @@ public abstract class AbpDatePickerBaseTagHelperService : AbpTagHelp ServiceProvider = serviceProvider; L = l; TagHelperLocalizer = tagHelperLocalizer; - - InputTagHelper = new InputTagHelper(Generator) { InputTypeName = "text" }; } protected virtual T? GetAttribute() where T : Attribute @@ -95,19 +92,7 @@ public abstract class AbpDatePickerBaseTagHelperService : AbpTagHelp public async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output) { - TagHelperOutput = new TagHelperOutput("input", GetInputAttributes(context, output), (_, _) => Task.FromResult(new DefaultTagHelperContent())); - - InputTagHelper.ViewContext = TagHelper.ViewContext; - - if (!TagHelper.Name.IsNullOrEmpty()) - { - InputTagHelper.Name = TagHelper.Name; - } - - if (!TagHelper.Value.IsNullOrEmpty()) - { - InputTagHelper.Value = TagHelper.Value; - } + TagHelperOutput = TagHelperOutput = new TagHelperOutput("input", GetInputAttributes(context, output), (_, _) => Task.FromResult(new DefaultTagHelperContent())); AddDisabledAttribute(TagHelperOutput); AddAutoFocusAttribute(TagHelperOutput); @@ -131,7 +116,7 @@ public abstract class AbpDatePickerBaseTagHelperService : AbpTagHelp var labelContent = await GetLabelAsHtmlAsync(context, output, TagHelperOutput); var infoContent = GetInfoAsHtml(context, output, TagHelperOutput); - var validationContent = await GetValidationAsHtmlAsync(context, output); + var validationContent = await GetValidationAsHtmlAsync(context, TagHelperOutput); var inputGroup = new TagHelperOutput("div", new TagHelperAttributeList(new[] { new TagHelperAttribute("class", "input-group") }), @@ -754,16 +739,37 @@ public abstract class AbpDatePickerBaseTagHelperService : AbpTagHelp }; } - protected abstract Task GetValidationAsHtmlAsync(TagHelperContext context, TagHelperOutput output); + protected virtual Task GetValidationAsHtmlAsync(TagHelperContext context, TagHelperOutput output) + { + var @for = GetModelExpression(); + if (@for == null) + { + return Task.FromResult(string.Empty); + } + + return GetValidationAsHtmlByInputAsync(context, output, @for); + } protected virtual async Task GetValidationAsHtmlByInputAsync(TagHelperContext context, TagHelperOutput output, - [NotNull]InputTagHelper inputTag) + [NotNull]ModelExpression @for) { var validationMessageTagHelper = - new ValidationMessageTagHelper(Generator) { For = inputTag.For, ViewContext = TagHelper.ViewContext }; + new ValidationMessageTagHelper(Generator) { For = @for, ViewContext = TagHelper.ViewContext }; - var attributeList = new TagHelperAttributeList { { "class", "text-danger col-auto" } }; + var attributeList = new TagHelperAttributeList { { "class", "text-danger" } }; + + if(!output.Attributes.TryGetAttribute("name", out var nameAttribute) || nameAttribute == null || nameAttribute.Value == null) + { + if (nameAttribute != null) + { + output.Attributes.Remove(nameAttribute); + } + nameAttribute = new TagHelperAttribute("name", "date_" + Guid.NewGuid().ToString("N")); + output.Attributes.Add(nameAttribute); + } + + attributeList.Add("data-valmsg-for", nameAttribute.Value); return await validationMessageTagHelper.RenderAsync(attributeList, context, Encoder, "span", TagMode.StartTagAndEndTag); diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerTagHelperService.cs index d135d28667..a2abf7c368 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerTagHelperService.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerTagHelperService.cs @@ -77,11 +77,6 @@ public class AbpDatePickerTagHelperService : AbpDatePickerBaseTagHelperService GetValidationAsHtmlAsync(TagHelperContext context, TagHelperOutput output) - { - return DateTagHelper != null ? await GetValidationAsHtmlByInputAsync(context, output, DateTagHelper) : string.Empty; - } - protected override string GetExtraInputHtml(TagHelperContext context, TagHelperOutput output) { return DateTagHelperOutput?.Render(Encoder)!; diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDateRangePickerTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDateRangePickerTagHelperService.cs index 3c2b8aaa03..f21c2a1507 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDateRangePickerTagHelperService.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDateRangePickerTagHelperService.cs @@ -112,23 +112,6 @@ public class AbpDateRangePickerTagHelperService : AbpDatePickerBaseTagHelperServ protected override ModelExpression? GetModelExpression() { - return TagHelper.AspForStart; - } - - protected async override Task GetValidationAsHtmlAsync(TagHelperContext context, TagHelperOutput output) - { - var validationHtml = string.Empty; - - if (StartDateTagHelper != null) - { - validationHtml += await GetValidationAsHtmlByInputAsync(context, output, StartDateTagHelper); - } - - if (EndDateTagHelper != null) - { - validationHtml += await GetValidationAsHtmlByInputAsync(context, output, EndDateTagHelper); - } - - return validationHtml; + return TagHelper.AspForStart ?? TagHelper.AspForEnd; } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/date-range-picker/date-range-picker-extensions.js b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/date-range-picker/date-range-picker-extensions.js index a67ec1401b..f45f0b1ff8 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/date-range-picker/date-range-picker-extensions.js +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/date-range-picker/date-range-picker-extensions.js @@ -553,6 +553,10 @@ triggerDateChange($input, startDate, isDateRangePickerTrigger); } } + + if(isTrigger || isInputTrigger || isDateRangePickerTrigger){ + triggerValidation(); + } } function setDataDates(date, $selfInput, prefix){ @@ -562,6 +566,25 @@ $input.data(prefix + 'date', date); } + function triggerValidation() { + checkValidity($startDateInput); + checkValidity($endDateInput); + checkValidity($dateInput); + checkValidity($input); + } + + function checkValidity($selfInput) { + if (!$selfInput) { + return; + } + + if($selfInput.closest('form').length === 0) { + return; + } + + $selfInput.valid(); + } + function triggerDateChange($selfInput, value, isDateRangePickerTrigger) { $selfInput.trigger('change'); if(isDateRangePickerTrigger !== false){