From 17e3cebd490994dc94d0cf6a3911efa9925e41b8 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Mon, 20 Jun 2022 10:28:20 +0300 Subject: [PATCH 001/110] Cli: Don't allow company name in ms-service generation --- .../Commands/ProjectCreationCommandBase.cs | 38 ++++++++++++++++--- .../Abp/Cli/ProjectBuilding/SolutionName.cs | 2 + 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs index 6e280d7dc3..e672c763ae 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs @@ -129,18 +129,38 @@ public abstract class ProjectCreationCommandBase SolutionName solutionName; if (MicroserviceServiceTemplateBase.IsMicroserviceServiceTemplate(template)) { - var slnFile = Directory.GetFiles(outputFolderRoot, "*.sln").FirstOrDefault(); + var slnPath = commandLineArgs.Options.GetOrNull(Options.MainSolution.Short, Options.MainSolution.Long); - if (slnFile == null) + if (slnPath == null) { - throw new CliUsageException("This command should be run inside a folder that contains a microservice solution!"); + slnPath = Directory.GetFiles(outputFolderRoot, "*.sln").FirstOrDefault(); + } + else if (slnPath.EndsWith(".sln")) + { + Directory.SetCurrentDirectory(Path.GetDirectoryName(slnPath)); + outputFolderRoot = Path.GetDirectoryName(slnPath); + } + else if (!Directory.Exists(slnPath)) + { + slnPath = null; + } + else + { + Directory.SetCurrentDirectory(slnPath); + outputFolderRoot = slnPath; + slnPath = Directory.GetFiles(outputFolderRoot, "*.sln").FirstOrDefault(); + } + + if (slnPath == null) + { + throw new CliUsageException($"This command should be run inside a folder that contains a microservice solution! Or use -{Options.MainSolution.Short} parameter."); } - var microserviceSolutionName = Path.GetFileName(slnFile).RemovePostFix(".sln"); + var microserviceSolutionName = Path.GetFileName(slnPath).RemovePostFix(".sln"); - version ??= SolutionPackageVersionFinder.Find(slnFile); + version ??= SolutionPackageVersionFinder.Find(slnPath); solutionName = SolutionName.Parse(microserviceSolutionName, projectName); - outputFolder = MicroserviceServiceTemplateBase.CalculateTargetFolder(outputFolderRoot, projectName); + outputFolder = MicroserviceServiceTemplateBase.CalculateTargetFolder(outputFolderRoot, solutionName.ProjectName); uiFramework = uiFramework == UiFramework.NotSpecified ? FindMicroserviceSolutionUiFramework(outputFolderRoot) : uiFramework; } else @@ -512,5 +532,11 @@ public abstract class ProjectCreationCommandBase { public const string Short = "pwa"; } + + public static class MainSolution + { + public const string Short = "ms"; + public const string Long = "main-solution"; + } } } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/SolutionName.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/SolutionName.cs index 784fca27ad..13f759c851 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/SolutionName.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/SolutionName.cs @@ -19,6 +19,8 @@ public class SolutionName public static SolutionName Parse(string fullName, string microserviceName) { + microserviceName = microserviceName.Replace(".", string.Empty); + return new SolutionName(fullName + "." + microserviceName, fullName, microserviceName); } From d84130012fadf60e0688708d9f579eda1729bdc3 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Wed, 22 Jun 2022 09:45:53 +0300 Subject: [PATCH 002/110] Created ListTemplatesCommand empty --- .../Volo/Abp/Cli/AbpCliCoreModule.cs | 1 + .../Abp/Cli/Commands/ListTemplatesCommand.cs | 39 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ListTemplatesCommand.cs diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs index 4fda075521..7aba9ae849 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs @@ -49,6 +49,7 @@ public class AbpCliCoreModule : AbpModule options.Commands[AddPackageCommand.Name] = typeof(AddPackageCommand); options.Commands[AddModuleCommand.Name] = typeof(AddModuleCommand); options.Commands[ListModulesCommand.Name] = typeof(ListModulesCommand); + options.Commands[ListTemplatesCommand.Name] = typeof(ListTemplatesCommand); options.Commands[LoginCommand.Name] = typeof(LoginCommand); options.Commands[LoginInfoCommand.Name] = typeof(LoginInfoCommand); options.Commands[LogoutCommand.Name] = typeof(LogoutCommand); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ListTemplatesCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ListTemplatesCommand.cs new file mode 100644 index 0000000000..c38f55a5b3 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ListTemplatesCommand.cs @@ -0,0 +1,39 @@ +using System.Text; +using System.Threading.Tasks; +using Volo.Abp.Cli.Args; +using Volo.Abp.DependencyInjection; + +namespace Volo.Abp.Cli.Commands; + +public class ListTemplatesCommand : IConsoleCommand, ITransientDependency +{ + public const string Name = "list-templates"; + + public ListTemplatesCommand() + { + + } + + public async Task ExecuteAsync(CommandLineArgs commandLineArgs) + { + + } + + public string GetUsageInfo() + { + var sb = new StringBuilder(); + + sb.AppendLine(""); + sb.AppendLine("Usage:"); + sb.AppendLine(" abp list-templates"); + sb.AppendLine(""); + sb.AppendLine("See the documentation for more info: https://docs.abp.io/en/abp/latest/CLI"); + + return sb.ToString(); + } + + public string GetShortDescription() + { + return "Lists available templates to be created."; + } +} From 6c3fa717877abca5b97b99460a17019ad7ed610b Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Wed, 22 Jun 2022 11:10:50 +0300 Subject: [PATCH 003/110] Cli ListTemplatesCommand: Get templates from abp.io & list resolves https://github.com/abpframework/abp/issues/13008 --- .../Abp/Cli/Commands/ListTemplatesCommand.cs | 79 +++++++++++++++++-- .../Cli/Commands/Templates/TemplateInfo.cs | 14 ++++ 2 files changed, 87 insertions(+), 6 deletions(-) create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/Templates/TemplateInfo.cs diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ListTemplatesCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ListTemplatesCommand.cs index c38f55a5b3..7274fb641d 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ListTemplatesCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ListTemplatesCommand.cs @@ -1,22 +1,89 @@ -using System.Text; +using System; +using System.Collections.Generic; +using System.Text; using System.Threading.Tasks; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Abstractions; using Volo.Abp.Cli.Args; +using Volo.Abp.Cli.Commands.Templates; +using Volo.Abp.Cli.Http; +using Volo.Abp.Cli.ProjectBuilding; using Volo.Abp.DependencyInjection; +using Volo.Abp.Json; +using Volo.Abp.Threading; namespace Volo.Abp.Cli.Commands; public class ListTemplatesCommand : IConsoleCommand, ITransientDependency { public const string Name = "list-templates"; - - public ListTemplatesCommand() + + private readonly CliHttpClientFactory _cliHttpClientFactory; + private readonly IJsonSerializer _jsonSerializer; + private readonly ICancellationTokenProvider _cancellationTokenProvider; + private readonly IRemoteServiceExceptionHandler _remoteServiceExceptionHandler; + + public ILogger Logger { get; set; } + + public ListTemplatesCommand( + CliHttpClientFactory cliHttpClientFactory, + IJsonSerializer jsonSerializer, + ICancellationTokenProvider cancellationTokenProvider, + IRemoteServiceExceptionHandler remoteServiceExceptionHandler) { - + _cliHttpClientFactory = cliHttpClientFactory; + _jsonSerializer = jsonSerializer; + _cancellationTokenProvider = cancellationTokenProvider; + _remoteServiceExceptionHandler = remoteServiceExceptionHandler; + + Logger = NullLogger.Instance; } public async Task ExecuteAsync(CommandLineArgs commandLineArgs) { - + var templateNameSpaceLength = 26; + var templateDisplayNameSpaceLength = 32; + + var templates = await GetTemplatesAsync(); + + var output = new StringBuilder(Environment.NewLine + Environment.NewLine); + + output.AppendLine( + $"{"Template".PadRight(templateNameSpaceLength)}" + + $"{"Template Name".PadRight(templateDisplayNameSpaceLength)}" + + "Document Url"); + + output.AppendLine( + $"{"--------".PadRight(templateNameSpaceLength)}" + + $"{"-------------".PadRight(templateDisplayNameSpaceLength)}" + + "------------"); + + output.AppendLine(); + + foreach (var template in templates) + { + output.AppendLine( + $"{template.Name?.PadRight(templateNameSpaceLength)}" + + $"{template.DisplayName?.PadRight(templateDisplayNameSpaceLength)}" + + $"{template.DocumentUrl}"); + } + + Logger.LogInformation(output.ToString()); + } + + private async Task> GetTemplatesAsync() + { + var client = _cliHttpClientFactory.CreateClient(); + + using (var responseMessage = await client.GetAsync( + $"{CliUrls.WwwAbpIo}api/download/templates/", + _cancellationTokenProvider.Token + )) + { + await _remoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(responseMessage); + var result = await responseMessage.Content.ReadAsStringAsync(); + return _jsonSerializer.Deserialize>(result); + } } public string GetUsageInfo() @@ -36,4 +103,4 @@ public class ListTemplatesCommand : IConsoleCommand, ITransientDependency { return "Lists available templates to be created."; } -} +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/Templates/TemplateInfo.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/Templates/TemplateInfo.cs new file mode 100644 index 0000000000..c0c269de5b --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/Templates/TemplateInfo.cs @@ -0,0 +1,14 @@ +namespace Volo.Abp.Cli.Commands.Templates; + +public class TemplateInfo +{ + public string Name { get; set; } + + public string DisplayName { get; set; } + + public string ShortDescription { get; set; } + + public string DocumentUrl { get; set; } + + public bool IsPro { get; set; } +} \ No newline at end of file From b7a66e54e857dc9ffb7ae5eb0496c1d9e04db404 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Wed, 22 Jun 2022 11:14:28 +0300 Subject: [PATCH 004/110] Add `list-templates` to docs https://github.com/abpframework/abp/issues/13008 --- docs/en/CLI.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/en/CLI.md b/docs/en/CLI.md index 57e27c23ec..8f6eaddd9c 100644 --- a/docs/en/CLI.md +++ b/docs/en/CLI.md @@ -34,6 +34,7 @@ Here, is the list of all available commands before explaining their details: * **`add-package`**: Adds an ABP package to a project. * **`add-module`**: Adds a [multi-package application module](https://docs.abp.io/en/abp/latest/Modules/Index) to a solution. * **`list-modules`**: Lists names of open-source application modules. +* **`list-templates`**: Lists names of available templates to create solutions. * **`get-source`**: Downloads the source code of a module. * **`generate-proxy`**: Generates client side proxies to use HTTP API endpoints. * **`remove-proxy`**: Removes previously generated client side proxies. From b275fd5d4061dc3446fd0b48493d37906994596e Mon Sep 17 00:00:00 2001 From: malik masis Date: Wed, 22 Jun 2022 15:50:06 +0300 Subject: [PATCH 005/110] Init commit --- .../CmsKit/Contents/AddWidgetModal.cshtml | 29 +++++++++++++ .../CmsKit/Contents/AddWidgetModal.cshtml.cs | 30 +++++++++++++ .../Pages/CmsKit/Contents/addWidgetModal.js | 14 ++++++ .../Pages/CmsKit/Pages/create.js | 43 ++++++++++++++++++- 4 files changed, 115 insertions(+), 1 deletion(-) create mode 100644 modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml create mode 100644 modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml.cs create mode 100644 modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml new file mode 100644 index 0000000000..a70d738c13 --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml @@ -0,0 +1,29 @@ +@page +@using Microsoft.AspNetCore.Mvc.Localization +@using Volo.CmsKit.Admin.Web.Pages +@using Volo.CmsKit.Localization +@using Volo.CmsKit.Admin.Web.Pages.CmsKit.Contents; +@inject IHtmlLocalizer L + + +@model AddWidgetModal; +@{ + Layout = null; +} + +@section scripts +{ + +} + + + + + +
+ Text + + +
+ + diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml.cs new file mode 100644 index 0000000000..8c2f25a2ad --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml.cs @@ -0,0 +1,30 @@ +using System; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using Volo.Abp.AspNetCore.Mvc.UI.RazorPages; + +namespace Volo.CmsKit.Admin.Web.Pages.CmsKit.Contents; + +public class AddWidgetModal : AbpPageModel +{ + [BindProperty(SupportsGet = true)] + public Guid Id { get; set; } + + [BindProperty(SupportsGet = true)] + public string Text { get; set; } + + + public AddWidgetModal() + { + } + + public async Task OnGetAsync() + { + + } + + public async Task OnPostAsync() + { + + } +} diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js new file mode 100644 index 0000000000..b59bbc0c8b --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js @@ -0,0 +1,14 @@ +var abp = abp || {}; +$(function () { + alert("hello guys1"); + abp.modals.addWidgetModal = function () { + + var initModal = function () { + alert("hello guys"); + }; + + return { + initModal: initModal + }; + }; +}); \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js index 1de6021a7d..a3583bfe0a 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js @@ -6,6 +6,8 @@ $(function () { var $slug = $('#ViewModel_Slug'); var $buttonSubmit = $('#button-page-create'); + var widgetModal = new abp.ModalManager({ viewUrl: abp.appPath + "CmsKit/Contents/AddWidgetModal", modalClass: "addWidgetModal" }); + var scriptEditor = CodeMirror.fromTextArea(document.getElementById("ViewModel_Script"), { mode: "javascript", lineNumbers: true @@ -25,7 +27,7 @@ $(function () { $createForm.on('submit', function (e) { e.preventDefault(); - + if ($createForm.valid()) { abp.ui.setBusy(); @@ -112,6 +114,19 @@ $(function () { minHeight: "25em", initialEditType: 'markdown', language: $editorContainer.data("language"), + toolbarItems: [ + ['heading', 'bold', 'italic', 'strike'], + ['hr', 'quote'], + ['ul', 'ol', 'task', 'indent', 'outdent'], + ['table', 'image', 'link'], + ['code', 'codeblock'], + // Using Option: Customize the last button + [{ + el: createLastButton(), + command: 'bold', + tooltip: 'Add Widget' + }] + ], hooks: { addImageBlobHook: uploadFile, }, @@ -122,6 +137,15 @@ $(function () { } } }); + + editor.insertToolbarItem({ groupIndex: 0, itemIndex: 0 }, { + name: 'myItem', + tooltip: 'Custom Button', + command: 'bold', + text: '@', + className: 'toastui-editor-toolbar-icons first', + style: { backgroundImage: 'none' } + }); } function uploadFile(blob, callback, source) { @@ -155,4 +179,21 @@ $(function () { } }); } + + function createLastButton() { + const button = document.createElement('button'); + + button.className = 'toastui-editor-toolbar-icons last dropdown'; + button.style.backgroundImage = 'none'; + button.style.margin = '0'; + button.innerHTML = `AW`; + button.addEventListener('click', (event) => { + //editor.exec('bold'); + event.preventDefault(); + alert("ye"); + widgetModal.open(); + }); + + return button; + } }); From 62c597e50d54469176747b5a27e281a19e0d50c7 Mon Sep 17 00:00:00 2001 From: malik masis Date: Thu, 23 Jun 2022 13:51:51 +0300 Subject: [PATCH 006/110] Included js files to the modal --- .../Pages/CmsKit/Contents/AddWidgetModal.cshtml | 2 +- .../Pages/CmsKit/Contents/addWidgetModal.js | 5 +++-- .../Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Create.cshtml | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml index a70d738c13..00ec2f251d 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml @@ -23,7 +23,7 @@
Text - +
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js index b59bbc0c8b..6d7aa1430a 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js @@ -1,10 +1,11 @@ var abp = abp || {}; $(function () { - alert("hello guys1"); abp.modals.addWidgetModal = function () { var initModal = function () { - alert("hello guys"); + $("#save-changes").click(function () { + alert("works"); + }); }; return { diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Create.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Create.cshtml index 4671cb2ca2..9348b07507 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Create.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Create.cshtml @@ -29,6 +29,7 @@ + } From cdd9169ba16a5383c52029cba4ca95300fee1041 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alper=20Ebi=C3=A7o=C4=9Flu?= <9526587+ebicoglu@users.noreply.github.com> Date: Thu, 23 Jun 2022 16:57:58 +0300 Subject: [PATCH 007/110] Update CLI.md --- docs/en/CLI.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/CLI.md b/docs/en/CLI.md index 8f6eaddd9c..408064205a 100644 --- a/docs/en/CLI.md +++ b/docs/en/CLI.md @@ -34,7 +34,7 @@ Here, is the list of all available commands before explaining their details: * **`add-package`**: Adds an ABP package to a project. * **`add-module`**: Adds a [multi-package application module](https://docs.abp.io/en/abp/latest/Modules/Index) to a solution. * **`list-modules`**: Lists names of open-source application modules. -* **`list-templates`**: Lists names of available templates to create solutions. +* **`list-templates`**: Lists the names of available templates to create a solution. * **`get-source`**: Downloads the source code of a module. * **`generate-proxy`**: Generates client side proxies to use HTTP API endpoints. * **`remove-proxy`**: Removes previously generated client side proxies. From 840b7fb96f06575fc0099cacccaa3e557f7fa988 Mon Sep 17 00:00:00 2001 From: malik masis Date: Fri, 24 Jun 2022 17:19:35 +0300 Subject: [PATCH 008/110] Appended the popup's text to the editor --- .../Pages/CmsKit/Contents/addWidgetModal.js | 8 +++++++- .../Pages/CmsKit/Pages/create.js | 11 ----------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js index 6d7aa1430a..54a1c8b869 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js @@ -4,7 +4,13 @@ $(function () { var initModal = function () { $("#save-changes").click(function () { - alert("works"); + var updatedText = $("#textId").val(); + + var contentEditorText = $("#ContentEditor")[0].innerText.split("\n")[2]; + + $('.ProseMirror div').contents()[0].data = contentEditorText + updatedText; + + $('#addWidgetModal').modal('hide'); }); }; diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js index a3583bfe0a..3fd4df2c06 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js @@ -137,15 +137,6 @@ $(function () { } } }); - - editor.insertToolbarItem({ groupIndex: 0, itemIndex: 0 }, { - name: 'myItem', - tooltip: 'Custom Button', - command: 'bold', - text: '@', - className: 'toastui-editor-toolbar-icons first', - style: { backgroundImage: 'none' } - }); } function uploadFile(blob, callback, source) { @@ -188,9 +179,7 @@ $(function () { button.style.margin = '0'; button.innerHTML = `AW`; button.addEventListener('click', (event) => { - //editor.exec('bold'); event.preventDefault(); - alert("ye"); widgetModal.open(); }); From c0311b1fe038027fb34ba44afcbe8b0e0cb16a84 Mon Sep 17 00:00:00 2001 From: malik masis Date: Mon, 27 Jun 2022 10:56:35 +0300 Subject: [PATCH 009/110] Configured widget type list --- .../CmsKit/Admin/Contents/ContentWidgetDto.cs | 9 ++++++ .../Admin/Contents/IContentAdminAppService.cs | 9 ++++++ .../Admin/Contents/ContentAdminAppService.cs | 32 +++++++++++++++++++ .../CmsKit/Contents/AddWidgetModal.cshtml | 6 ++-- .../CmsKit/Contents/AddWidgetModal.cshtml.cs | 29 +++++++++++------ 5 files changed, 73 insertions(+), 12 deletions(-) create mode 100644 modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Contents/ContentWidgetDto.cs create mode 100644 modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Contents/IContentAdminAppService.cs create mode 100644 modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Contents/ContentAdminAppService.cs diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Contents/ContentWidgetDto.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Contents/ContentWidgetDto.cs new file mode 100644 index 0000000000..e55c98b5a2 --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Contents/ContentWidgetDto.cs @@ -0,0 +1,9 @@ +using System; + +namespace Volo.CmsKit.Admin.Contents; + +[Serializable] +public class ContentWidgetDto +{ + public string Key { get; set; } +} diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Contents/IContentAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Contents/IContentAdminAppService.cs new file mode 100644 index 0000000000..28a1e7d992 --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Contents/IContentAdminAppService.cs @@ -0,0 +1,9 @@ +using System.Threading.Tasks; +using Volo.Abp.Application.Dtos; +using Volo.Abp.Application.Services; + +namespace Volo.CmsKit.Admin.Contents; +public interface IContentAdminAppService : IApplicationService +{ + Task> GetWidgetsAsync(); +} diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Contents/ContentAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Contents/ContentAdminAppService.cs new file mode 100644 index 0000000000..5a96b71c61 --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Contents/ContentAdminAppService.cs @@ -0,0 +1,32 @@ +using System.Linq; +using System.Threading.Tasks; +using Microsoft.Extensions.Options; +using Volo.Abp.Application.Dtos; +using Volo.CmsKit.Contents; + +namespace Volo.CmsKit.Admin.Contents; + +public class ContentAdminAppService : CmsKitAdminAppServiceBase, IContentAdminAppService +{ + private readonly CmsKitContentWidgetOptions _options; + + public ContentAdminAppService(IOptions options) + { + _options = options.Value; + } + + public Task> GetWidgetsAsync() + { + var aa = _options.WidgetConfigs.ToList(); + return Task.FromResult(new ListResultDto() + { + Items = _options.WidgetConfigs + .Select(n => + new ContentWidgetDto + { + Key = n.Key + + }).ToList() + }); + } +} diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml index 00ec2f251d..654fd89b1a 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml @@ -20,9 +20,9 @@ -
- Text - +
+ +
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml.cs index 8c2f25a2ad..c6f13aa85a 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml.cs @@ -1,30 +1,41 @@ -using System; +using System.Collections.Generic; +using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.Rendering; +using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form; using Volo.Abp.AspNetCore.Mvc.UI.RazorPages; +using Volo.CmsKit.Admin.Contents; namespace Volo.CmsKit.Admin.Web.Pages.CmsKit.Contents; public class AddWidgetModal : AbpPageModel { - [BindProperty(SupportsGet = true)] - public Guid Id { get; set; } + protected IContentAdminAppService ContentAdminAppService { get; } - [BindProperty(SupportsGet = true)] - public string Text { get; set; } + [BindProperty] + public ContentViewModel ViewModel { get; set; } - public AddWidgetModal() + public List Widgets { get; set; } = new(); + + public AddWidgetModal(IContentAdminAppService contentAdminAppService) { + ContentAdminAppService = contentAdminAppService; } public async Task OnGetAsync() { - + Widgets = new List() { new("", "") }; + Widgets.AddRange((await ContentAdminAppService.GetWidgetsAsync()) + .Items + .Select(w => new SelectListItem(w.Key, w.Key)) + .ToList()); } - public async Task OnPostAsync() + public class ContentViewModel { - + [SelectItems(nameof(Widgets))] + public string Widget { get; set; } } } From b38984568b3b8624a76f18eac24e0c5f4997bf4b Mon Sep 17 00:00:00 2001 From: maliming Date: Mon, 27 Jun 2022 16:10:39 +0800 Subject: [PATCH 010/110] Introduce `SettingPageContributorManager`. --- .../SettingManagementMainMenuContributor.cs | 21 +---- .../ISettingPageContributor.cs | 2 - .../Pages/SettingManagement/Index.cshtml.cs | 17 ++-- .../SettingPageContributorBase.cs | 54 ++++++++++++ .../SettingPageContributorManager.cs | 88 +++++++++++++++++++ .../Settings/EmailingPageContributor.cs | 52 ++--------- 6 files changed, 158 insertions(+), 76 deletions(-) create mode 100644 modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageContributorBase.cs create mode 100644 modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageContributorManager.cs diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Navigation/SettingManagementMainMenuContributor.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Navigation/SettingManagementMainMenuContributor.cs index 97eb89b6c6..a5775a8a42 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Navigation/SettingManagementMainMenuContributor.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Navigation/SettingManagementMainMenuContributor.cs @@ -1,5 +1,4 @@ using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Options; using System.Linq; using System.Threading.Tasks; using Volo.Abp.Features; @@ -25,10 +24,8 @@ public class SettingManagementMainMenuContributor : IMenuContributor return; } - var settingManagementPageOptions = context.ServiceProvider.GetRequiredService>().Value; - var settingPageCreationContext = new SettingPageCreationContext(context.ServiceProvider); - if (!settingManagementPageOptions.Contributors.Any() || - !(await CheckAnyOfPagePermissionsGranted(settingManagementPageOptions, settingPageCreationContext))) + var settingPageContributorManager = context.ServiceProvider.GetRequiredService(); + if (!(await settingPageContributorManager.GetAvailableContributors()).Any()) { return; } @@ -46,18 +43,4 @@ public class SettingManagementMainMenuContributor : IMenuContributor ).RequireFeatures(SettingManagementFeatures.Enable) ); } - - protected virtual async Task CheckAnyOfPagePermissionsGranted( - SettingManagementPageOptions settingManagementPageOptions, - SettingPageCreationContext settingPageCreationContext) - { - foreach (var contributor in settingManagementPageOptions.Contributors) - { - if (await contributor.CheckPermissionsAsync(settingPageCreationContext)) - { - return true; - } - } - return false; - } } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/ISettingPageContributor.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/ISettingPageContributor.cs index 4128e9cd05..16bb6962d9 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/ISettingPageContributor.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/ISettingPageContributor.cs @@ -5,6 +5,4 @@ namespace Volo.Abp.SettingManagement.Web.Pages.SettingManagement; public interface ISettingPageContributor { Task ConfigureAsync(SettingPageCreationContext context); - - Task CheckPermissionsAsync(SettingPageCreationContext context); } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml.cs index bf0b3e0d6b..0dcb3fb388 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml.cs @@ -1,5 +1,4 @@ using System.Threading.Tasks; -using Microsoft.Extensions.Options; using Microsoft.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations; using Volo.Abp.AspNetCore.Mvc.UI.RazorPages; @@ -13,25 +12,19 @@ public class IndexModel : AbpPageModel { public SettingPageCreationContext SettingPageCreationContext { get; private set; } + protected SettingPageContributorManager SettingPageContributorManager { get; } + protected ILocalEventBus LocalEventBus { get; } - protected SettingManagementPageOptions Options { get; } - public IndexModel( - IOptions options, - ILocalEventBus localEventBus) + public IndexModel(ILocalEventBus localEventBus, SettingPageContributorManager settingPageContributorManager) { LocalEventBus = localEventBus; - Options = options.Value; + SettingPageContributorManager = settingPageContributorManager; } public virtual async Task OnGetAsync() { - SettingPageCreationContext = new SettingPageCreationContext(ServiceProvider); - - foreach (var contributor in Options.Contributors) - { - await contributor.ConfigureAsync(SettingPageCreationContext); - } + SettingPageCreationContext = await SettingPageContributorManager.ConfigureAsync(); return Page(); } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageContributorBase.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageContributorBase.cs new file mode 100644 index 0000000000..7e9d1f7954 --- /dev/null +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageContributorBase.cs @@ -0,0 +1,54 @@ +using System.Collections.Generic; +using System.Threading.Tasks; +using Volo.Abp.MultiTenancy; + +namespace Volo.Abp.SettingManagement.Web.Pages.SettingManagement; + +public abstract class SettingPageContributorBase : ISettingPageContributor +{ + private readonly HashSet _requiredPermissions; + private readonly HashSet _requiredFeatures; + private readonly HashSet _requiredTenantSideFeatures; + + protected SettingPageContributorBase() + { + _requiredPermissions = new HashSet(); + _requiredFeatures = new HashSet(); + _requiredTenantSideFeatures = new HashSet(); + } + + protected virtual SettingPageContributorBase RequiredPermissions(params string[] permissions) + { + Check.NotNullOrEmpty(permissions, nameof(permissions)); + _requiredPermissions.AddIfNotContains(permissions); + return this; + } + + public virtual IReadOnlySet GetRequiredPermissions() + { + return _requiredPermissions; + } + + protected virtual SettingPageContributorBase RequiredFeatures(params string[] features) + { + Check.NotNullOrEmpty(features, nameof(features)); + _requiredFeatures.AddIfNotContains(features); + return this; + } + + protected virtual SettingPageContributorBase RequiredTenantSideFeatures(params string[] features) + { + Check.NotNullOrEmpty(features, nameof(features)); + _requiredTenantSideFeatures.AddIfNotContains(features); + return this; + } + + public virtual IReadOnlySet GetRequiredFeatures(MultiTenancySides? multiTenancySides = null) + { + return multiTenancySides == null || multiTenancySides != MultiTenancySides.Tenant + ? _requiredFeatures + : _requiredTenantSideFeatures; + } + + public abstract Task ConfigureAsync(SettingPageCreationContext context); +} diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageContributorManager.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageContributorManager.cs new file mode 100644 index 0000000000..6bd70f2eae --- /dev/null +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageContributorManager.cs @@ -0,0 +1,88 @@ +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Options; +using Volo.Abp.Authorization.Permissions; +using Volo.Abp.DependencyInjection; +using Volo.Abp.Features; +using Volo.Abp.MultiTenancy; + +namespace Volo.Abp.SettingManagement.Web.Pages.SettingManagement; + +public class SettingPageContributorManager : IScopedDependency +{ + protected IServiceProvider ServiceProvider { get; } + + protected ConcurrentDictionary> CachedAvailableContributors { get; set; } + + public SettingPageContributorManager(IServiceProvider serviceProvider) + { + ServiceProvider = serviceProvider; + CachedAvailableContributors = new ConcurrentDictionary>(); + } + + public virtual async Task> GetAvailableContributors() + { + return CachedAvailableContributors.GetOrAdd(nameof(SettingPageContributorManager), await GetAvailableContributorsInternalAsync()); + } + + public virtual async Task ConfigureAsync() + { + var contributors = CachedAvailableContributors.GetOrAdd(nameof(SettingPageContributorManager), await GetAvailableContributorsInternalAsync()); + var context = new SettingPageCreationContext(ServiceProvider); + foreach (var contributor in contributors) + { + await contributor.ConfigureAsync(context); + } + return context; + } + + protected virtual async Task> GetAvailableContributorsInternalAsync() + { + var contributors = ServiceProvider.GetRequiredService>().Value.Contributors; + var contributorBases = contributors.Where(x => x is SettingPageContributorBase).Cast().ToList(); + + var permissions = new HashSet(); + permissions.AddIfNotContains(contributorBases.SelectMany(x => x.GetRequiredPermissions())); + + var featureChecker = ServiceProvider.GetRequiredService(); + var permissionChecker = ServiceProvider.GetRequiredService(); + var grantResult = await permissionChecker.IsGrantedAsync(permissions.ToArray()); + + var availableContributors = new List(); + foreach (var contributor in contributorBases) + { + var available = true; + + var requiredFeatures = contributor.GetRequiredFeatures(); + if (requiredFeatures.Any() && !await featureChecker.IsEnabledAsync(true, requiredFeatures.ToArray())) + { + available = false; + } + + if (available) + { + var requiredTenantSideFeatures = contributor.GetRequiredFeatures(MultiTenancySides.Tenant); + if (requiredTenantSideFeatures.Any() && !await featureChecker.IsEnabledAsync(true, requiredTenantSideFeatures.ToArray())) + { + available = false; + } + } + + if (available) + { + available = contributor.GetRequiredPermissions().All(x => grantResult.Result.ContainsKey(x) && grantResult.Result[x] == PermissionGrantResult.Granted); + } + + if (available) + { + availableContributors.Add(contributor); + } + } + + return availableContributors; + } +} diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Settings/EmailingPageContributor.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Settings/EmailingPageContributor.cs index 35e6714b9f..773088d140 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Settings/EmailingPageContributor.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Settings/EmailingPageContributor.cs @@ -1,24 +1,22 @@ using System.Threading.Tasks; -using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Localization; -using Volo.Abp.Features; -using Volo.Abp.MultiTenancy; using Volo.Abp.SettingManagement.Localization; using Volo.Abp.SettingManagement.Web.Pages.SettingManagement; using Volo.Abp.SettingManagement.Web.Pages.SettingManagement.Components.EmailSettingGroup; namespace Volo.Abp.SettingManagement.Web.Settings; -public class EmailingPageContributor : ISettingPageContributor +public class EmailingPageContributor : SettingPageContributorBase { - public async Task ConfigureAsync(SettingPageCreationContext context) + public EmailingPageContributor() + { + RequiredFeatures(SettingManagementFeatures.Enable); + RequiredTenantSideFeatures(SettingManagementFeatures.AllowTenantsToChangeEmailSettings); + RequiredPermissions(SettingManagementPermissions.Emailing); + } + public override Task ConfigureAsync(SettingPageCreationContext context) { - if (!await CheckPermissionsInternalAsync(context)) - { - return; - } - var l = context.ServiceProvider.GetRequiredService>(); context.Groups.Add( new SettingPageGroup( @@ -27,38 +25,6 @@ public class EmailingPageContributor : ISettingPageContributor typeof(EmailSettingGroupViewComponent) ) ); - } - - public async Task CheckPermissionsAsync(SettingPageCreationContext context) - { - return await CheckPermissionsInternalAsync(context); - } - - private async Task CheckPermissionsInternalAsync(SettingPageCreationContext context) - { - if (!await CheckFeatureAsync(context)) - { - return false; - } - - var authorizationService = context.ServiceProvider.GetRequiredService(); - - return await authorizationService.IsGrantedAsync(SettingManagementPermissions.Emailing); - } - - private async Task CheckFeatureAsync(SettingPageCreationContext context) - { - var featureCheck = context.ServiceProvider.GetRequiredService(); - if (!await featureCheck.IsEnabledAsync(SettingManagementFeatures.Enable)) - { - return false; - } - - if (context.ServiceProvider.GetRequiredService().IsAvailable) - { - return await featureCheck.IsEnabledAsync(SettingManagementFeatures.AllowTenantsToChangeEmailSettings); - } - - return true; + return Task.CompletedTask; } } From dcb35f2d6296a3403fad50fde2f6d1c76b695116 Mon Sep 17 00:00:00 2001 From: maliming Date: Mon, 27 Jun 2022 16:47:42 +0800 Subject: [PATCH 011/110] Make `CheckPermissionsAsync` obsolete. --- .../SettingManagement/ISettingPageContributor.cs | 6 +++++- .../SettingManagement/SettingPageContributorBase.cs | 5 +++++ .../SettingPageContributorManager.cs | 11 +++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/ISettingPageContributor.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/ISettingPageContributor.cs index 16bb6962d9..7bf0653380 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/ISettingPageContributor.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/ISettingPageContributor.cs @@ -1,8 +1,12 @@ -using System.Threading.Tasks; +using System; +using System.Threading.Tasks; namespace Volo.Abp.SettingManagement.Web.Pages.SettingManagement; public interface ISettingPageContributor { Task ConfigureAsync(SettingPageCreationContext context); + + [Obsolete("Use SettingPageContributorBase as base class and call `RequiredPermissions` or `RequiredFeatures` for better performance.")] + Task CheckPermissionsAsync(SettingPageCreationContext context); } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageContributorBase.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageContributorBase.cs index 7e9d1f7954..b79c452df9 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageContributorBase.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageContributorBase.cs @@ -51,4 +51,9 @@ public abstract class SettingPageContributorBase : ISettingPageContributor } public abstract Task ConfigureAsync(SettingPageCreationContext context); + + public virtual Task CheckPermissionsAsync(SettingPageCreationContext context) + { + return Task.FromResult(true); + } } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageContributorManager.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageContributorManager.cs index 6bd70f2eae..e1f597b85a 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageContributorManager.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageContributorManager.cs @@ -83,6 +83,17 @@ public class SettingPageContributorManager : IScopedDependency } } + var context = new SettingPageCreationContext(ServiceProvider); + foreach (var contributor in contributors.Where(x => x is not SettingPageContributorBase)) + { +#pragma warning disable CS0618 + if (await contributor.CheckPermissionsAsync(context)) +#pragma warning restore CS0618 + { + availableContributors.Add(contributor); + } + } + return availableContributors; } } From be317d252821090e46aae692b88ca2958874ec5e Mon Sep 17 00:00:00 2001 From: Engincan VESKE Date: Mon, 27 Jun 2022 14:56:17 +0300 Subject: [PATCH 012/110] Update en.json --- .../Commercial/Localization/Resources/en.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json index 36c00e9015..f448364d1b 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json @@ -730,7 +730,10 @@ "Welcome_Page_UseSameCredentialForCommercialWebsites": "Use the same credentials for both commercial.abp.io and support.abp.io.", "WatchCrudPagesVideo": "Watch the \"Creating CRUD Pages with ABP Suite\" Video!", "WatchGeneratingFromDatabaseVideo": "Watch the \"ABP Suite: Generating CRUD Pages From Existing Database Tables\" Video!", - "WatchTakeCloserLookVideo": "Watch the \"Take a closer look at the code generation: ABP Suite\" Video!" - + "WatchTakeCloserLookVideo": "Watch the \"Take a closer look at the code generation: ABP Suite\" Video!", + "ConfirmedEmailAddressRequiredToStartTrial": "You should have a confirmed email address in order to start a trial license.", + "EmailVerificationMailNotSent": "Email verification mail couldn't send.", + "GetConfirmationEmail": "Click here to get a confirmation email if you haven't got it before.", + "WhichLicenseTypeYouAreInterestedIn": "Which license type you are interested in?" } } From 04912e4b74839883f16c5f6e2aa38a2bfe6ae95d Mon Sep 17 00:00:00 2001 From: Engincan VESKE Date: Mon, 27 Jun 2022 15:19:30 +0300 Subject: [PATCH 013/110] Update en.json --- .../AbpIoLocalization/Commercial/Localization/Resources/en.json | 1 + 1 file changed, 1 insertion(+) diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json index f448364d1b..2e30f25780 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json @@ -536,6 +536,7 @@ "Pricing_Page_Testimonial_2": "We are seeing the value of using ABP Commercial to reduce the overhead of custom development projects. And the team is able to unify the code pattern in different project streams. We see more potential in the framework for us to build new features faster than before. We trust we will be constantly seeing the value of leveraging ABP Commercial.", "Pricing_Page_Testimonial_3": "We love ABP. We don't have to write everything from scratch. We start from out-of-the-box features and just focus on what we really need to write. Also, ABP is well-architected and the code is high quality with fewer bugs. If we would have to write everything we needed on our own, we might have to spend years. Once more things we like is that the new version, or issue fixing, or improvement come out very soon every other week. We don't wait too long.", "Pricing_Page_Testimonial_4": "ABP Commercial is a fantastic product would recommend. Commercial products to market for our customers in a single configurable platform. The jump start that the framework and tooling provide any team is worth every cent. ABP Commercial was the best fit for our needs.", + "Pricing_Page_Testimonial_5": "ABP Framework is not only a framework, it is also a guidance for project development/management, because it provides DDD, GenericRepository, DI, Microservice, Modularity trainings. Even if you are not going to use framework itself, you can develop yourself with docs.abp.io which is well and professionally prepared (OpenIddict, Redis, Quartz etc.). Because many thing pre-built, it shortens project development time significantly (Such as login page, exception handling, data filtering-seeding, audit logging, localization, auto api controller etc.). As an example from our app, I have used Local Event Bus for stock control. So, I am able to manage order movements by writing stock handler. It is wonderful not to lose time for CreationTime, CreatorId. They are filled automatically.", "AbpBookDownloadArea_ClaimYourEBook": "Claim your Mastering ABP Framework E-Book", "AddMemberModal_Warning_1": "If the username you are trying to add doesn't exist in the system, please ask your team member to register on {0} and share the username of his/her account with you.", "MyOrganizations_Detail_WelcomeMessage": "Welcome to your organization, {0}", From 1fbd755f8bcf01beee4b1341b2fe4e74eb9766d2 Mon Sep 17 00:00:00 2001 From: Engincan VESKE Date: Mon, 27 Jun 2022 15:42:04 +0300 Subject: [PATCH 014/110] Add missing Chinese localizations for abp.io websites --- .../Localization/Resources/zh-Hans.json | 4 +- .../Base/Localization/Resources/zh-Hans.json | 124 +++++++++++++++++- .../Blog/Localization/Resources/zh-Hans.json | 2 + .../Localization/Resources/zh-Hans.json | 57 ++++++-- .../Www/Localization/Resources/zh-Hans.json | 101 +++++++++++++- 5 files changed, 276 insertions(+), 12 deletions(-) diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Account/Localization/Resources/zh-Hans.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Account/Localization/Resources/zh-Hans.json index e790ad80af..a773568a31 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Account/Localization/Resources/zh-Hans.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Account/Localization/Resources/zh-Hans.json @@ -11,6 +11,6 @@ "CommercialSupportWebSite": "商业版支持网站", "CommunityWebSite": "ABP社区网站", "ManageAccount": "我的帐户 | ABP.IO", - "ManageYourAccount": "管理您的帐户" + "ManageYourProfile": "管理您的个人资料" } -} +} \ No newline at end of file diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/zh-Hans.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/zh-Hans.json index 01335e7921..c7ccd1e1e2 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/zh-Hans.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/zh-Hans.json @@ -14,6 +14,20 @@ "Volo.AbpIo.Domain:020002": "不能删除该NPM包因为\"{Modules}\"模块正在使用此包.", "Volo.AbpIo.Domain:020003": "不能删除该NPM包因为\"{Modules}\"模块正在使用此包并且\"{NugetPackages}\"Nuget包依赖此包.", "Volo.AbpIo.Domain:020004": "不能删除该Nuget包因为\"{Modules}\"模块正在使用此包.", + "Volo.AbpIo.Domain:030000": "您已经完成了试用期。", + "Volo.AbpIo.Domain:030001": "此组织名称已存在。", + "Volo.AbpIo.Domain:030002": "一旦激活，您将无法将试用许可证切换到 -requested- 状态！", + "Volo.AbpIo.Domain:030003": "没有这种状态！", + "Volo.AbpIo.Domain:030004": "由于意外错误，无法更改状态！", + "Volo.AbpIo.Domain:030005": "试用许可证处于激活状态时可以更新开始和结束日期！", + "Volo.AbpIo.Domain:030006": "结束日期必须大于开始日期！", + "Volo.AbpIo.Domain:030007": "此试用许可证已激活！", + "Volo.AbpIo.Domain:030008": "只有状态为-purchased-时才能设置购买日期！", + "Volo.AbpIo.Domain:030009": "找不到用户！", + "Volo.AbpIo.Domain:030010": "要购买试用许可证，您首先需要激活您的试用许可证！", + "Volo.AbpIo.Domain:030011": "购买后不能删除试用许可证！", + "Volo.AbpIo.Domain:070000": "组织名称只能包含拉丁字母、数字、点和连字符！", + "Volo.AbpIo.Domain:070001": "公司名称只能包含拉丁字母、数字、点、空格和连字符！", "WantToLearn?": "想学习吗?", "ReadyToGetStarted?": "准备开始了吗?", "JoinOurCommunity": "加入我们的社区", @@ -39,6 +53,114 @@ "TrialLicensePeriodHasExpired": "您的试用许可期限已于 {0} 天前到期。", "TrialLicensePeriodWillExpire": "您的试用许可期限将在 {0} 天后到期。", "TrialLicensePeriodExpireToday": "您的试用许可期将于今天到期。", - "PurchaseNow": "现在买！" + "PurchaseNow": "现在买！", + "LatestReleaseLogs": "最新发布日志", + "RoadMap": "路线图", + "FAQ": "常见问题", + "SourceCode": "源代码", + "SeeAllPosts": "查看所有帖子", + "Contribute": "贡献", + "LiveDemo": "在线演示", + "GetLicense": "获得许可证", + "OpenSource": "开源", + "WebApplication": "Web应用程序", + "MeetTheABP": "认识 ABP", + "CompleteWebDevelopment": "一个完整的 Web 开发", + "Platform": "平台", + "ABPDescription": "ABP 框架是一个完整的基础架构，可通过遵循软件开发最佳实践和约定来创建现代 Web 应用程序。", + "StrongInfrastructure": "强大的基础设施", + "CompleteArchitecture": "完整的架构", + "DeveloperFocused": "以开发者为中心", + "ShareYourExperiences": "分享您使用 ABP 框架的经验", + "LatestPosts": "最新的帖子", + "Views": "意见", + "LearnLatestNewsAboutABPFramework": "获取有关 ABP 的最新相关信息，例如新版本、免费资源、帖子等。", + "DeveloperTools": "开发者工具", + "StartupTemplates": "启动模板", + "ApplicationModules": "应用模块", + "UI": "UI", + "Themes": "主题", + "Premium": "高级的", + "PrivacyPolicy": "隐私政策", + "TermsAndConditions": "条款 & 条件", + "WouldLikeToReceiveMarketingMaterials": "我想收到产品交易和特别优惠等市场推广材料。", + "JoinOurMarketingNewsletter": "加入我们市场推广时事通讯", + "CommunityPrivacyPolicyConfirmation": "我同意条款 & 条件和隐私政策 。", + "WouldLikeToReceiveNotification": "我想从 abp.io 网站接收最新消息。", + "CommercialNewsletterConfirmationMessage": "我同意条款 & 条件 和 隐私政策。", + "FreeDDDEBook": "免费 DDD 电子书", + "AdditionalServices": "额外服务", + "Learn": "学习", + "AccountOverview": "账户信息", + "MyOrganizations": "我的组织", + "MySupportQuestions": "我的支持问题", + "MyProfile": "我的简介", + "Logout": "登出", + "Home": "主页", + "Posts": "帖子", + "JoinTheABPCommunity": "加入 ABP 社区", + "SubmitYourPost": "提交您的帖子", + "Modules": "模块", + "Tools": "工具", + "Pricing": "价格", + "ChangeLogs": "更改日志", + "SubscribeToNewsletter": "订阅时事通讯", + "SubscribeToNewsletterDescription": "获取有关 ABP 的最新相关信息，例如新版本、免费资源、帖子等。", + "EmailAddress": "邮箱地址", + "Subscribe": "订阅", + "WelcomeToABP": "欢迎来到 ABP", + "EULA": "最终用户许可协议", + "ABPCommercialIntroductionMessage": "预建应用程序模块、高级启动模板、快速应用程序开发工具、专业 UI 主题和高级支持。", + "MasteringAbpFrameworkEBook": "掌握 ABP 框架", + "MasteringTheABPFrameworkExplanation": "本书由 ABP 框架的创建者撰写，将帮助您全面了解框架和现代 Web 应用程序开发技术。", + "Speakers": "发言者", + "PreviousEvents": "以往活动", + "WatchTheEvent": "观看活动", + "RegisterNow": "现在注册", + "ThereIsNoEvent": "没有活动。", + "Events": "活动", + "Volo.AbpIo.Domain:080000": "已有一个名为 \"{Name}\" 的购买项目", + "MasteringAbpFrameworkBook": "书籍：掌握 ABP 框架", + "ABPIO-CommonPreferenceDefinition": "获取有关 ABP 平台的最新消息，例如新帖子、活动等。", + "BuiltOn": "建立在", + "AbpFramework": "ABP 框架", + "Volo.AbpIo.Domain:080001": "开始时间不能大于结束时间", + "Enum:BookType:0": "掌握 ABP 框架", + "Enum:PurchasePlatform:0": "亚马逊", + "Enum:PurchasePlatform:1": "Packt", + "Copied": "已复制！", + "CouldNotCopy": "无法复制！", + "CopyNotSupportByYourBrowser": "此功能在您使用的浏览器中不起作用。", + "City": "城市", + "ZipCode": "邮政编码", + "Address": "地址", + "Homepage": "主页", + "Year": "年份", + "Copyright": "版权所有 © {1}", + "DomainDrivenDesign": "领域驱动设计", + "CrossCuttingConcerns": "横切关注点", + "AbpCommunity": "ABP 社区", + "Footer_GithubStarCount": "{0} 在 GitHub 上加星", + "Footer_NugetDownloadCount": "{0} 在 NuGet 上下载", + "AbpDescription": "ABP 是一个开源应用程序框架，专注于基于 AspNet Core 的 Web 应用程序开发。 Don't repeat yourself，专注于自己的业务代码。", + "Layout_AbpFramework_MetaTitle": "ABP 框架 - 开源 Web 应用程序框架", + "CommunityTalks_CountdownDays": "天", + "CommunityTalks_CountdownHours": "小时", + "CommunityTalks_CountdownMinutes": "分钟", + "CommunityTalks_CountdownSeconds": "秒", + "SeePreviousEvents": "查看以前的活动", + "CookieConsent_Accept": "接受", + "CookieConsent_Explanation_1": "我们使用 cookie 为您提供在我们网站上的最佳体验。", + "CookieConsent_Explanation_2": "如果您继续浏览，则表示您同意我们的隐私政策和cookie 政策。。", + "Error_Page_400_Title": "提供请求的页面时出现问题。", + "Error_Page_400_Description_1": "通常这意味着在处理您的请求时发生了意外错误。", + "Error_Page_400_Description_2": "如果问题仍然存在，请通过 info@abp.io 联系我们，我们将帮助您开始。", + "GoToHomepage": "去首页", + "Error_Page_404_Title": "页面未找到！", + "Error_Page_404_Description_1": "这不是您要查找的网页。", + "Error_Page_500_Title": "好像出了什么问题！", + "Error_Page_500_Description_1": "我们会自动跟踪这些错误，但如果问题仍然存在，请随时
联系我们。 与此同时，尝试刷新。", + "Error_Page_500_Description_2": "通过 info@abp.io 与我们联系。", + "Books": "书籍" } } \ No newline at end of file diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Blog/Localization/Resources/zh-Hans.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Blog/Localization/Resources/zh-Hans.json index df772fa60b..524c3345e3 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Blog/Localization/Resources/zh-Hans.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Blog/Localization/Resources/zh-Hans.json @@ -1,5 +1,7 @@ { "culture": "zh-Hans", "texts": { + "AbpTitle": "ABP 框架 - 开源 Web 应用程序框架", + "AbpDescription": "ABP 是一个开源应用程序框架，专注于基于 AspNet Core 的 Web 应用程序开发。 Don't repeat yourself，专注于自己的业务代码。" } } \ No newline at end of file diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/zh-Hans.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/zh-Hans.json index b5d9d65c82..3513a37dde 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/zh-Hans.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/zh-Hans.json @@ -29,14 +29,12 @@ "ContributionGuide": "贡献指南", "BugReport": "Bug报告", "SeeAllPosts": "查看所有的文章", - "WelcomeToABPCommunity!": "欢迎来到ABP社区!", - "MyProfile": "我的资料", - "MyOrganizations": "我的组织", + "WelcomeToABP": "欢迎来到ABP", "EmailNotValid": "请输入有效的电子邮箱地址.", "FeatureRequest": "功能请求", "CreatePostTitleInfo": "文章标题显示在文章列表中.", "CreatePostSummaryInfo": "文章的简短摘要将显示在文章列表中.", - "CreatePostCoverInfo": "为了创建有效的文章,请添加封面图. 仅支持16:9的图片!", + "CreatePostCoverInfo": "要创建一个有效的帖子,需要添加封面图片. 上传16:9的图片获取最佳视觉效果. 文件最大支持: 1MB", "ThisExtensionIsNotAllowed": "不允许此扩展名.", "TheFileIsTooLarge": "文件过大.", "GoToThePost": "转到文章", @@ -45,7 +43,7 @@ "Done": "完成", "Open": "打开", "Closed": "关闭", - "LatestQuestionOnThe": "有关的最新问题", + "RecentQuestionFrom": "最近的问题来自", "Stackoverflow": "Stackoverflow", "Votes": "票数", "Answer": "回答", @@ -59,7 +57,7 @@ "QuestionItemErrorMessage": "无法从Stackoverflow获取最新的问题详细信息.", "Oops": "哎呀!", "CreatePostSuccessMessage": "文章提交成功. 网站管理员审核通过后将被发布.", - "ChooseCoverImage": "选项一张封面图片", + "Browse": "浏览", "CoverImage": "封面图片", "ShareYourExperiencesWithTheABPFramework": "分享你的ABP Framework经验!", "Optional": "可选的", @@ -88,6 +86,8 @@ "PostRequestFromGithubIssue": "现在没有任何文章请求.", "LatestPosts": "最新的帖子", "ArticleRequests": "文章请求", + "ArticleRequestsDescription": "想在这里查看具体内容吗？ 您可以要求社区创建它！", + "LatestContentRequests": "最新内容请求", "AllPostRequests": "查看所有文章请求", "SubscribeToTheNewsletter": "订阅简讯", "NewsletterEmailDefinition": "获取有关ABP发生的信息,例如新版本,免费资源,文章等.", @@ -115,7 +115,6 @@ "VideoUrl": "视频Url", "GithubPostUrl": "Github文章Url", "ExternalPostUrl": "外部文章Url", - "CreatePostCoverInfo": "要创建一个有效的帖子,需要添加封面图片. 上传16:9的图片获取最佳视觉效果. 文件最大支持: 1MB", "ThankYouForContribution": "感谢你对ABP社区的贡献", "GithubPost": "Github文章", "GithubPostSubmitStepOne": "1. 用Markdown格式在GitHub的任何公共存储库上写一篇文章. 示例", @@ -143,6 +142,48 @@ "Volo.AbpIo.Domain:060001": "源 URL(\"{PostUrl}\") 不是 Github URL", "Volo.AbpIo.Domain:060002": "文章内容无法从 Github(\"{PostUrl}\") 资源中获得。", "Volo.AbpIo.Domain:060003": "没有找到文章内容！", - "SeeMore": "查看更多" + "SeeMore": "查看更多", + "JoinTheABPCommunity": "加入 ABP 社区", + "ABPCommunityTalks": "ABP 社区会谈", + "LiveDemo": "现场演示", + "GetLicense": "获得许可证", + "GetStarted": "开始使用", + "SourceCode": "源代码", + "LeaveComment": "发表评论", + "ReadMore": "阅读更多", + "ShowMore": "展示更多", + "NoPublishedPostsYet": "还没有发布的帖子。", + "Name": "名字", + "Surname": "姓氏", + "WebSite": "网站", + "FullURL": "完整网址", + "JobTitle": "职称", + "Prev": "上一页", + "Previous": "前面的", + "Next": "下一页", + "Share": "分享", + "SortBy": "排序方式", + "NoPublishedEventsYet": "尚未发布活动。", + "SubscribeYoutubeChannel": "订阅 Youtube 频道", + "Enum:EventType:0": "会谈", + "MemberNotPublishedPostYet": "该成员尚未发布任何帖子。", + "TimeAgo": "{0} 前", + "Discord_Page_JoinCommunityMessage": "加入 ABP Discord 社区", + "Discord_Page_Announce": "我们很高兴地宣布 ABP 社区 Discord 服务器！", + "Discord_Page_Description_1": "ABP 社区从第一天起就一直在壮大。 我们希望通过创建一个官方的 ABP Discord 服务器将其带入下一步，这样 ABP 社区就可以使用即时消息的功能彼此进行互动。", + "Discord_Page_Description_2": "ABP Community Discord Server 是您可以使用 ABP 框架来展示您的创作、分享对您有用的技巧、了解有关 ABP 框架的最新消息和公告、与社区成员聊天交流想法并玩得开心的地方！", + "Discord_Page_Description_3": "此 ABP 社区 Discord 服务器是 ABP 核心团队的官方服务器，存在于服务器上进行监控。", + "Discord_Page_JoinToServer": "加入 ABP Discord 服务器", + "Events_Page_MetaTitle": "ABP 社区活动", + "Events_Page_MetaDescription": "现场活动由 ABP 团队主持，是充满社区内容、演示、问答和围绕 ABP 正在发生的事情的讨论的休闲会议。", + "Events_Page_Title": "ABP社区会谈", + "Events_Page_WritingFromUser": "阅读来自 ABP 社区的 {0} 的文章。", + "Post_Create_Page_MetaTitle": "最新帖子", + "Post_Create_Page_MetaDescription": "创建您的帖子以分享您对 ABP 框架的经验并为 ABP 社区做出贡献。", + "Post_Create_Page_CreateNewPost": "创建新帖子", + "Post_Index_Page_MetaDescription": "ABP 社区的目的是为使用 ABP 框架的开发人员创建一个贡献环境。", + "Layout_Title": "{0} | ABP 社区", + "Layout_MetaDescription": "ABP 社区是一个人们可以分享有关 ABP 框架的帖子并关注项目的环境。", + "Index_Page_CommunityIntroduction": "这是 ABP 框架、.NET 和软件开发的中心。 您可以阅读文章，观看视频教程，了解 ABP 的开发进度和 ABP 相关事件，帮助其他开发人员并与 ABP 社区分享您的专业知识。" } } \ No newline at end of file diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/zh-Hans.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/zh-Hans.json index dd91379201..7de1be2f2b 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/zh-Hans.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/zh-Hans.json @@ -174,6 +174,7 @@ "CreateProjectWizard": "此向导让你从启动模板创建一个新项目,该启动模板已正确配置为可以快速启动你的项目.", "TieredOption": "创建一个分层解决方案,其中Web和Http API层在物理上是分离的. 如果没有选中则创建一个不那么复杂且适合大多数场景的分层解决方案.", "SeparateIdentityServerOption": "将服务器端分离为两个应用程序:第一个应用程序用于身份服务器,第二个应用程序用于服务器端HTTP API.", + "ProgressiveWebApplicationOption": "将项目指定为渐进式 Web 应用程序", "UseslatestPreVersion": "使用最新的预发布版本", "ReadTheDocumentation": "阅读文档", "Documentation": "文档", @@ -214,7 +215,11 @@ "SeeDocs": "查看文档", "None": "空", "Application": "应用程序", + "ApplicationExplanation": "基于领域驱动设计实践创建一个完全分层的解决方案。 推荐用于需要可维护和可扩展代码库的长期项目。", + "ApplicationNoLayer": "应用程序（单层）", + "ApplicationNoLayerExplanation": "创建单层 Web 应用程序。 推荐用于构建具有更简单且易于理解的架构的应用程序。", "Module": "模块", + "ModuleExplanation": "创建可重用、完全分层的应用程序模块解决方案。 您可以使用此选项为您的模块化应用程序创建模块。", "PackageName": "包名称", "LicenseURL": "许可URL", "License": "许可", @@ -273,6 +278,100 @@ "SubscribeToNewsletter": "订阅时事通讯以获取有关 ABP.IO 平台中发生的事件的信息，例如新版本、文章、优惠等。", "FirstEdition": "第一版", "ThankYou": "谢谢！", - "CheckboxMandatory": "你需要检查这个才能继续！" + "CheckboxMandatory": "你需要检查这个才能继续！", + "UserInterface": "用户界面", + "APIGateway": "API 网关", + "Database": "数据库", + "Saas": "Saas", + "OpenSourceWebApp": "打开 source
Web 应用程序", + "Framework": "框架", + "AuditLoggingExplanation": "自动跟踪系统中的所有操作和数据更改。", + "AbpNewCommandExplanation": "使用 ABP 启动模板创建新的解决方案。", + "AbpAddModuleCommandExplanation": "将预构建的应用程序模块安装到您的解决方案中", + "AbpUpdateCommandExplanation": "自动更新解决方案中所有与 ABP 相关的 NuGet 和 NPM 包。", + "ExploreAllCLICommands": "探索所有 CLI 命令", + "ExploreDocumentationAndGuides": "探索全面的文档和指南。", + "Documentations": "文档", + "Views": "意见", + "ReadMore": "阅读更多", + "EnterYouEmailToGetNews": "输入您的电子邮件以获取有关 ABP 框架的最新消息", + "Tiered": "分层", + "SeparateIdentityServer": "独立的身份服务器", + "ProgressiveWebApplication": "渐进式 Web 应用程序", + "Preview": "预览", + "CreateANewSolution": "创建一个新的解决方案", + "ABPFrameworkFeatures": "ABP 框架 功能", + "Commercial": "商业版", + "ThirdPartyTools": "第三方工具", + "Back": "后退", + "Community": "社区", + "SeeMore": "查看更多", + "DetailsOfTheEBook": "电子书详情", + "JoinOurMarketingNewsletter": "加入我们的市场推广时事通讯", + "FrameworkNewsletterConfirmationMessage": "我同意条款和条件 和 隐私政策。", + "GetYourFreeEBook": "获取您的 免费 DDD 电子书", + "EverythingYouNeedToKnow": "您需要了解的一切。", + "PreOrderNow": "立即预订", + "UITheming": "用户界面主题", + "UIThemingExplanation": "创建可重用的 UI 主题和布局，或使用预构建的 UI 主题之一。", + "DataFilteringExplanation2": "自动过滤来自数据库的查询，以轻松实现软删除和多租户等模式。", + "NeedHelp": "您需要帮助吗？", + "GiveYourProjectAName": "给您的项目命名", + "SelectProjectType": "选择项目类型", + "SelectUIFramework": "选择 UI 框架", + "SelectDatabaseProvider": "选择数据库提供者", + "SelectDatabaseManagementSystem": "选择数据库管理系统", + "InstallingTheABPCLI": "安装 ABP CLI", + "CreateYourProjectNow": "立即创建您的项目", + "OrderOn": "在 {0} 订购", + "DownloadFreeDDDBook": "下载免费的 DDD 书", + "WhatIsABPFramework": "什么是 ABP 框架？", + "TenantDatabase": "租户 {0} 数据库", + "SharedDatabase": "共享数据库", + "ConnectionResolver": "连接解析器", + "TenantBasedDataFilter": "基于租户的数据过滤器", + "ApplicationCode": "申请代码", + "TenantResolution": "租户决议", + "TenantUser": "租户 {0} 用户", + "CardTitle": "卡片标题", + "View": "查看", + "Model": "模型", + "Email": "电子邮箱", + "Password": "密码", + "Address": "地址", + "Gender": "性别", + "Male": "男", + "Female": "女", + "Submit": "提交", + "Unspecified": "未指定", + "StaticFileMiddleware": "静态文件中间件", + "RazorViewEngine": "Razor 视图引擎", + "PhysicalFiles": "物理文件 (wwwroot)", + "EmbeddedFiles": "嵌入式文件（DDL) ", + "DynamicFiles": "动态文件（内存）", + "BuildSolutionsWithAbp": "遵循使用 ABP 的软件开发最佳实践，构建可维护的 .NET 解决方案。", + "BuyOnAmazon": "在亚马逊上购买", + "BuyOnPackt": "在 Packt 上购买", + "Discounted": "打折", + "MasteringAbpFramework_Book_KeyFeatures": "主要特性", + "MasteringAbpFramework_Book_Key_Features_Description_1": "使用 ABP 框架构建强大、可维护、模块化和可扩展的软件解决方案。", + "MasteringAbpFramework_Book_Key_Features_Description_2": "了解如何在您的 Web 应用程序中实施 SOLID 原则和领域驱动设计。", + "MasteringAbpFramework_Book_Key_Features_Description_3": "了解 ABP 框架如何通过自动执行重复性任务来加快您的开发周期。", + "MasteringAbpFramework_Book_Description": "书籍说明", + "MasteringAbpFramework_Book_Description_Details_1": "ABP 框架是一个完整的基础架构，用于通过遵循软件 \n 开发最佳实践和约定来创建现代 Web 应用程序。 借助 ABP 的高级框架和生态系统，您可以 \n 实现 Don't Repeat Yourself (DRY) 原则并专注于您的业务代码。", + "MasteringAbpFramework_Book_Description_Details_2": "本书由 ABP 框架的创建者撰写，将帮助您全面了解该框架和现代 Web 应用程序开发技术。 通过对基本概念和实际示例的逐步解释，您将了解现代 Web 解决方案的要求以及 ABP\n 框架如何使开发您自己的解决方案变得轻松愉快。 您将发现\n 企业 Web 应用程序开发的常见需求，并探索 ABP 提供的基础架构。 在整本书中，您将掌握构建可维护和模块化 Web 解决方案的软件开发最佳实践。", + "MasteringAbpFramework_Book_Description_Details_3": "在本书结束时，您将能够创建一个易于开发、\n 维护和测试的完整 Web 解决方案。", + "MasteringAbpFramework_Book_WhatYouWillLearn": "你将会学到什么", + "MasteringAbpFramework_Book_What_You_Will_Learn_1": "设置开发环境并开始使用 ABP 框架。", + "MasteringAbpFramework_Book_What_You_Will_Learn_2": "使用 Entity Framework Core 和 MongoDB 开发您的数据访问层。", + "MasteringAbpFramework_Book_What_You_Will_Learn_3": "了解横切关注点以及 ABP 如何自动执行重复性任务。", + "MasteringAbpFramework_Book_What_You_Will_Learn_4": "掌握使用 ABP 框架实施领域驱动设计。", + "MasteringAbpFramework_Book_What_You_Will_Learn_5": "使用 ASP.NET Core MVC (Razor Pages) 和 Blazor 构建 UI 页面和组件。", + "MasteringAbpFramework_Book_What_You_Will_Learn_6": "使用多租户创建模块化 Web 应用程序。", + "MasteringAbpFramework_Book_What_You_Will_Learn_7": "了解模块化并创建可重用的应用程序模块。", + "MasteringAbpFramework_Book_What_You_Will_Learn_8": "使用 ABP 框架编写单元、集成和 UI 测试。", + "MasteringAbpFramework_Book_WhoIsThisBookFor": "这本书是给谁看的", + "MasteringAbpFramework_Book_WhoIsThisBookFor_Description": "本书适用于希望学习软件架构和最佳实践的 Web 开发人员，以使用 Microsoft 技术和 ABP 框架构建\n 可维护的基于 Web 的解决方案。 C#\n 和 ASP.NET Core 的基本知识是开始阅读本书所必需的。", + "ComputersAndTechnology": "计算机与技术" } } \ No newline at end of file From c0c78c90ae1dd77da2b19d147ddc58d27c349f27 Mon Sep 17 00:00:00 2001 From: malik masis Date: Mon, 27 Jun 2022 16:53:20 +0300 Subject: [PATCH 015/110] Added dynamic properties for hard-coded definition --- .../CmsKit/Admin/Contents/ContentWidgetDto.cs | 2 ++ .../Admin/Contents/ContentAdminAppService.cs | 9 ++++++-- .../CmsKit/Contents/AddWidgetModal.cshtml | 14 +++++++++-- .../CmsKit/Contents/AddWidgetModal.cshtml.cs | 14 +++++++++-- .../Pages/CmsKit/Contents/addWidgetModal.js | 23 ++++++++++++++++++- .../CmsKit/Contents/ContentWidgetConfig.cs | 6 ++++- 6 files changed, 60 insertions(+), 8 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Contents/ContentWidgetDto.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Contents/ContentWidgetDto.cs index e55c98b5a2..09e631ee62 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Contents/ContentWidgetDto.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Contents/ContentWidgetDto.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; namespace Volo.CmsKit.Admin.Contents; @@ -6,4 +7,5 @@ namespace Volo.CmsKit.Admin.Contents; public class ContentWidgetDto { public string Key { get; set; } + public List Properties { get; set; } = new(); } diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Contents/ContentAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Contents/ContentAdminAppService.cs index 5a96b71c61..fb9243e96d 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Contents/ContentAdminAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Contents/ContentAdminAppService.cs @@ -17,14 +17,19 @@ public class ContentAdminAppService : CmsKitAdminAppServiceBase, IContentAdminAp public Task> GetWidgetsAsync() { - var aa = _options.WidgetConfigs.ToList(); + //TODO remove + if (!_options.WidgetConfigs.Any()) + { + _options.AddWidget("Poll", "CmsPollByCode"); + } return Task.FromResult(new ListResultDto() { Items = _options.WidgetConfigs .Select(n => new ContentWidgetDto { - Key = n.Key + Key = n.Key, + Properties = n.Value.Properties }).ToList() }); diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml index 654fd89b1a..83cb016c5c 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml @@ -17,13 +17,23 @@ } + -
+
- +
+ @foreach (var item in Model.ViewModel.Properties.FirstOrDefault(p=>p.Key == "Poll").Properties) + { +
+ + +
+ } +
+ diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml.cs index c6f13aa85a..4d2ac7a459 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; @@ -26,8 +27,14 @@ public class AddWidgetModal : AbpPageModel public async Task OnGetAsync() { + ViewModel = new ContentViewModel(); + + var widgets = await ContentAdminAppService.GetWidgetsAsync(); + ViewModel.Properties = widgets.Items.ToArray(); + + Widgets = new List() { new("", "") }; - Widgets.AddRange((await ContentAdminAppService.GetWidgetsAsync()) + Widgets.AddRange(widgets .Items .Select(w => new SelectListItem(w.Key, w.Key)) .ToList()); @@ -37,5 +44,8 @@ public class AddWidgetModal : AbpPageModel { [SelectItems(nameof(Widgets))] public string Widget { get; set; } + + public ContentWidgetDto[] Properties { get; set; } = Array.Empty(); + } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js index 54a1c8b869..ee2659d598 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js @@ -3,11 +3,32 @@ $(function () { abp.modals.addWidgetModal = function () { var initModal = function () { + + $('#PropertySideId').hide(); + + $("#ViewModel_Widget").change(function () { + $('#PropertySideId').show(); + }); + $("#save-changes").click(function () { - var updatedText = $("#textId").val(); + var keys = []; + var values = []; + $(".properties").each(function () { + if (($.trim($(this).val()).length > 0)) { + keys.push(this.id); + values.push($(this).val()); + } + }); var contentEditorText = $("#ContentEditor")[0].innerText.split("\n")[2]; + var updatedText = "[Widget "; + + for (var i = 0; i < keys.length; i++) { + updatedText += keys[i] + "=\"" + values[i] + "\" "; + } + + updatedText += "]"; $('.ProseMirror div').contents()[0].data = contentEditorText + updatedText; $('#addWidgetModal').modal('hide'); diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/ContentWidgetConfig.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/ContentWidgetConfig.cs index a5eab5930a..1b4591628c 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/ContentWidgetConfig.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/ContentWidgetConfig.cs @@ -1,8 +1,12 @@ -namespace Volo.CmsKit.Contents; +using System.Collections.Generic; + +namespace Volo.CmsKit.Contents; public class ContentWidgetConfig { public string Name { get; } + //TODO remove - just for example + public List Properties { get; } = new() { "Type", "Code" }; public ContentWidgetConfig(string widgetName) { From 94b624c881b8fa7cb6bd82237e749c442e35d8f5 Mon Sep 17 00:00:00 2001 From: maliming Date: Tue, 28 Jun 2022 12:47:32 +0800 Subject: [PATCH 016/110] Lazy loading settings page. --- .../Components/EmailSettingGroup/Default.js | 60 ++++++++++--------- .../Pages/SettingManagement/Index.cshtml | 28 +++++---- .../Pages/SettingManagement/Index.cshtml.cs | 14 +++++ .../Pages/SettingManagement/Index.js | 18 ++++++ 4 files changed, 79 insertions(+), 41 deletions(-) diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/EmailSettingGroup/Default.js b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/EmailSettingGroup/Default.js index ae8e694de3..aeced4f4dc 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/EmailSettingGroup/Default.js +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/EmailSettingGroup/Default.js @@ -8,44 +8,46 @@ var l = abp.localization.getResource('AbpSettingManagement'); - $("#EmailSettingsForm").on('submit', function (event) { - event.preventDefault(); + abp.event.on('Abp.SettingManagement.View.Render.Volo.Abp.EmailSetting', function (eventData) { + $("#EmailSettingsForm").on('submit', function (event) { + event.preventDefault(); - if (!$(this).valid()) { - return; - } + if (!$(this).valid()) { + return; + } + + var form = $(this).serializeFormToObject(); + volo.abp.settingManagement.emailSettings.update(form).then(function (result) { + $(document).trigger("AbpSettingSaved"); + }); - var form = $(this).serializeFormToObject(); - volo.abp.settingManagement.emailSettings.update(form).then(function (result) { - $(document).trigger("AbpSettingSaved"); }); - }); + $('#SmtpUseDefaultCredentials').change(function () { + if (this.checked) { + $('#HideSectionWhenUseDefaultCredentialsIsChecked').slideUp(); + } else { + $('#HideSectionWhenUseDefaultCredentialsIsChecked').slideDown(); + } + }); - $('#SmtpUseDefaultCredentials').change(function () { - if (this.checked) { - $('#HideSectionWhenUseDefaultCredentialsIsChecked').slideUp(); - } else { - $('#HideSectionWhenUseDefaultCredentialsIsChecked').slideDown(); - } - }); + _sendTestEmailModal.onOpen(function () { + var $form = _sendTestEmailModal.getForm(); + _sendTestEmailModal.getForm().off('abp-ajax-success'); - _sendTestEmailModal.onOpen(function () { - var $form = _sendTestEmailModal.getForm(); - _sendTestEmailModal.getForm().off('abp-ajax-success'); + $form.on('abp-ajax-success', function () { + _sendTestEmailModal.setResult(); + }); + }) - $form.on('abp-ajax-success', function () { - _sendTestEmailModal.setResult(); + _sendTestEmailModal.onResult(function () { + abp.notify.success(l('SuccessfullySent')); }); - }) - - _sendTestEmailModal.onResult(function () { - abp.notify.success(l('SuccessfullySent')); - }); - $("#SendTestEmailButton").click(function (e) { - e.preventDefault(); - _sendTestEmailModal.open(); + $("#SendTestEmailButton").click(function (e) { + e.preventDefault(); + _sendTestEmailModal.open(); + }); }); }); diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml index 6ee1d62299..3f9c347cc6 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml @@ -21,19 +21,23 @@
- - @foreach (var group in Model.SettingPageCreationContext.Groups) - { - -

@group.DisplayName

-
- @await Component.InvokeAsync(group.ComponentType, new +
+
+ +
+
+
+
+
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml.cs index 0dcb3fb388..1e55bd2f6a 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml.cs @@ -1,3 +1,4 @@ +using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations; @@ -34,6 +35,19 @@ public class IndexModel : AbpPageModel return Task.FromResult(Page()); } + public virtual async Task OnPostRenderViewAsync(string id) + { + var context = await SettingPageContributorManager.ConfigureAsync(); + + var view = context.Groups.FirstOrDefault(x => x.Id == id); + if (view != null) + { + return ViewComponent(view.ComponentType, view.Parameter); + } + + return NoContent(); + } + public virtual async Task OnPostRefreshConfigurationAsync() { await LocalEventBus.PublishAsync( diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.js b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.js index 8af1bb6715..b7c0c5b32e 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.js +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.js @@ -1,6 +1,24 @@ (function ($) { var l = abp.localization.getResource('AbpSettingManagement'); + $('#tabs-nav .nav-item').click(function () { + var id = $(this).attr("id") + abp.ui.block({ + elm: '#tab-content', + busy: true, + promise: abp.ajax({ + type: "POST", + url: "SettingManagement?handler=RenderView&id=" + id, + dataType: "html", + contentType: false, + processData: false + }).done(function (response) { + $('#tab-content').html(response); + abp.event.trigger('Abp.SettingManagement.View.Render.' + id); + }) + }); + }).first().click(); + $(document).on('AbpSettingSaved', function () { abp.notify.success(l('SuccessfullySaved')); From 4094f33e2f92db31b70606a57ff25d6e63bc4923 Mon Sep 17 00:00:00 2001 From: maliming Date: Tue, 28 Jun 2022 15:35:11 +0800 Subject: [PATCH 017/110] Load tabs only once. --- .../Pages/SettingManagement/Index.cshtml | 7 ++++--- .../Pages/SettingManagement/Index.js | 17 ++++++++++++----- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml index 3f9c347cc6..9c79489c41 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml @@ -28,14 +28,15 @@ { var group = Model.SettingPageCreationContext.Groups[i]; var active = i == 0 ? "active" : string.Empty; -
  • + @group.DisplayName
    • }
    -
    +
    +
    diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.js b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.js index b7c0c5b32e..813608f28c 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.js +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.js @@ -1,19 +1,26 @@ (function ($) { var l = abp.localization.getResource('AbpSettingManagement'); - $('#tabs-nav .nav-item').click(function () { - var id = $(this).attr("id") + $('#tabs-nav .nav-item .nav-link').click(function () { + var _this = $(this); + if(_this.attr('data-bs-target') !== undefined) { + return; + } + + var id = _this.attr("id") abp.ui.block({ elm: '#tab-content', busy: true, promise: abp.ajax({ - type: "POST", - url: "SettingManagement?handler=RenderView&id=" + id, + type: 'POST', + url: 'SettingManagement?handler=RenderView&id=' + id, dataType: "html", contentType: false, processData: false }).done(function (response) { - $('#tab-content').html(response); + $('#tab-content').children('.tab-pane').removeClass('show').removeClass('active'); + _this.attr('data-bs-target', '#' + $.escapeSelector($.escapeSelector(id))); + $('#tab-content').append('
    ' + response + '
    '); abp.event.trigger('Abp.SettingManagement.View.Render.' + id); }) }); From 3c0e7d1146732fb592a7ff32c32700bc4004a257 Mon Sep 17 00:00:00 2001 From: maliming Date: Tue, 28 Jun 2022 15:47:01 +0800 Subject: [PATCH 018/110] Use `data-id`. --- .../Pages/SettingManagement/Index.cshtml | 2 +- .../Pages/SettingManagement/Index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml index 9c79489c41..0ff8e7d0ac 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml @@ -29,7 +29,7 @@ var group = Model.SettingPageCreationContext.Groups[i]; var active = i == 0 ? "active" : string.Empty;
  • - @group.DisplayName + @group.DisplayName
    • } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.js b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.js index 813608f28c..82e075b45e 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.js +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.js @@ -7,7 +7,7 @@ return; } - var id = _this.attr("id") + var id = _this.data("id") abp.ui.block({ elm: '#tab-content', busy: true, From 0adbd3115b61c0854987b6f485ff27a6ac1c867b Mon Sep 17 00:00:00 2001 From: maliming Date: Tue, 28 Jun 2022 16:49:48 +0800 Subject: [PATCH 019/110] Add js file to setting views. --- .../AbpSettingManagementWebModule.cs | 18 +----- .../EmailSettingGroup/Default.cshtml | 4 +- .../Components/EmailSettingGroup/Default.js | 60 +++++++++---------- .../Pages/SettingManagement/Index.js | 1 - 4 files changed, 35 insertions(+), 48 deletions(-) diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/AbpSettingManagementWebModule.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/AbpSettingManagementWebModule.cs index 61874c0b6b..b544d4a7bf 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/AbpSettingManagementWebModule.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/AbpSettingManagementWebModule.cs @@ -1,7 +1,5 @@ -using Microsoft.AspNetCore.Mvc.RazorPages; -using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; using Volo.Abp.AspNetCore.Mvc.Localization; -using Volo.Abp.AspNetCore.Mvc.UI.Bundling; using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared; using Volo.Abp.AutoMapper; using Volo.Abp.Http.ProxyScripting.Generators.JQuery; @@ -29,7 +27,7 @@ public class AbpSettingManagementWebModule : AbpModule { options.AddAssemblyResource(typeof(AbpSettingManagementResource), typeof(AbpSettingManagementWebModule).Assembly); }); - + PreConfigure(mvcBuilder => { mvcBuilder.AddApplicationPartIfNotExists(typeof(AbpSettingManagementWebModule).Assembly); @@ -54,21 +52,11 @@ public class AbpSettingManagementWebModule : AbpModule options.FileSets.AddEmbedded(); }); - Configure(options => - { - options.ScriptBundles - .Configure(typeof(IndexModel).FullName, - configuration => - { - configuration.AddFiles("/Pages/SettingManagement/Components/EmailSettingGroup/Default.js"); - }); - }); - Configure(options => { options.DisableModule(SettingManagementRemoteServiceConsts.ModuleName); }); - + context.Services.AddAutoMapperObjectMapper(); Configure(options => { diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/EmailSettingGroup/Default.cshtml b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/EmailSettingGroup/Default.cshtml index caca43c1e1..a5e0275535 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/EmailSettingGroup/Default.cshtml +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/EmailSettingGroup/Default.cshtml @@ -6,6 +6,8 @@ @inject IPermissionChecker PermissionChecker @model Volo.Abp.SettingManagement.Web.Pages.SettingManagement.Components.EmailSettingGroup.EmailSettingGroupViewComponent.UpdateEmailSettingsViewModel + +
    @@ -36,4 +38,4 @@ -
    \ No newline at end of file + diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/EmailSettingGroup/Default.js b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/EmailSettingGroup/Default.js index aeced4f4dc..ae8e694de3 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/EmailSettingGroup/Default.js +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/EmailSettingGroup/Default.js @@ -8,46 +8,44 @@ var l = abp.localization.getResource('AbpSettingManagement'); - abp.event.on('Abp.SettingManagement.View.Render.Volo.Abp.EmailSetting', function (eventData) { - $("#EmailSettingsForm").on('submit', function (event) { - event.preventDefault(); + $("#EmailSettingsForm").on('submit', function (event) { + event.preventDefault(); - if (!$(this).valid()) { - return; - } - - var form = $(this).serializeFormToObject(); - volo.abp.settingManagement.emailSettings.update(form).then(function (result) { - $(document).trigger("AbpSettingSaved"); - }); + if (!$(this).valid()) { + return; + } + var form = $(this).serializeFormToObject(); + volo.abp.settingManagement.emailSettings.update(form).then(function (result) { + $(document).trigger("AbpSettingSaved"); }); - $('#SmtpUseDefaultCredentials').change(function () { - if (this.checked) { - $('#HideSectionWhenUseDefaultCredentialsIsChecked').slideUp(); - } else { - $('#HideSectionWhenUseDefaultCredentialsIsChecked').slideDown(); - } - }); + }); - _sendTestEmailModal.onOpen(function () { - var $form = _sendTestEmailModal.getForm(); - _sendTestEmailModal.getForm().off('abp-ajax-success'); + $('#SmtpUseDefaultCredentials').change(function () { + if (this.checked) { + $('#HideSectionWhenUseDefaultCredentialsIsChecked').slideUp(); + } else { + $('#HideSectionWhenUseDefaultCredentialsIsChecked').slideDown(); + } + }); - $form.on('abp-ajax-success', function () { - _sendTestEmailModal.setResult(); - }); - }) + _sendTestEmailModal.onOpen(function () { + var $form = _sendTestEmailModal.getForm(); + _sendTestEmailModal.getForm().off('abp-ajax-success'); - _sendTestEmailModal.onResult(function () { - abp.notify.success(l('SuccessfullySent')); + $form.on('abp-ajax-success', function () { + _sendTestEmailModal.setResult(); }); + }) + + _sendTestEmailModal.onResult(function () { + abp.notify.success(l('SuccessfullySent')); + }); - $("#SendTestEmailButton").click(function (e) { - e.preventDefault(); - _sendTestEmailModal.open(); - }); + $("#SendTestEmailButton").click(function (e) { + e.preventDefault(); + _sendTestEmailModal.open(); }); }); diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.js b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.js index 82e075b45e..07b40c2c38 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.js +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.js @@ -21,7 +21,6 @@ $('#tab-content').children('.tab-pane').removeClass('show').removeClass('active'); _this.attr('data-bs-target', '#' + $.escapeSelector($.escapeSelector(id))); $('#tab-content').append('
    ' + response + '
    '); - abp.event.trigger('Abp.SettingManagement.View.Render.' + id); }) }); }).first().click(); From b81a87dfa7e9a4828a63be907217c909d6820f21 Mon Sep 17 00:00:00 2001 From: malik masis Date: Tue, 28 Jun 2022 15:19:59 +0300 Subject: [PATCH 020/110] Completed adding widget config --- .../CmsKit/Admin/Contents/ContentWidgetDto.cs | 3 +- .../Admin/Contents/ContentAdminAppService.cs | 8 +++- .../CmsKit/Contents/AddWidgetModal.cshtml | 18 +++++--- .../CmsKit/Contents/AddWidgetModal.cshtml.cs | 6 +-- .../Pages/CmsKit/Contents/addWidgetModal.js | 43 +++++++++++++++++-- .../Volo/CmsKit/Contents/PropertyDto.cs | 10 +++++ .../Contents/CmsKitContentWidgetOptions.cs | 6 ++- .../CmsKit/Contents/ContentWidgetConfig.cs | 10 ++++- 8 files changed, 84 insertions(+), 20 deletions(-) create mode 100644 modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo/CmsKit/Contents/PropertyDto.cs diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Contents/ContentWidgetDto.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Contents/ContentWidgetDto.cs index 09e631ee62..0292108185 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Contents/ContentWidgetDto.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Contents/ContentWidgetDto.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using Volo.CmsKit.Contents; namespace Volo.CmsKit.Admin.Contents; @@ -7,5 +8,5 @@ namespace Volo.CmsKit.Admin.Contents; public class ContentWidgetDto { public string Key { get; set; } - public List Properties { get; set; } = new(); + public List Properties { get; set; } = new(); } diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Contents/ContentAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Contents/ContentAdminAppService.cs index fb9243e96d..bdb6502fbe 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Contents/ContentAdminAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Contents/ContentAdminAppService.cs @@ -1,4 +1,5 @@ -using System.Linq; +using System.Collections.Generic; +using System.Linq; using System.Threading.Tasks; using Microsoft.Extensions.Options; using Volo.Abp.Application.Dtos; @@ -20,7 +21,10 @@ public class ContentAdminAppService : CmsKitAdminAppServiceBase, IContentAdminAp //TODO remove if (!_options.WidgetConfigs.Any()) { - _options.AddWidget("Poll", "CmsPollByCode"); + _options.AddWidget("Poll", "CmsPollByCode", new List() + { + new PropertyDto() { Key = "Code", Name = "Code" } + }); } return Task.FromResult(new ListResultDto() { diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml index 83cb016c5c..9370b37b49 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml @@ -5,7 +5,6 @@ @using Volo.CmsKit.Admin.Web.Pages.CmsKit.Contents; @inject IHtmlLocalizer L - @model AddWidgetModal; @{ Layout = null; @@ -23,12 +22,21 @@
    -
    - @foreach (var item in Model.ViewModel.Properties.FirstOrDefault(p=>p.Key == "Poll").Properties) +
    + @foreach (var item in Model.ViewModel.ContentWidgets.FirstOrDefault(p=>p.Key == "Poll").Properties) + { +
    + + +
    + } +
    +
    + @foreach (var item in Model.ViewModel.ContentWidgets.FirstOrDefault(p=>p.Key == "Comment").Properties) {
    - - + +
    }
    diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml.cs index 4d2ac7a459..8b38b79f3b 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml.cs @@ -17,7 +17,6 @@ public class AddWidgetModal : AbpPageModel [BindProperty] public ContentViewModel ViewModel { get; set; } - public List Widgets { get; set; } = new(); public AddWidgetModal(IContentAdminAppService contentAdminAppService) @@ -30,8 +29,7 @@ public class AddWidgetModal : AbpPageModel ViewModel = new ContentViewModel(); var widgets = await ContentAdminAppService.GetWidgetsAsync(); - ViewModel.Properties = widgets.Items.ToArray(); - + ViewModel.ContentWidgets = widgets.Items.ToArray(); Widgets = new List() { new("", "") }; Widgets.AddRange(widgets @@ -45,7 +43,7 @@ public class AddWidgetModal : AbpPageModel [SelectItems(nameof(Widgets))] public string Widget { get; set; } - public ContentWidgetDto[] Properties { get; set; } = Array.Empty(); + public ContentWidgetDto[] ContentWidgets { get; set; } = Array.Empty(); } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js index ee2659d598..25fdc1e811 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js @@ -4,10 +4,45 @@ $(function () { var initModal = function () { - $('#PropertySideId').hide(); + $('#PropertySideIdPoll').hide(); + $('#PropertySideIdComment').hide(); + + //var getRelatedProperties = function () { + // var html = ""; + + // for (var i = 0; i < 2; i++) { + // html += "
    " + + // " " + + // " " + + // "
    "; + // } + + // $("#ye").each(function () { + // debugger + // alert("a"); + // }); + + // return html; + //} + + let widgetType; $("#ViewModel_Widget").change(function () { - $('#PropertySideId').show(); + widgetType = this.value; + debugger + if (widgetType == "Poll") { + $('#PropertySideIdPoll').show(); + $('#PropertySideIdComment').hide(); + } + else { + $('#PropertySideIdPoll').hide(); + $('#PropertySideIdComment').show(); + } + + //var newHtml = getRelatedProperties(); + + //$("#PropertySideId").append(newHtml); + }); $("#save-changes").click(function () { @@ -20,9 +55,9 @@ $(function () { } }); - var contentEditorText = $("#ContentEditor")[0].innerText.split("\n")[2]; + var contentEditorText = $("#ContentEditor")[0].innerText.split("\n")[1]; - var updatedText = "[Widget "; + var updatedText = "[Widget Type=\"" + widgetType + "\" "; for (var i = 0; i < keys.length; i++) { updatedText += keys[i] + "=\"" + values[i] + "\" "; diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo/CmsKit/Contents/PropertyDto.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo/CmsKit/Contents/PropertyDto.cs new file mode 100644 index 0000000000..4e0a1a700c --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo/CmsKit/Contents/PropertyDto.cs @@ -0,0 +1,10 @@ +using System; + +namespace Volo.CmsKit.Contents; + +[Serializable] +public class PropertyDto +{ + public string Key { get; set; } + public string Name { get; set; } +} diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/CmsKitContentWidgetOptions.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/CmsKitContentWidgetOptions.cs index 1f9dae60ab..1a480a18a2 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/CmsKitContentWidgetOptions.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/CmsKitContentWidgetOptions.cs @@ -11,8 +11,10 @@ public class CmsKitContentWidgetOptions WidgetConfigs = new(); } - public void AddWidget(string widgetName, string widgetKey) + public void AddWidget(string widgetName, string widgetKey, List properties = null) { - WidgetConfigs.Add(widgetName, new ContentWidgetConfig(widgetKey)); + var conf = new ContentWidgetConfig(widgetKey); + conf.Properties.AddRange(properties); + WidgetConfigs.Add(widgetName, conf); } } \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/ContentWidgetConfig.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/ContentWidgetConfig.cs index 1b4591628c..507024956a 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/ContentWidgetConfig.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/ContentWidgetConfig.cs @@ -5,11 +5,17 @@ namespace Volo.CmsKit.Contents; public class ContentWidgetConfig { public string Name { get; } - //TODO remove - just for example - public List Properties { get; } = new() { "Type", "Code" }; + public List Properties { get; } public ContentWidgetConfig(string widgetName) { + Properties = new(); Name = widgetName; } + + public void AddProperty(string key, string name) + { + Properties.Add(new PropertyDto() { Key = key, Name = name }); + } + } \ No newline at end of file From 5f2185f4292e15bbde74c8c13110e8f3ba1179b7 Mon Sep 17 00:00:00 2001 From: malik masis Date: Tue, 28 Jun 2022 17:07:45 +0300 Subject: [PATCH 021/110] Made dynamic the code using ajax call --- modules/cms-kit/Volo.CmsKit.sln | 54 +++++++++---------- .../Admin/Contents/ContentAdminAppService.cs | 8 ++- .../ContentAdminClientProxy.Generated.cs | 22 ++++++++ .../ClientProxies/ContentAdminClientProxy.cs | 7 +++ .../cms-kit-admin-generate-proxy.json | 41 ++++++++++++++ .../Admin/Contents/ContentAdminController.cs | 25 +++++++++ .../CmsKit/Contents/AddWidgetModal.cshtml | 18 +------ .../Pages/CmsKit/Contents/addWidgetModal.js | 53 ++++++------------ .../client-proxies/cms-kit-admin-proxy.js | 17 +++++- 9 files changed, 161 insertions(+), 84 deletions(-) create mode 100644 modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/ContentAdminClientProxy.Generated.cs create mode 100644 modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/ContentAdminClientProxy.cs create mode 100644 modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Contents/ContentAdminController.cs diff --git a/modules/cms-kit/Volo.CmsKit.sln b/modules/cms-kit/Volo.CmsKit.sln index 080ccbcf7f..e35e143c92 100644 --- a/modules/cms-kit/Volo.CmsKit.sln +++ b/modules/cms-kit/Volo.CmsKit.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29001.49 +# Visual Studio Version 17 +VisualStudioVersion = 17.2.32616.157 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.CmsKit.Domain.Shared", "src\Volo.CmsKit.Domain.Shared\Volo.CmsKit.Domain.Shared.csproj", "{D64C1577-4929-4B60-939E-96DE1534891A}" EndProject @@ -57,37 +57,37 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "public", "public", "{3C74B8 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "admin", "admin", "{E737206B-FA99-4460-861D-82902ECE93DB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.CmsKit.Admin.Application", "src\Volo.CmsKit.Admin.Application\Volo.CmsKit.Admin.Application.csproj", "{A5363215-BF61-467F-80D0-40D93590F509}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.CmsKit.Admin.Application", "src\Volo.CmsKit.Admin.Application\Volo.CmsKit.Admin.Application.csproj", "{A5363215-BF61-467F-80D0-40D93590F509}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.CmsKit.Admin.Application.Contracts", "src\Volo.CmsKit.Admin.Application.Contracts\Volo.CmsKit.Admin.Application.Contracts.csproj", "{AE000591-86E3-4AD4-AA86-C47FED4A3ACB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.CmsKit.Admin.Application.Contracts", "src\Volo.CmsKit.Admin.Application.Contracts\Volo.CmsKit.Admin.Application.Contracts.csproj", "{AE000591-86E3-4AD4-AA86-C47FED4A3ACB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.CmsKit.Admin.HttpApi", "src\Volo.CmsKit.Admin.HttpApi\Volo.CmsKit.Admin.HttpApi.csproj", "{A402371A-B714-4BBC-AC22-9C0BD7679F25}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.CmsKit.Admin.HttpApi", "src\Volo.CmsKit.Admin.HttpApi\Volo.CmsKit.Admin.HttpApi.csproj", "{A402371A-B714-4BBC-AC22-9C0BD7679F25}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.CmsKit.Admin.HttpApi.Client", "src\Volo.CmsKit.Admin.HttpApi.Client\Volo.CmsKit.Admin.HttpApi.Client.csproj", "{97D7BB7A-1D45-4E54-B327-3718F62E8A86}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.CmsKit.Admin.HttpApi.Client", "src\Volo.CmsKit.Admin.HttpApi.Client\Volo.CmsKit.Admin.HttpApi.Client.csproj", "{97D7BB7A-1D45-4E54-B327-3718F62E8A86}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.CmsKit.Admin.Web", "src\Volo.CmsKit.Admin.Web\Volo.CmsKit.Admin.Web.csproj", "{CA6A7FAF-0EF9-42D9-B7A3-5CA690687045}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.CmsKit.Admin.Web", "src\Volo.CmsKit.Admin.Web\Volo.CmsKit.Admin.Web.csproj", "{CA6A7FAF-0EF9-42D9-B7A3-5CA690687045}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.CmsKit.Public.Application", "src\Volo.CmsKit.Public.Application\Volo.CmsKit.Public.Application.csproj", "{E3963E05-9645-4AFD-AC99-C5E9F9153B61}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.CmsKit.Public.Application", "src\Volo.CmsKit.Public.Application\Volo.CmsKit.Public.Application.csproj", "{E3963E05-9645-4AFD-AC99-C5E9F9153B61}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.CmsKit.Public.Application.Contracts", "src\Volo.CmsKit.Public.Application.Contracts\Volo.CmsKit.Public.Application.Contracts.csproj", "{50147423-F37D-46D3-A25D-C51CD48A7DA7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.CmsKit.Public.Application.Contracts", "src\Volo.CmsKit.Public.Application.Contracts\Volo.CmsKit.Public.Application.Contracts.csproj", "{50147423-F37D-46D3-A25D-C51CD48A7DA7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.CmsKit.Public.HttpApi", "src\Volo.CmsKit.Public.HttpApi\Volo.CmsKit.Public.HttpApi.csproj", "{37C03B72-5FD8-4B67-8090-8A20CD8095A6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.CmsKit.Public.HttpApi", "src\Volo.CmsKit.Public.HttpApi\Volo.CmsKit.Public.HttpApi.csproj", "{37C03B72-5FD8-4B67-8090-8A20CD8095A6}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.CmsKit.Public.HttpApi.Client", "src\Volo.CmsKit.Public.HttpApi.Client\Volo.CmsKit.Public.HttpApi.Client.csproj", "{E790C2C6-39AC-4068-AA7D-309DC9AA1437}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.CmsKit.Public.HttpApi.Client", "src\Volo.CmsKit.Public.HttpApi.Client\Volo.CmsKit.Public.HttpApi.Client.csproj", "{E790C2C6-39AC-4068-AA7D-309DC9AA1437}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.CmsKit.Public.Web", "src\Volo.CmsKit.Public.Web\Volo.CmsKit.Public.Web.csproj", "{BE2572ED-F505-435D-9A90-30DBC6C2DC1D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.CmsKit.Public.Web", "src\Volo.CmsKit.Public.Web\Volo.CmsKit.Public.Web.csproj", "{BE2572ED-F505-435D-9A90-30DBC6C2DC1D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.CmsKit.Common.Web", "src\Volo.CmsKit.Common.Web\Volo.CmsKit.Common.Web.csproj", "{4B2C2431-7351-41F0-B5E1-F8A9859FA838}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.CmsKit.Common.Web", "src\Volo.CmsKit.Common.Web\Volo.CmsKit.Common.Web.csproj", "{4B2C2431-7351-41F0-B5E1-F8A9859FA838}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.CmsKit.Common.Application.Contracts", "src\Volo.CmsKit.Common.Application.Contracts\Volo.CmsKit.Common.Application.Contracts.csproj", "{A0D38C5B-047F-49C1-9A6D-B41E4FB9B323}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.CmsKit.Common.Application.Contracts", "src\Volo.CmsKit.Common.Application.Contracts\Volo.CmsKit.Common.Application.Contracts.csproj", "{A0D38C5B-047F-49C1-9A6D-B41E4FB9B323}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.CmsKit.Common.Application", "src\Volo.CmsKit.Common.Application\Volo.CmsKit.Common.Application.csproj", "{5D9BD65D-353E-4618-BE49-E1DF4CFF2393}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.CmsKit.Common.Application", "src\Volo.CmsKit.Common.Application\Volo.CmsKit.Common.Application.csproj", "{5D9BD65D-353E-4618-BE49-E1DF4CFF2393}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.CmsKit.Common.HttpApi", "src\Volo.CmsKit.Common.HttpApi\Volo.CmsKit.Common.HttpApi.csproj", "{E8CC280A-D049-4564-9C71-2F5657C17937}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.CmsKit.Common.HttpApi", "src\Volo.CmsKit.Common.HttpApi\Volo.CmsKit.Common.HttpApi.csproj", "{E8CC280A-D049-4564-9C71-2F5657C17937}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.CmsKit.Common.HttpApi.Client", "src\Volo.CmsKit.Common.HttpApi.Client\Volo.CmsKit.Common.HttpApi.Client.csproj", "{EC98F006-2002-4CE2-AA62-5EBB589ACD79}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.CmsKit.Common.HttpApi.Client", "src\Volo.CmsKit.Common.HttpApi.Client\Volo.CmsKit.Common.HttpApi.Client.csproj", "{EC98F006-2002-4CE2-AA62-5EBB589ACD79}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.CmsKit.Installer", "src\Volo.CmsKit.Installer\Volo.CmsKit.Installer.csproj", "{908C157E-2352-4373-BF5D-E5DA19913390}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.CmsKit.Installer", "src\Volo.CmsKit.Installer\Volo.CmsKit.Installer.csproj", "{908C157E-2352-4373-BF5D-E5DA19913390}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -244,28 +244,28 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution + {D64C1577-4929-4B60-939E-96DE1534891A} = {DDE20914-DD1B-4C7B-86FF-F21E6B5DF1D1} + {F2840BC7-0188-4606-9126-DADD0F5ABF7A} = {DDE20914-DD1B-4C7B-86FF-F21E6B5DF1D1} + {BD65D04F-08D5-40C1-8C24-77CA0BACB877} = {963FBC0A-1FBA-47DA-8A61-8F57D3EC8D49} + {78040F9E-3501-4A40-82DF-00A597710F35} = {963FBC0A-1FBA-47DA-8A61-8F57D3EC8D49} + {0CE86223-D31D-4315-A1F5-87BA3EE1B844} = {DDE20914-DD1B-4C7B-86FF-F21E6B5DF1D1} + {F1C58097-4C08-4D88-8976-6B3389391481} = {DDE20914-DD1B-4C7B-86FF-F21E6B5DF1D1} + {077AA5F8-8B61-420C-A6B5-0150A66FDB34} = {963FBC0A-1FBA-47DA-8A61-8F57D3EC8D49} + {36E2735F-CEAB-44C8-A6D1-2CDAFF399751} = {963FBC0A-1FBA-47DA-8A61-8F57D3EC8D49} {C5BB573D-3030-4BCB-88B7-F6A85C32766C} = {CCD2960C-23CC-4AB4-B84D-60C7AAA52F4D} {527F645C-C1FC-406E-8479-81386C8ECF13} = {CCD2960C-23CC-4AB4-B84D-60C7AAA52F4D} {D0AD9179-125C-40B2-A8EE-CD4C1EE24BB6} = {CCD2960C-23CC-4AB4-B84D-60C7AAA52F4D} {E60895E5-79C4-447D-88B7-85CB5BA336A4} = {CCD2960C-23CC-4AB4-B84D-60C7AAA52F4D} {90CB5DC4-C040-45C7-8900-9688B26405BC} = {CCD2960C-23CC-4AB4-B84D-60C7AAA52F4D} {37B135B0-DAFE-4616-B25C-1BDF32FC44A2} = {E400416D-2895-4512-9D17-90681EEC7E0A} + {3B7B6317-1B85-4164-8E11-75574F80AE17} = {963FBC0A-1FBA-47DA-8A61-8F57D3EC8D49} {1EDCD6D4-DF3A-4E3B-ABB6-C0D0B373EAB8} = {CCD2960C-23CC-4AB4-B84D-60C7AAA52F4D} {73513786-B6C6-4A21-89C5-0FBDD0A46107} = {E400416D-2895-4512-9D17-90681EEC7E0A} {690203F4-3CD5-4569-88D9-EE831EEA5F5F} = {E400416D-2895-4512-9D17-90681EEC7E0A} {F6AC8D4A-EDD7-4514-8E8A-5BCB019864DB} = {E400416D-2895-4512-9D17-90681EEC7E0A} {3D872C41-E226-45C8-89C1-9D3DBD7C73F2} = {E400416D-2895-4512-9D17-90681EEC7E0A} {DDE20914-DD1B-4C7B-86FF-F21E6B5DF1D1} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545} - {F2840BC7-0188-4606-9126-DADD0F5ABF7A} = {DDE20914-DD1B-4C7B-86FF-F21E6B5DF1D1} - {D64C1577-4929-4B60-939E-96DE1534891A} = {DDE20914-DD1B-4C7B-86FF-F21E6B5DF1D1} - {F1C58097-4C08-4D88-8976-6B3389391481} = {DDE20914-DD1B-4C7B-86FF-F21E6B5DF1D1} - {0CE86223-D31D-4315-A1F5-87BA3EE1B844} = {DDE20914-DD1B-4C7B-86FF-F21E6B5DF1D1} {963FBC0A-1FBA-47DA-8A61-8F57D3EC8D49} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545} - {78040F9E-3501-4A40-82DF-00A597710F35} = {963FBC0A-1FBA-47DA-8A61-8F57D3EC8D49} - {BD65D04F-08D5-40C1-8C24-77CA0BACB877} = {963FBC0A-1FBA-47DA-8A61-8F57D3EC8D49} - {077AA5F8-8B61-420C-A6B5-0150A66FDB34} = {963FBC0A-1FBA-47DA-8A61-8F57D3EC8D49} - {36E2735F-CEAB-44C8-A6D1-2CDAFF399751} = {963FBC0A-1FBA-47DA-8A61-8F57D3EC8D49} - {3B7B6317-1B85-4164-8E11-75574F80AE17} = {963FBC0A-1FBA-47DA-8A61-8F57D3EC8D49} {3C74B8E8-CB34-49C8-B02A-05E959601FEE} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545} {E737206B-FA99-4460-861D-82902ECE93DB} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545} {A5363215-BF61-467F-80D0-40D93590F509} = {E737206B-FA99-4460-861D-82902ECE93DB} diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Contents/ContentAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Contents/ContentAdminAppService.cs index bdb6502fbe..f8a76cabc8 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Contents/ContentAdminAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Contents/ContentAdminAppService.cs @@ -16,7 +16,7 @@ public class ContentAdminAppService : CmsKitAdminAppServiceBase, IContentAdminAp _options = options.Value; } - public Task> GetWidgetsAsync() + public virtual Task> GetWidgetsAsync() { //TODO remove if (!_options.WidgetConfigs.Any()) @@ -25,6 +25,12 @@ public class ContentAdminAppService : CmsKitAdminAppServiceBase, IContentAdminAp { new PropertyDto() { Key = "Code", Name = "Code" } }); + + _options.AddWidget("Comment", "CmsCommenting", new List() + { + new PropertyDto() { Key = "EntityType", Name = "EntityType" }, + new PropertyDto() { Key = "EntityId", Name = "EntityId" } + }); } return Task.FromResult(new ListResultDto() { diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/ContentAdminClientProxy.Generated.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/ContentAdminClientProxy.Generated.cs new file mode 100644 index 0000000000..30c6052af3 --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/ContentAdminClientProxy.Generated.cs @@ -0,0 +1,22 @@ +// This file is automatically generated by ABP framework to use MVC Controllers from CSharp +using System; +using System.Threading.Tasks; +using Volo.Abp.Application.Dtos; +using Volo.Abp.Http.Client; +using Volo.Abp.Http.Modeling; +using Volo.Abp.DependencyInjection; +using Volo.Abp.Http.Client.ClientProxying; +using Volo.CmsKit.Admin.Contents; + +// ReSharper disable once CheckNamespace +namespace Volo.CmsKit.Admin.Contents.ClientProxies; + +[Dependency(ReplaceServices = true)] +[ExposeServices(typeof(IContentAdminAppService), typeof(ContentAdminClientProxy))] +public partial class ContentAdminClientProxy : ClientProxyBase, IContentAdminAppService +{ + public virtual async Task> GetWidgetsAsync() + { + return await RequestAsync>(nameof(GetWidgetsAsync)); + } +} diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/ContentAdminClientProxy.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/ContentAdminClientProxy.cs new file mode 100644 index 0000000000..d2caea5777 --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/ContentAdminClientProxy.cs @@ -0,0 +1,7 @@ +// This file is part of ContentAdminClientProxy, you can customize it here +// ReSharper disable once CheckNamespace +namespace Volo.CmsKit.Admin.Contents.ClientProxies; + +public partial class ContentAdminClientProxy +{ +} diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/cms-kit-admin-generate-proxy.json b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/cms-kit-admin-generate-proxy.json index 0e93081b39..32a833e884 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/cms-kit-admin-generate-proxy.json +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/cms-kit-admin-generate-proxy.json @@ -1191,6 +1191,35 @@ } } }, + "Volo.CmsKit.Admin.Contents.ContentAdminController": { + "controllerName": "ContentAdmin", + "controllerGroupName": "ContentAdmin", + "isRemoteService": true, + "apiVersion": null, + "type": "Volo.CmsKit.Admin.Contents.ContentAdminController", + "interfaces": [ + { + "type": "Volo.CmsKit.Admin.Contents.IContentAdminAppService" + } + ], + "actions": { + "GetWidgetsAsync": { + "uniqueName": "GetWidgetsAsync", + "name": "GetWidgetsAsync", + "httpMethod": "GET", + "url": "api/cms-kit-admin/contents", + "supportedVersions": [], + "parametersOnMethod": [], + "parameters": [], + "returnValue": { + "type": "Volo.Abp.Application.Dtos.ListResultDto", + "typeSimple": "Volo.Abp.Application.Dtos.ListResultDto" + }, + "allowAnonymous": null, + "implementFrom": "Volo.CmsKit.Admin.Contents.IContentAdminAppService" + } + } + }, "Volo.CmsKit.Admin.Comments.CommentAdminController": { "controllerName": "CommentAdmin", "controllerGroupName": "CommentAdmin", @@ -1953,6 +1982,18 @@ "bindingSourceId": "ModelBinding", "descriptorName": "input" }, + { + "nameOnMethod": "input", + "name": "TagId", + "jsonName": null, + "type": "System.Guid?", + "typeSimple": "string?", + "isOptional": false, + "defaultValue": null, + "constraintTypes": null, + "bindingSourceId": "ModelBinding", + "descriptorName": "input" + }, { "nameOnMethod": "input", "name": "Status", diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Contents/ContentAdminController.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Contents/ContentAdminController.cs new file mode 100644 index 0000000000..83bfcde600 --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Contents/ContentAdminController.cs @@ -0,0 +1,25 @@ +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using Volo.Abp; +using Volo.Abp.Application.Dtos; + +namespace Volo.CmsKit.Admin.Contents; + +[RemoteService(Name = CmsKitAdminRemoteServiceConsts.RemoteServiceName)] +[Area(CmsKitAdminRemoteServiceConsts.ModuleName)] +[Route("api/cms-kit-admin/contents")] +public class ContentAdminController : CmsKitAdminController, IContentAdminAppService +{ + protected IContentAdminAppService ContentAdminAppService { get; } + + public ContentAdminController(IContentAdminAppService contentAdminAppService) + { + ContentAdminAppService = contentAdminAppService; + } + + [HttpGet] + public virtual Task> GetWidgetsAsync() + { + return ContentAdminAppService.GetWidgetsAsync(); + } +} diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml index 9370b37b49..6c50455781 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml @@ -22,23 +22,7 @@
    -
    - @foreach (var item in Model.ViewModel.ContentWidgets.FirstOrDefault(p=>p.Key == "Poll").Properties) - { -
    - - -
    - } -
    -
    - @foreach (var item in Model.ViewModel.ContentWidgets.FirstOrDefault(p=>p.Key == "Comment").Properties) - { -
    - - -
    - } +
    diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js index 25fdc1e811..711c940db9 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js @@ -4,45 +4,23 @@ $(function () { var initModal = function () { - $('#PropertySideIdPoll').hide(); - $('#PropertySideIdComment').hide(); - - //var getRelatedProperties = function () { - // var html = ""; - - // for (var i = 0; i < 2; i++) { - // html += "
    " + - // " " + - // " " + - // "
    "; - // } - - // $("#ye").each(function () { - // debugger - // alert("a"); - // }); - - // return html; - //} - let widgetType; - $("#ViewModel_Widget").change(function () { widgetType = this.value; - debugger - if (widgetType == "Poll") { - $('#PropertySideIdPoll').show(); - $('#PropertySideIdComment').hide(); - } - else { - $('#PropertySideIdPoll').hide(); - $('#PropertySideIdComment').show(); - } - - //var newHtml = getRelatedProperties(); - - //$("#PropertySideId").append(newHtml); + $("#PropertySideId").html(''); + volo.cmsKit.admin.contents.contentAdmin.getWidgets().then(function (data) { + var widgetTypes = data.items.filter(v => v.key === widgetType); + //TODO null check + var firstWidgetType = widgetTypes[0]; + for (const property of firstWidgetType.properties) { + let html = "
    " + + " " + + " " + + "
    "; + $("#PropertySideId").append(html); + } + }); }); $("#save-changes").click(function () { @@ -54,15 +32,14 @@ $(function () { values.push($(this).val()); } }); - - var contentEditorText = $("#ContentEditor")[0].innerText.split("\n")[1]; + //TODO review here + var contentEditorText = $("#ContentEditor")[0].innerText.split("\n")[2]; var updatedText = "[Widget Type=\"" + widgetType + "\" "; for (var i = 0; i < keys.length; i++) { updatedText += keys[i] + "=\"" + values[i] + "\" "; } - updatedText += "]"; $('.ProseMirror div').contents()[0].data = contentEditorText + updatedText; diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/wwwroot/client-proxies/cms-kit-admin-proxy.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/wwwroot/client-proxies/cms-kit-admin-proxy.js index 228ffb907b..94017ec7e2 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/wwwroot/client-proxies/cms-kit-admin-proxy.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/wwwroot/client-proxies/cms-kit-admin-proxy.js @@ -247,6 +247,21 @@ })(); + // controller volo.cmsKit.admin.contents.contentAdmin + + (function(){ + + abp.utils.createNamespace(window, 'volo.cmsKit.admin.contents.contentAdmin'); + + volo.cmsKit.admin.contents.contentAdmin.getWidgets = function(ajaxParams) { + return abp.ajax($.extend(true, { + url: abp.appPath + 'api/cms-kit-admin/contents', + type: 'GET' + }, ajaxParams)); + }; + + })(); + // controller volo.cmsKit.admin.comments.commentAdmin (function(){ @@ -378,7 +393,7 @@ volo.cmsKit.admin.blogs.blogPostAdmin.getList = function(input, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/blogs/blog-posts' + abp.utils.buildQueryString([{ name: 'filter', value: input.filter }, { name: 'blogId', value: input.blogId }, { name: 'authorId', value: input.authorId }, { name: 'status', value: input.status }, { name: 'sorting', value: input.sorting }, { name: 'skipCount', value: input.skipCount }, { name: 'maxResultCount', value: input.maxResultCount }]) + '', + url: abp.appPath + 'api/cms-kit-admin/blogs/blog-posts' + abp.utils.buildQueryString([{ name: 'filter', value: input.filter }, { name: 'blogId', value: input.blogId }, { name: 'authorId', value: input.authorId }, { name: 'tagId', value: input.tagId }, { name: 'status', value: input.status }, { name: 'sorting', value: input.sorting }, { name: 'skipCount', value: input.skipCount }, { name: 'maxResultCount', value: input.maxResultCount }]) + '', type: 'GET' }, ajaxParams)); }; From 2921c869da5f9a22dd889928a0fc2f39956cac6a Mon Sep 17 00:00:00 2001 From: muhammedaltug Date: Tue, 28 Jun 2022 17:24:29 +0300 Subject: [PATCH 022/110] do not run change detection in extensible system components with using abp permission directive --- .../packages/core/src/lib/core.module.ts | 2 +- .../lib/directives/permission.directive.ts | 8 ++- .../lib/tests/permission.directive.spec.ts | 50 ++++++++++++++++++- .../extensible-form-prop.component.html | 6 ++- .../extensible-table.component.html | 2 +- .../grid-actions/grid-actions.component.html | 4 +- .../page-toolbar/page-toolbar.component.html | 8 ++- 7 files changed, 71 insertions(+), 9 deletions(-) diff --git a/npm/ng-packs/packages/core/src/lib/core.module.ts b/npm/ng-packs/packages/core/src/lib/core.module.ts index 58c128ac32..bcc071185f 100644 --- a/npm/ng-packs/packages/core/src/lib/core.module.ts +++ b/npm/ng-packs/packages/core/src/lib/core.module.ts @@ -136,6 +136,7 @@ export class CoreModule { return { ngModule: RootCoreModule, providers: [ + OAuthModule.forRoot().providers, LocaleProvider, CookieLanguageProvider, { @@ -190,7 +191,6 @@ export class CoreModule { useValue: localizationContributor(options.localizations), deps: [LocalizationService], }, - OAuthModule.forRoot().providers, ], }; } diff --git a/npm/ng-packs/packages/core/src/lib/directives/permission.directive.ts b/npm/ng-packs/packages/core/src/lib/directives/permission.directive.ts index 2054a0d529..824b013843 100644 --- a/npm/ng-packs/packages/core/src/lib/directives/permission.directive.ts +++ b/npm/ng-packs/packages/core/src/lib/directives/permission.directive.ts @@ -18,6 +18,8 @@ import { PermissionService } from '../services/permission.service'; export class PermissionDirective implements OnDestroy, OnChanges { @Input('abpPermission') condition: string | undefined; + @Input('abpPermissionRunChangeDetection') runChangeDetection = true; + subscription!: Subscription; constructor( @@ -38,7 +40,11 @@ export class PermissionDirective implements OnDestroy, OnChanges { .subscribe(isGranted => { this.vcRef.clear(); if (isGranted) this.vcRef.createEmbeddedView(this.templateRef); - this.cdRef.detectChanges(); + if (this.runChangeDetection) { + this.cdRef.detectChanges(); + } else { + this.cdRef.markForCheck(); + } }); } diff --git a/npm/ng-packs/packages/core/src/lib/tests/permission.directive.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/permission.directive.spec.ts index d465a60fa3..37d792787c 100644 --- a/npm/ng-packs/packages/core/src/lib/tests/permission.directive.spec.ts +++ b/npm/ng-packs/packages/core/src/lib/tests/permission.directive.spec.ts @@ -2,10 +2,12 @@ import { createDirectiveFactory, SpectatorDirective } from '@ngneat/spectator/je import { Subject } from 'rxjs'; import { PermissionDirective } from '../directives/permission.directive'; import { PermissionService } from '../services'; +import { ChangeDetectorRef } from '@angular/core'; describe('PermissionDirective', () => { let spectator: SpectatorDirective; let directive: PermissionDirective; + let cdr: ChangeDetectorRef; const grantedPolicy$ = new Subject(); const createDirective = createDirectiveFactory({ directive: PermissionDirective, @@ -30,7 +32,7 @@ describe('PermissionDirective', () => { grantedPolicy$.next(true); expect(spectator.query('#test-element')).toBeTruthy(); grantedPolicy$.next(false); - // expect(spectator.query('#test-element')).toBeFalsy(); // TODO: change detection problem should be fixed + expect(spectator.query('#test-element')).toBeFalsy(); }); }); @@ -41,6 +43,7 @@ describe('PermissionDirective', () => { { hostProps: { condition: '' } }, ); directive = spectator.directive; + cdr = (directive as any).cdRef as ChangeDetectorRef; }); it('should be created', () => { @@ -55,8 +58,22 @@ describe('PermissionDirective', () => { grantedPolicy$.next(false); expect(spectator.query('#test-element')).toBeFalsy(); grantedPolicy$.next(true); + expect(spectator.queryAll('#test-element')).toHaveLength(1); + }); + + it('should call detect changes method', () => { + const detectChanges = jest.spyOn(cdr, 'detectChanges'); + expect(spectator.query('#test-element')).toBeFalsy(); + spectator.setHostInput({ condition: 'test' }); + grantedPolicy$.next(true); + expect(spectator.query('#test-element')).toBeTruthy(); + expect(detectChanges).toHaveBeenCalled(); + grantedPolicy$.next(false); + expect(spectator.query('#test-element')).toBeFalsy(); + expect(detectChanges).toHaveBeenCalled(); grantedPolicy$.next(true); expect(spectator.queryAll('#test-element')).toHaveLength(1); + expect(detectChanges).toHaveBeenCalled(); }); describe('#subscription', () => { @@ -70,4 +87,35 @@ describe('PermissionDirective', () => { }); }); }); + describe('with runChangeDetection Input', () => { + beforeEach(() => { + spectator = createDirective( + '
    Testing Permission Directive
    ', + { hostProps: { condition: '' } }, + ); + directive = spectator.directive; + cdr = (directive as any).cdRef as ChangeDetectorRef; + }); + it('should not call detectChanges method', () => { + const detectChanges = jest.spyOn(cdr, 'detectChanges'); + const markForCheck = jest.spyOn(cdr, 'markForCheck'); + expect(spectator.query('#test-element')).toBeFalsy(); + spectator.setHostInput({ condition: 'test' }); + + grantedPolicy$.next(true); + expect(spectator.query('#test-element')).toBeTruthy(); + expect(detectChanges).not.toHaveBeenCalled(); + expect(markForCheck).toHaveBeenCalled(); + + grantedPolicy$.next(false); + expect(spectator.query('#test-element')).toBeFalsy(); + expect(detectChanges).not.toHaveBeenCalled(); + expect(markForCheck).toHaveBeenCalled(); + + grantedPolicy$.next(true); + expect(spectator.queryAll('#test-element')).toHaveLength(1); + expect(detectChanges).not.toHaveBeenCalled(); + expect(markForCheck).toHaveBeenCalled(); + }); + }); }); diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html index 24fd4e0f54..4367bd098a 100644 --- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html +++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html @@ -1,4 +1,8 @@ -
    +
    - +
    From c99af59b9530d97c2ada7accc337272e787eeaa8 Mon Sep 17 00:00:00 2001 From: Engincan VESKE Date: Tue, 28 Jun 2022 17:30:04 +0300 Subject: [PATCH 023/110] Update leptonx-lite docs --- docs/en/Themes/LeptonXLite/{mvc.md => AspNetCore.md} | 0 docs/en/Themes/LeptonXLite/angular.md | 2 +- docs/en/Themes/LeptonXLite/blazor.md | 4 ++-- docs/en/UI/Blazor/Theming.md | 2 +- docs/en/docs-nav.json | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) rename docs/en/Themes/LeptonXLite/{mvc.md => AspNetCore.md} (100%) diff --git a/docs/en/Themes/LeptonXLite/mvc.md b/docs/en/Themes/LeptonXLite/AspNetCore.md similarity index 100% rename from docs/en/Themes/LeptonXLite/mvc.md rename to docs/en/Themes/LeptonXLite/AspNetCore.md diff --git a/docs/en/Themes/LeptonXLite/angular.md b/docs/en/Themes/LeptonXLite/angular.md index 6e4cbef317..f362a4d95e 100644 --- a/docs/en/Themes/LeptonXLite/angular.md +++ b/docs/en/Themes/LeptonXLite/angular.md @@ -79,4 +79,4 @@ To change the logos and brand color of `LeptonX`, simply add the following CSS t ### Server Side -In order to migrate to LeptonX on your server side projects (Host and/or IdentityServer projects), please follow the [Server Side Migration](mvc.md) document. +In order to migrate to LeptonX on your server side projects (Host and/or IdentityServer projects), please follow the [Server Side Migration](AspNetCore.md) document. diff --git a/docs/en/Themes/LeptonXLite/blazor.md b/docs/en/Themes/LeptonXLite/blazor.md index 6f28d74a95..8ed8d37237 100644 --- a/docs/en/Themes/LeptonXLite/blazor.md +++ b/docs/en/Themes/LeptonXLite/blazor.md @@ -16,7 +16,7 @@ LeptonX Lite has implementation for the ABP Framework Blazor WebAssembly & Blazo ## Installation {{if UI == "Blazor"}} -- Complete the [MVC Razor Pages Installation](mvc.md#installation) for the **HttpApi.Host** application first. _If the solution is tiered/micro-service, complete the MVC steps for all MVC applications such as **HttpApi.Host** and if identity server is separated, install to the **IdentityServer**_. +- Complete the [MVC Razor Pages Installation](AspNetCore.md#installation) for the **HttpApi.Host** application first. _If the solution is tiered/micro-service, complete the MVC steps for all MVC applications such as **HttpApi.Host** and if identity server is separated, install to the **IdentityServer**_. - Add **Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme** package to your **Blazor WebAssembly** application with the following command: @@ -52,7 +52,7 @@ builder.RootComponents.Add("#ApplicationContainer"); {{if UI == "BlazorServer"}} -- Complete the [MVC Razor Pages Installation](mvc.md#installation) first. _If the solution is tiered/micro-service, complete the MVC steps for all MVC applications such as **HttpApi.Host** and **IdentityServer**_. +- Complete the [MVC Razor Pages Installation](AspNetCore.md#installation) first. _If the solution is tiered/micro-service, complete the MVC steps for all MVC applications such as **HttpApi.Host** and **IdentityServer**_. - Add **Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme** package to your **Blazor server** application with the following command: diff --git a/docs/en/UI/Blazor/Theming.md b/docs/en/UI/Blazor/Theming.md index c7f92189de..d8cec07cb3 100644 --- a/docs/en/UI/Blazor/Theming.md +++ b/docs/en/UI/Blazor/Theming.md @@ -27,7 +27,7 @@ Currently, three themes are **officially provided**: * The [Basic Theme](Basic-Theme.md) is the minimalist theme with the plain Bootstrap style. It is **open source and free**. * The [Lepton Theme](https://commercial.abp.io/themes) is a **commercial** theme developed by the core ABP team and is a part of the [ABP Commercial](https://commercial.abp.io/) license. -* The [LeptonX Theme](https://x.leptontheme.com/) is a theme that has a [commercial](https://docs.abp.io/en/commercial/latest/themes/lepton-x/commercial/blazor) and a [lite](../../Themes/LeptonXLite/blazor.md) version. +* The [LeptonX Theme](https://x.leptontheme.com/) is a theme that has a [commercial](https://docs.abp.io/en/commercial/latest/themes/lepton-x/commercial/blazor) and a [lite](../../Themes/LeptonXLite/Blazor.md) version. ## Overall diff --git a/docs/en/docs-nav.json b/docs/en/docs-nav.json index fe1033b305..3706f9289e 100644 --- a/docs/en/docs-nav.json +++ b/docs/en/docs-nav.json @@ -721,7 +721,7 @@ }, { "text": "LeptonX Lite", - "path": "Themes/LeptonXLite/mvc.md" + "path": "Themes/LeptonXLite/AspNetCore.md" } ] }, @@ -837,7 +837,7 @@ }, { "text": "LeptonX Lite", - "path": "Themes/LeptonXLite/blazor.md" + "path": "Themes/LeptonXLite/Blazor.md" }, { "text": "Branding", @@ -1104,7 +1104,7 @@ }, { "text": "LeptonX Lite", - "path": "Themes/LeptonXLite/angular.md" + "path": "Themes/LeptonXLite/Angular.md" } ] }, From ae71fd269f41d4444807ec56b2d8292af2d93372 Mon Sep 17 00:00:00 2001 From: enisn Date: Tue, 28 Jun 2022 17:50:29 +0300 Subject: [PATCH 024/110] Fix mistaken merge conflict merge --- .../Commands/ProjectCreationCommandBase.cs | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs index f0a85aeb53..7090853734 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs @@ -44,7 +44,7 @@ public abstract class ProjectCreationCommandBase AngularPwaSupportAdder angularPwaSupportAdder, InitialMigrationCreator initialMigrationCreator, ThemePackageAdder themePackageAdder, - ILocalEventBus eventBus) + ILocalEventBus eventBus) { ConnectionStringProvider = connectionStringProvider; SolutionPackageVersionFinder = solutionPackageVersionFinder; @@ -170,7 +170,7 @@ public abstract class ProjectCreationCommandBase outputFolderRoot = slnPath; slnPath = Directory.GetFiles(outputFolderRoot, "*.sln").FirstOrDefault(); } - + if (slnPath == null) { throw new CliUsageException($"This command should be run inside a folder that contains a microservice solution! Or use -{Options.MainSolution.Short} parameter."); @@ -227,10 +227,11 @@ public abstract class ProjectCreationCommandBase protected void ExtractProjectZip(ProjectBuildResult project, string outputFolder) { - EventBus.PublishAsync(new ProjectCreationProgressEvent { + EventBus.PublishAsync(new ProjectCreationProgressEvent + { Message = "Extracting the solution archieve" }, false); - + using (var templateFileStream = new MemoryStream(project.ZipContent)) { using (var zipInputStream = new ZipInputStream(templateFileStream)) @@ -366,10 +367,11 @@ public abstract class ProjectCreationCommandBase { if (MicroserviceServiceTemplateBase.IsMicroserviceServiceTemplate(projectArgs.TemplateName)) { - await EventBus.PublishAsync(new ProjectCreationProgressEvent { + await EventBus.PublishAsync(new ProjectCreationProgressEvent + { Message = "Building the microservice solution" }, false); - + CmdHelper.RunCmd("dotnet build /graphbuild", projectArgs.OutputFolder); } } @@ -382,11 +384,12 @@ public abstract class ProjectCreationCommandBase MicroserviceServiceTemplateBase.IsMicroserviceTemplate(projectArgs.TemplateName)) { Logger.LogInformation("Installing client-side packages..."); - - await EventBus.PublishAsync(new ProjectCreationProgressEvent { + + await EventBus.PublishAsync(new ProjectCreationProgressEvent + { Message = "Installing client-side packages" }, false); - + await InstallLibsService.InstallLibsAsync(projectArgs.OutputFolder); } } @@ -423,10 +426,11 @@ public abstract class ProjectCreationCommandBase return; } - await EventBus.PublishAsync(new ProjectCreationProgressEvent { + await EventBus.PublishAsync(new ProjectCreationProgressEvent + { Message = "Creating the initial DB migration" }, false); - + await InitialMigrationCreator.CreateAsync(Path.GetDirectoryName(efCoreProjectPath), isLayeredTemplate); } @@ -438,7 +442,7 @@ public abstract class ProjectCreationCommandBase if (isAngular && isPwa) { Logger.LogInformation("Adding PWA Support to Angular app."); - + AngularPwaSupportAdder.AddPwaSupport(projectArgs.OutputFolder); } } @@ -659,10 +663,11 @@ public abstract class ProjectCreationCommandBase { public const string Short = "ms"; public const string Long = "main-solution"; - + } + public static class Theme { public const string Long = "theme"; } } -} +} \ No newline at end of file From 287d18e04693c503db91a140f0d1bf4b2858f9d9 Mon Sep 17 00:00:00 2001 From: Mahmut Gundogdu Date: Tue, 28 Jun 2022 22:37:51 +0300 Subject: [PATCH 025/110] Fix #12999 --- .../src/lib/constants/validation.ts | 4 ++ .../src/lib/utils/validation-utils.ts | 41 +++++++++++++++++-- 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/npm/ng-packs/packages/theme-shared/src/lib/constants/validation.ts b/npm/ng-packs/packages/theme-shared/src/lib/constants/validation.ts index 463a7b01dc..65b759a21e 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/constants/validation.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/constants/validation.ts @@ -13,4 +13,8 @@ export const DEFAULT_VALIDATION_BLUEPRINTS = { range: 'AbpValidation::ThisFieldMustBeBetween{0}And{1}[{{ min }},{{ max }}]', required: 'AbpValidation::ThisFieldIsRequired.', url: 'AbpValidation::ThisFieldIsNotAValidFullyQualifiedHttpHttpsOrFtpUrl', + passwordRequiresLower: 'AbpIdentity::Volo.Abp.Identity:PasswordRequiresLower', + passwordRequiresUpper: 'AbpIdentity::Volo.Abp.Identity:PasswordRequiresUpper', + passwordRequiresDigit: 'AbpIdentity::Volo.Abp.Identity:PasswordRequiresDigit', + passwordRequiresNonAlphanumeric: 'AbpIdentity::Volo.Abp.Identity:PasswordRequiresNonAlphanumeric', }; diff --git a/npm/ng-packs/packages/theme-shared/src/lib/utils/validation-utils.ts b/npm/ng-packs/packages/theme-shared/src/lib/utils/validation-utils.ts index a9ec1d4270..b7d8d23376 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/utils/validation-utils.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/utils/validation-utils.ts @@ -1,7 +1,7 @@ import { ABP, ConfigStateService } from '@abp/ng.core'; import { Injector } from '@angular/core'; -import { ValidatorFn, Validators } from '@angular/forms'; -import { PasswordRules, validatePassword } from '@ngx-validate/core'; +import { AbstractControl, ValidatorFn, Validators } from '@angular/forms'; +import { PasswordRules, normalizeDiacritics } from '@ngx-validate/core'; const { minLength, maxLength } = Validators; @@ -31,7 +31,8 @@ export function getPasswordValidators(injector: Injector): ValidatorFn[] { requiredLength = +getRule('RequiredLength'); } - return [validatePassword(passwordRulesArr), minLength(requiredLength), maxLength(128)]; + const passwordValidators = passwordRulesArr.map(rule => validatePassword(rule)); + return [...passwordValidators, minLength(requiredLength), maxLength(128)]; } function getRuleFn(injector: Injector) { @@ -43,3 +44,37 @@ function getRuleFn(injector: Injector) { return (passwordRules[`Abp.Identity.Password.${key}`] || '').toLowerCase(); }; } +const errorMessageMap = { + small: 'passwordRequiresLower', + capital: 'passwordRequiresUpper', + number: 'passwordRequiresDigit', + special: 'passwordRequiresNonAlphanumeric', +}; + +function validatePassword(shouldContain: 'small' | 'capital' | 'number' | 'special'): ValidatorFn { + return (control: AbstractControl) => { + if (!control.value) return null; + + const value = normalizeDiacritics(control.value); + + const regexMap = { + small: /.*[a-z].*/, + capital: /.*[A-Z].*/, + number: /.*[0-9].*/, + special: /.*[^0-9a-zA-Z].*/, + }; + const regex = regexMap[shouldContain]; + + const hasError = regex[shouldContain].test(value); + + if (!hasError) { + return null; + } + + const error = errorMessageMap[shouldContain]; + + return { + [error]: true, + }; + }; +} From fa23fd0147147677ec3c8a5a192321f75e55885f Mon Sep 17 00:00:00 2001 From: maliming Date: Wed, 29 Jun 2022 09:57:54 +0800 Subject: [PATCH 026/110] Add the `X-Requested-With` header to Swagger requests. --- .../wwwroot/swagger/ui/abp.swagger.js | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/framework/src/Volo.Abp.Swashbuckle/wwwroot/swagger/ui/abp.swagger.js b/framework/src/Volo.Abp.Swashbuckle/wwwroot/swagger/ui/abp.swagger.js index 249f75ebb0..c143b7e75e 100644 --- a/framework/src/Volo.Abp.Swashbuckle/wwwroot/swagger/ui/abp.swagger.js +++ b/framework/src/Volo.Abp.Swashbuckle/wwwroot/swagger/ui/abp.swagger.js @@ -1,24 +1,23 @@ var abp = abp || {}; -(function () { +(function() { - abp.SwaggerUIBundle = function (configObject) { + abp.SwaggerUIBundle = function(configObject) { var excludeUrl = ["swagger.json", "connect/token"] var firstRequest = true; abp.appPath = configObject.baseUrl || abp.appPath; var requestInterceptor = configObject.requestInterceptor; - - configObject.requestInterceptor = async function (request) { - if(request.url.includes(excludeUrl[1])){ + configObject.requestInterceptor = async function(request) { + + if (request.url.includes(excludeUrl[1])) { firstRequest = true; } - if(firstRequest && !excludeUrl.some(url => request.url.includes(url))) - { - await fetch(`${abp.appPath}abp/Swashbuckle/SetCsrfCookie`,{ + if (firstRequest && !excludeUrl.some(url => request.url.includes(url))) { + await fetch(`${abp.appPath}abp/Swashbuckle/SetCsrfCookie`, { headers: request.headers }); firstRequest = false; @@ -28,8 +27,12 @@ var abp = abp || {}; if (antiForgeryToken) { request.headers[abp.security.antiForgery.tokenHeaderName] = antiForgeryToken; } - - if(requestInterceptor){ + + if (!request.headers["X-Requested-With"]) { + request.headers["X-Requested-With"] = "XMLHttpRequest"; + } + + if (requestInterceptor) { requestInterceptor(request); } return request; From 98c8aa69a74c156bf3bf2acbc99734e6206d315a Mon Sep 17 00:00:00 2001 From: maliming Date: Wed, 29 Jun 2022 11:34:14 +0800 Subject: [PATCH 027/110] Try to delete the tenant's cookie if it does not exist or is inactive. Resolve #13146 --- .../AbpAspNetCoreMultiTenancyOptions.cs | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/AbpAspNetCoreMultiTenancyOptions.cs b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/AbpAspNetCoreMultiTenancyOptions.cs index 4f89ef7b97..d3b66952ef 100644 --- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/AbpAspNetCoreMultiTenancyOptions.cs +++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/AbpAspNetCoreMultiTenancyOptions.cs @@ -3,6 +3,8 @@ using System.Globalization; using System.Net; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Options; using Volo.Abp.MultiTenancy; namespace Volo.Abp.AspNetCore.MultiTenancy; @@ -21,6 +23,15 @@ public class AbpAspNetCoreMultiTenancyOptions TenantKey = TenantResolverConsts.DefaultTenantKey; MultiTenancyMiddlewareErrorPageBuilder = async (context, exception) => { + // Try to delete the tenant's cookie if it does not exist or is inactive. + var tenantResolveResult = context.RequestServices.GetRequiredService().Result; + if (tenantResolveResult != null && + tenantResolveResult.AppliedResolvers.Contains(CookieTenantResolveContributor.ContributorName)) + { + var options = context.RequestServices.GetRequiredService>().Value; + AbpMultiTenancyCookieHelper.SetTenantCookie(context, null, options.TenantKey); + } + context.Response.StatusCode = (int)HttpStatusCode.InternalServerError; ; context.Response.ContentType = "text/html"; @@ -31,8 +42,8 @@ public class AbpAspNetCoreMultiTenancyOptions await context.Response.WriteAsync($"

    {message}

    {details}
    \r\n"); await context.Response.WriteAsync("\r\n"); - // Note the 500 spaces are to work around an IE 'feature' - await context.Response.WriteAsync(new string(' ', 500)); + // Note the 500 spaces are to work around an IE 'feature' + await context.Response.WriteAsync(new string(' ', 500)); }; } } From 4ab0f7fe8c07ae170e7cfdb19059ff3e95edaf17 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Wed, 29 Jun 2022 13:57:42 +0800 Subject: [PATCH 028/110] Fix Kafka problem --- .../Kafka/KafkaDistributedEventBus.cs | 94 +++++-------------- .../Volo/Abp/Kafka/ProducerPool.cs | 10 +- 2 files changed, 23 insertions(+), 81 deletions(-) diff --git a/framework/src/Volo.Abp.EventBus.Kafka/Volo/Abp/EventBus/Kafka/KafkaDistributedEventBus.cs b/framework/src/Volo.Abp.EventBus.Kafka/Volo/Abp/EventBus/Kafka/KafkaDistributedEventBus.cs index 4dba728c51..aa79c81f50 100644 --- a/framework/src/Volo.Abp.EventBus.Kafka/Volo/Abp/EventBus/Kafka/KafkaDistributedEventBus.cs +++ b/framework/src/Volo.Abp.EventBus.Kafka/Volo/Abp/EventBus/Kafka/KafkaDistributedEventBus.cs @@ -162,13 +162,13 @@ public class KafkaDistributedEventBus : DistributedEventBusBase, ISingletonDepen protected async override Task PublishToEventBusAsync(Type eventType, object eventData) { await PublishAsync( + AbpKafkaEventBusOptions.TopicName, eventType, eventData, new Headers { - { "messageId", System.Text.Encoding.UTF8.GetBytes(Guid.NewGuid().ToString("N")) } - }, - null + { "messageId", System.Text.Encoding.UTF8.GetBytes(Guid.NewGuid().ToString("N")) } + } ); } @@ -188,42 +188,31 @@ public class KafkaDistributedEventBus : DistributedEventBusBase, ISingletonDepen new Headers { { "messageId", System.Text.Encoding.UTF8.GetBytes(outgoingEvent.Id.ToString("N")) } - }, - null + } ); } public override Task PublishManyFromOutboxAsync(IEnumerable outgoingEvents, OutboxConfig outboxConfig) { - var producer = ProducerPool.Get(); + var producer = ProducerPool.Get(AbpKafkaEventBusOptions.ConnectionName); var outgoingEventArray = outgoingEvents.ToArray(); - producer.BeginTransaction(); - try + + foreach (var outgoingEvent in outgoingEventArray) { - foreach (var outgoingEvent in outgoingEventArray) + var messageId = outgoingEvent.Id.ToString("N"); + var headers = new Headers { - var messageId = outgoingEvent.Id.ToString("N"); - var headers = new Headers - { - { "messageId", System.Text.Encoding.UTF8.GetBytes(messageId)} - }; - - producer.Produce( - AbpKafkaEventBusOptions.TopicName, - new Message - { - Key = outgoingEvent.EventName, - Value = outgoingEvent.EventData, - Headers = headers - }); - } + { "messageId", System.Text.Encoding.UTF8.GetBytes(messageId)} + }; - producer.CommitTransaction(); - } - catch (Exception e) - { - producer.AbortTransaction(); - throw; + producer.Produce( + AbpKafkaEventBusOptions.TopicName, + new Message + { + Key = outgoingEvent.EventName, + Value = outgoingEvent.EventData, + Headers = headers + }); } return Task.CompletedTask; @@ -253,47 +242,22 @@ public class KafkaDistributedEventBus : DistributedEventBusBase, ISingletonDepen return Serializer.Serialize(eventData); } - public virtual async Task PublishAsync(Type eventType, object eventData, Headers headers, Dictionary headersArguments) - { - await PublishAsync( - AbpKafkaEventBusOptions.TopicName, - eventType, - eventData, - headers, - headersArguments - ); - } - - private Task PublishAsync(string topicName, Type eventType, object eventData, Headers headers, Dictionary headersArguments) + private Task PublishAsync(string topicName, Type eventType, object eventData, Headers headers) { var eventName = EventNameAttribute.GetNameOrDefault(eventType); var body = Serializer.Serialize(eventData); - return PublishAsync(topicName, eventName, body, headers, headersArguments); + return PublishAsync(topicName, eventName, body, headers); } private Task> PublishAsync( string topicName, string eventName, byte[] body, - Headers headers, - Dictionary headersArguments) + Headers headers) { var producer = ProducerPool.Get(AbpKafkaEventBusOptions.ConnectionName); - return PublishAsync(producer, topicName, eventName, body, headers, headersArguments); - } - - private Task> PublishAsync( - IProducer producer, - string topicName, - string eventName, - byte[] body, - Headers headers, - Dictionary headersArguments) - { - SetEventMessageHeaders(headers, headersArguments); - return producer.ProduceAsync( topicName, new Message @@ -304,20 +268,6 @@ public class KafkaDistributedEventBus : DistributedEventBusBase, ISingletonDepen }); } - private void SetEventMessageHeaders(Headers headers, Dictionary headersArguments) - { - if (headersArguments == null) - { - return; - } - - foreach (var header in headersArguments) - { - headers.Remove(header.Key); - headers.Add(header.Key, Serializer.Serialize(header.Value)); - } - } - private List GetOrCreateHandlerFactories(Type eventType) { return HandlerFactories.GetOrAdd( diff --git a/framework/src/Volo.Abp.Kafka/Volo/Abp/Kafka/ProducerPool.cs b/framework/src/Volo.Abp.Kafka/Volo/Abp/Kafka/ProducerPool.cs index 0a31a3483a..691a29c1d2 100644 --- a/framework/src/Volo.Abp.Kafka/Volo/Abp/Kafka/ProducerPool.cs +++ b/framework/src/Volo.Abp.Kafka/Volo/Abp/Kafka/ProducerPool.cs @@ -41,16 +41,8 @@ public class ProducerPool : IProducerPool, ISingletonDependency { var producerConfig = new ProducerConfig(Options.Connections.GetOrDefault(connection)); Options.ConfigureProducer?.Invoke(producerConfig); - - if (producerConfig.TransactionalId.IsNullOrWhiteSpace()) - { - producerConfig.TransactionalId = Guid.NewGuid().ToString(); - } - - var producer = new ProducerBuilder(producerConfig).Build(); - producer.InitTransactions(DefaultTransactionsWaitDuration); + return new ProducerBuilder(producerConfig).Build(); - return producer; })).Value; } From 77b52d419f56e172567fd0b03e49dc4f11797353 Mon Sep 17 00:00:00 2001 From: maliming Date: Wed, 29 Jun 2022 13:57:58 +0800 Subject: [PATCH 029/110] Update the `Multi-Tenancy.md` to explains the `MultiTenancyMiddlewareErrorPageBuilder`. --- docs/en/Multi-Tenancy.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docs/en/Multi-Tenancy.md b/docs/en/Multi-Tenancy.md index 2603cb0436..8b8480669f 100644 --- a/docs/en/Multi-Tenancy.md +++ b/docs/en/Multi-Tenancy.md @@ -32,6 +32,22 @@ Configure(options => > Multi-Tenancy is disabled in the ABP Framework by default. However, it is **enabled by default** when you create a new solution using the [startup template](Startup-Templates/Application.md). `MultiTenancyConsts` class in the solution has a constant to control it in a single place. +### AbpMultiTenancyOptions: Handle inactive and non-existent tenants. + +The `MultiTenancyMiddlewareErrorPageBuilder` of `AbpMultiTenancyOptions` is used to handle inactive and non-existent tenants. + +It will respond to an error page by default, you can change it if you want, eg: only output the error log and continue ASP NET Core's request pipeline. + +```csharp +Configure(options => +{ + options.MultiTenancyMiddlewareErrorPageBuilder = async (context, exception) => + { + // Handle the exception. + }; +}); +``` + ### Database Architecture ABP Framework supports all the following approaches to store the tenant data in the database; From c776d10f5907a347074970787a0a4abdbfaeb142 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Wed, 29 Jun 2022 14:13:43 +0800 Subject: [PATCH 030/110] Update Multi-Tenancy.md --- docs/zh-Hans/Multi-Tenancy.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docs/zh-Hans/Multi-Tenancy.md b/docs/zh-Hans/Multi-Tenancy.md index 8e92d10673..472dde9eab 100644 --- a/docs/zh-Hans/Multi-Tenancy.md +++ b/docs/zh-Hans/Multi-Tenancy.md @@ -34,6 +34,22 @@ namespace MyCompany.MyProject > 随着"Multi-tenancy ready"的概念,我们打算开发我们的代码和多租户方法兼容.然后它可以被用于多租户和非多租户的程序中,这取决于最终程序的需求. +### AbpMultiTenancyOptions: 处理不活跃或不存在的租户 + +`MultiTenancyMiddlewareErrorPageBuilder` 或 `AbpMultiTenancyOptions` 用于 处理不活跃或不存在的租户. + +默认情况下会响应错误页面, 你可以根据自己的需要更改它, 比如: 只输出错误日志并继续ASP NET Core的请求管道 + +```csharp +Configure(options => +{ + options.MultiTenancyMiddlewareErrorPageBuilder = async (context, exception) => + { + // Handle the exception. + }; +}); +``` + #### 定义实体 你可以在你的实体中实现 **IMultiTenant** 接口来实现多租户,例如: From b2fdabfc98397bf9559ee2be3a7c4218d9468077 Mon Sep 17 00:00:00 2001 From: selman koc <64414348+skoc10@users.noreply.github.com> Date: Wed, 29 Jun 2022 09:53:58 +0300 Subject: [PATCH 031/110] Update common.props --- common.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.props b/common.props index c38f9d03e2..e372fe23a8 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 5.3.0 + 5.3.1 $(NoWarn);CS1591;CS0436 https://abp.io/assets/abp_nupkg.png https://abp.io/ From e8409a7511818800640959f3916a97ea6b662202 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alper=20Ebi=C3=A7o=C4=9Flu?= <9526587+ebicoglu@users.noreply.github.com> Date: Wed, 29 Jun 2022 10:34:52 +0300 Subject: [PATCH 032/110] Update en.json --- .../AbpIoLocalization/Commercial/Localization/Resources/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json index 2e30f25780..caf4a9dbbe 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json @@ -536,7 +536,7 @@ "Pricing_Page_Testimonial_2": "We are seeing the value of using ABP Commercial to reduce the overhead of custom development projects. And the team is able to unify the code pattern in different project streams. We see more potential in the framework for us to build new features faster than before. We trust we will be constantly seeing the value of leveraging ABP Commercial.", "Pricing_Page_Testimonial_3": "We love ABP. We don't have to write everything from scratch. We start from out-of-the-box features and just focus on what we really need to write. Also, ABP is well-architected and the code is high quality with fewer bugs. If we would have to write everything we needed on our own, we might have to spend years. Once more things we like is that the new version, or issue fixing, or improvement come out very soon every other week. We don't wait too long.", "Pricing_Page_Testimonial_4": "ABP Commercial is a fantastic product would recommend. Commercial products to market for our customers in a single configurable platform. The jump start that the framework and tooling provide any team is worth every cent. ABP Commercial was the best fit for our needs.", - "Pricing_Page_Testimonial_5": "ABP Framework is not only a framework, it is also a guidance for project development/management, because it provides DDD, GenericRepository, DI, Microservice, Modularity trainings. Even if you are not going to use framework itself, you can develop yourself with docs.abp.io which is well and professionally prepared (OpenIddict, Redis, Quartz etc.). Because many thing pre-built, it shortens project development time significantly (Such as login page, exception handling, data filtering-seeding, audit logging, localization, auto api controller etc.). As an example from our app, I have used Local Event Bus for stock control. So, I am able to manage order movements by writing stock handler. It is wonderful not to lose time for CreationTime, CreatorId. They are filled automatically.", + "Pricing_Page_Testimonial_5": "ABP Framework is not only a framework, but it is also a guide for project development/management, because it provides DDD, GenericRepository, DI, Microservice, and Modularity training. Even if you are not going to use the framework itself, you can develop yourself with docs.abp.io which is well and professionally prepared (OpenIddict, Redis, Quartz etc.). Because many things are pre-built, it shortens project development time significantly (Such as login page, exception handling, data filtering, seeding, audit logging, localization, auto API controller etc.). As an example from our application, I have used Local Event Bus for stock control. So, I am able to manage order movements by writing stock handler. It is wonderful not to lose time for CreationTime, CreatorId. They are being filled automatically.", "AbpBookDownloadArea_ClaimYourEBook": "Claim your Mastering ABP Framework E-Book", "AddMemberModal_Warning_1": "If the username you are trying to add doesn't exist in the system, please ask your team member to register on {0} and share the username of his/her account with you.", "MyOrganizations_Detail_WelcomeMessage": "Welcome to your organization, {0}", From da0fe2246a76784cc9f94fdb5457327d24917077 Mon Sep 17 00:00:00 2001 From: Mahmut Gundogdu Date: Wed, 29 Jun 2022 10:46:08 +0300 Subject: [PATCH 033/110] Update npm/ng-packs/packages/theme-shared/src/lib/utils/validation-utils.ts Co-authored-by: Qingxiao Ren --- .../packages/theme-shared/src/lib/utils/validation-utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm/ng-packs/packages/theme-shared/src/lib/utils/validation-utils.ts b/npm/ng-packs/packages/theme-shared/src/lib/utils/validation-utils.ts index b7d8d23376..eb9d21c192 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/utils/validation-utils.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/utils/validation-utils.ts @@ -65,7 +65,7 @@ function validatePassword(shouldContain: 'small' | 'capital' | 'number' | 'speci }; const regex = regexMap[shouldContain]; - const hasError = regex[shouldContain].test(value); + const hasError = regex.test(value); if (!hasError) { return null; From 2b28c0f44f38d53d13fc45217ef1dfea33667133 Mon Sep 17 00:00:00 2001 From: Mahmut Gundogdu Date: Wed, 29 Jun 2022 10:53:44 +0300 Subject: [PATCH 034/110] Revert if condition validatePassword func on validation-utils.ts --- .../packages/theme-shared/src/lib/utils/validation-utils.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/npm/ng-packs/packages/theme-shared/src/lib/utils/validation-utils.ts b/npm/ng-packs/packages/theme-shared/src/lib/utils/validation-utils.ts index eb9d21c192..0d0faf4211 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/utils/validation-utils.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/utils/validation-utils.ts @@ -65,9 +65,9 @@ function validatePassword(shouldContain: 'small' | 'capital' | 'number' | 'speci }; const regex = regexMap[shouldContain]; - const hasError = regex.test(value); + const isValid = regex.test(value); - if (!hasError) { + if (isValid) { return null; } From adcb457f8f9348af54ffed325e0513d036091e60 Mon Sep 17 00:00:00 2001 From: muhammedaltug Date: Wed, 29 Jun 2022 10:59:45 +0300 Subject: [PATCH 035/110] update tests --- .../packages/theme-shared/src/lib/models/index.ts | 1 + .../packages/theme-shared/src/lib/models/validation.ts | 1 + .../src/lib/tests/validation-utils.spec.ts | 10 +++++++--- .../theme-shared/src/lib/utils/validation-utils.ts | 7 +++++-- 4 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 npm/ng-packs/packages/theme-shared/src/lib/models/validation.ts diff --git a/npm/ng-packs/packages/theme-shared/src/lib/models/index.ts b/npm/ng-packs/packages/theme-shared/src/lib/models/index.ts index ca6aa74124..4cb240e9ab 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/models/index.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/models/index.ts @@ -4,3 +4,4 @@ export * from './nav-item'; export * from './statistics'; export * from './toaster'; export * from './user-menu'; +export * from './validation'; diff --git a/npm/ng-packs/packages/theme-shared/src/lib/models/validation.ts b/npm/ng-packs/packages/theme-shared/src/lib/models/validation.ts new file mode 100644 index 0000000000..bcc53a34e7 --- /dev/null +++ b/npm/ng-packs/packages/theme-shared/src/lib/models/validation.ts @@ -0,0 +1 @@ +export type PasswordRule = 'small' | 'capital' | 'number' | 'special'; diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/validation-utils.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/validation-utils.spec.ts index fe7577477c..435afb76e6 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/tests/validation-utils.spec.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/validation-utils.spec.ts @@ -4,10 +4,11 @@ import { HttpClient } from '@angular/common/http'; import { Component, Injector } from '@angular/core'; import { Validators } from '@angular/forms'; import { createComponentFactory, Spectator } from '@ngneat/spectator/jest'; -import { validatePassword } from '@ngx-validate/core'; import { OAuthService } from 'angular-oauth2-oidc'; import { of } from 'rxjs'; -import { getPasswordValidators } from '../utils'; +import { getPasswordValidators, validatePassword } from '../utils'; +import { PasswordRule } from '../models/validation'; + @Component({ template: '', selector: 'abp-dummy' }) class DummyComponent {} @@ -47,8 +48,11 @@ describe('ValidationUtils', () => { configState.refreshAppState(); const validators = getPasswordValidators(spectator.inject(Injector)); + const passwordValidators = ['number', 'small', 'capital', 'special'].map( + (rule: PasswordRule) => validatePassword(rule), + ); const expectedValidators = [ - validatePassword(['number', 'small', 'capital', 'special']), + ...passwordValidators, Validators.minLength(6), Validators.maxLength(128), ]; diff --git a/npm/ng-packs/packages/theme-shared/src/lib/utils/validation-utils.ts b/npm/ng-packs/packages/theme-shared/src/lib/utils/validation-utils.ts index b7d8d23376..4d3f4a1f15 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/utils/validation-utils.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/utils/validation-utils.ts @@ -1,7 +1,8 @@ import { ABP, ConfigStateService } from '@abp/ng.core'; import { Injector } from '@angular/core'; import { AbstractControl, ValidatorFn, Validators } from '@angular/forms'; -import { PasswordRules, normalizeDiacritics } from '@ngx-validate/core'; +import { normalizeDiacritics, PasswordRules } from '@ngx-validate/core'; +import { PasswordRule } from "../models/validation"; const { minLength, maxLength } = Validators; @@ -51,7 +52,9 @@ const errorMessageMap = { special: 'passwordRequiresNonAlphanumeric', }; -function validatePassword(shouldContain: 'small' | 'capital' | 'number' | 'special'): ValidatorFn { +export function validatePassword( + shouldContain: PasswordRule +): ValidatorFn { return (control: AbstractControl) => { if (!control.value) return null; From 8ee18d6b449b2e3879eabe22295b2900be876cf5 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Wed, 29 Jun 2022 11:05:58 +0300 Subject: [PATCH 036/110] Fix: Cli fails to copy angular files when adding new module resolves volosoft/volo#10857 --- .../AngularSourceCodeAdder.cs | 13 ++++++++- .../SolutionModuleAdder.cs | 29 ------------------- 2 files changed, 12 insertions(+), 30 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs index 9847a2b7a5..84e995f1fd 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs @@ -246,6 +246,17 @@ public class AngularSourceCodeAdder : ITransientDependency foreach (var folder in angularPathsInDownloadedSourceCode) { + var nodeModulesFolder = Path.Combine(folder, "node_modules"); + var vscodeFolder = Path.Combine(folder, ".vscode"); + if (Directory.Exists(nodeModulesFolder)) + { + Directory.Delete(nodeModulesFolder, true); + } + if (Directory.Exists(vscodeFolder)) + { + Directory.Delete(vscodeFolder, true); + } + var projectsInFolder = Directory.GetDirectories(folder); if (projectsInFolder.Length == 1 && Path.GetFileName(projectsInFolder[0]) == "projects") @@ -286,7 +297,7 @@ public class AngularSourceCodeAdder : ITransientDependency Directory.Move(projectInFolder, destDirName); } - if (!Directory.GetFiles(folder).Any() && !Directory.GetDirectories(folder).Any()) + if (!Directory.GetDirectories(folder).Any()) { Directory.Delete(folder, true); } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs index 2bfcad2d32..f418d8b490 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs @@ -427,11 +427,6 @@ public class SolutionModuleAdder : ITransientDependency await PublishEventAsync(9, $"Adding angular source code"); - if (newTemplate) - { - MoveAngularFolderInNewTemplate(modulesFolderInSolution, moduleName); - } - await AngularSourceCodeAdder.AddFromModuleAsync(solutionFilePath, angularPath); } @@ -449,30 +444,6 @@ public class SolutionModuleAdder : ITransientDependency } } - private static void MoveAngularFolderInNewTemplate(string modulesFolderInSolution, string moduleName) - { - var moduleAngularFolder = Path.Combine(modulesFolderInSolution, moduleName, "angular"); - - if (!Directory.Exists(moduleAngularFolder)) - { - return; - } - - var files = Directory.GetFiles(moduleAngularFolder); - var folders = Directory.GetDirectories(moduleAngularFolder); - - Directory.CreateDirectory(Path.Combine(moduleAngularFolder, moduleName)); - - foreach (var file in files) - { - File.Move(file, Path.Combine(moduleAngularFolder, moduleName, Path.GetFileName(file))); - } - foreach (var folder in folders) - { - Directory.Move(folder, Path.Combine(moduleAngularFolder, moduleName, Path.GetFileName(folder))); - } - } - private async Task DownloadSourceCodesToSolutionFolder(ModuleWithMastersInfo module, string modulesFolderInSolution, string version = null, bool newTemplate = false, bool newProTemplate = false) From 6fd38cde9277b537fea873a7954da78749e7d1e8 Mon Sep 17 00:00:00 2001 From: maliming Date: Wed, 29 Jun 2022 16:07:06 +0800 Subject: [PATCH 037/110] Forward Identity authentication for `Bearer`. --- ...bpAspNetCoreServiceCollectionExtensions.cs | 26 +++++++++++++++++++ .../MyProjectNameModule.cs | 5 +++- .../MyProjectNameModule.cs | 5 +++- .../MyProjectNameModule.cs | 5 +++- .../MyProjectNameModule.cs | 5 +++- .../MyProjectNameModule.cs | 7 +++-- .../MyProjectNameModule.cs | 7 +++-- .../MyProjectNameBlazorModule.cs | 3 +++ .../MyProjectNameHttpApiHostModule.cs | 3 +++ .../MyProjectNameWebModule.cs | 3 +++ .../MyProjectNameBlazorHostModule.cs | 3 +++ .../MyProjectNameIdentityServerModule.cs | 3 +++ 12 files changed, 67 insertions(+), 8 deletions(-) create mode 100644 modules/identity/src/Volo.Abp.Identity.AspNetCore/Microsoft/AspNetCore/Extensions/DependencyInjection/AbpAspNetCoreServiceCollectionExtensions.cs diff --git a/modules/identity/src/Volo.Abp.Identity.AspNetCore/Microsoft/AspNetCore/Extensions/DependencyInjection/AbpAspNetCoreServiceCollectionExtensions.cs b/modules/identity/src/Volo.Abp.Identity.AspNetCore/Microsoft/AspNetCore/Extensions/DependencyInjection/AbpAspNetCoreServiceCollectionExtensions.cs new file mode 100644 index 0000000000..de491eb7a2 --- /dev/null +++ b/modules/identity/src/Volo.Abp.Identity.AspNetCore/Microsoft/AspNetCore/Extensions/DependencyInjection/AbpAspNetCoreServiceCollectionExtensions.cs @@ -0,0 +1,26 @@ +using System; +using Microsoft.Extensions.DependencyInjection; + +namespace Microsoft.AspNetCore.Extensions.DependencyInjection; + +public static class AbpAspNetCoreServiceCollectionExtensions +{ + public static IServiceCollection ForwardIdentityAuthenticationForBearer(this IServiceCollection services, string targetAuthenticationScheme = "Bearer") + { + services.ConfigureApplicationCookie(options => + { + options.ForwardDefaultSelector = ctx => + { + string authorization = ctx.Request.Headers.Authorization; + if (!authorization.IsNullOrWhiteSpace() && authorization.StartsWith("Bearer ", StringComparison.OrdinalIgnoreCase)) + { + return targetAuthenticationScheme; + } + + return null; + }; + }); + + return services; + } +} diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyProjectNameModule.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyProjectNameModule.cs index 0a173f00b9..b9b468e397 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyProjectNameModule.cs +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyProjectNameModule.cs @@ -1,5 +1,6 @@ using Blazorise.Bootstrap5; using Blazorise.Icons.FontAwesome; +using Microsoft.AspNetCore.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.OpenApi.Models; using MyCompanyName.MyProjectName.Data; @@ -129,7 +130,7 @@ public class MyProjectNameModule : AbpModule { context.Services.Replace(ServiceDescriptor.Singleton()); } - + ConfigureUrls(configuration); ConfigureBundles(); ConfigureAutoMapper(context); @@ -188,6 +189,8 @@ public class MyProjectNameModule : AbpModule options.RequireHttpsMetadata = Convert.ToBoolean(configuration["AuthServer:RequireHttpsMetadata"]); options.Audience = "MyProjectName"; }); + + context.Services.ForwardIdentityAuthenticationForBearer(); } private void ConfigureLocalizationServices() diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameModule.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameModule.cs index f5ad689be7..1a3e0a1c67 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameModule.cs +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameModule.cs @@ -1,5 +1,6 @@ using Blazorise.Bootstrap5; using Blazorise.Icons.FontAwesome; +using Microsoft.AspNetCore.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.OpenApi.Models; using MyCompanyName.MyProjectName.Data; @@ -125,7 +126,7 @@ public class MyProjectNameModule : AbpModule { var hostingEnvironment = context.Services.GetHostingEnvironment(); var configuration = context.Services.GetConfiguration(); - + if (hostingEnvironment.IsDevelopment()) { context.Services.Replace(ServiceDescriptor.Singleton()); @@ -189,6 +190,8 @@ public class MyProjectNameModule : AbpModule options.RequireHttpsMetadata = Convert.ToBoolean(configuration["AuthServer:RequireHttpsMetadata"]); options.Audience = "MyProjectName"; }); + + context.Services.ForwardIdentityAuthenticationForBearer(); } private void ConfigureLocalizationServices() diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyProjectNameModule.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyProjectNameModule.cs index 4550b6d997..4913fc441e 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyProjectNameModule.cs +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyProjectNameModule.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore.Cors; using Microsoft.AspNetCore.DataProtection; +using Microsoft.AspNetCore.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.OpenApi.Models; using MyCompanyName.MyProjectName.Data; @@ -112,7 +113,7 @@ public class MyProjectNameModule : AbpModule { var hostingEnvironment = context.Services.GetHostingEnvironment(); var configuration = context.Services.GetConfiguration(); - + if (hostingEnvironment.IsDevelopment()) { context.Services.Replace(ServiceDescriptor.Singleton()); @@ -172,6 +173,8 @@ public class MyProjectNameModule : AbpModule options.RequireHttpsMetadata = Convert.ToBoolean(configuration["AuthServer:RequireHttpsMetadata"]); options.Audience = "MyProjectName"; }); + + services.ForwardIdentityAuthenticationForBearer(); } private void ConfigureLocalization() diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyProjectNameModule.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyProjectNameModule.cs index c5cf3e4d79..b062de6a79 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyProjectNameModule.cs +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyProjectNameModule.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore.Cors; using Microsoft.AspNetCore.DataProtection; +using Microsoft.AspNetCore.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.OpenApi.Models; using MyCompanyName.MyProjectName.Data; @@ -114,7 +115,7 @@ public class MyProjectNameModule : AbpModule { var hostingEnvironment = context.Services.GetHostingEnvironment(); var configuration = context.Services.GetConfiguration(); - + if (hostingEnvironment.IsDevelopment()) { context.Services.Replace(ServiceDescriptor.Singleton()); @@ -174,6 +175,8 @@ public class MyProjectNameModule : AbpModule options.RequireHttpsMetadata = Convert.ToBoolean(configuration["AuthServer:RequireHttpsMetadata"]); options.Audience = "MyProjectName"; }); + + services.ForwardIdentityAuthenticationForBearer(); } private void ConfigureLocalization() diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyProjectNameModule.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyProjectNameModule.cs index a6379697d5..f6ab66aa61 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyProjectNameModule.cs +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyProjectNameModule.cs @@ -1,4 +1,5 @@ -using Microsoft.Extensions.DependencyInjection.Extensions; +using Microsoft.AspNetCore.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.OpenApi.Models; using MyCompanyName.MyProjectName.Data; using MyCompanyName.MyProjectName.Localization; @@ -118,7 +119,7 @@ public class MyProjectNameModule : AbpModule { var hostingEnvironment = context.Services.GetHostingEnvironment(); var configuration = context.Services.GetConfiguration(); - + if (hostingEnvironment.IsDevelopment()) { context.Services.Replace(ServiceDescriptor.Singleton()); @@ -176,6 +177,8 @@ public class MyProjectNameModule : AbpModule options.RequireHttpsMetadata = Convert.ToBoolean(configuration["AuthServer:RequireHttpsMetadata"]); options.Audience = "MyProjectName"; }); + + services.ForwardIdentityAuthenticationForBearer(); } private void ConfigureLocalization() diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyProjectNameModule.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyProjectNameModule.cs index 90e602c336..ec73113cce 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyProjectNameModule.cs +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyProjectNameModule.cs @@ -1,4 +1,5 @@ -using Microsoft.Extensions.DependencyInjection.Extensions; +using Microsoft.AspNetCore.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.OpenApi.Models; using MyCompanyName.MyProjectName.Data; using MyCompanyName.MyProjectName.Localization; @@ -119,7 +120,7 @@ public class MyProjectNameModule : AbpModule { var hostingEnvironment = context.Services.GetHostingEnvironment(); var configuration = context.Services.GetConfiguration(); - + if (hostingEnvironment.IsDevelopment()) { context.Services.Replace(ServiceDescriptor.Singleton()); @@ -178,6 +179,8 @@ public class MyProjectNameModule : AbpModule options.RequireHttpsMetadata = Convert.ToBoolean(configuration["AuthServer:RequireHttpsMetadata"]); options.Audience = "MyProjectName"; }); + + services.ForwardIdentityAuthenticationForBearer(); } private void ConfigureLocalization() diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorModule.cs index 39c3601722..d8c3be6007 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorModule.cs @@ -4,6 +4,7 @@ using System.Net.Http; using Blazorise.Bootstrap5; using Blazorise.Icons.FontAwesome; using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Extensions.DependencyInjection; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; @@ -138,6 +139,8 @@ public class MyProjectNameBlazorModule : AbpModule options.RequireHttpsMetadata = Convert.ToBoolean(configuration["AuthServer:RequireHttpsMetadata"]); options.Audience = "MyProjectName"; }); + + context.Services.ForwardIdentityAuthenticationForBearer(); } private void ConfigureVirtualFileSystem(IWebHostEnvironment hostingEnvironment) diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs index 586507bbc4..40e4614ec0 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Net.Http; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Cors; +using Microsoft.AspNetCore.Extensions.DependencyInjection; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; @@ -129,6 +130,8 @@ public class MyProjectNameHttpApiHostModule : AbpModule HttpClientHandler.DangerousAcceptAnyServerCertificateValidator }; }); + + context.Services.ForwardIdentityAuthenticationForBearer(); } private static void ConfigureSwaggerServices(ServiceConfigurationContext context, IConfiguration configuration) diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs index b6daf2a4a8..ea906774fc 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs @@ -1,6 +1,7 @@ using System; using System.IO; using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Extensions.DependencyInjection; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; @@ -118,6 +119,8 @@ public class MyProjectNameWebModule : AbpModule options.RequireHttpsMetadata = Convert.ToBoolean(configuration["AuthServer:RequireHttpsMetadata"]); options.Audience = "MyProjectName"; }); + + context.Services.ForwardIdentityAuthenticationForBearer(); } private void ConfigureAutoMapper() diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyProjectNameBlazorHostModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyProjectNameBlazorHostModule.cs index cb44a1a683..96e10ea7aa 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyProjectNameBlazorHostModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyProjectNameBlazorHostModule.cs @@ -5,6 +5,7 @@ using System.Threading.Tasks; using Blazorise.Bootstrap5; using Blazorise.Icons.FontAwesome; using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Hosting; @@ -142,6 +143,8 @@ public class MyProjectNameBlazorHostModule : AbpModule options.Audience = "MyProjectName"; }); + context.Services.ForwardIdentityAuthenticationForBearer(); + if (hostingEnvironment.IsDevelopment()) { Configure(options => diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs index eb854d3bc1..da127f4279 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs @@ -4,6 +4,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Cors; using Microsoft.AspNetCore.DataProtection; +using Microsoft.AspNetCore.Extensions.DependencyInjection; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; @@ -147,6 +148,8 @@ public class MyProjectNameIdentityServerModule : AbpModule options.Audience = configuration["AuthServer:ApiName"]; }); + context.Services.ForwardIdentityAuthenticationForBearer(); + Configure(options => { options.KeyPrefix = "MyProjectName:"; From 7fc1af9a8524b17c8643a82d5fb42521b86c738a Mon Sep 17 00:00:00 2001 From: Engincan VESKE Date: Wed, 29 Jun 2022 11:09:39 +0300 Subject: [PATCH 038/110] Add new localizations --- .../AbpIoLocalization/Base/Localization/Resources/en.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json index 382d31dd5d..3a1b574d21 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json @@ -161,6 +161,9 @@ "Error_Page_500_Title": "Looks like something went wrong!", "Error_Page_500_Description_1": "We track these errors automatically, but if the problem persists feel free to
    contact us. In the meantime, try refreshing.", "Error_Page_500_Description_2": "Contact with us at info@abp.io.", - "Books": "Books" + "Books": "Books", + "ABPDiscordServer": "ABP Discord Server", + "ABPCommunityTalks": "ABP Community Talks", + "ABPCommunityPosts": "ABP Community Posts" } } From 481d031c3eb33a635a381d4ab12254353e710bb7 Mon Sep 17 00:00:00 2001 From: maliming Date: Wed, 29 Jun 2022 16:20:27 +0800 Subject: [PATCH 039/110] Update AbpAspNetCoreServiceCollectionExtensions.cs --- .../AbpAspNetCoreServiceCollectionExtensions.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/identity/src/Volo.Abp.Identity.AspNetCore/Microsoft/AspNetCore/Extensions/DependencyInjection/AbpAspNetCoreServiceCollectionExtensions.cs b/modules/identity/src/Volo.Abp.Identity.AspNetCore/Microsoft/AspNetCore/Extensions/DependencyInjection/AbpAspNetCoreServiceCollectionExtensions.cs index de491eb7a2..8d26a17835 100644 --- a/modules/identity/src/Volo.Abp.Identity.AspNetCore/Microsoft/AspNetCore/Extensions/DependencyInjection/AbpAspNetCoreServiceCollectionExtensions.cs +++ b/modules/identity/src/Volo.Abp.Identity.AspNetCore/Microsoft/AspNetCore/Extensions/DependencyInjection/AbpAspNetCoreServiceCollectionExtensions.cs @@ -5,7 +5,7 @@ namespace Microsoft.AspNetCore.Extensions.DependencyInjection; public static class AbpAspNetCoreServiceCollectionExtensions { - public static IServiceCollection ForwardIdentityAuthenticationForBearer(this IServiceCollection services, string targetAuthenticationScheme = "Bearer") + public static IServiceCollection ForwardIdentityAuthenticationForBearer(this IServiceCollection services, string jwtBearerScheme = "Bearer") { services.ConfigureApplicationCookie(options => { @@ -14,7 +14,7 @@ public static class AbpAspNetCoreServiceCollectionExtensions string authorization = ctx.Request.Headers.Authorization; if (!authorization.IsNullOrWhiteSpace() && authorization.StartsWith("Bearer ", StringComparison.OrdinalIgnoreCase)) { - return targetAuthenticationScheme; + return jwtBearerScheme; } return null; From 2e723d8a1d98b39eb49606e14b82c01e51dec979 Mon Sep 17 00:00:00 2001 From: Engincan VESKE Date: Wed, 29 Jun 2022 11:55:34 +0300 Subject: [PATCH 040/110] Add missing Chienese localizations --- .../Localization/Resources/zh-Hans.json | 353 +++++++++++++++++- 1 file changed, 342 insertions(+), 11 deletions(-) diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/zh-Hans.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/zh-Hans.json index 4fe47cb523..5930a69a6f 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/zh-Hans.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/zh-Hans.json @@ -9,9 +9,10 @@ "QuestionCount": "剩余/问题总数", "Unlimited": "无限制", "Owners": "所有者", + "Owner": "所有者", "AddMember": "添加成员", - "AddOwner": "添加所有者", - "AddDeveloper": "添加开发者", + "AddNewOwner": "添加新的所有者", + "AddNewDeveloper": "添加新的开发者", "UserName": "用户名", "Name": "名称", "EmailAddress": "电子邮件地址", @@ -62,8 +63,6 @@ "Themes": "主题", "JoinOurNewsletter": "加入我们的时事通讯", "Send": "发送", - "Learn": "学习", - "AdditionalServices": "额外的服务", "WhatIsABPFramework": "什么是ABP框架?", "OpenSourceBaseFramework": "开源的框架", "ABPFrameworkExplanation": "

    ABP商业版基于ABP框架, 这是一个开源和社区驱动的ASP.NET Core web应用程序开发框架.

    ABP框架提供了出色的基础设施, 使用最佳实践编写可维护,可扩展,可测试的代码.

    基于你已经知道的流行工具. 低学习曲线,容易适应,舒适的开发体检.

    ", @@ -129,6 +128,8 @@ "TellUsWhatYouNeed": "告诉我们你需要什么.", "YourMessage": "你的消息", "YourFullName": "你的全名", + "FirstNameField": "名字", + "LastNameField": "姓氏", "EmailField": "E-mail地址", "YourEmailAddress": "你的e-mail地址", "HowMayWeHelpYou": "需要获得购买帮助？(提供中文服务）", @@ -159,6 +160,8 @@ "SearchQuestionPlaceholder": "搜索常见的问题", "WhatIsTheABPCommercial": "什么是ABP商业版?", "WhatAreDifferencesThanAbpFramework": "ABP框架与ABP商业版有什么不同?", + "AbpCommercialMetaTitle": "ABP 商业版 - 完整的网页开发平台 : {0} | ABP 商业版 ", + "AbpCommercialMetaDescription": "ABP 商业版是在开源ABP框架之上构建的一组预构建应用程序模块、快速开发工具、UI主题和服务架构", "ABPCommercialExplanation": "ABP商业版是一套基于开源ABP框架之上的高级模块,工具,主题和服务. ABP商业版由ABP框架背后的同一团队开发和支持.", "WhatAreDifferencesThanABPFrameworkExplanation": "

    ABP框架是模块化,主题化,微服务兼容的ASP.NET Core应用程序开发框架. 它提供了一个完整的架构和强大的基础设施,让你专注于自己的业务代码而不是重复自己的每一个项目. 它基于软件开发的最佳实践和你已经知道的流行工具

    ABP框架是完全免费,开源和由社区驱动的. 它还提供了一个免费的主题和一些预构建的模块 (如 identity管理和租户管理).

    ", "VisitTheFrameworkVSCommercialDocument": "访问以下链接,了解更多信息 {1} ", @@ -191,6 +194,7 @@ "IsSourceCodeIncludedExplanation4": "

    将模块的源代码包含到解决方案中,可以最大程度地自定义该模块. 但是当新版本发布时,将无法自动升级模块.

    这些许可均不包含ABP Suite源代码,该源代码是一个外部工具,可以为你生成代码并帮助你进行开发

    有关许可类型之间的其它差异查看定价页面.

    ", "ChangingDevelopers": "我将来可以更改我组织的注册开发人员吗?", "ChangingDevelopersExplanation": "除了将新的开发人员添加到你的许可中之外,你还可以更改现有的开发人员(可以删除一个开发人员并将新的开发人员添加到同一位置),而无需任何额外费用.", + "WhatHappensWhenLicenseEndsExplanation8": "您生成的 ABP 项目未存储在我们的服务器上。 因此，您有责任保留下载的源代码。 当您的许可证到期时，将无法获取您生成的 ABP 项目源代码。", "WhenShouldIRenewMyLicense": "我什么时候应该续订我的许可?", "WhenShouldIRenewMyLicenseExplanation": "如果您在许可证到期后 1 个月内续订许可证，将享受以下折扣：团队许可证 {0}% 折扣、商业许可证 {1}% 折扣、企业许可证 {2}% 折扣 . 如果您在许可证到期后 1 个月续订许可证，续订价格将与许可证购买价格相同，并且续订不会有折扣。", "TrialPlan": "你们有试用计划吗?", @@ -350,7 +354,6 @@ "WeWillSendYouADownloadLink": "下载电子书的链接已发送至{0}。
    检查您的收件箱/垃圾箱/垃圾邮件箱！", "InvalidFormInputs": "请输入表格中指定的有效信息。", "DDDBookEmailBody": "谢谢你。
    要下载您的图书，请点击此处。", - "FreeDDDEBook": "免费 DDD 电子书", "StartFree": "免费开始", "FreeTrial": "免费试用", "AcceptsMarketingCommunications": " 是的，我想接收 ABP 商业营销通讯。", @@ -361,7 +364,6 @@ "CompanySize": "公司规模", "Next": "下一个", "StartTrial": "开始我的免费试用", - "ContactUsIssues": "如果您有任何问题，请联系我们", "TrialActivatedWarning": "亲爱的{0}，用户只能享受 1 个免费试用期。您已经使用了试用期。", "SaveAndDownload": "保存和下载", "CompanyNameValidationMessage": "公司名称太长！", @@ -369,17 +371,346 @@ "TaxNoValidationMessage": "TAX/VAT No 太长了！", "NotesValidationMessage": "备注字段太长！", "CheckYourBillingInfo": "您只能创建一次发票！在创建发票之前检查您的帐单信息。", - "Volo.AbpIo.Commercial:030000": "您已经使用了试用期。", - "Volo.AbpIo.Commercial:030001": "此组织名称已存在。", "StartYourFreeTrial": "开始你的免费试用", "TrialLicenseModelInvalidErrorMessage": "以下字段之一无效：国家名称、公司规模、行业或使用目的。", "Trial": "审判", "Purchased": "已购买", - "PurchaseLicense": "购买许可证", + "PurchaseNow": "立即购买", "PurchaseTrialLicenseMessage": "您的许可证到期日期是 {0}。
    如果您想继续使用您在免费试用期内创建的项目，您需要更改 appsettings.secrets.json 文件中的许可证密钥。这是您的许可证密钥：", "TrialLicenseExpireMessage": "您正在使用试用许可证，您的试用许可证将于 {0}到期。", "TryForFree": "免费试用", "TrialLicenseExpiredInfo": "您的试用许可期限已过！", - "CommercialNewsletterConfirmationMessage": "我同意条款和条件和隐私政策。" + "DowngradeLicensePlan": "我将来可以降级到较低的许可版本吗？", + "DowngradeLicensePlanExplanation": "您不能降级现有的许可版本。 但是您可以购买新的较低许可版本并继续使用新许可证进行开发。 购买较低的许可版本后，您只需通过 ABP CLI 命令登录到新的许可版本：` abp login -o `。", + "LicenseTransfer": "许可证可以从一个开发者转移到另一个开发者吗？", + "LicenseTransferExplanation": "是的！ 购买许可证后，您将成为许可证持有者，因此您可以访问组织管理页面。 组织具有所有者和开发者角色。 业主可以管理开发者席位和分配开发者。 每个分配的开发者都将通过 ABP CLI 命令登录系统，并拥有开发和支持权限。", + "UserOwnerDescription": "组织的“所有者”是此帐户的管理员。 他/她通过购买许可证和分配开发者来管理组织。 “所有者”不能在 ABP 商业项目中编写代码，不能下载 ABP 示例项目，也不能在支持的网站上进行提问。 如果你想拥有这些操作权限，你必须也将自己添加为开发人员。", + "UserDeveloperDescription": "“开发人员”可以在 ABP 商业版项目中编写代码，下载 ABP 示例项目，并在支持的网站上进行提问。 然而另一方面，“开发者”无法管理这个组织。", + "RemoveCurrentUserFromOrganizationWarningMessage": "您正在将自己从自己的组织中移除。 您将无法再管理此组织，您确定吗？", + "RenewExistingOrganizationOrCreateNewOneMessage": "您可以通过单击下面的 \"立即延长\"按钮来更新您组织的许可证，因此您可以将许可证到期日期延长 1 年。 如果您继续结帐，您将拥有一个新的组织。 您想继续开始新的组织许可吗？", + "ExtendNow": "立即延长", + "CreateNewOrganization": "建立新的组织", + "RenewLicenseEarly": "如果我提前更新我的许可证，我会得到一整年吗？", + "RenewLicenseEarylExplanation": "当您在许可证到期日期之前续订许可证时，您的许可证到期日期仍将增加 1 年。 例如，如果您的许可在 {0}-06-06 到期，而您在 {0}-01-01 续订，那么您的新许可到期日期仍将是 {1}-06-06。", + "OpenSourceWebApplication": "开源网络应用程序", + "CompleteWebDevelopment": "一个完整的网络开发", + "ABPFrameworkDescription": "ABP 框架是一个完整的基础架构，可通过遵循软件开发和约定的最佳实践来创建现代 Web 应用程序。", + "CommunityDescription": "分享您使用 ABP 框架的经验！", + "GetStarted": "开始使用", + "Views": "意见", + "LatestPosts": "最新的帖子", + "PreBuiltApplication": "预构建应用程序", + "DatabaseProviders": "数据库提供者", + "UIFrameworks": "用户界面框架", + "UsefulLinks": "有用的链接", + "Platform": "平台", + "CoolestCompaniesUseABPCommercial": "最酷的公司都已经在使用 ABP Commercial。", + "UserInterface": "用户界面", + "APIGateway": "网关", + "Microservice": "微服务", + "Database": "数据库", + "Architecture": "结构", + "MicroserviceArchitectureExplanation": "这是一个完整的解决方案架构，由多个应用程序、API 网关、微服务和数据库组成，使用最新技术构建可扩展的微服务解决方案。", + "BusinessLogic": "业务逻辑", + "DataAccessLayer": "数据访问层", + "Monolith": "单体", + "ModularArchitectureExplanation": "此启动模板提供了分层、模块化和基于 DDD 的解决方案架构，以构建清晰且可维护的代码库。", + "SeeDetails": "阅读详情", + "SeeDocumentation": "查看文档", + "Bs5Compatible": "Bootstrap 5 兼容的专业主题，非常适合您的管理网站。", + "LeptonXTheme": "LeptonX 主题", + "LeptonXDark": "LeptonX 深色", + "LeptonXLight": "LeptonX 浅色", + "LeptonXSemiDark": "LeptonX 半深色", + "BuiltOnBs5Library": "基于 Bootstrap 5 库构建", + "FullyCompatibleWithBs5": "100% 兼容 Bootstrap 5 HTML 结构和 CSS 类", + "ResponsiveAndMobileCompatible": "响应式、移动兼容、RTL 支持", + "ProvidesStylesForDatatables": "为数据表提供样式", + "MultipleLayoutOptions": "多种布局选项", + "EasilyInstallAndUpgrade": "轻松安装和升级", + "SupportForum": "支持论坛", + "TrustedBy": "授信于", + "OurPricing": "我们的 价格", + "Plans": "计划", + "NameSurname": "姓名", + "Unspecified": "未指定的", + "LicenceType": "许可证类型", + "LicenseDiscountWarning": "此折扣页面使用默认折扣代码并适用于 VOLOSOFT 开发人员。 下面的购买链接不起作用。", + "DiscountedLicenseExplanation": "这些许可价格适用于小型初创公司、个人开发者、学生、非营利组织和项目！", + "General": "一般的", + "License": "许可证", + "Development": "开发", + "Payment": "支付", + "WatchExplainerVideo": "让我们见面吧！ 观看解说视频", + "LightDarkAndSemiDarkThemes": "浅色、深色和半深色", + "LeptonXThemeExplanation": "Lepton Theme 可以根据您的系统设置更改您的主题。", + "PRO": "专业版", + "WelcomeToABPCommercial": "欢迎来到 ABP 商业版！", + "YourAccountDetails": "您的帐户详细信息", + "OrganizationName": "组织名称", + "AddDevelopers": "添加开发者", + "StartDevelopment": "开始开发", + "CreateAndRunApplicationUsingStartupTemplate": "了解如何使用 ABP Commercial 启动模板创建和运行新的 Web 应用程序。", + "CommunityDescription2": "community.abp.io 是人们可以分享 ABP 相关文章的地方。 搜索文章、教程、代码示例、案例研究并结识与您同路的人。", + "UseABPSuiteExplanation": "使用 ABP Suite 下载模块和主题的源代码。", + "ManageModulesWithSuite": "您还可以使用 Suite 管理您的 ABP 模块。", + "LearnHowToInstallSuite": "了解如何安装和使用 ABP 套件。", + "SeeMore": "查看更多", + "SeeLess": "收起全文", + "LayeredSolutionStructure": "分层解决方案结构", + "LayeredSolutionStructureExplanation": "该解决方案基于领域驱动设计原则和模式进行分层，以将您的业务逻辑与基础架构和集成隔离开来，并最大限度地提高代码的可维护性和可重用性。 ABP 框架已经提供了抽象、基类和指南来真正为您的应用程序实现 DDD。", + "MultipleUIOptions": "多个用户界面选项", + "MultipleUIOptionsExplanation": "我们喜欢不同的方式来创建用户界面。 此启动解决方案为您的业务应用程序提供了三种不同的 UI 框架选项。", + "MultipleDatabaseOptions": "多个数据库选项", + "MultipleDatabaseOptionsExplanation": "您有两个数据库提供程序选项（除了在单个应用程序中使用两者）。 使用 Entity Framework Core 处理任何关系数据库，当您需要编写低级查询以获得更好的性能时，可以选择使用 Dapper。 如果您需要使用基于文档的 NoSQL 数据库，MongoDB 是另一种选择。 虽然这些提供程序是良好集成、抽象和预配置的，但您实际上可以与任何可与 .NET 一起使用的数据库系统进行交互。", + "ModularArchitectureExplanation2": "模块化是 ABP.IO 平台的一等公民。 所有应用程序功能都被拆分为隔离良好的可选模块。 启动解决方案已经预装了基本的 ABP 商业模块。 您还可以创建自己的模块来为自己的应用程序构建模块化系统。", + "MultiTenancyForSaasBusiness": "SaaS 业务的多租户", + "MultiTenancyForSaasBusinessExplanation": "ABP 商业版 提供完整的端到端多租户系统来创建您的 SaaS（软件即服务）系统。 它允许租户通过动态数据库创建和迁移系统共享或拥有自己的数据库。", + "MicroserviceStartupSolution": "微服务启动解决方案", + "MicroserviceArchitectureExplanation2": "您可以将它用于您的下一个微服务系统，以利用预先构建的基础解决方案和提炼的经验。", + "PreIntegratedTools": "预集成到流行工具", + "PreIntegratedToolsExplanation": "该解决方案已集成到行业标准工具和技术中，而您可以随时更改它们并集成到您喜欢的工具中。", + "SingleSignOnAuthenticationServer": "单点登录认证服务器", + "SingleSignOnAuthenticationServerExplanation": "该解决方案有一个身份验证服务器应用程序，其他应用程序将其用作具有 API 访问管理功能的单点登录服务器。 它基于 IdentityServer。", + "WebAppsWithGateways": "2 个 Web 应用程序和 2 个 API 网关", + "WebAppsWithGatewaysExplanation": "该解决方案包含两个 Web 应用程序，每个应用程序都有一个专用的 API 网关（BFF - Backend For Frontend 模式）。", + "BackOfficeApplication": "后台应用程序", + "BackOfficeApplicationExplanation": "系统的实际 Web 应用程序，具有多个 UI 框架选项。 您可以创建任何类型的业务应用程序。", + "LandingWebsite": "登陆网站", + "LandingWebsiteExplanation": "可用于多种目的的通用登陆/公共网站，例如介绍您的公司、销售您的产品等。", + "ABPFrameworkEBook": "掌握 ABP 框架电子书", + "MasteringAbpFrameworkEBookDescription": "包含在您的 ABP 商业许可证中", + "FullName": "全名", + "LicenseTypeNotCorrect": "许可类型不正确！", + "Trainings": "培训", + "ChooseTrainingPlaceholder": "选择培训...", + "DoYouNeedTrainings": "您需要这些培训之一吗？", + "DoYouNeedTraining": "您需要 {0} 培训吗？", + "GetInTouchUs": "请与我们联系", + "ForMoreInformationClickHere": "如需更多信息，请点击此处。", + "IsGetOnboardingTraining": "您想获得入职和 Web 应用程序开发培训吗？", + "OnboardingWebApplicationDevelopmentTrainingMessage": "要安排您的培训日历，请在创建组织后联系 {0}", + "CustomPurchaseMessage": "对于下一步，单击 {0} 与我们联系。", + "Note": "说明", + "AdditionalNote": "附加说明", + "OnboardingTrainingFaqTitle": "你有 ABP 熟练使用培训吗？", + "OnboardingTrainingFaqExplanation": "是的，我们有 ABP 培训服务来帮助您快速启动您的 ABP 项目。 您将从 ABP 核心团队成员那里了解 ABP，并获得开始您的 ABP 项目的技能。 在 ABP 培训中，我们将解释如何设置开发环境、安装所需工具、创建功能齐全的 CRUD 页面。 培训将会以直播的形式并使用 Zoom 应用程序，我们也对使用其他在线会议平台持开放态度。 主要培训语言为英语。 您也可以在会议期间询问有关 ABP 的问题。 我们将安排一个方便双方的时间和日期。 要获取更多信息，请通过 info@abp.io 联系我们。", + "AddBasket": "添加到购物车", + "SendTrainingRequest": "发送培训请求", + "OnlyEnglishVersionOfThisDocumentIsTheRecentAndValid": "* 本文件的英文版本为最新版本，如有任何争议，以英文版本为准。", + "Pricing_Page_Title": "计划 & 定价", + "Pricing_Page_Description": "现在就选择您的业务及需要的特性和功能。 购买 ABP 商业许可证创建无限量项目。", + "Pricing_Page_HurryUp": "赶快行动吧！", + "Pricing_Page_BuyLicense": "在 1 月 16 日前以 2021 年价格 购买许可证！", + "Pricing_Page_ValidForExistingCustomers": "也适用于现有客户和许可证续订。", + "Pricing_Page_Hint1": "许可价格包括一定数量的开发者席位。 如果您有更多的开发人员，您可以随时购买额外的席位。", + "Pricing_Page_Hint2": "您现在或将来都可以购买更多的开发者许可证。 许可证是基于席位的，因此您可以将席位从开发人员转移到另一个开发人员。", + "Pricing_Page_Hint3": "您可以使用您的许可证开发无限数量的不同产品。", + "Pricing_Page_Hint4": "ABP Suite 是帮助您开发以提高生产力的工具。 它支持生成 CRUD 页面和创建新项目。", + "Pricing_Page_Hint5": "您可以在应用程序中使用所有预构建的模块。", + "Pricing_Page_Hint6": "您可以在应用程序中使用所有预构建的主题。", + "Pricing_Page_Hint7": "启动模板是一种 Visual Studio 解决方案，可让您快速启动项目。 所有基本模块都为您添加和预配置。", + "Pricing_Page_Hint8": "掌握 ABP 框架电子书解释了如何使用最佳实践实施 .NET 解决方案。它在 Amazon.com 上出售，您可以在许可证范围内免费下载该书。", + "Pricing_Page_Hint9": "您可以下载任何模块的源代码。 您可能希望将源代码添加到您的解决方案中以进行彻底的更改，或者出于安全原因将其自己保留。", + "Pricing_Page_Hint10": "许可证是终身的。 这意味着您可以永远继续开发您的应用程序。 在许可期限内（1 年，除非您续订）授予访问最新版本并获得支持。", + "Pricing_Page_Hint11": "部署没有限制！ 您可以根据需要部署到任意数量的服务器，包括云服务或本地。", + "Pricing_Page_Hint12": "您可以在有效许可期内将模块、主题和工具更新到最新版本。 在您的许可证到期后，您需要对其进行续订，以继续获取错误修复、新功能和增强功能的更新。", + "Pricing_Page_Hint13": "您可以获得一年的高级支持（您可以续订许可证以延长它）。", + "Pricing_Page_Hint14": "团队和营业许可有事件/问题计数限制。 如果您购买额外的开发者许可，您的事件限制会按开发人员增加 {0}（对于团队许可）或 {1}（对于商业许可）每个开发者增加。", + "Pricing_Page_Hint15": "只有企业许可证包括私人支持。 您可以直接向 ABP 团队发送电子邮件或在 support.abp.io 上使用私人门票选项提问。 私人门票对公众不可见。", + "Pricing_Page_Hint16": "您可以下载所有 ABP 主题的源代码。 您可能希望将源代码添加到您的解决方案中以进行彻底的更改，或者出于安全原因将其自己保留。", + "Pricing_Page_Testimonial_1": "ABP Commercial 允许 SC Ventures 在 9 个月内交付银行级多租户silo数据库 SaaS 平台，以支持来自多个集成锚点的大额发票的应收账款/应付账款供应链融资。 ABP 的模块化使团队能够在创纪录的时间内交付，通过所有 VAPT，并通过完整的 CI/CD 和管道将容器化的微服务码部署到生产中。", + "Pricing_Page_Testimonial_2": "我们看到了使用 ABP Commercial 能减少定制开发项目开销的价值。 并且团队能够在不同的项目流中统一代码模式。 我们在框架中看到了能比以前更快地构建新功能的更多潜力。 我们相信我们将会持续地看到使用 ABP Commercial 的价值。", + "Pricing_Page_Testimonial_3": "我们大爱 ABP。 我们不必从头开始编写所有内容。 我们从\"开箱即用\"的功能开始，只需关注我们真正需要编写的内容。 此外，ABP 架构良好，代码质量高，错误少。 如果我们需要自己来编写所需的一切，我们可能需要花费数年时间。 另一点让我们喜欢的是新版本、问题修复或改进每隔一周很快地就会出现。 我们不会等太久。", + "Pricing_Page_Testimonial_4": "ABP 商业版 是一款很值得推荐的出色产品。 是在一个可配置的平台上为我们的客户推向市场的商业产品。 其框架和工具为任何团队提供的快速启动值得每一分钱。 ABP 商业版 最适合我们的需求。", + "AbpBookDownloadArea_ClaimYourEBook": "领取您的掌握ABP框架电子书", + "AddMemberModal_Warning_1": "如果您尝试添加的用户名在系统中不存在，请让您的团队成员在 {0} 并与您分享他/她帐户的用户名。", + "MyOrganizations_Detail_WelcomeMessage": "欢迎加入您的组织，{0}", + "MyOrganizations_Detail_OrganizationManagement": "组织管理", + "OrganizationDisplayName": "组织显示名称", + "MyOrganizations_Detail_EditDisplayName": "编辑显示名称", + "MyOrganizations_Detail_UpgradeYourLicense": "升级您的许可证", + "MyOrganizations_Detail_LicenseStartAndExpiryDate": "许可证开始日期 - 到期日期", + "MyOrganizations_Detail_OwnerRightInfo": "您正在使用您的 {1} 所有者权利中的 {0}。", + "MyOrganizations_Detail_CopyApiKey": "复制密钥", + "MyOrganizations_Detail_ApiKeyDescription": "API 密钥是托管在 {1} 上的 PRO 包的令牌。 ", + "MyOrganizations_Detail_YourPrivateNugetSource": "您的私有 NuGet 源是 {0}", + "MyOrganizations_Detail_PrivateNugetSourceWarning": "这将自动添加一个源到您的 ABP 解决方案中的 NuGet.Config。 不要与未经授权的用户共享您的私钥！", + "MyOrganizations_Detail_DeveloperSeatInfo": "您正在使用您的 {1} 个开发者席位中的 {0} 个。", + "NeedMoreSeatsForYourTeam": "您的团队需要更多席位吗？", + "MyOrganizations_Detail_PricePerYear": "{0} / 每年", + "MyOrganizations_Detail_PurchaseDeveloperSeats": "购买开发者席位", + "Invoices": "发票", + "RequestInvoice": "索取发票", + "OrderNumber": "订单号", + "Date": "日期", + "Products": "产品", + "TotalPrice": "总价格", + "ThereIsNoInvoice": "没有发票", + "MyOrganizations_Detail_PaymentProviderInfo": "如果您通过 {0} 网关购买了许可证，PDF 发票会被发送到您的电子邮件地址，请参阅 { 0} 发票。", + "MyOrganizations_Detail_PayUInfo": "如果您是通过PayU网关购买的，请点击\"索取发票\"按钮并填写账单信息。", + "MyOrganizations_Detail_ConclusionInfo": "您的发票申请将在 {0} 个工作日内完成。", + "ExtendYourLicense": "延长您的 {0} 许可", + "Continue": "继续", + "PurchaseLicense": "购买许可证", + "DownloadInvoiceModal_DownloadInvoice": "下载发票", + "DownloadInvoiceModal_SaveInformationOnlyOnce": "您只能保存一次账单信息。", + "InvoiceModal_EnterCompanyName": "请输入您的法定公司名称...", + "InvoiceModal_EnterCompanyAddress": "请输入您的法定公司地址...", + "InvoiceModal_EnterTaxNumber": "请输入您的税号/增值税号（如果有）...", + "RequestInvoiceModal_EnterNotes": "请输入您的有关发票的额外信息...", + "PrePayment_PayWithIyzico": "您将使用 Iyzico 付款", + "ContinueToCheckout": "继续结帐", + "PrePayment_IyzicoRedirectionInfo": "您将被重定向到 Iyzico 支付网关以安全地完成您的购买。", + "PrePayment_IyzicoAcceptVisaAndMasterCard": "Iyzico 接受 Visa 和 MasterCard。", + "Purchase": "购买", + "AcceptTermsAndConditions": "我已阅读、理解并接受隐私政策， 条款和条件和 EULA。", + "AcceptTermsAndConditionsWarningMessage": "请接受隐私政策和条款和条件", + "SelectGatewayToContinue": "请选择一个网关以继续！", + "GatewaySelection_SelectGateway": "选择支付网关", + "GatewaySelection_RedirectionMessage": "接下来，您将被重定向到所选支付网关的交易网站。", + "PaymentSucceed_PaymentSuccessMessage": "支付成功", + "PaymentSucceed_ThanksForPurchase": "感谢您的购买！", + "PaymentSucceed_CreateYourOrganization": "创建您的组织", + "PaymentSucceed_AddMeAsDeveloper": "我是开发人员，请将我作为开发人员添加到我的组织中。", + "PaymentSucceed_CreateOrganization": "创建组织", + "PaymentSucceed_OrganizationDescription": "一个组织由开发人员和所有者组成。 开发人员是在 ABP 项目上编写代码的用户，将受益于 {1} 网站。 所有者是分配开发者席位和管理许可的用户。", + "PaymentSucceed_ViewOrganization": "点击这里查看组织", + "Purchase_TotalAnnualPrice": "总计 （年费）", + "Purchase_TrainingPrice": "培训价格", + "Purchase_OnboardingTraining": "ABP 熟悉使用和 Web 应用程序开发现场培训", + "TotalDeveloperPrice": "开发商总价", + "Purchase_PricePerDeveloper": "{0} {1} 每个开发者", + "Purchase_IncludedDeveloperInfo": "{0} {1} 包括在内。", + "Purchase_LicenseExtraDeveloperPurchaseMessage": "{0} 许可 包含 {1} 个开发者。 您可以现在或以后添加其他开发人员。", + "StartupTemplates_Page_Title": "启动模板", + "StartupTemplates_Page_Description": "ABP 商业版 允许您构建任何复杂程度的解决方案。 它提供了两种主要的预构建启动解决方案。 您可以选择最接近您要求的解决方案，并在此基础上构建您自己的定制解决方案。", + "MicroserviceStartupSolutionForDotnet": ".NET 微服务启动解决方案", + "MonolithSolutionForDotnet": ".NET 的单体（模块化）解决方案", + "TrainingDetailsHeaderInfo_TrainingHour": "{0} 小时", + "Trainings_Content": "培训内容", + "Trial_Page_StartYourFreeTrial": "开始您的免费试用", + "Contact_Page_Title": "联系 ABP 开发团队", + "Contact_Page_Description": "如果您需要任何帮助或分享您的想法和意见，请与 ABP 开发团队联系！ ABP 支持团队随时准备提供帮助。", + "Demo_Page_Title": "创建演示", + "Demo_Page_Description": "创建免费演示以查看使用 ABP 商业版 启动模板创建的示例应用程序。 不要重复自己的常见应用程序要求。", + "Discounted_Page_Title": "折扣价", + "Discounted_Page_Description": "现在就选择您的业务及需要的特性和功能。 购买 ABP 商业许可证并创建无限量项目", + "Faq_Page_Title": "常见问题 (FAQ)", + "Faq_Page_Description": "您有任何问题吗？ 搜索常见问题或使用联系表向我们提问。", + "Faq_Page_SwiftCode": "SWIFT代码", + "Faq_Page_BankName": "银行名称", + "Faq_Page_AccountName": "账户名称", + "Faq_Page_AccountNumber": "账号", + "Faq_Page_Currency": "货币", + "Faq_Page_VatNumber": "增值税号", + "Faq_Page_OtherCurrenciesInfo": "对于其他货币，请参阅所有账户", + "ModuleDetail_Page_Title": "模块详细信息 - {0}", + "ProjectCreatedSuccess_Page_Title": "您的项目已创建", + "ProjectCreatedSuccess_Page_Description": "您的 ABP 项目创建成功！", + "Suite_Page_Title": "ABP 套件 - 创建 CRUD 页面", + "Suite_Page_Description": "ABP Commercial 提供快速应用程序开发工具以提高开发人员的工作效率。 ABP 套件 允许您轻松创建 CRUD 页面。", + "Themes_Page_Title": "现代和实用的 UI 主题", + "Themes_Page_Description": "ABP 商业版 提供多种专业、现代的 UI 主题。 创建免费演示以快速查看 UI 的外观。", + "Tools_Page_Title": "快速应用程序开发工具", + "Tools_Page_Description": "ABP 商业版 提供快速应用程序开发工具以提高开发人员的工作效率。 ABP 套件 允许您轻松创建 CRUD 页面。", + "DeveloperPrice": "开发者价格", + "AdditionalDeveloperPaymentInfoSection_AdditionalDevelopers": "{0} 开发者", + "LicenseRemainingDays": " {0} 天", + "ExtendPaymentInfoSection_Description": "通过延长/续订您的许可，您将继续获得高级支持。 您还将能够获得模块和主题的重大更新。 您将能够继续创建新项目。 您仍然可以使用 ABP 套件 来加速您的开发。", + "LicenseRenewalPrice": "许可证续订价格", + "LicensePrice": "许可证价格", + "TrialLicensePaymentInfoSection_Description": "购买许可证：通过购买许可证，您将继续获得高级支持。 您还将能够获得模块和主题的重大更新。 您将能够继续创建新项目。 而且您仍然可以使用 ABP 套件 加速您的开发。
    请参阅 许可证比较表来查看许可证类型之间的差异。", + "SelectTargetLicense": "选择目标许可证", + "UpgradePaymentInfoSection_ExtendMyLicenseForOneYear": "是的，将我的许可证到期日期延长 1 年。", + "UpgradePaymentInfoSection_WantToExtendLicense": "您想将许可证再延长 {0} 年吗？", + "UpgradePaymentInfoSection_UpgradingWillNotExtendLicense": "升级不会延长您的许可证到期日期！", + "UpgradePaymentInfoSection_LicenseUpgradeDescription": "通过升级您的许可证，您将升级到更高的许可证类型，这将使您获得额外的好处。 请参阅许可证比较表以查看许可证类型之间的差异。", + "Landing_Page_CustomerStories": "客户故事", + "Landing_Page_OurGreatCustomers": "我们的大客户", + "Landing_Page_WebApplicationFramework": "网络应用框架", + "Landing_Page_WebDevelopmentPlatform": "网页开发平台", + "Landing_Page_CompleteWebDevelopmentPlatform": "完整的网页开发平台", + "Landing_Page_TryFreeDemo": "试用免费演示", + "Landing_Page_StartingPointForWebApplications": "基于 ASP.NET Core 的 Web 应用程序的起点！ 它是基于最佳 Web 开发的 ABP 框架。", + "Landing_Page_AbpProvidesSoftwareInfrastructure": "ABP 框架提供了一个软件基础架构来开发基于最佳实践的优秀 Web 应用程序。", + "Landing_Page_MicroserviceCompatibleArchitecture": "微服务兼容架构", + "Landing_Page_PreBuiltApplicationModulesAndThemes": "预建的应用程序模块和主题", + "Landing_Page_MultiTenantArchitecture": "多租户架构", + "Landing_Page_MultiTenancyDescription": "SaaS 应用程序变得简单！ 从数据库到 UI 的集成多租户。", + "Landing_Page_DDDIntroduction": "基于 DDD 模式和原则设计和开发。 为您的应用程序提供分层模型。", + "Landing_Page_CrossCuttingConcernsInfo": "用于授权、验证、异常处理、缓存、审计日志记录、事务管理等的完整基础架构。", + "Landing_Page_PreBuiltApplicationModules": "预建应用程序模块，其中包括最常见的 Web 应用程序要求。", + "Landing_Page_ChatModule": "聊天", + "Landing_Page_DocsModule": "文档", + "Landing_Page_FileManagementModule": "文档", + "Landing_Page_CustomerStory_1": "ABP 商业版 允许 SC Ventures 在 9 个月内交付银行级多租户silo数据库 SaaS 平台，以支持来自多个集成锚点的大额发票的应收账款/应付账款供应链融资。 ABP 的模块化使团队能够在创纪录的时间内交付，通过所有 VAPT，并通过完整的 CI/CD 和管道将容器化的微服务码部署到生产中。", + "Landing_Page_CustomerStory_2": "我们看到了使用 ABP 商业版 来减少定制开发项目开销的价值。 并且团队能够在不同的项目流中统一代码模式。 我们在框架中看到了比以前更快地构建新功能的更多潜力。 我们相信我们将不断看到使用 ABP 商业版 的价值。", + "Landing_Page_CustomerStory_3": "我们很爱 ABP。 我们不必从头开始编写所有内容。 我们从\"开箱即用\"的功能开始，只关注我们真正需要编写的内容。 此外，ABP 架构良好，代码质量高，错误少。 如果我们必须自己编写所需的一切，我们可能需要花费数年时间。 另一件事是我们喜欢的是新版本、问题修复或改进每隔一周就很快会出现\n。 我们不会等太久。", + "Landing_Page_CustomerStory_4": "ABP 商业版 是一款值得推荐的出色产品。 在一个可配置的平台上为我们的客户推向市场的商业产品。 为任何团队提供的框架和工具的快速启动都值得每一分钱。 ABP 商业版 最适合我们的需求。", + "Landing_Page_AdditionalServices": "定制或批量许可、熟悉使用培训、网上培训和支持、定制项目开发、移植现有项目等等...", + "Landing_Page_IncludedDeveloperLicenses": "包含 {0} 开发者许可", + "Landing_Page_SeeOnDemo": "见演示", + "Landing_Page_LeptonThemes": "Lepton主题", + "Landing_Page_AccountModuleDescription_1": "该模块实现了应用程序的认证系统；", + "Landing_Page_AccountModuleDescription_2": "提供带有用户名和密码的登录页面", + "Landing_Page_AccountModuleDescription_3": "提供一个注册页面来创建一个新账户。", + "Landing_Page_AccountModuleDescription_4": "提供忘记密码页面，以电子邮件形式发送密码重置链接。", + "Landing_Page_AccountModuleDescription_5": "通过 UI 提供电子邮件确认功能。", + "Landing_Page_AccountModuleDescription_6": "实现双重身份验证（短信和电子邮件）。", + "Landing_Page_AccountModuleDescription_7": "实现用户锁定（当在一定时间间隔内由于无效凭据发生一定次数的登录失败时，将账户锁定设定的时间）。", + "Landing_Page_AccountModuleDescription_8": "实现 身份验证 身份验证服务器 UI 和功能。", + "Landing_Page_AccountModuleDescription_9": "允许在多租户环境中在租户之间切换。", + "Landing_Page_AccountModuleDescription_10": "允许更改应用程序的UI 语言。", + "Landing_Page_AuditLoggingModuleDescription_1": "此模块为审计基础设施提供审计日志报告 UI。 允许搜索、过滤和显示审计日志条目和实体更改日志。", + "Landing_Page_AuditLoggingModuleDescription_2": "审核日志条目包含有关每个客户端请求的关键数据：", + "Landing_Page_AuditLoggingModuleDescription_3": "URL、浏览器、IP 地址、客户端名称", + "Landing_Page_AuditLoggingModuleDescription_4": "用户", + "Landing_Page_AuditLoggingModuleDescription_5": "HTTP方法，HTTP返回状态码", + "Landing_Page_AuditLoggingModuleDescription_6": "成功/失败，异常详细信息（如果有）", + "Landing_Page_AuditLoggingModuleDescription_7": "请求执行时长", + "Landing_Page_AuditLoggingModuleDescription_8": "此请求中已创建、删除或更新实体（具有更改的属性）。", + "Landing_Page_BloggingModuleDescription_1": "该模块将一个简单的博客添加到您的 ABP 应用程序；", + "Landing_Page_BloggingModuleDescription_2": "允许在单个应用程序中创建多个博客。", + "Landing_Page_BloggingModuleDescription_3": "支持 Markdown 格式。", + "Landing_Page_BloggingModuleDescription_4": "允许为帖子写评论。", + "Landing_Page_BloggingModuleDescription_5": "允许为博客文章分配标签。", + "Landing_Page_BloggingModuleDescription_6": "请参阅 blog.abp.io 网站作为博客模块的实时示例。", + "Landing_Page_ChatModuleDescription_1": "该模块用于应用程序中用户之间的实时消息传递。", + "Landing_Page_ChatModuleDescription_2": "聊天页面上的实时消息。", + "Landing_Page_ChatModuleDescription_3": "在应用程序中搜索用户以获取新对话。", + "Landing_Page_ChatModuleDescription_4": "最近对话的联系人列表。", + "Landing_Page_ChatModuleDescription_5": "当用户正在查看另一个页面时的新消息通知。", + "Landing_Page_ChatModuleDescription_6": "菜单图标上的未读消息总数徽章。", + "Landing_Page_ChatModuleDescription_7": "每个对话的未读消息计数。", + "Landing_Page_ChatModuleDescription_8": "延迟加载的对话。", + "Landing_Page_DocsModuleDescription_1": "该模块用于创建技术文档网站；", + "Landing_Page_DocsModuleDescription_2": "内置 GitHub 集成：直接在 GitHub 上编写和管理文档。", + "Landing_Page_DocsModuleDescription_3": "版本控制支持直接集成到 GitHub 版本。", + "Landing_Page_DocsModuleDescription_4": "支持多语言（回退支持默认语言）。", + "Landing_Page_DocsModuleDescription_5": "支持 Markdown 和 HTML 格式。", + "Landing_Page_DocsModuleDescription_6": "提供导航和大纲部分。", + "Landing_Page_DocsModuleDescription_7": "允许在单个应用程序中托管多个项目文档。", + "Landing_Page_DocsModuleDescription_8": "GitHub 上文件的链接，因此任何人都可以通过单击编辑链接轻松贡献。", + "Landing_Page_DocsModuleDescription_9": "除了 GitHub 源之外，还允许简单地使用文件夹作为文档源。", + "Landing_Page_FileManagementModuleDescription_1": "在分层文件夹结构中上传、下载和组织文件。", + "Landing_Page_FileManagementModuleDescription_2": "该模块用于上传、下载和组织分层文件夹结构中的文件。 它还兼容多租户，您可以确定租户的总大小限制。", + "Landing_Page_FileManagementModuleDescription_3": "本模块基于BLOB Storing系统，因此可以使用不同的存储供应商存储文件内容。", + "Landing_Page_IdentityModuleDescription_1": "该模块实现了应用程序的用户和角色系统；", + "Landing_Page_IdentityModuleDescription_2": "基于 Microsoft 的 ASP.NET Core Identity 库构建。", + "Landing_Page_IdentityModuleDescription_3": "管理系统中的角色和用户。 一个用户可以拥有多个角色。", + "Landing_Page_IdentityModuleDescription_4": "在角色和用户级别设置权限。", + "Landing_Page_IdentityModuleDescription_5": "为每个用户启用/禁用双重身份验证和用户锁定。", + "Landing_Page_IdentityModuleDescription_6": "管理基本的用户个人资料和密码。", + "Landing_Page_IdentityModuleDescription_7": "管理系统中的声明类型，为角色和用户设置声明。，", + "Landing_Page_IdentityModuleDescription_8": "设置页面以管理密码复杂性、用户登录、账户和锁定。", + "Landing_Page_IdentityModuleDescription_9": "支持 LDAP 身份验证。", + "Landing_Page_IdentityModuleDescription_10": "提供电子邮件和电话号码验证。", + "Landing_Page_IdentityModuleDescription_11": "支持社交登录集成（Twitter、Facebook、GitHub 等）。", + "Landing_Page_IdentityModuleDescription_12": "管理系统中的组织单位。", + "Landing_Page_PaymentModuleDescription_1": "为不同的支付网关提供集成。", + "Landing_Page_PaymentModuleDescription_2": "该模块提供支付网关的集成，因此您可以轻松地从客户那里获得付款。", + "Landing_Page_PaymentModuleDescription_3": "该模块支持以下支付网关", + "Welcome_Page_UseSameCredentialForCommercialWebsites": "commercial.abp.io 和 support.abp.io使用相同的凭据。" } -} +} \ No newline at end of file From 75bcd9cbf54e6a3f76434e397900ed5e551f7f04 Mon Sep 17 00:00:00 2001 From: muhammedaltug Date: Wed, 29 Jun 2022 12:32:39 +0300 Subject: [PATCH 041/110] add angular version to ng add command --- .../Volo/Abp/Cli/ProjectModification/AngularPwaSupportAdder.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularPwaSupportAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularPwaSupportAdder.cs index 891ac28ecb..86880aaacf 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularPwaSupportAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularPwaSupportAdder.cs @@ -30,6 +30,6 @@ public class AngularPwaSupportAdder : ITransientDependency { var directory = Path.GetDirectoryName(filePath).EnsureEndsWith(Path.DirectorySeparatorChar); - CmdHelper.RunCmd("ng add @angular/pwa --skip-confirmation", workingDirectory: directory); + CmdHelper.RunCmd("ng add @angular/pwa@13 --skip-confirmation", workingDirectory: directory); } } From bc688e537f986e9faa46b22066612d3c63323ed5 Mon Sep 17 00:00:00 2001 From: maliming Date: Wed, 29 Jun 2022 18:24:18 +0800 Subject: [PATCH 042/110] Forward Identity authentication for `Bearer`. --- .../MyProjectNameModule.cs | 7 +++++++ .../MyProjectNameModule.cs | 9 ++++++++- .../MyProjectNameModule.cs | 7 +++++++ .../MyProjectNameModule.cs | 7 +++++++ .../MyProjectNameModule.cs | 9 ++++++++- .../MyProjectNameModule.cs | 7 +++++++ .../MyProjectNameBlazorModule.cs | 7 +++++++ .../MyProjectNameHttpApiHostModule.cs | 7 +++++++ .../MyProjectNameAuthServerModule.cs | 4 ++++ .../MyProjectNameBlazorHostModule.cs | 3 +++ 10 files changed, 65 insertions(+), 2 deletions(-) diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyProjectNameModule.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyProjectNameModule.cs index 0e5d86e4c7..f234a8b833 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyProjectNameModule.cs +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyProjectNameModule.cs @@ -6,6 +6,7 @@ using Microsoft.OpenApi.Models; using MyCompanyName.MyProjectName.Data; using MyCompanyName.MyProjectName.Localization; using MyCompanyName.MyProjectName.Menus; +using OpenIddict.Validation.AspNetCore; using Volo.Abp; using Volo.Abp.Account; using Volo.Abp.Account.Web; @@ -139,6 +140,7 @@ public class MyProjectNameModule : AbpModule context.Services.Replace(ServiceDescriptor.Singleton()); } + ConfigureAuthentication(context); ConfigureUrls(configuration); ConfigureBundles(); ConfigureAutoMapper(context); @@ -152,6 +154,11 @@ public class MyProjectNameModule : AbpModule ConfigureMongoDB(context); } + private void ConfigureAuthentication(ServiceConfigurationContext context) + { + context.Services.ForwardIdentityAuthenticationForBearer(OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme); + } + private void ConfigureUrls(IConfiguration configuration) { Configure(options => diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameModule.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameModule.cs index b9d407572b..3f46aea839 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameModule.cs +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameModule.cs @@ -6,6 +6,7 @@ using Microsoft.OpenApi.Models; using MyCompanyName.MyProjectName.Data; using MyCompanyName.MyProjectName.Localization; using MyCompanyName.MyProjectName.Menus; +using OpenIddict.Validation.AspNetCore; using Volo.Abp; using Volo.Abp.Account; using Volo.Abp.Account.Web; @@ -63,7 +64,7 @@ namespace MyCompanyName.MyProjectName; typeof(AbpAspNetCoreSerilogModule), typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule), typeof(AbpAspNetCoreComponentsServerLeptonXLiteThemeModule), - + // Account module packages typeof(AbpAccountApplicationModule), typeof(AbpAccountHttpApiModule), @@ -140,6 +141,7 @@ public class MyProjectNameModule : AbpModule context.Services.Replace(ServiceDescriptor.Singleton()); } + ConfigureAuthentication(context); ConfigureUrls(configuration); ConfigureBundles(); ConfigureAutoMapper(context); @@ -153,6 +155,11 @@ public class MyProjectNameModule : AbpModule ConfigureEfCore(context); } + private void ConfigureAuthentication(ServiceConfigurationContext context) + { + context.Services.ForwardIdentityAuthenticationForBearer(OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme); + } + private void ConfigureUrls(IConfiguration configuration) { Configure(options => diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyProjectNameModule.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyProjectNameModule.cs index b9e6fe7590..45e5006b8a 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyProjectNameModule.cs +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyProjectNameModule.cs @@ -5,6 +5,7 @@ using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.OpenApi.Models; using MyCompanyName.MyProjectName.Data; using MyCompanyName.MyProjectName.Localization; +using OpenIddict.Validation.AspNetCore; using Volo.Abp; using Volo.Abp.Account; using Volo.Abp.Account.Web; @@ -127,6 +128,7 @@ public class MyProjectNameModule : AbpModule context.Services.Replace(ServiceDescriptor.Singleton()); } + ConfigureAuthentication(context); ConfigureBundles(); ConfigureMultiTenancy(); ConfigureUrls(configuration); @@ -140,6 +142,11 @@ public class MyProjectNameModule : AbpModule ConfigureMongoDB(context); } + private void ConfigureAuthentication(ServiceConfigurationContext context) + { + context.Services.ForwardIdentityAuthenticationForBearer(OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme); + } + private void ConfigureBundles() { Configure(options => diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyProjectNameModule.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyProjectNameModule.cs index 043d86a923..74e564c94b 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyProjectNameModule.cs +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyProjectNameModule.cs @@ -5,6 +5,7 @@ using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.OpenApi.Models; using MyCompanyName.MyProjectName.Data; using MyCompanyName.MyProjectName.Localization; +using OpenIddict.Validation.AspNetCore; using Volo.Abp; using Volo.Abp.Account; using Volo.Abp.Account.Web; @@ -129,6 +130,7 @@ public class MyProjectNameModule : AbpModule context.Services.Replace(ServiceDescriptor.Singleton()); } + ConfigureAuthentication(context); ConfigureBundles(); ConfigureMultiTenancy(); ConfigureUrls(configuration); @@ -142,6 +144,11 @@ public class MyProjectNameModule : AbpModule ConfigureEfCore(context); } + private void ConfigureAuthentication(ServiceConfigurationContext context) + { + context.Services.ForwardIdentityAuthenticationForBearer(OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme); + } + private void ConfigureBundles() { Configure(options => diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyProjectNameModule.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyProjectNameModule.cs index 5344e574bf..f097d8d434 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyProjectNameModule.cs +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyProjectNameModule.cs @@ -4,6 +4,7 @@ using Microsoft.OpenApi.Models; using MyCompanyName.MyProjectName.Data; using MyCompanyName.MyProjectName.Localization; using MyCompanyName.MyProjectName.Menus; +using OpenIddict.Validation.AspNetCore; using Volo.Abp; using Volo.Abp.Account; using Volo.Abp.Account.Web; @@ -57,7 +58,7 @@ namespace MyCompanyName.MyProjectName; typeof(AbpSwashbuckleModule), typeof(AbpAspNetCoreSerilogModule), typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule), - + // Account module packages typeof(AbpAccountApplicationModule), typeof(AbpAccountHttpApiModule), @@ -133,6 +134,7 @@ public class MyProjectNameModule : AbpModule context.Services.Replace(ServiceDescriptor.Singleton()); } + ConfigureAuthentication(context); ConfigureMultiTenancy(); ConfigureUrls(configuration); ConfigureBundles(); @@ -145,6 +147,11 @@ public class MyProjectNameModule : AbpModule ConfigureMongoDB(context); } + private void ConfigureAuthentication(ServiceConfigurationContext context) + { + context.Services.ForwardIdentityAuthenticationForBearer(OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme); + } + private void ConfigureMultiTenancy() { Configure(options => diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyProjectNameModule.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyProjectNameModule.cs index 7fede74c7a..ba26323705 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyProjectNameModule.cs +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyProjectNameModule.cs @@ -4,6 +4,7 @@ using Microsoft.OpenApi.Models; using MyCompanyName.MyProjectName.Data; using MyCompanyName.MyProjectName.Localization; using MyCompanyName.MyProjectName.Menus; +using OpenIddict.Validation.AspNetCore; using Volo.Abp; using Volo.Abp.Account; using Volo.Abp.Account.Web; @@ -134,6 +135,7 @@ public class MyProjectNameModule : AbpModule context.Services.Replace(ServiceDescriptor.Singleton()); } + ConfigureAuthentication(context); ConfigureMultiTenancy(); ConfigureUrls(configuration); ConfigureBundles(); @@ -146,6 +148,11 @@ public class MyProjectNameModule : AbpModule ConfigureEfCore(context); } + private void ConfigureAuthentication(ServiceConfigurationContext context) + { + context.Services.ForwardIdentityAuthenticationForBearer(OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme); + } + private void ConfigureMultiTenancy() { Configure(options => diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorModule.cs index 2e251e86e9..e919342fe9 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorModule.cs @@ -12,6 +12,7 @@ using MyCompanyName.MyProjectName.Blazor.Server.Menus; using MyCompanyName.MyProjectName.EntityFrameworkCore; using MyCompanyName.MyProjectName.Localization; using MyCompanyName.MyProjectName.MultiTenancy; +using OpenIddict.Validation.AspNetCore; using Volo.Abp; using Volo.Abp.Account.Web; using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme; @@ -88,6 +89,7 @@ public class MyProjectNameBlazorModule : AbpModule var hostingEnvironment = context.Services.GetHostingEnvironment(); var configuration = context.Services.GetConfiguration(); + ConfigureAuthentication(context); ConfigureUrls(configuration); ConfigureBundles(); ConfigureAutoMapper(); @@ -100,6 +102,11 @@ public class MyProjectNameBlazorModule : AbpModule ConfigureMenu(context); } + private void ConfigureAuthentication(ServiceConfigurationContext context) + { + context.Services.ForwardIdentityAuthenticationForBearer(OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme); + } + private void ConfigureUrls(IConfiguration configuration) { Configure(options => diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs index a981a370a8..49ee9d6b03 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs @@ -13,6 +13,7 @@ using MyCompanyName.MyProjectName.MultiTenancy; using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite; using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling; using Microsoft.OpenApi.Models; +using OpenIddict.Validation.AspNetCore; using Volo.Abp; using Volo.Abp.Account; using Volo.Abp.Account.Web; @@ -61,6 +62,7 @@ public class MyProjectNameHttpApiHostModule : AbpModule var configuration = context.Services.GetConfiguration(); var hostingEnvironment = context.Services.GetHostingEnvironment(); + ConfigureAuthentication(context); ConfigureBundles(); ConfigureUrls(configuration); ConfigureConventionalControllers(); @@ -70,6 +72,11 @@ public class MyProjectNameHttpApiHostModule : AbpModule ConfigureSwaggerServices(context, configuration); } + private void ConfigureAuthentication(ServiceConfigurationContext context) + { + context.Services.ForwardIdentityAuthenticationForBearer(OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme); + } + private void ConfigureBundles() { Configure(options => diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/MyProjectNameAuthServerModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/MyProjectNameAuthServerModule.cs index 9fca370381..8d5967e361 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/MyProjectNameAuthServerModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/MyProjectNameAuthServerModule.cs @@ -4,12 +4,14 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Cors; using Microsoft.AspNetCore.DataProtection; +using Microsoft.AspNetCore.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Hosting; using MyCompanyName.MyProjectName.MultiTenancy; using StackExchange.Redis; using Microsoft.OpenApi.Models; +using OpenIddict.Validation.AspNetCore; using Volo.Abp; using Volo.Abp.Account; using Volo.Abp.Account.Web; @@ -100,6 +102,8 @@ public class MyProjectNameAuthServerModule : AbpModule var hostingEnvironment = context.Services.GetHostingEnvironment(); var configuration = context.Services.GetConfiguration(); + context.Services.ForwardIdentityAuthenticationForBearer(OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme); + Configure(options => { options.UseSqlServer(); diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyProjectNameBlazorHostModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyProjectNameBlazorHostModule.cs index 1c4acef254..46bb89e1b8 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyProjectNameBlazorHostModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyProjectNameBlazorHostModule.cs @@ -13,6 +13,7 @@ using MyCompanyName.MyProjectName.Blazor.Server.Host.Menus; using MyCompanyName.MyProjectName.EntityFrameworkCore; using MyCompanyName.MyProjectName.Localization; using MyCompanyName.MyProjectName.MultiTenancy; +using OpenIddict.Validation.AspNetCore; using Volo.Abp; using Volo.Abp.Account; using Volo.Abp.Account.Web; @@ -113,6 +114,8 @@ public class MyProjectNameBlazorHostModule : AbpModule var hostingEnvironment = context.Services.GetHostingEnvironment(); var configuration = context.Services.GetConfiguration(); + context.Services.ForwardIdentityAuthenticationForBearer(OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme); + Configure(options => { options.UseSqlServer(); From 6e20185a67b4f7ac41e9724dea7d868d92855848 Mon Sep 17 00:00:00 2001 From: malik masis Date: Wed, 29 Jun 2022 14:14:27 +0300 Subject: [PATCH 043/110] Removed contentWidgets --- .../Pages/CmsKit/Contents/AddWidgetModal.cshtml.cs | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml.cs index 8b38b79f3b..6614c40d27 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; @@ -26,13 +25,8 @@ public class AddWidgetModal : AbpPageModel public async Task OnGetAsync() { - ViewModel = new ContentViewModel(); - - var widgets = await ContentAdminAppService.GetWidgetsAsync(); - ViewModel.ContentWidgets = widgets.Items.ToArray(); - Widgets = new List() { new("", "") }; - Widgets.AddRange(widgets + Widgets.AddRange((await ContentAdminAppService.GetWidgetsAsync()) .Items .Select(w => new SelectListItem(w.Key, w.Key)) .ToList()); @@ -42,8 +36,5 @@ public class AddWidgetModal : AbpPageModel { [SelectItems(nameof(Widgets))] public string Widget { get; set; } - - public ContentWidgetDto[] ContentWidgets { get; set; } = Array.Empty(); - } } From 1d2dc38ff88a4aa93ee1fdc4347a44748b4ecbb8 Mon Sep 17 00:00:00 2001 From: malik masis Date: Wed, 29 Jun 2022 14:16:12 +0300 Subject: [PATCH 044/110] Adding widget even editor is empty --- .../Pages/CmsKit/Contents/addWidgetModal.js | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js index 711c940db9..c57dd4f2aa 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js @@ -32,16 +32,32 @@ $(function () { values.push($(this).val()); } }); - //TODO review here - var contentEditorText = $("#ContentEditor")[0].innerText.split("\n")[2]; + + var contentEditorText = $("#ContentEditor")[0].innerText + .replace('WritePreview', '') + .replace('MarkdownWYSIWYG', '') + .replace('AW', ''); var updatedText = "[Widget Type=\"" + widgetType + "\" "; for (var i = 0; i < keys.length; i++) { updatedText += keys[i] + "=\"" + values[i] + "\" "; } + updatedText += "]"; - $('.ProseMirror div').contents()[0].data = contentEditorText + updatedText; + + if (contentEditorText == '\n\n\n') { + //TODO fails event + var fixedData = "
    " + updatedText + "
    "; + var innerHtml = $("#ContentEditor")[0].innerHTML; + var replacedInnerHtml = innerHtml.replace('

    ', fixedData); + $("#ContentEditor")[0].innerHTML = replacedInnerHtml; + } + else { + + $('.ProseMirror div').contents()[0].data = contentEditorText + updatedText; + } + $('#addWidgetModal').modal('hide'); }); From 0b162335a8237043cf4b7895fa2fa72c7559c297 Mon Sep 17 00:00:00 2001 From: malik masis Date: Wed, 29 Jun 2022 15:07:49 +0300 Subject: [PATCH 045/110] Added validation once widget is empty --- .../Pages/CmsKit/Contents/addWidgetModal.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js index c57dd4f2aa..8785add3b7 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js @@ -11,7 +11,6 @@ $(function () { $("#PropertySideId").html(''); volo.cmsKit.admin.contents.contentAdmin.getWidgets().then(function (data) { var widgetTypes = data.items.filter(v => v.key === widgetType); - //TODO null check var firstWidgetType = widgetTypes[0]; for (const property of firstWidgetType.properties) { let html = "
    " + @@ -38,13 +37,17 @@ $(function () { .replace('MarkdownWYSIWYG', '') .replace('AW', ''); - var updatedText = "[Widget Type=\"" + widgetType + "\" "; + let updatedText = ''; + if (widgetType != undefined) { - for (var i = 0; i < keys.length; i++) { - updatedText += keys[i] + "=\"" + values[i] + "\" "; - } + updatedText = "[Widget Type=\"" + widgetType + "\" "; + + for (var i = 0; i < keys.length; i++) { + updatedText += keys[i] + "=\"" + values[i] + "\" "; + } - updatedText += "]"; + updatedText += "]"; + } if (contentEditorText == '\n\n\n') { //TODO fails event @@ -54,11 +57,9 @@ $(function () { $("#ContentEditor")[0].innerHTML = replacedInnerHtml; } else { - $('.ProseMirror div').contents()[0].data = contentEditorText + updatedText; } - $('#addWidgetModal').modal('hide'); }); }; From f2ea8335bdb96dfc020c219a94edf6125f4ad0be Mon Sep 17 00:00:00 2001 From: malik masis Date: Wed, 29 Jun 2022 15:08:04 +0300 Subject: [PATCH 046/110] Added language --- .../Pages/CmsKit/Contents/AddWidgetModal.cshtml | 10 ++++++++-- .../Volo/CmsKit/Localization/Resources/en.json | 5 ++++- .../Volo/CmsKit/Localization/Resources/tr.json | 5 ++++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml index 6c50455781..2b402c9353 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml @@ -17,14 +17,20 @@ - +
    + @if(Model.Widgets.Count() > 1){
    - + + } + else + { +

    @L["PleaseConfigureWidgets"].Value

    + }
    diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json index 6926fdb771..b98319f51b 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json @@ -181,6 +181,9 @@ "HasBlogPostWaitingForReviewMessage": "You have a blog post waiting for review. Click to list.", "SelectAStatus": "Select a status", "Status": "Status", - "CmsKit.BlogPost.ScrollIndex": "Quick navigation bar in blog posts" + "CmsKit.BlogPost.ScrollIndex": "Quick navigation bar in blog posts", + "Add": "Add", + "AddWidget": "Add Widget", + "PleaseConfigureWidgets": "Please configure widgets" } } \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json index b49f1f8326..431c50596c 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json @@ -187,6 +187,9 @@ "InThisDocument": "Bu belgede", "RemoveCoverImageConfirmationMessage": "Kapak resmini kaldırmak istediğinize emin misiniz?", "RemoveCoverImage": "Kapak resmini kaldır", - "CmsKit.BlogPost.ScrollIndex": "Blog yazılarında hızlı gezinme çubuğu" + "CmsKit.BlogPost.ScrollIndex": "Blog yazılarında hızlı gezinme çubuğu", + "Add": "Ekle", + "AddWidget": "Widget Ekle", + "PleaseConfigureWidgets": "Lütfen widget'leri yapılandırın" } } From 98849328f0bb93774b03ef82d2cdd99120a6ac96 Mon Sep 17 00:00:00 2001 From: icagatay Date: Wed, 29 Jun 2022 15:14:59 +0300 Subject: [PATCH 047/110] fix DefaultFromAddress localization fix DefaultFromDisplayName localization --- .../Localization/Resources/AbpSettingManagement/tr.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/tr.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/tr.json index 57397659f1..925825e3cc 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/tr.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/tr.json @@ -23,8 +23,8 @@ "SmtpDomain": "Domain", "SmtpEnableSsl": "Ssl'i aktif et", "SmtpUseDefaultCredentials": "Varsayılan yetkilendirmeleri kullan", - "DefaultFromAddress": "Varsayılan gönderici görünen isim", - "DefaultFromDisplayName": "Varsayılan gönderici email adresi", + "DefaultFromAddress": "Varsayılan gönderici email adresi", + "DefaultFromDisplayName": "Varsayılan gönderici görünen isim", "Feature:SettingManagementGroup": "Ayar yönetimi", "Feature:SettingManagementEnable": "Ayar yönetimini etkinleştir", "Feature:SettingManagementEnableDescription": "Uygulamada ayar yönetim sistemini etkinleştirin.", From 0bd830e5635a24e706c26de09a5330d9a85960bd Mon Sep 17 00:00:00 2001 From: Engincan VESKE Date: Wed, 29 Jun 2022 15:15:31 +0300 Subject: [PATCH 048/110] Docs: Fix concurrency exception --- .../Volo/Docs/Documents/DocumentAppService.cs | 3 +-- .../Volo/Docs/Documents/IDocumentRepository.cs | 1 + .../Volo/Docs/Documents/EFCoreDocumentRepository.cs | 4 ++-- .../Volo/Docs/Documents/MongoDocumentRepository.cs | 5 ++--- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/DocumentAppService.cs b/modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/DocumentAppService.cs index 570c8590b0..228648f2fb 100644 --- a/modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/DocumentAppService.cs +++ b/modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/DocumentAppService.cs @@ -404,8 +404,7 @@ namespace Volo.Docs.Documents var sourceDocument = await source.GetDocumentAsync(project, documentName, languageCode, version, oldDocument?.LastSignificantUpdateTime); - await _documentRepository.DeleteAsync(project.Id, sourceDocument.Name, sourceDocument.LanguageCode, - sourceDocument.Version); + await _documentRepository.DeleteAsync(project.Id, sourceDocument.Name, sourceDocument.LanguageCode, sourceDocument.Version, autoSave: true); await _documentRepository.InsertAsync(sourceDocument, true); Logger.LogInformation($"Document retrieved: {documentName}"); diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/IDocumentRepository.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/IDocumentRepository.cs index 6b911c6e36..740d6921b3 100644 --- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/IDocumentRepository.cs +++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/IDocumentRepository.cs @@ -23,6 +23,7 @@ namespace Volo.Docs.Documents string name, string languageCode, string version, + bool autoSave = false, CancellationToken cancellationToken = default); Task> GetListAsync( diff --git a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Documents/EFCoreDocumentRepository.cs b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Documents/EFCoreDocumentRepository.cs index d1d78cc24a..7656975f16 100644 --- a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Documents/EFCoreDocumentRepository.cs +++ b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Documents/EFCoreDocumentRepository.cs @@ -141,11 +141,11 @@ namespace Volo.Docs.Documents GetCancellationToken(cancellationToken)); } - public async Task DeleteAsync(Guid projectId, string name, string languageCode, string version, CancellationToken cancellationToken = default) + public async Task DeleteAsync(Guid projectId, string name, string languageCode, string version, bool autoSave = false, CancellationToken cancellationToken = default) { await DeleteAsync(x => x.ProjectId == projectId && x.Name == name && x.LanguageCode == languageCode && - x.Version == version, cancellationToken: cancellationToken); + x.Version == version, autoSave, cancellationToken: cancellationToken); } public async Task GetAsync(Guid id, CancellationToken cancellationToken = default) diff --git a/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/Documents/MongoDocumentRepository.cs b/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/Documents/MongoDocumentRepository.cs index c812947388..0086624d43 100644 --- a/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/Documents/MongoDocumentRepository.cs +++ b/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/Documents/MongoDocumentRepository.cs @@ -49,12 +49,11 @@ namespace Volo.Docs.Documents x.Version == version, GetCancellationToken(cancellationToken)); } - public async Task DeleteAsync(Guid projectId, string name, string languageCode, string version, - CancellationToken cancellationToken = default) + public async Task DeleteAsync(Guid projectId, string name, string languageCode, string version, bool autoSave = false, CancellationToken cancellationToken = default) { await DeleteAsync(x => x.ProjectId == projectId && x.Name == name && x.LanguageCode == languageCode && - x.Version == version, cancellationToken: cancellationToken); + x.Version == version, autoSave, cancellationToken: cancellationToken); } public async Task> GetListAsync(Guid? projectId, string version, string name, CancellationToken cancellationToken = default) From 99a793a5a8c0f28fa0bb94b6a3575b8400da8139 Mon Sep 17 00:00:00 2001 From: Volosoft Agent <43883821+voloagent@users.noreply.github.com> Date: Wed, 29 Jun 2022 16:25:31 +0300 Subject: [PATCH 049/110] Update_NPM_Packages --- .../package.json | 2 +- .../yarn.lock | 224 +++++------ .../package.json | 4 +- .../yarn.lock | 260 ++++++------ .../app/Volo.BloggingTestApp/package.json | 4 +- .../app/Volo.BloggingTestApp/yarn.lock | 298 +++++++------- .../Volo.ClientSimulation.Demo/package.json | 2 +- .../demo/Volo.ClientSimulation.Demo/yarn.lock | 238 +++++------ modules/cms-kit/angular/package.json | 10 +- .../angular/projects/cms-kit/package.json | 4 +- .../Volo.CmsKit.IdentityServer/package.json | 2 +- .../host/Volo.CmsKit.IdentityServer/yarn.lock | 238 +++++------ .../host/Volo.CmsKit.Web.Host/package.json | 2 +- .../host/Volo.CmsKit.Web.Host/yarn.lock | 238 +++++------ .../host/Volo.CmsKit.Web.Unified/package.json | 4 +- .../host/Volo.CmsKit.Web.Unified/yarn.lock | 372 +++++++++--------- modules/docs/app/VoloDocs.Web/package.json | 4 +- modules/docs/app/VoloDocs.Web/yarn.lock | 298 +++++++------- .../package.json | 2 +- .../yarn.lock | 238 +++++------ .../package.json | 4 +- .../yarn.lock | 272 ++++++------- npm/lerna.json | 2 +- npm/ng-packs/lerna.version.json | 2 +- npm/ng-packs/package.json | 24 +- .../packages/account-core/package.json | 6 +- npm/ng-packs/packages/account/package.json | 6 +- npm/ng-packs/packages/components/package.json | 6 +- npm/ng-packs/packages/core/package.json | 4 +- .../packages/feature-management/package.json | 4 +- npm/ng-packs/packages/identity/package.json | 6 +- .../permission-management/package.json | 4 +- npm/ng-packs/packages/schematics/package.json | 2 +- .../packages/setting-management/package.json | 6 +- .../packages/tenant-management/package.json | 6 +- .../packages/theme-basic/package.json | 6 +- .../packages/theme-shared/package.json | 4 +- npm/packs/anchor-js/package.json | 4 +- .../package.json | 4 +- .../package.json | 6 +- .../package.json | 4 +- .../package.json | 30 +- npm/packs/aspnetcore.mvc.ui/package-lock.json | 2 +- npm/packs/aspnetcore.mvc.ui/package.json | 2 +- npm/packs/blogging/package.json | 10 +- npm/packs/bootstrap-datepicker/package.json | 2 +- npm/packs/bootstrap/package.json | 4 +- npm/packs/chart.js/package.json | 2 +- npm/packs/clipboard/package.json | 4 +- npm/packs/cms-kit.admin/package.json | 12 +- npm/packs/cms-kit.public/package.json | 6 +- npm/packs/cms-kit/package.json | 6 +- npm/packs/codemirror/package.json | 4 +- npm/packs/core/package.json | 4 +- npm/packs/cropperjs/package.json | 4 +- npm/packs/datatables.net-bs4/package.json | 4 +- npm/packs/datatables.net-bs5/package.json | 4 +- npm/packs/datatables.net/package.json | 4 +- npm/packs/docs/package.json | 12 +- npm/packs/flag-icon-css/package.json | 2 +- npm/packs/font-awesome/package.json | 4 +- npm/packs/highlight.js/package.json | 4 +- npm/packs/jquery-form/package.json | 4 +- .../package.json | 4 +- npm/packs/jquery-validation/package.json | 4 +- npm/packs/jquery/package.json | 4 +- npm/packs/jstree/package.json | 4 +- npm/packs/lodash/package.json | 4 +- npm/packs/luxon/package.json | 4 +- .../package.json | 4 +- npm/packs/markdown-it/package.json | 4 +- npm/packs/owl.carousel/package.json | 4 +- npm/packs/popper.js/package.json | 4 +- npm/packs/prismjs/package.json | 6 +- npm/packs/select2/package.json | 4 +- npm/packs/signalr/package.json | 4 +- npm/packs/slugify/package.json | 2 +- npm/packs/star-rating-svg/package.json | 4 +- npm/packs/sweetalert2/package.json | 4 +- npm/packs/timeago/package.json | 4 +- npm/packs/toastr/package.json | 4 +- npm/packs/tui-editor/package.json | 6 +- npm/packs/uppy/package.json | 4 +- npm/packs/utils/package.json | 2 +- npm/packs/vee-validate/package.json | 4 +- npm/packs/virtual-file-explorer/package.json | 6 +- npm/packs/vue/package.json | 2 +- templates/app-nolayers/angular/package.json | 18 +- .../package.json | 4 +- .../package.json | 4 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- templates/app/angular/package.json | 18 +- .../package.json | 4 +- .../package.json | 4 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- templates/module/angular/package.json | 18 +- .../projects/my-project-name/package.json | 4 +- .../package.json | 4 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- 107 files changed, 1576 insertions(+), 1576 deletions(-) diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json index 76201505bd..644d8b3ff1 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json @@ -3,7 +3,7 @@ "name": "asp.net", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.shared": "^5.3.0", + "@abp/aspnetcore.mvc.ui.theme.shared": "^5.3.1", "highlight.js": "^9.13.1" }, "devDependencies": {} diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock index 47b4380f81..26ed449e8d 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock @@ -2,30 +2,30 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.shared@^5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.0.tgz#84e94845a247815ce981cda2d195944a350530b9" - integrity sha512-RwXxlncjidvh8Hgw91Hz1f5rnfG9hlNROr5bD/kxTUB47vIh/TIBd06UYrYw2/lqFLw5d6wd8q7VLuDjGUQbpg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.0" - "@abp/bootstrap" "~5.3.0" - "@abp/bootstrap-datepicker" "~5.3.0" - "@abp/datatables.net-bs5" "~5.3.0" - "@abp/font-awesome" "~5.3.0" - "@abp/jquery-form" "~5.3.0" - "@abp/jquery-validation-unobtrusive" "~5.3.0" - "@abp/lodash" "~5.3.0" - "@abp/luxon" "~5.3.0" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.0" - "@abp/select2" "~5.3.0" - "@abp/sweetalert2" "~5.3.0" - "@abp/timeago" "~5.3.0" - "@abp/toastr" "~5.3.0" - -"@abp/aspnetcore.mvc.ui@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.0.tgz#e947fd1aecbd2aabc5db4c6a64b78f2690fcf0d4" - integrity sha512-en2YDb/hRG1MKkbli1PYcoeU9OLU0YPSahkIBSfOmMLntAe8y0c2+Xe09chXP4r+GoZu0zd9FM3qqCRZojrlug== +"@abp/aspnetcore.mvc.ui.theme.shared@^5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.1.tgz#7fe0aba80670bf4326251138dc7e12ea5830c919" + integrity sha512-ieS54bLQr4Aa96CnFEmuxe0ndeJpJMkq5eYSWAziH4i15jm7o+K2ouIL0K606lk1Sn/UrP8Yl+DRhxr4i4P8ow== + dependencies: + "@abp/aspnetcore.mvc.ui" "~5.3.1" + "@abp/bootstrap" "~5.3.1" + "@abp/bootstrap-datepicker" "~5.3.1" + "@abp/datatables.net-bs5" "~5.3.1" + "@abp/font-awesome" "~5.3.1" + "@abp/jquery-form" "~5.3.1" + "@abp/jquery-validation-unobtrusive" "~5.3.1" + "@abp/lodash" "~5.3.1" + "@abp/luxon" "~5.3.1" + "@abp/malihu-custom-scrollbar-plugin" "~5.3.1" + "@abp/select2" "~5.3.1" + "@abp/sweetalert2" "~5.3.1" + "@abp/timeago" "~5.3.1" + "@abp/toastr" "~5.3.1" + +"@abp/aspnetcore.mvc.ui@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.1.tgz#17ccf9a2a40cbd79e670a0cb5be74ac9eb17b963" + integrity sha512-UuXH0Lz7DqiGp47BC7xllT3Imf2Nk+eccOiVRwc9PAfHKnNOOJYxvDlHS0x8CM09qxM5EVaH7tfwOLSS09HXpg== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -34,144 +34,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.0.tgz#09c44954774d8f52ca8ff6699ad4dbb7cc0308c2" - integrity sha512-AQ26I0jgoCioW1/4XmQIyn1c1+CLv8KTb4Vd4ZbtdYGBkkkUe+JEAWpJSeXlJRr/XrOs0BKWp/fa7Nnwx8srLg== +"@abp/bootstrap-datepicker@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.1.tgz#241aebfbae0fa451d3e719776096b14bf77c08fa" + integrity sha512-gvP7SNEnPFYuLmIBp7QobveAGv8Rm/8JTmixCChQPPP9XX3u82ilKP2cgxVXm/4/jf0Gy7Gusn7urmTbTxeGEw== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.0.tgz#42dac2d2d6374f39d068a638687039c5c74df123" - integrity sha512-rg9mLcvT4JQRc1rIAhGYK1P2eMRJ1+GArQXV5l7k3FrVU+bRLKdoE6PNpuwXHpdlom4/dOgekfuWH/SAuY5kyw== +"@abp/bootstrap@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.1.tgz#f941afe2be2deaa1962a3626593451847dee5bd6" + integrity sha512-qPGeNFEaQF57b0viA0eHKA0cZ9b0gscOqE0o4ewHxnlRoRYiY3Ob9V6x6S85n2b7H6tDZOWAePXEgkV40yK/Bg== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" bootstrap "^5.1.3" -"@abp/core@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.0.tgz#032724dd0c0b850204896ce0275c7f9c8f516740" - integrity sha512-Uk9h98jiEF1dItWrvWnYB6s/UNZZapvFSyJ4+piAsZmXOSAbrObV+s19n5xfUagQQTWn4+aU5+aChEcfWpYv9A== +"@abp/core@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.1.tgz#26890ab049d43db58f3a0fba2f4c50bd2fbf7811" + integrity sha512-7PBPDYq/s0T5H0iYaeCzqWF44jbiOkFlwGnXqZeKHt2cKZaMyCStgotrpap8qoZKlxuyxudFIzJrzJIEP0AN/Q== dependencies: - "@abp/utils" "~5.3.0" + "@abp/utils" "~5.3.1" -"@abp/datatables.net-bs5@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.0.tgz#84771ce4eb7229bed347a5904c891b08e3230422" - integrity sha512-FpKrgrjaBKVgFAnbBsrvDIJJOy8gbWCEHm5Jy2vFWXmx25fITMw/2ckBDH87yrZtCNVTSUbMIdHYOIHMPfSavQ== +"@abp/datatables.net-bs5@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.1.tgz#e380cc253a837a0629baec9dabb4e8919878cc38" + integrity sha512-LpGPWLvFsLkQjo5RTgEl24LbBokgsO1gv7/pVy/1oiXXCLTuVwJ8vYYKfDNkrrSLDUOJ9cCC0YUE5SRfDUystA== dependencies: - "@abp/datatables.net" "~5.3.0" + "@abp/datatables.net" "~5.3.1" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.0.tgz#dd27ae451df9551f5b815e10c87a8a89c6a38293" - integrity sha512-d4lQ09G7HY2gEN1lRAteCZzY0Fv3gPuUM+icgWm+UkmDZV9lhvovTQ58Xkwayw8vf+NPlit1eGMMQedn6MbeAQ== +"@abp/datatables.net@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.1.tgz#8200b5a3a719f51d21670b1420e3df48af4de42e" + integrity sha512-v30gkk4dcmWz260C8BA7uaU4kqpiC1wkgMvdzjPGefzYXsMftlcoX7GUvByWwTzlJnTphGvnIVJhnhX73VVDHg== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" datatables.net "^1.11.4" -"@abp/font-awesome@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.0.tgz#ce1d5bb59bd597cc9717885917d4dd2eae1f8b9c" - integrity sha512-JX62EVfZSJ7pv75Gd3ya/3c3He0hXF7KmpTizUNd/EbeHuNJoCND5wwq5OAFV9Ld3vdcGJChNTydNa5RsBzrpg== +"@abp/font-awesome@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.1.tgz#2b4654b463b7858fc237219fd852ca0f41e4e062" + integrity sha512-LFKPjQgJmQ6GNqW3geluHMgV3WbisniAaK9tl6Pv8WOvPluvZGHTK5qjcAQVwM6Bj944VYeuvLo1ZCOoC/rWLg== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.0.tgz#5ae9906f0cffaf3e043681a5dd80a014b4860f6b" - integrity sha512-ZTpXCImHirJDZjfnJRtSEHLIbWMTYkqtTv7Z3GMRKnI4fllpmuco9EWLAKjAfYPyc/QpTx+MYnUg5SsXORhJyQ== +"@abp/jquery-form@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.1.tgz#e17367af8dafcfbb352775fb6ab9182d1fd9cd63" + integrity sha512-s8XItBHKJuehprFy7xePWHxt8jMvjDmkmk2nEuJXj+gcZyVEEa3hBd4ykKDXFfmNrfS8aMy+VqA+VEA24Cmpww== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.0.tgz#ccf90a7840398e69e0a91ed6c32b80fa2eb82d14" - integrity sha512-6B3ywnpvPxpnxkrcXzjTjMWgKRImbzNPOZvv5ant/kQv3zXedV1GXSIILy+imX39FuDPslOmEfx8plwrNvIteA== +"@abp/jquery-validation-unobtrusive@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.1.tgz#7c5c31df1cd021b3eed618d914926b76dc7e9e6e" + integrity sha512-B5USCmF56eWQO+R4eZtMjURtoNGUEuAuBy4ltCPtZx0s6yn94Ooq4oYKqEbfnLoSsQshajUwBtqtlC6+YA612Q== dependencies: - "@abp/jquery-validation" "~5.3.0" + "@abp/jquery-validation" "~5.3.1" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.0.tgz#a21696e7d5d54ef8bcdc0e8bd2debb1da1f7f5cc" - integrity sha512-4z2I9iORf+z5SlN9crC/Gx3X5GAOVePD+WN8SaHSYr4VWYNe8TV8LvCZPilN56sIPt3jYvy0N+bI1tAuZPu/NQ== +"@abp/jquery-validation@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.1.tgz#b34c0e29e12843de4a407bc8775a2e560e4db923" + integrity sha512-lu2e47GwWmh/ahWA5bbeR9Gqqsy4a3htTIvnwWbtu7dnHVHA6469+uCt+0f+sVthDIL+cMwoYgcygMLIUHoFxg== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.0.tgz#0279ee501ed774a788072c2ec8b003e348fec22c" - integrity sha512-rqYbU3LpsT7XT8ygn+TFVmjev5NlgEcDhGwQ8PraY1dEjlDbteeQ50N4adS8fdRfOM1UjGL19ueN3F8E5qNUSg== +"@abp/jquery@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.1.tgz#8f6032253d4c44b135c238a4efa010bee1ec5991" + integrity sha512-ngy9Kvy6lXrQBCxWi7t8I4Wudv87C2R50O/T4CZPfM2nwYLynopa+aI9r9VLhO/wIROyXX3C8UIpeLhQzm776w== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" jquery "~3.6.0" -"@abp/lodash@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.0.tgz#45f1dba7bb65b6599b4973d7e0c617dfd2c46c49" - integrity sha512-vQVMv58QuYttWBfLjJzIsw92JunGbWYsqk6pp6/JuoBls5UJtdP1F7vM4JgQxsscGYHFRZB3F4a3h1cxZ+dblQ== +"@abp/lodash@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.1.tgz#49c0806bae0858047faed75b6e9ed6207dc4cffc" + integrity sha512-QQshVHkNlunbhcmBG5E2wdZNcHYrTsNQjJNF6IZkeFszNRHu/k0u1bhszDwjPgEzeewTqMu8n44TzkbA8yP5GA== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" lodash "^4.17.21" -"@abp/luxon@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.0.tgz#8a6277046f6e38c3affbf79c06f8ac00d1ca8098" - integrity sha512-6tETR03i1NPJuDqSQWtpkOykdq/84awifQUqRyh+b8340wV7P54NqUMDXDit9sjITFDhq99V/R+Rj3PVjvJD3A== +"@abp/luxon@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.1.tgz#8d843023b05b157ff9ab23548c8d8c4e7101ae88" + integrity sha512-Jw8p5S9qHZkUrD1fx3nvpnBqn8Zb9jDiG6xdc6tY+v1aqDDwEqPUr7TqaLnY9GnZefiM3sYVwAh42nzPOwg9aQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.0.tgz#e6e12162aa50d3c3d98629378cec2f6fd5964338" - integrity sha512-GVwgAZQurH/tr4Hgmuby2dun//v1dT+wLGV4ZvjCJzBRs4FgrB+25pj4qKm20j6/NKRKc4V5re/b1y6njCubFQ== +"@abp/malihu-custom-scrollbar-plugin@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.1.tgz#7f0e4f2df325345a8e3be67456522cb035e3e962" + integrity sha512-ll49qD7bslt7+deMAFZ0DfveH/5ZsHyL2RLDg796ARz+H7fQpEhyNFeGETGj+HSOvAl3ivux2mxNCMYbXHR4RQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.0.tgz#aae202b87dc23dfc7c8fd933413a8dbeb2f5b683" - integrity sha512-0aIxdtzgONkrYnUN5ACkIIIhsC9e61QLRq3K+/98fjf7NkHOjG3Sptr8EKu5U3IQ2hNHgqBjPGYjkztGuxZ9kw== +"@abp/select2@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.1.tgz#9a49aa983d52eecbd2dc2160349d45bd46324e36" + integrity sha512-ne4LJJy9n3V8BPtyU6voX4Bo0/GUrZBnI4Mkb0wRKNt1rxj7PhPXebsYYz090QJuJh8fuF2OHteNMBA7gMryLQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" select2 "^4.0.13" -"@abp/sweetalert2@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.0.tgz#67379cfa4cb8884cb66b58f4cafa79960cf8426a" - integrity sha512-EBr8J7MDsYmSvOYxTbqsSmw6c2yLokHZe8A+EW2vsY9VYFXkoOJLVpCkCK4fhvHUv8/+Y5QnHW7bs1I6SKYXOw== +"@abp/sweetalert2@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.1.tgz#676a3269fe4511fc4f81c3231ed9a96fe4c8f006" + integrity sha512-UDQrJiq8OfIDy3GSq7NJ4TKKEihzp6Qc06KGRdnN74lm4JsxxGUToSaD1AbyrLt53jZlRZK2NNc8IiyqPvyfbQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.0.tgz#3aaef3edca333224ba6b3e81c8ad1ebaae51a2f4" - integrity sha512-FxtoPYxyk2CHeoloC6kaeCj5YtXH0rebhOEaCjrfyg9/Ec6LEkvpfC7RWlcsHaEUAtFXZegJDfOk066EPH7RHQ== +"@abp/timeago@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.1.tgz#069a4eb2725b0a183cb7609e1f48d8d857a606ba" + integrity sha512-+QWO9MTuf6X7sUXxoUGyoQ0EhoQUlRDdCPmwwcZyBzBf8q9A3hS+Rtmex3BqwRLDxL2vL78gbDpIBgPn/kFuUA== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" timeago "^1.6.7" -"@abp/toastr@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.0.tgz#8a002c19ea25ac6b042a25c0f9d289d03c93c2fb" - integrity sha512-gjb2O/XrYkX8IeCERIqlOYPh15WlF9LxGR6t9jeVF/p6BTX/yaWabYCFfB9SkU2pQ6xrGl7WmSTAC06JOAtPTA== +"@abp/toastr@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.1.tgz#4a18b293444f7f8a523b7255ea61fed838131f1c" + integrity sha512-gz5cl6sPu6b65h8VJ6ne+dkM0oVXSYBlDoKBYbDRjhH6i7yWUpcylY/lrOvWacNQBOagBy5bep1937aec1/BXQ== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" toastr "^2.1.4" -"@abp/utils@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.0.tgz#e93739074a3cd445a5a221209506b7e663050ca0" - integrity sha512-Nm+h+3PL10+rBFSh8UUuenmGM+OBlEoNQeGzHRmhOc6hJ3oqCogPzY+zkq0e4pksrwhjxAu/cgCEGLAoEXXycw== +"@abp/utils@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.1.tgz#ff238e3b70c6fffb1600d845c202961e1179c813" + integrity sha512-XVYrygoWq1ZHz4N7BSJ4P77wmd0geRhpyR5ztzyP1WaF2LaCRS63BjZ/a7xKdtioUby9GP5jSvMjBvwqVviYIQ== dependencies: just-compare "^1.3.0" diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json index 8b294fd2ef..8cb5c7cd0f 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json @@ -3,8 +3,8 @@ "name": "asp.net", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.0", - "@abp/prismjs": "^5.3.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.1", + "@abp/prismjs": "^5.3.1" }, "devDependencies": {} } diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock index c9f19af8be..0b948f67cf 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.0.tgz#dcdd73d8582c4d14438f70d765170398d5d582fb" - integrity sha512-H6UrafHRI1DHfIoi47gZWHKSanlyAkghtGgUO6GTmPqTubBXjl7Ky3owVUAXvFd49+72gwdCLA/DB0Khjc3Ayw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.0" - -"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.0.tgz#84e94845a247815ce981cda2d195944a350530b9" - integrity sha512-RwXxlncjidvh8Hgw91Hz1f5rnfG9hlNROr5bD/kxTUB47vIh/TIBd06UYrYw2/lqFLw5d6wd8q7VLuDjGUQbpg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.0" - "@abp/bootstrap" "~5.3.0" - "@abp/bootstrap-datepicker" "~5.3.0" - "@abp/datatables.net-bs5" "~5.3.0" - "@abp/font-awesome" "~5.3.0" - "@abp/jquery-form" "~5.3.0" - "@abp/jquery-validation-unobtrusive" "~5.3.0" - "@abp/lodash" "~5.3.0" - "@abp/luxon" "~5.3.0" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.0" - "@abp/select2" "~5.3.0" - "@abp/sweetalert2" "~5.3.0" - "@abp/timeago" "~5.3.0" - "@abp/toastr" "~5.3.0" - -"@abp/aspnetcore.mvc.ui@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.0.tgz#e947fd1aecbd2aabc5db4c6a64b78f2690fcf0d4" - integrity sha512-en2YDb/hRG1MKkbli1PYcoeU9OLU0YPSahkIBSfOmMLntAe8y0c2+Xe09chXP4r+GoZu0zd9FM3qqCRZojrlug== +"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.1.tgz#469befe88cd7d3362112db9a5ce7cf3eae328b3e" + integrity sha512-qvzNICtvrNVllo7c8khvKw4LQ6MxwWcJar8PyOhgS+Pgtn4lT5rQqzGvaYKMiDyj5gjWGzPOzjU/vgR1uiGYNg== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.1" + +"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.1.tgz#7fe0aba80670bf4326251138dc7e12ea5830c919" + integrity sha512-ieS54bLQr4Aa96CnFEmuxe0ndeJpJMkq5eYSWAziH4i15jm7o+K2ouIL0K606lk1Sn/UrP8Yl+DRhxr4i4P8ow== + dependencies: + "@abp/aspnetcore.mvc.ui" "~5.3.1" + "@abp/bootstrap" "~5.3.1" + "@abp/bootstrap-datepicker" "~5.3.1" + "@abp/datatables.net-bs5" "~5.3.1" + "@abp/font-awesome" "~5.3.1" + "@abp/jquery-form" "~5.3.1" + "@abp/jquery-validation-unobtrusive" "~5.3.1" + "@abp/lodash" "~5.3.1" + "@abp/luxon" "~5.3.1" + "@abp/malihu-custom-scrollbar-plugin" "~5.3.1" + "@abp/select2" "~5.3.1" + "@abp/sweetalert2" "~5.3.1" + "@abp/timeago" "~5.3.1" + "@abp/toastr" "~5.3.1" + +"@abp/aspnetcore.mvc.ui@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.1.tgz#17ccf9a2a40cbd79e670a0cb5be74ac9eb17b963" + integrity sha512-UuXH0Lz7DqiGp47BC7xllT3Imf2Nk+eccOiVRwc9PAfHKnNOOJYxvDlHS0x8CM09qxM5EVaH7tfwOLSS09HXpg== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,161 +41,161 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.0.tgz#09c44954774d8f52ca8ff6699ad4dbb7cc0308c2" - integrity sha512-AQ26I0jgoCioW1/4XmQIyn1c1+CLv8KTb4Vd4ZbtdYGBkkkUe+JEAWpJSeXlJRr/XrOs0BKWp/fa7Nnwx8srLg== +"@abp/bootstrap-datepicker@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.1.tgz#241aebfbae0fa451d3e719776096b14bf77c08fa" + integrity sha512-gvP7SNEnPFYuLmIBp7QobveAGv8Rm/8JTmixCChQPPP9XX3u82ilKP2cgxVXm/4/jf0Gy7Gusn7urmTbTxeGEw== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.0.tgz#42dac2d2d6374f39d068a638687039c5c74df123" - integrity sha512-rg9mLcvT4JQRc1rIAhGYK1P2eMRJ1+GArQXV5l7k3FrVU+bRLKdoE6PNpuwXHpdlom4/dOgekfuWH/SAuY5kyw== +"@abp/bootstrap@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.1.tgz#f941afe2be2deaa1962a3626593451847dee5bd6" + integrity sha512-qPGeNFEaQF57b0viA0eHKA0cZ9b0gscOqE0o4ewHxnlRoRYiY3Ob9V6x6S85n2b7H6tDZOWAePXEgkV40yK/Bg== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" bootstrap "^5.1.3" -"@abp/clipboard@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-5.3.0.tgz#579bbc786d32c4e07c969073872b936575df7a9c" - integrity sha512-J55jQnzPOOAwo70GK9hAB3JxG7rz75tex+17QSFjW7/dXVWt1bPIDRHh/a1wiLEgYc6btsSGhptLtkYAfWpq6w== +"@abp/clipboard@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-5.3.1.tgz#aede839bfba487461d31589092a3f2b0a75a2925" + integrity sha512-XKxxjjT2x7+a6vrw2x6G//ntQGmRcvBz8KcxCXuWJ8cCrHb1x7ZEzIUU4rF6ee7BlnLoEIZ/dCF+s/93yPs9ng== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" clipboard "^2.0.8" -"@abp/core@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.0.tgz#032724dd0c0b850204896ce0275c7f9c8f516740" - integrity sha512-Uk9h98jiEF1dItWrvWnYB6s/UNZZapvFSyJ4+piAsZmXOSAbrObV+s19n5xfUagQQTWn4+aU5+aChEcfWpYv9A== +"@abp/core@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.1.tgz#26890ab049d43db58f3a0fba2f4c50bd2fbf7811" + integrity sha512-7PBPDYq/s0T5H0iYaeCzqWF44jbiOkFlwGnXqZeKHt2cKZaMyCStgotrpap8qoZKlxuyxudFIzJrzJIEP0AN/Q== dependencies: - "@abp/utils" "~5.3.0" + "@abp/utils" "~5.3.1" -"@abp/datatables.net-bs5@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.0.tgz#84771ce4eb7229bed347a5904c891b08e3230422" - integrity sha512-FpKrgrjaBKVgFAnbBsrvDIJJOy8gbWCEHm5Jy2vFWXmx25fITMw/2ckBDH87yrZtCNVTSUbMIdHYOIHMPfSavQ== +"@abp/datatables.net-bs5@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.1.tgz#e380cc253a837a0629baec9dabb4e8919878cc38" + integrity sha512-LpGPWLvFsLkQjo5RTgEl24LbBokgsO1gv7/pVy/1oiXXCLTuVwJ8vYYKfDNkrrSLDUOJ9cCC0YUE5SRfDUystA== dependencies: - "@abp/datatables.net" "~5.3.0" + "@abp/datatables.net" "~5.3.1" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.0.tgz#dd27ae451df9551f5b815e10c87a8a89c6a38293" - integrity sha512-d4lQ09G7HY2gEN1lRAteCZzY0Fv3gPuUM+icgWm+UkmDZV9lhvovTQ58Xkwayw8vf+NPlit1eGMMQedn6MbeAQ== +"@abp/datatables.net@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.1.tgz#8200b5a3a719f51d21670b1420e3df48af4de42e" + integrity sha512-v30gkk4dcmWz260C8BA7uaU4kqpiC1wkgMvdzjPGefzYXsMftlcoX7GUvByWwTzlJnTphGvnIVJhnhX73VVDHg== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" datatables.net "^1.11.4" -"@abp/font-awesome@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.0.tgz#ce1d5bb59bd597cc9717885917d4dd2eae1f8b9c" - integrity sha512-JX62EVfZSJ7pv75Gd3ya/3c3He0hXF7KmpTizUNd/EbeHuNJoCND5wwq5OAFV9Ld3vdcGJChNTydNa5RsBzrpg== +"@abp/font-awesome@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.1.tgz#2b4654b463b7858fc237219fd852ca0f41e4e062" + integrity sha512-LFKPjQgJmQ6GNqW3geluHMgV3WbisniAaK9tl6Pv8WOvPluvZGHTK5qjcAQVwM6Bj944VYeuvLo1ZCOoC/rWLg== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.0.tgz#5ae9906f0cffaf3e043681a5dd80a014b4860f6b" - integrity sha512-ZTpXCImHirJDZjfnJRtSEHLIbWMTYkqtTv7Z3GMRKnI4fllpmuco9EWLAKjAfYPyc/QpTx+MYnUg5SsXORhJyQ== +"@abp/jquery-form@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.1.tgz#e17367af8dafcfbb352775fb6ab9182d1fd9cd63" + integrity sha512-s8XItBHKJuehprFy7xePWHxt8jMvjDmkmk2nEuJXj+gcZyVEEa3hBd4ykKDXFfmNrfS8aMy+VqA+VEA24Cmpww== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.0.tgz#ccf90a7840398e69e0a91ed6c32b80fa2eb82d14" - integrity sha512-6B3ywnpvPxpnxkrcXzjTjMWgKRImbzNPOZvv5ant/kQv3zXedV1GXSIILy+imX39FuDPslOmEfx8plwrNvIteA== +"@abp/jquery-validation-unobtrusive@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.1.tgz#7c5c31df1cd021b3eed618d914926b76dc7e9e6e" + integrity sha512-B5USCmF56eWQO+R4eZtMjURtoNGUEuAuBy4ltCPtZx0s6yn94Ooq4oYKqEbfnLoSsQshajUwBtqtlC6+YA612Q== dependencies: - "@abp/jquery-validation" "~5.3.0" + "@abp/jquery-validation" "~5.3.1" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.0.tgz#a21696e7d5d54ef8bcdc0e8bd2debb1da1f7f5cc" - integrity sha512-4z2I9iORf+z5SlN9crC/Gx3X5GAOVePD+WN8SaHSYr4VWYNe8TV8LvCZPilN56sIPt3jYvy0N+bI1tAuZPu/NQ== +"@abp/jquery-validation@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.1.tgz#b34c0e29e12843de4a407bc8775a2e560e4db923" + integrity sha512-lu2e47GwWmh/ahWA5bbeR9Gqqsy4a3htTIvnwWbtu7dnHVHA6469+uCt+0f+sVthDIL+cMwoYgcygMLIUHoFxg== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.0.tgz#0279ee501ed774a788072c2ec8b003e348fec22c" - integrity sha512-rqYbU3LpsT7XT8ygn+TFVmjev5NlgEcDhGwQ8PraY1dEjlDbteeQ50N4adS8fdRfOM1UjGL19ueN3F8E5qNUSg== +"@abp/jquery@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.1.tgz#8f6032253d4c44b135c238a4efa010bee1ec5991" + integrity sha512-ngy9Kvy6lXrQBCxWi7t8I4Wudv87C2R50O/T4CZPfM2nwYLynopa+aI9r9VLhO/wIROyXX3C8UIpeLhQzm776w== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" jquery "~3.6.0" -"@abp/lodash@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.0.tgz#45f1dba7bb65b6599b4973d7e0c617dfd2c46c49" - integrity sha512-vQVMv58QuYttWBfLjJzIsw92JunGbWYsqk6pp6/JuoBls5UJtdP1F7vM4JgQxsscGYHFRZB3F4a3h1cxZ+dblQ== +"@abp/lodash@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.1.tgz#49c0806bae0858047faed75b6e9ed6207dc4cffc" + integrity sha512-QQshVHkNlunbhcmBG5E2wdZNcHYrTsNQjJNF6IZkeFszNRHu/k0u1bhszDwjPgEzeewTqMu8n44TzkbA8yP5GA== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" lodash "^4.17.21" -"@abp/luxon@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.0.tgz#8a6277046f6e38c3affbf79c06f8ac00d1ca8098" - integrity sha512-6tETR03i1NPJuDqSQWtpkOykdq/84awifQUqRyh+b8340wV7P54NqUMDXDit9sjITFDhq99V/R+Rj3PVjvJD3A== +"@abp/luxon@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.1.tgz#8d843023b05b157ff9ab23548c8d8c4e7101ae88" + integrity sha512-Jw8p5S9qHZkUrD1fx3nvpnBqn8Zb9jDiG6xdc6tY+v1aqDDwEqPUr7TqaLnY9GnZefiM3sYVwAh42nzPOwg9aQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.0.tgz#e6e12162aa50d3c3d98629378cec2f6fd5964338" - integrity sha512-GVwgAZQurH/tr4Hgmuby2dun//v1dT+wLGV4ZvjCJzBRs4FgrB+25pj4qKm20j6/NKRKc4V5re/b1y6njCubFQ== +"@abp/malihu-custom-scrollbar-plugin@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.1.tgz#7f0e4f2df325345a8e3be67456522cb035e3e962" + integrity sha512-ll49qD7bslt7+deMAFZ0DfveH/5ZsHyL2RLDg796ARz+H7fQpEhyNFeGETGj+HSOvAl3ivux2mxNCMYbXHR4RQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/prismjs@^5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-5.3.0.tgz#658a371023d9a3de9ecfff1f10bae7a83064fac7" - integrity sha512-NPsYJ9oj/57vG+eVGpDkJcdPAx4WlXTVEUZWWxmaXuM9sHY1/2av975Qk8R5HG6fC74w3DrVCP8YQvU6jlaF1w== +"@abp/prismjs@^5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-5.3.1.tgz#46b7a7f456b60f3f0f3b92b0a645f30495db571b" + integrity sha512-21h2L4XTIKAuWqYCGKC/MrqledtWsToGLs8Tkk4ML9eQgnpOwGvWyD/5wywlA7zfKKaeOAC9/7Ga7+qckQoQvg== dependencies: - "@abp/clipboard" "~5.3.0" - "@abp/core" "~5.3.0" + "@abp/clipboard" "~5.3.1" + "@abp/core" "~5.3.1" prismjs "^1.26.0" -"@abp/select2@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.0.tgz#aae202b87dc23dfc7c8fd933413a8dbeb2f5b683" - integrity sha512-0aIxdtzgONkrYnUN5ACkIIIhsC9e61QLRq3K+/98fjf7NkHOjG3Sptr8EKu5U3IQ2hNHgqBjPGYjkztGuxZ9kw== +"@abp/select2@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.1.tgz#9a49aa983d52eecbd2dc2160349d45bd46324e36" + integrity sha512-ne4LJJy9n3V8BPtyU6voX4Bo0/GUrZBnI4Mkb0wRKNt1rxj7PhPXebsYYz090QJuJh8fuF2OHteNMBA7gMryLQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" select2 "^4.0.13" -"@abp/sweetalert2@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.0.tgz#67379cfa4cb8884cb66b58f4cafa79960cf8426a" - integrity sha512-EBr8J7MDsYmSvOYxTbqsSmw6c2yLokHZe8A+EW2vsY9VYFXkoOJLVpCkCK4fhvHUv8/+Y5QnHW7bs1I6SKYXOw== +"@abp/sweetalert2@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.1.tgz#676a3269fe4511fc4f81c3231ed9a96fe4c8f006" + integrity sha512-UDQrJiq8OfIDy3GSq7NJ4TKKEihzp6Qc06KGRdnN74lm4JsxxGUToSaD1AbyrLt53jZlRZK2NNc8IiyqPvyfbQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.0.tgz#3aaef3edca333224ba6b3e81c8ad1ebaae51a2f4" - integrity sha512-FxtoPYxyk2CHeoloC6kaeCj5YtXH0rebhOEaCjrfyg9/Ec6LEkvpfC7RWlcsHaEUAtFXZegJDfOk066EPH7RHQ== +"@abp/timeago@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.1.tgz#069a4eb2725b0a183cb7609e1f48d8d857a606ba" + integrity sha512-+QWO9MTuf6X7sUXxoUGyoQ0EhoQUlRDdCPmwwcZyBzBf8q9A3hS+Rtmex3BqwRLDxL2vL78gbDpIBgPn/kFuUA== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" timeago "^1.6.7" -"@abp/toastr@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.0.tgz#8a002c19ea25ac6b042a25c0f9d289d03c93c2fb" - integrity sha512-gjb2O/XrYkX8IeCERIqlOYPh15WlF9LxGR6t9jeVF/p6BTX/yaWabYCFfB9SkU2pQ6xrGl7WmSTAC06JOAtPTA== +"@abp/toastr@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.1.tgz#4a18b293444f7f8a523b7255ea61fed838131f1c" + integrity sha512-gz5cl6sPu6b65h8VJ6ne+dkM0oVXSYBlDoKBYbDRjhH6i7yWUpcylY/lrOvWacNQBOagBy5bep1937aec1/BXQ== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" toastr "^2.1.4" -"@abp/utils@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.0.tgz#e93739074a3cd445a5a221209506b7e663050ca0" - integrity sha512-Nm+h+3PL10+rBFSh8UUuenmGM+OBlEoNQeGzHRmhOc6hJ3oqCogPzY+zkq0e4pksrwhjxAu/cgCEGLAoEXXycw== +"@abp/utils@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.1.tgz#ff238e3b70c6fffb1600d845c202961e1179c813" + integrity sha512-XVYrygoWq1ZHz4N7BSJ4P77wmd0geRhpyR5ztzyP1WaF2LaCRS63BjZ/a7xKdtioUby9GP5jSvMjBvwqVviYIQ== dependencies: just-compare "^1.3.0" diff --git a/modules/blogging/app/Volo.BloggingTestApp/package.json b/modules/blogging/app/Volo.BloggingTestApp/package.json index 4b5eeb5694..fa85f91098 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/package.json +++ b/modules/blogging/app/Volo.BloggingTestApp/package.json @@ -3,7 +3,7 @@ "name": "volo.blogtestapp", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.0", - "@abp/blogging": "^5.3.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.1", + "@abp/blogging": "^5.3.1" } } diff --git a/modules/blogging/app/Volo.BloggingTestApp/yarn.lock b/modules/blogging/app/Volo.BloggingTestApp/yarn.lock index 193494fc04..db24607e4a 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/yarn.lock +++ b/modules/blogging/app/Volo.BloggingTestApp/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.0.tgz#dcdd73d8582c4d14438f70d765170398d5d582fb" - integrity sha512-H6UrafHRI1DHfIoi47gZWHKSanlyAkghtGgUO6GTmPqTubBXjl7Ky3owVUAXvFd49+72gwdCLA/DB0Khjc3Ayw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.0" - -"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.0.tgz#84e94845a247815ce981cda2d195944a350530b9" - integrity sha512-RwXxlncjidvh8Hgw91Hz1f5rnfG9hlNROr5bD/kxTUB47vIh/TIBd06UYrYw2/lqFLw5d6wd8q7VLuDjGUQbpg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.0" - "@abp/bootstrap" "~5.3.0" - "@abp/bootstrap-datepicker" "~5.3.0" - "@abp/datatables.net-bs5" "~5.3.0" - "@abp/font-awesome" "~5.3.0" - "@abp/jquery-form" "~5.3.0" - "@abp/jquery-validation-unobtrusive" "~5.3.0" - "@abp/lodash" "~5.3.0" - "@abp/luxon" "~5.3.0" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.0" - "@abp/select2" "~5.3.0" - "@abp/sweetalert2" "~5.3.0" - "@abp/timeago" "~5.3.0" - "@abp/toastr" "~5.3.0" - -"@abp/aspnetcore.mvc.ui@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.0.tgz#e947fd1aecbd2aabc5db4c6a64b78f2690fcf0d4" - integrity sha512-en2YDb/hRG1MKkbli1PYcoeU9OLU0YPSahkIBSfOmMLntAe8y0c2+Xe09chXP4r+GoZu0zd9FM3qqCRZojrlug== +"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.1.tgz#469befe88cd7d3362112db9a5ce7cf3eae328b3e" + integrity sha512-qvzNICtvrNVllo7c8khvKw4LQ6MxwWcJar8PyOhgS+Pgtn4lT5rQqzGvaYKMiDyj5gjWGzPOzjU/vgR1uiGYNg== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.1" + +"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.1.tgz#7fe0aba80670bf4326251138dc7e12ea5830c919" + integrity sha512-ieS54bLQr4Aa96CnFEmuxe0ndeJpJMkq5eYSWAziH4i15jm7o+K2ouIL0K606lk1Sn/UrP8Yl+DRhxr4i4P8ow== + dependencies: + "@abp/aspnetcore.mvc.ui" "~5.3.1" + "@abp/bootstrap" "~5.3.1" + "@abp/bootstrap-datepicker" "~5.3.1" + "@abp/datatables.net-bs5" "~5.3.1" + "@abp/font-awesome" "~5.3.1" + "@abp/jquery-form" "~5.3.1" + "@abp/jquery-validation-unobtrusive" "~5.3.1" + "@abp/lodash" "~5.3.1" + "@abp/luxon" "~5.3.1" + "@abp/malihu-custom-scrollbar-plugin" "~5.3.1" + "@abp/select2" "~5.3.1" + "@abp/sweetalert2" "~5.3.1" + "@abp/timeago" "~5.3.1" + "@abp/toastr" "~5.3.1" + +"@abp/aspnetcore.mvc.ui@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.1.tgz#17ccf9a2a40cbd79e670a0cb5be74ac9eb17b963" + integrity sha512-UuXH0Lz7DqiGp47BC7xllT3Imf2Nk+eccOiVRwc9PAfHKnNOOJYxvDlHS0x8CM09qxM5EVaH7tfwOLSS09HXpg== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,187 +41,187 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/blogging@^5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/blogging/-/blogging-5.3.0.tgz#ccc257d04e586e66e2350b3f3bdc77d55171b516" - integrity sha512-ZeMaprd1MXXebCX1ocyQO7n62tx3+ly0FFTbXRAL/aBRANWVZ+M3c6vPixwJZVyY8CfGHrN+chseD7Tnczw0zA== +"@abp/blogging@^5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/blogging/-/blogging-5.3.1.tgz#22be54c25afc809f836d6d8e250e4eed340a4ef9" + integrity sha512-0pAnCt3tunjZ7hlTp0Vi+xn8tH6s2K/lqPcEbi077OnkDxZC8qCltAREK2rje/86RHV/xPIs7rg/T5WJ18BD9w== dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.0" - "@abp/owl.carousel" "~5.3.0" - "@abp/prismjs" "~5.3.0" - "@abp/tui-editor" "~5.3.0" + "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.1" + "@abp/owl.carousel" "~5.3.1" + "@abp/prismjs" "~5.3.1" + "@abp/tui-editor" "~5.3.1" -"@abp/bootstrap-datepicker@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.0.tgz#09c44954774d8f52ca8ff6699ad4dbb7cc0308c2" - integrity sha512-AQ26I0jgoCioW1/4XmQIyn1c1+CLv8KTb4Vd4ZbtdYGBkkkUe+JEAWpJSeXlJRr/XrOs0BKWp/fa7Nnwx8srLg== +"@abp/bootstrap-datepicker@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.1.tgz#241aebfbae0fa451d3e719776096b14bf77c08fa" + integrity sha512-gvP7SNEnPFYuLmIBp7QobveAGv8Rm/8JTmixCChQPPP9XX3u82ilKP2cgxVXm/4/jf0Gy7Gusn7urmTbTxeGEw== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.0.tgz#42dac2d2d6374f39d068a638687039c5c74df123" - integrity sha512-rg9mLcvT4JQRc1rIAhGYK1P2eMRJ1+GArQXV5l7k3FrVU+bRLKdoE6PNpuwXHpdlom4/dOgekfuWH/SAuY5kyw== +"@abp/bootstrap@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.1.tgz#f941afe2be2deaa1962a3626593451847dee5bd6" + integrity sha512-qPGeNFEaQF57b0viA0eHKA0cZ9b0gscOqE0o4ewHxnlRoRYiY3Ob9V6x6S85n2b7H6tDZOWAePXEgkV40yK/Bg== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" bootstrap "^5.1.3" -"@abp/clipboard@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-5.3.0.tgz#579bbc786d32c4e07c969073872b936575df7a9c" - integrity sha512-J55jQnzPOOAwo70GK9hAB3JxG7rz75tex+17QSFjW7/dXVWt1bPIDRHh/a1wiLEgYc6btsSGhptLtkYAfWpq6w== +"@abp/clipboard@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-5.3.1.tgz#aede839bfba487461d31589092a3f2b0a75a2925" + integrity sha512-XKxxjjT2x7+a6vrw2x6G//ntQGmRcvBz8KcxCXuWJ8cCrHb1x7ZEzIUU4rF6ee7BlnLoEIZ/dCF+s/93yPs9ng== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" clipboard "^2.0.8" -"@abp/core@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.0.tgz#032724dd0c0b850204896ce0275c7f9c8f516740" - integrity sha512-Uk9h98jiEF1dItWrvWnYB6s/UNZZapvFSyJ4+piAsZmXOSAbrObV+s19n5xfUagQQTWn4+aU5+aChEcfWpYv9A== +"@abp/core@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.1.tgz#26890ab049d43db58f3a0fba2f4c50bd2fbf7811" + integrity sha512-7PBPDYq/s0T5H0iYaeCzqWF44jbiOkFlwGnXqZeKHt2cKZaMyCStgotrpap8qoZKlxuyxudFIzJrzJIEP0AN/Q== dependencies: - "@abp/utils" "~5.3.0" + "@abp/utils" "~5.3.1" -"@abp/datatables.net-bs5@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.0.tgz#84771ce4eb7229bed347a5904c891b08e3230422" - integrity sha512-FpKrgrjaBKVgFAnbBsrvDIJJOy8gbWCEHm5Jy2vFWXmx25fITMw/2ckBDH87yrZtCNVTSUbMIdHYOIHMPfSavQ== +"@abp/datatables.net-bs5@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.1.tgz#e380cc253a837a0629baec9dabb4e8919878cc38" + integrity sha512-LpGPWLvFsLkQjo5RTgEl24LbBokgsO1gv7/pVy/1oiXXCLTuVwJ8vYYKfDNkrrSLDUOJ9cCC0YUE5SRfDUystA== dependencies: - "@abp/datatables.net" "~5.3.0" + "@abp/datatables.net" "~5.3.1" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.0.tgz#dd27ae451df9551f5b815e10c87a8a89c6a38293" - integrity sha512-d4lQ09G7HY2gEN1lRAteCZzY0Fv3gPuUM+icgWm+UkmDZV9lhvovTQ58Xkwayw8vf+NPlit1eGMMQedn6MbeAQ== +"@abp/datatables.net@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.1.tgz#8200b5a3a719f51d21670b1420e3df48af4de42e" + integrity sha512-v30gkk4dcmWz260C8BA7uaU4kqpiC1wkgMvdzjPGefzYXsMftlcoX7GUvByWwTzlJnTphGvnIVJhnhX73VVDHg== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" datatables.net "^1.11.4" -"@abp/font-awesome@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.0.tgz#ce1d5bb59bd597cc9717885917d4dd2eae1f8b9c" - integrity sha512-JX62EVfZSJ7pv75Gd3ya/3c3He0hXF7KmpTizUNd/EbeHuNJoCND5wwq5OAFV9Ld3vdcGJChNTydNa5RsBzrpg== +"@abp/font-awesome@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.1.tgz#2b4654b463b7858fc237219fd852ca0f41e4e062" + integrity sha512-LFKPjQgJmQ6GNqW3geluHMgV3WbisniAaK9tl6Pv8WOvPluvZGHTK5qjcAQVwM6Bj944VYeuvLo1ZCOoC/rWLg== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.0.tgz#5ae9906f0cffaf3e043681a5dd80a014b4860f6b" - integrity sha512-ZTpXCImHirJDZjfnJRtSEHLIbWMTYkqtTv7Z3GMRKnI4fllpmuco9EWLAKjAfYPyc/QpTx+MYnUg5SsXORhJyQ== +"@abp/jquery-form@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.1.tgz#e17367af8dafcfbb352775fb6ab9182d1fd9cd63" + integrity sha512-s8XItBHKJuehprFy7xePWHxt8jMvjDmkmk2nEuJXj+gcZyVEEa3hBd4ykKDXFfmNrfS8aMy+VqA+VEA24Cmpww== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.0.tgz#ccf90a7840398e69e0a91ed6c32b80fa2eb82d14" - integrity sha512-6B3ywnpvPxpnxkrcXzjTjMWgKRImbzNPOZvv5ant/kQv3zXedV1GXSIILy+imX39FuDPslOmEfx8plwrNvIteA== +"@abp/jquery-validation-unobtrusive@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.1.tgz#7c5c31df1cd021b3eed618d914926b76dc7e9e6e" + integrity sha512-B5USCmF56eWQO+R4eZtMjURtoNGUEuAuBy4ltCPtZx0s6yn94Ooq4oYKqEbfnLoSsQshajUwBtqtlC6+YA612Q== dependencies: - "@abp/jquery-validation" "~5.3.0" + "@abp/jquery-validation" "~5.3.1" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.0.tgz#a21696e7d5d54ef8bcdc0e8bd2debb1da1f7f5cc" - integrity sha512-4z2I9iORf+z5SlN9crC/Gx3X5GAOVePD+WN8SaHSYr4VWYNe8TV8LvCZPilN56sIPt3jYvy0N+bI1tAuZPu/NQ== +"@abp/jquery-validation@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.1.tgz#b34c0e29e12843de4a407bc8775a2e560e4db923" + integrity sha512-lu2e47GwWmh/ahWA5bbeR9Gqqsy4a3htTIvnwWbtu7dnHVHA6469+uCt+0f+sVthDIL+cMwoYgcygMLIUHoFxg== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.0.tgz#0279ee501ed774a788072c2ec8b003e348fec22c" - integrity sha512-rqYbU3LpsT7XT8ygn+TFVmjev5NlgEcDhGwQ8PraY1dEjlDbteeQ50N4adS8fdRfOM1UjGL19ueN3F8E5qNUSg== +"@abp/jquery@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.1.tgz#8f6032253d4c44b135c238a4efa010bee1ec5991" + integrity sha512-ngy9Kvy6lXrQBCxWi7t8I4Wudv87C2R50O/T4CZPfM2nwYLynopa+aI9r9VLhO/wIROyXX3C8UIpeLhQzm776w== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" jquery "~3.6.0" -"@abp/lodash@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.0.tgz#45f1dba7bb65b6599b4973d7e0c617dfd2c46c49" - integrity sha512-vQVMv58QuYttWBfLjJzIsw92JunGbWYsqk6pp6/JuoBls5UJtdP1F7vM4JgQxsscGYHFRZB3F4a3h1cxZ+dblQ== +"@abp/lodash@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.1.tgz#49c0806bae0858047faed75b6e9ed6207dc4cffc" + integrity sha512-QQshVHkNlunbhcmBG5E2wdZNcHYrTsNQjJNF6IZkeFszNRHu/k0u1bhszDwjPgEzeewTqMu8n44TzkbA8yP5GA== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" lodash "^4.17.21" -"@abp/luxon@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.0.tgz#8a6277046f6e38c3affbf79c06f8ac00d1ca8098" - integrity sha512-6tETR03i1NPJuDqSQWtpkOykdq/84awifQUqRyh+b8340wV7P54NqUMDXDit9sjITFDhq99V/R+Rj3PVjvJD3A== +"@abp/luxon@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.1.tgz#8d843023b05b157ff9ab23548c8d8c4e7101ae88" + integrity sha512-Jw8p5S9qHZkUrD1fx3nvpnBqn8Zb9jDiG6xdc6tY+v1aqDDwEqPUr7TqaLnY9GnZefiM3sYVwAh42nzPOwg9aQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.0.tgz#e6e12162aa50d3c3d98629378cec2f6fd5964338" - integrity sha512-GVwgAZQurH/tr4Hgmuby2dun//v1dT+wLGV4ZvjCJzBRs4FgrB+25pj4qKm20j6/NKRKc4V5re/b1y6njCubFQ== +"@abp/malihu-custom-scrollbar-plugin@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.1.tgz#7f0e4f2df325345a8e3be67456522cb035e3e962" + integrity sha512-ll49qD7bslt7+deMAFZ0DfveH/5ZsHyL2RLDg796ARz+H7fQpEhyNFeGETGj+HSOvAl3ivux2mxNCMYbXHR4RQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/owl.carousel@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/owl.carousel/-/owl.carousel-5.3.0.tgz#65f4459fa25f3aadf7bbd11e7202dfc4bc50c943" - integrity sha512-ku7a6Yq46lXU3RMnYDPBb5fCYr2Il1U/iGv+rFLueJ2Y06gvLBOEYF+5VAK+nv6Q6nvUdtubOC5SX9Hn2VHtjQ== +"@abp/owl.carousel@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/owl.carousel/-/owl.carousel-5.3.1.tgz#5f004062d802a1efab6117eafcb5140055ef2a1a" + integrity sha512-vRw/75WGhLFgcBhQ4GCP/wdiFPhyKa25EDWhxxFbp3hCo7JSj5xlYdyfoCupfnwJUN7zTMpyj9oiQ2r81+c4Jg== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" owl.carousel "^2.3.4" -"@abp/prismjs@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-5.3.0.tgz#658a371023d9a3de9ecfff1f10bae7a83064fac7" - integrity sha512-NPsYJ9oj/57vG+eVGpDkJcdPAx4WlXTVEUZWWxmaXuM9sHY1/2av975Qk8R5HG6fC74w3DrVCP8YQvU6jlaF1w== +"@abp/prismjs@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-5.3.1.tgz#46b7a7f456b60f3f0f3b92b0a645f30495db571b" + integrity sha512-21h2L4XTIKAuWqYCGKC/MrqledtWsToGLs8Tkk4ML9eQgnpOwGvWyD/5wywlA7zfKKaeOAC9/7Ga7+qckQoQvg== dependencies: - "@abp/clipboard" "~5.3.0" - "@abp/core" "~5.3.0" + "@abp/clipboard" "~5.3.1" + "@abp/core" "~5.3.1" prismjs "^1.26.0" -"@abp/select2@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.0.tgz#aae202b87dc23dfc7c8fd933413a8dbeb2f5b683" - integrity sha512-0aIxdtzgONkrYnUN5ACkIIIhsC9e61QLRq3K+/98fjf7NkHOjG3Sptr8EKu5U3IQ2hNHgqBjPGYjkztGuxZ9kw== +"@abp/select2@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.1.tgz#9a49aa983d52eecbd2dc2160349d45bd46324e36" + integrity sha512-ne4LJJy9n3V8BPtyU6voX4Bo0/GUrZBnI4Mkb0wRKNt1rxj7PhPXebsYYz090QJuJh8fuF2OHteNMBA7gMryLQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" select2 "^4.0.13" -"@abp/sweetalert2@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.0.tgz#67379cfa4cb8884cb66b58f4cafa79960cf8426a" - integrity sha512-EBr8J7MDsYmSvOYxTbqsSmw6c2yLokHZe8A+EW2vsY9VYFXkoOJLVpCkCK4fhvHUv8/+Y5QnHW7bs1I6SKYXOw== +"@abp/sweetalert2@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.1.tgz#676a3269fe4511fc4f81c3231ed9a96fe4c8f006" + integrity sha512-UDQrJiq8OfIDy3GSq7NJ4TKKEihzp6Qc06KGRdnN74lm4JsxxGUToSaD1AbyrLt53jZlRZK2NNc8IiyqPvyfbQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.0.tgz#3aaef3edca333224ba6b3e81c8ad1ebaae51a2f4" - integrity sha512-FxtoPYxyk2CHeoloC6kaeCj5YtXH0rebhOEaCjrfyg9/Ec6LEkvpfC7RWlcsHaEUAtFXZegJDfOk066EPH7RHQ== +"@abp/timeago@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.1.tgz#069a4eb2725b0a183cb7609e1f48d8d857a606ba" + integrity sha512-+QWO9MTuf6X7sUXxoUGyoQ0EhoQUlRDdCPmwwcZyBzBf8q9A3hS+Rtmex3BqwRLDxL2vL78gbDpIBgPn/kFuUA== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" timeago "^1.6.7" -"@abp/toastr@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.0.tgz#8a002c19ea25ac6b042a25c0f9d289d03c93c2fb" - integrity sha512-gjb2O/XrYkX8IeCERIqlOYPh15WlF9LxGR6t9jeVF/p6BTX/yaWabYCFfB9SkU2pQ6xrGl7WmSTAC06JOAtPTA== +"@abp/toastr@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.1.tgz#4a18b293444f7f8a523b7255ea61fed838131f1c" + integrity sha512-gz5cl6sPu6b65h8VJ6ne+dkM0oVXSYBlDoKBYbDRjhH6i7yWUpcylY/lrOvWacNQBOagBy5bep1937aec1/BXQ== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" toastr "^2.1.4" -"@abp/tui-editor@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-5.3.0.tgz#99969b636687a6ca4fc651129d12b8a19499c32c" - integrity sha512-FldoVDpVnbBd7jirGnsVDho9hV6Qg2lU4YB5iUgkuMjAEVO/QOb25FK4Fei1jwioE6fjbyF9cwG7WDnG/YEc3g== +"@abp/tui-editor@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-5.3.1.tgz#8906a1f7b307aa2d734954dce1d7c679d6fcf94d" + integrity sha512-+3XNcf2fnVw4L6R40LQ4W4UCgmoajM6SLys3O4NSbx7+JnOV6Wnz3ToiDDFcZESzFWyfejmPGY2EiC7WIN+8RQ== dependencies: - "@abp/jquery" "~5.3.0" - "@abp/prismjs" "~5.3.0" + "@abp/jquery" "~5.3.1" + "@abp/prismjs" "~5.3.1" -"@abp/utils@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.0.tgz#e93739074a3cd445a5a221209506b7e663050ca0" - integrity sha512-Nm+h+3PL10+rBFSh8UUuenmGM+OBlEoNQeGzHRmhOc6hJ3oqCogPzY+zkq0e4pksrwhjxAu/cgCEGLAoEXXycw== +"@abp/utils@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.1.tgz#ff238e3b70c6fffb1600d845c202961e1179c813" + integrity sha512-XVYrygoWq1ZHz4N7BSJ4P77wmd0geRhpyR5ztzyP1WaF2LaCRS63BjZ/a7xKdtioUby9GP5jSvMjBvwqVviYIQ== dependencies: just-compare "^1.3.0" diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json index fda2f11795..d3d11d5507 100644 --- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json +++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json @@ -3,6 +3,6 @@ "name": "client-simulation-web", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.1" } } diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock index 6404fcd773..09368cc227 100644 --- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock +++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.0.tgz#dcdd73d8582c4d14438f70d765170398d5d582fb" - integrity sha512-H6UrafHRI1DHfIoi47gZWHKSanlyAkghtGgUO6GTmPqTubBXjl7Ky3owVUAXvFd49+72gwdCLA/DB0Khjc3Ayw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.0" - -"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.0.tgz#84e94845a247815ce981cda2d195944a350530b9" - integrity sha512-RwXxlncjidvh8Hgw91Hz1f5rnfG9hlNROr5bD/kxTUB47vIh/TIBd06UYrYw2/lqFLw5d6wd8q7VLuDjGUQbpg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.0" - "@abp/bootstrap" "~5.3.0" - "@abp/bootstrap-datepicker" "~5.3.0" - "@abp/datatables.net-bs5" "~5.3.0" - "@abp/font-awesome" "~5.3.0" - "@abp/jquery-form" "~5.3.0" - "@abp/jquery-validation-unobtrusive" "~5.3.0" - "@abp/lodash" "~5.3.0" - "@abp/luxon" "~5.3.0" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.0" - "@abp/select2" "~5.3.0" - "@abp/sweetalert2" "~5.3.0" - "@abp/timeago" "~5.3.0" - "@abp/toastr" "~5.3.0" - -"@abp/aspnetcore.mvc.ui@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.0.tgz#e947fd1aecbd2aabc5db4c6a64b78f2690fcf0d4" - integrity sha512-en2YDb/hRG1MKkbli1PYcoeU9OLU0YPSahkIBSfOmMLntAe8y0c2+Xe09chXP4r+GoZu0zd9FM3qqCRZojrlug== +"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.1.tgz#469befe88cd7d3362112db9a5ce7cf3eae328b3e" + integrity sha512-qvzNICtvrNVllo7c8khvKw4LQ6MxwWcJar8PyOhgS+Pgtn4lT5rQqzGvaYKMiDyj5gjWGzPOzjU/vgR1uiGYNg== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.1" + +"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.1.tgz#7fe0aba80670bf4326251138dc7e12ea5830c919" + integrity sha512-ieS54bLQr4Aa96CnFEmuxe0ndeJpJMkq5eYSWAziH4i15jm7o+K2ouIL0K606lk1Sn/UrP8Yl+DRhxr4i4P8ow== + dependencies: + "@abp/aspnetcore.mvc.ui" "~5.3.1" + "@abp/bootstrap" "~5.3.1" + "@abp/bootstrap-datepicker" "~5.3.1" + "@abp/datatables.net-bs5" "~5.3.1" + "@abp/font-awesome" "~5.3.1" + "@abp/jquery-form" "~5.3.1" + "@abp/jquery-validation-unobtrusive" "~5.3.1" + "@abp/lodash" "~5.3.1" + "@abp/luxon" "~5.3.1" + "@abp/malihu-custom-scrollbar-plugin" "~5.3.1" + "@abp/select2" "~5.3.1" + "@abp/sweetalert2" "~5.3.1" + "@abp/timeago" "~5.3.1" + "@abp/toastr" "~5.3.1" + +"@abp/aspnetcore.mvc.ui@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.1.tgz#17ccf9a2a40cbd79e670a0cb5be74ac9eb17b963" + integrity sha512-UuXH0Lz7DqiGp47BC7xllT3Imf2Nk+eccOiVRwc9PAfHKnNOOJYxvDlHS0x8CM09qxM5EVaH7tfwOLSS09HXpg== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,144 +41,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.0.tgz#09c44954774d8f52ca8ff6699ad4dbb7cc0308c2" - integrity sha512-AQ26I0jgoCioW1/4XmQIyn1c1+CLv8KTb4Vd4ZbtdYGBkkkUe+JEAWpJSeXlJRr/XrOs0BKWp/fa7Nnwx8srLg== +"@abp/bootstrap-datepicker@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.1.tgz#241aebfbae0fa451d3e719776096b14bf77c08fa" + integrity sha512-gvP7SNEnPFYuLmIBp7QobveAGv8Rm/8JTmixCChQPPP9XX3u82ilKP2cgxVXm/4/jf0Gy7Gusn7urmTbTxeGEw== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.0.tgz#42dac2d2d6374f39d068a638687039c5c74df123" - integrity sha512-rg9mLcvT4JQRc1rIAhGYK1P2eMRJ1+GArQXV5l7k3FrVU+bRLKdoE6PNpuwXHpdlom4/dOgekfuWH/SAuY5kyw== +"@abp/bootstrap@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.1.tgz#f941afe2be2deaa1962a3626593451847dee5bd6" + integrity sha512-qPGeNFEaQF57b0viA0eHKA0cZ9b0gscOqE0o4ewHxnlRoRYiY3Ob9V6x6S85n2b7H6tDZOWAePXEgkV40yK/Bg== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" bootstrap "^5.1.3" -"@abp/core@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.0.tgz#032724dd0c0b850204896ce0275c7f9c8f516740" - integrity sha512-Uk9h98jiEF1dItWrvWnYB6s/UNZZapvFSyJ4+piAsZmXOSAbrObV+s19n5xfUagQQTWn4+aU5+aChEcfWpYv9A== +"@abp/core@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.1.tgz#26890ab049d43db58f3a0fba2f4c50bd2fbf7811" + integrity sha512-7PBPDYq/s0T5H0iYaeCzqWF44jbiOkFlwGnXqZeKHt2cKZaMyCStgotrpap8qoZKlxuyxudFIzJrzJIEP0AN/Q== dependencies: - "@abp/utils" "~5.3.0" + "@abp/utils" "~5.3.1" -"@abp/datatables.net-bs5@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.0.tgz#84771ce4eb7229bed347a5904c891b08e3230422" - integrity sha512-FpKrgrjaBKVgFAnbBsrvDIJJOy8gbWCEHm5Jy2vFWXmx25fITMw/2ckBDH87yrZtCNVTSUbMIdHYOIHMPfSavQ== +"@abp/datatables.net-bs5@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.1.tgz#e380cc253a837a0629baec9dabb4e8919878cc38" + integrity sha512-LpGPWLvFsLkQjo5RTgEl24LbBokgsO1gv7/pVy/1oiXXCLTuVwJ8vYYKfDNkrrSLDUOJ9cCC0YUE5SRfDUystA== dependencies: - "@abp/datatables.net" "~5.3.0" + "@abp/datatables.net" "~5.3.1" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.0.tgz#dd27ae451df9551f5b815e10c87a8a89c6a38293" - integrity sha512-d4lQ09G7HY2gEN1lRAteCZzY0Fv3gPuUM+icgWm+UkmDZV9lhvovTQ58Xkwayw8vf+NPlit1eGMMQedn6MbeAQ== +"@abp/datatables.net@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.1.tgz#8200b5a3a719f51d21670b1420e3df48af4de42e" + integrity sha512-v30gkk4dcmWz260C8BA7uaU4kqpiC1wkgMvdzjPGefzYXsMftlcoX7GUvByWwTzlJnTphGvnIVJhnhX73VVDHg== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" datatables.net "^1.11.4" -"@abp/font-awesome@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.0.tgz#ce1d5bb59bd597cc9717885917d4dd2eae1f8b9c" - integrity sha512-JX62EVfZSJ7pv75Gd3ya/3c3He0hXF7KmpTizUNd/EbeHuNJoCND5wwq5OAFV9Ld3vdcGJChNTydNa5RsBzrpg== +"@abp/font-awesome@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.1.tgz#2b4654b463b7858fc237219fd852ca0f41e4e062" + integrity sha512-LFKPjQgJmQ6GNqW3geluHMgV3WbisniAaK9tl6Pv8WOvPluvZGHTK5qjcAQVwM6Bj944VYeuvLo1ZCOoC/rWLg== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.0.tgz#5ae9906f0cffaf3e043681a5dd80a014b4860f6b" - integrity sha512-ZTpXCImHirJDZjfnJRtSEHLIbWMTYkqtTv7Z3GMRKnI4fllpmuco9EWLAKjAfYPyc/QpTx+MYnUg5SsXORhJyQ== +"@abp/jquery-form@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.1.tgz#e17367af8dafcfbb352775fb6ab9182d1fd9cd63" + integrity sha512-s8XItBHKJuehprFy7xePWHxt8jMvjDmkmk2nEuJXj+gcZyVEEa3hBd4ykKDXFfmNrfS8aMy+VqA+VEA24Cmpww== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.0.tgz#ccf90a7840398e69e0a91ed6c32b80fa2eb82d14" - integrity sha512-6B3ywnpvPxpnxkrcXzjTjMWgKRImbzNPOZvv5ant/kQv3zXedV1GXSIILy+imX39FuDPslOmEfx8plwrNvIteA== +"@abp/jquery-validation-unobtrusive@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.1.tgz#7c5c31df1cd021b3eed618d914926b76dc7e9e6e" + integrity sha512-B5USCmF56eWQO+R4eZtMjURtoNGUEuAuBy4ltCPtZx0s6yn94Ooq4oYKqEbfnLoSsQshajUwBtqtlC6+YA612Q== dependencies: - "@abp/jquery-validation" "~5.3.0" + "@abp/jquery-validation" "~5.3.1" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.0.tgz#a21696e7d5d54ef8bcdc0e8bd2debb1da1f7f5cc" - integrity sha512-4z2I9iORf+z5SlN9crC/Gx3X5GAOVePD+WN8SaHSYr4VWYNe8TV8LvCZPilN56sIPt3jYvy0N+bI1tAuZPu/NQ== +"@abp/jquery-validation@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.1.tgz#b34c0e29e12843de4a407bc8775a2e560e4db923" + integrity sha512-lu2e47GwWmh/ahWA5bbeR9Gqqsy4a3htTIvnwWbtu7dnHVHA6469+uCt+0f+sVthDIL+cMwoYgcygMLIUHoFxg== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.0.tgz#0279ee501ed774a788072c2ec8b003e348fec22c" - integrity sha512-rqYbU3LpsT7XT8ygn+TFVmjev5NlgEcDhGwQ8PraY1dEjlDbteeQ50N4adS8fdRfOM1UjGL19ueN3F8E5qNUSg== +"@abp/jquery@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.1.tgz#8f6032253d4c44b135c238a4efa010bee1ec5991" + integrity sha512-ngy9Kvy6lXrQBCxWi7t8I4Wudv87C2R50O/T4CZPfM2nwYLynopa+aI9r9VLhO/wIROyXX3C8UIpeLhQzm776w== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" jquery "~3.6.0" -"@abp/lodash@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.0.tgz#45f1dba7bb65b6599b4973d7e0c617dfd2c46c49" - integrity sha512-vQVMv58QuYttWBfLjJzIsw92JunGbWYsqk6pp6/JuoBls5UJtdP1F7vM4JgQxsscGYHFRZB3F4a3h1cxZ+dblQ== +"@abp/lodash@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.1.tgz#49c0806bae0858047faed75b6e9ed6207dc4cffc" + integrity sha512-QQshVHkNlunbhcmBG5E2wdZNcHYrTsNQjJNF6IZkeFszNRHu/k0u1bhszDwjPgEzeewTqMu8n44TzkbA8yP5GA== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" lodash "^4.17.21" -"@abp/luxon@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.0.tgz#8a6277046f6e38c3affbf79c06f8ac00d1ca8098" - integrity sha512-6tETR03i1NPJuDqSQWtpkOykdq/84awifQUqRyh+b8340wV7P54NqUMDXDit9sjITFDhq99V/R+Rj3PVjvJD3A== +"@abp/luxon@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.1.tgz#8d843023b05b157ff9ab23548c8d8c4e7101ae88" + integrity sha512-Jw8p5S9qHZkUrD1fx3nvpnBqn8Zb9jDiG6xdc6tY+v1aqDDwEqPUr7TqaLnY9GnZefiM3sYVwAh42nzPOwg9aQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.0.tgz#e6e12162aa50d3c3d98629378cec2f6fd5964338" - integrity sha512-GVwgAZQurH/tr4Hgmuby2dun//v1dT+wLGV4ZvjCJzBRs4FgrB+25pj4qKm20j6/NKRKc4V5re/b1y6njCubFQ== +"@abp/malihu-custom-scrollbar-plugin@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.1.tgz#7f0e4f2df325345a8e3be67456522cb035e3e962" + integrity sha512-ll49qD7bslt7+deMAFZ0DfveH/5ZsHyL2RLDg796ARz+H7fQpEhyNFeGETGj+HSOvAl3ivux2mxNCMYbXHR4RQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.0.tgz#aae202b87dc23dfc7c8fd933413a8dbeb2f5b683" - integrity sha512-0aIxdtzgONkrYnUN5ACkIIIhsC9e61QLRq3K+/98fjf7NkHOjG3Sptr8EKu5U3IQ2hNHgqBjPGYjkztGuxZ9kw== +"@abp/select2@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.1.tgz#9a49aa983d52eecbd2dc2160349d45bd46324e36" + integrity sha512-ne4LJJy9n3V8BPtyU6voX4Bo0/GUrZBnI4Mkb0wRKNt1rxj7PhPXebsYYz090QJuJh8fuF2OHteNMBA7gMryLQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" select2 "^4.0.13" -"@abp/sweetalert2@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.0.tgz#67379cfa4cb8884cb66b58f4cafa79960cf8426a" - integrity sha512-EBr8J7MDsYmSvOYxTbqsSmw6c2yLokHZe8A+EW2vsY9VYFXkoOJLVpCkCK4fhvHUv8/+Y5QnHW7bs1I6SKYXOw== +"@abp/sweetalert2@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.1.tgz#676a3269fe4511fc4f81c3231ed9a96fe4c8f006" + integrity sha512-UDQrJiq8OfIDy3GSq7NJ4TKKEihzp6Qc06KGRdnN74lm4JsxxGUToSaD1AbyrLt53jZlRZK2NNc8IiyqPvyfbQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.0.tgz#3aaef3edca333224ba6b3e81c8ad1ebaae51a2f4" - integrity sha512-FxtoPYxyk2CHeoloC6kaeCj5YtXH0rebhOEaCjrfyg9/Ec6LEkvpfC7RWlcsHaEUAtFXZegJDfOk066EPH7RHQ== +"@abp/timeago@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.1.tgz#069a4eb2725b0a183cb7609e1f48d8d857a606ba" + integrity sha512-+QWO9MTuf6X7sUXxoUGyoQ0EhoQUlRDdCPmwwcZyBzBf8q9A3hS+Rtmex3BqwRLDxL2vL78gbDpIBgPn/kFuUA== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" timeago "^1.6.7" -"@abp/toastr@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.0.tgz#8a002c19ea25ac6b042a25c0f9d289d03c93c2fb" - integrity sha512-gjb2O/XrYkX8IeCERIqlOYPh15WlF9LxGR6t9jeVF/p6BTX/yaWabYCFfB9SkU2pQ6xrGl7WmSTAC06JOAtPTA== +"@abp/toastr@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.1.tgz#4a18b293444f7f8a523b7255ea61fed838131f1c" + integrity sha512-gz5cl6sPu6b65h8VJ6ne+dkM0oVXSYBlDoKBYbDRjhH6i7yWUpcylY/lrOvWacNQBOagBy5bep1937aec1/BXQ== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" toastr "^2.1.4" -"@abp/utils@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.0.tgz#e93739074a3cd445a5a221209506b7e663050ca0" - integrity sha512-Nm+h+3PL10+rBFSh8UUuenmGM+OBlEoNQeGzHRmhOc6hJ3oqCogPzY+zkq0e4pksrwhjxAu/cgCEGLAoEXXycw== +"@abp/utils@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.1.tgz#ff238e3b70c6fffb1600d845c202961e1179c813" + integrity sha512-XVYrygoWq1ZHz4N7BSJ4P77wmd0geRhpyR5ztzyP1WaF2LaCRS63BjZ/a7xKdtioUby9GP5jSvMjBvwqVviYIQ== dependencies: just-compare "^1.3.0" diff --git a/modules/cms-kit/angular/package.json b/modules/cms-kit/angular/package.json index 698f72979b..0e8836e10e 100644 --- a/modules/cms-kit/angular/package.json +++ b/modules/cms-kit/angular/package.json @@ -15,11 +15,11 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~5.3.0", - "@abp/ng.identity": "~5.3.0", - "@abp/ng.setting-management": "~5.3.0", - "@abp/ng.tenant-management": "~5.3.0", - "@abp/ng.theme.basic": "~5.3.0", + "@abp/ng.account": "~5.3.1", + "@abp/ng.identity": "~5.3.1", + "@abp/ng.setting-management": "~5.3.1", + "@abp/ng.tenant-management": "~5.3.1", + "@abp/ng.theme.basic": "~5.3.1", "@angular/animations": "~10.0.0", "@angular/common": "~10.0.0", "@angular/compiler": "~10.0.0", diff --git a/modules/cms-kit/angular/projects/cms-kit/package.json b/modules/cms-kit/angular/projects/cms-kit/package.json index 21c65e4430..1509904df4 100644 --- a/modules/cms-kit/angular/projects/cms-kit/package.json +++ b/modules/cms-kit/angular/projects/cms-kit/package.json @@ -4,8 +4,8 @@ "peerDependencies": { "@angular/common": "^9.1.11", "@angular/core": "^9.1.11", - "@abp/ng.core": ">=5.3.0", - "@abp/ng.theme.shared": ">=5.3.0" + "@abp/ng.core": ">=5.3.1", + "@abp/ng.theme.shared": ">=5.3.1" }, "dependencies": { "tslib": "^2.0.0" diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json index 47538f5c37..8bd0871145 100644 --- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json +++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json @@ -3,6 +3,6 @@ "name": "my-app-identityserver", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.1" } } diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock index 1106f769b6..3070b1708a 100644 --- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock +++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.0.tgz#dcdd73d8582c4d14438f70d765170398d5d582fb" - integrity sha512-H6UrafHRI1DHfIoi47gZWHKSanlyAkghtGgUO6GTmPqTubBXjl7Ky3owVUAXvFd49+72gwdCLA/DB0Khjc3Ayw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.0" - -"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.0.tgz#84e94845a247815ce981cda2d195944a350530b9" - integrity sha512-RwXxlncjidvh8Hgw91Hz1f5rnfG9hlNROr5bD/kxTUB47vIh/TIBd06UYrYw2/lqFLw5d6wd8q7VLuDjGUQbpg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.0" - "@abp/bootstrap" "~5.3.0" - "@abp/bootstrap-datepicker" "~5.3.0" - "@abp/datatables.net-bs5" "~5.3.0" - "@abp/font-awesome" "~5.3.0" - "@abp/jquery-form" "~5.3.0" - "@abp/jquery-validation-unobtrusive" "~5.3.0" - "@abp/lodash" "~5.3.0" - "@abp/luxon" "~5.3.0" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.0" - "@abp/select2" "~5.3.0" - "@abp/sweetalert2" "~5.3.0" - "@abp/timeago" "~5.3.0" - "@abp/toastr" "~5.3.0" - -"@abp/aspnetcore.mvc.ui@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.0.tgz#e947fd1aecbd2aabc5db4c6a64b78f2690fcf0d4" - integrity sha512-en2YDb/hRG1MKkbli1PYcoeU9OLU0YPSahkIBSfOmMLntAe8y0c2+Xe09chXP4r+GoZu0zd9FM3qqCRZojrlug== +"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.1.tgz#469befe88cd7d3362112db9a5ce7cf3eae328b3e" + integrity sha512-qvzNICtvrNVllo7c8khvKw4LQ6MxwWcJar8PyOhgS+Pgtn4lT5rQqzGvaYKMiDyj5gjWGzPOzjU/vgR1uiGYNg== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.1" + +"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.1.tgz#7fe0aba80670bf4326251138dc7e12ea5830c919" + integrity sha512-ieS54bLQr4Aa96CnFEmuxe0ndeJpJMkq5eYSWAziH4i15jm7o+K2ouIL0K606lk1Sn/UrP8Yl+DRhxr4i4P8ow== + dependencies: + "@abp/aspnetcore.mvc.ui" "~5.3.1" + "@abp/bootstrap" "~5.3.1" + "@abp/bootstrap-datepicker" "~5.3.1" + "@abp/datatables.net-bs5" "~5.3.1" + "@abp/font-awesome" "~5.3.1" + "@abp/jquery-form" "~5.3.1" + "@abp/jquery-validation-unobtrusive" "~5.3.1" + "@abp/lodash" "~5.3.1" + "@abp/luxon" "~5.3.1" + "@abp/malihu-custom-scrollbar-plugin" "~5.3.1" + "@abp/select2" "~5.3.1" + "@abp/sweetalert2" "~5.3.1" + "@abp/timeago" "~5.3.1" + "@abp/toastr" "~5.3.1" + +"@abp/aspnetcore.mvc.ui@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.1.tgz#17ccf9a2a40cbd79e670a0cb5be74ac9eb17b963" + integrity sha512-UuXH0Lz7DqiGp47BC7xllT3Imf2Nk+eccOiVRwc9PAfHKnNOOJYxvDlHS0x8CM09qxM5EVaH7tfwOLSS09HXpg== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,144 +41,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.0.tgz#09c44954774d8f52ca8ff6699ad4dbb7cc0308c2" - integrity sha512-AQ26I0jgoCioW1/4XmQIyn1c1+CLv8KTb4Vd4ZbtdYGBkkkUe+JEAWpJSeXlJRr/XrOs0BKWp/fa7Nnwx8srLg== +"@abp/bootstrap-datepicker@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.1.tgz#241aebfbae0fa451d3e719776096b14bf77c08fa" + integrity sha512-gvP7SNEnPFYuLmIBp7QobveAGv8Rm/8JTmixCChQPPP9XX3u82ilKP2cgxVXm/4/jf0Gy7Gusn7urmTbTxeGEw== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.0.tgz#42dac2d2d6374f39d068a638687039c5c74df123" - integrity sha512-rg9mLcvT4JQRc1rIAhGYK1P2eMRJ1+GArQXV5l7k3FrVU+bRLKdoE6PNpuwXHpdlom4/dOgekfuWH/SAuY5kyw== +"@abp/bootstrap@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.1.tgz#f941afe2be2deaa1962a3626593451847dee5bd6" + integrity sha512-qPGeNFEaQF57b0viA0eHKA0cZ9b0gscOqE0o4ewHxnlRoRYiY3Ob9V6x6S85n2b7H6tDZOWAePXEgkV40yK/Bg== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" bootstrap "^5.1.3" -"@abp/core@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.0.tgz#032724dd0c0b850204896ce0275c7f9c8f516740" - integrity sha512-Uk9h98jiEF1dItWrvWnYB6s/UNZZapvFSyJ4+piAsZmXOSAbrObV+s19n5xfUagQQTWn4+aU5+aChEcfWpYv9A== +"@abp/core@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.1.tgz#26890ab049d43db58f3a0fba2f4c50bd2fbf7811" + integrity sha512-7PBPDYq/s0T5H0iYaeCzqWF44jbiOkFlwGnXqZeKHt2cKZaMyCStgotrpap8qoZKlxuyxudFIzJrzJIEP0AN/Q== dependencies: - "@abp/utils" "~5.3.0" + "@abp/utils" "~5.3.1" -"@abp/datatables.net-bs5@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.0.tgz#84771ce4eb7229bed347a5904c891b08e3230422" - integrity sha512-FpKrgrjaBKVgFAnbBsrvDIJJOy8gbWCEHm5Jy2vFWXmx25fITMw/2ckBDH87yrZtCNVTSUbMIdHYOIHMPfSavQ== +"@abp/datatables.net-bs5@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.1.tgz#e380cc253a837a0629baec9dabb4e8919878cc38" + integrity sha512-LpGPWLvFsLkQjo5RTgEl24LbBokgsO1gv7/pVy/1oiXXCLTuVwJ8vYYKfDNkrrSLDUOJ9cCC0YUE5SRfDUystA== dependencies: - "@abp/datatables.net" "~5.3.0" + "@abp/datatables.net" "~5.3.1" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.0.tgz#dd27ae451df9551f5b815e10c87a8a89c6a38293" - integrity sha512-d4lQ09G7HY2gEN1lRAteCZzY0Fv3gPuUM+icgWm+UkmDZV9lhvovTQ58Xkwayw8vf+NPlit1eGMMQedn6MbeAQ== +"@abp/datatables.net@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.1.tgz#8200b5a3a719f51d21670b1420e3df48af4de42e" + integrity sha512-v30gkk4dcmWz260C8BA7uaU4kqpiC1wkgMvdzjPGefzYXsMftlcoX7GUvByWwTzlJnTphGvnIVJhnhX73VVDHg== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" datatables.net "^1.11.4" -"@abp/font-awesome@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.0.tgz#ce1d5bb59bd597cc9717885917d4dd2eae1f8b9c" - integrity sha512-JX62EVfZSJ7pv75Gd3ya/3c3He0hXF7KmpTizUNd/EbeHuNJoCND5wwq5OAFV9Ld3vdcGJChNTydNa5RsBzrpg== +"@abp/font-awesome@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.1.tgz#2b4654b463b7858fc237219fd852ca0f41e4e062" + integrity sha512-LFKPjQgJmQ6GNqW3geluHMgV3WbisniAaK9tl6Pv8WOvPluvZGHTK5qjcAQVwM6Bj944VYeuvLo1ZCOoC/rWLg== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.0.tgz#5ae9906f0cffaf3e043681a5dd80a014b4860f6b" - integrity sha512-ZTpXCImHirJDZjfnJRtSEHLIbWMTYkqtTv7Z3GMRKnI4fllpmuco9EWLAKjAfYPyc/QpTx+MYnUg5SsXORhJyQ== +"@abp/jquery-form@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.1.tgz#e17367af8dafcfbb352775fb6ab9182d1fd9cd63" + integrity sha512-s8XItBHKJuehprFy7xePWHxt8jMvjDmkmk2nEuJXj+gcZyVEEa3hBd4ykKDXFfmNrfS8aMy+VqA+VEA24Cmpww== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.0.tgz#ccf90a7840398e69e0a91ed6c32b80fa2eb82d14" - integrity sha512-6B3ywnpvPxpnxkrcXzjTjMWgKRImbzNPOZvv5ant/kQv3zXedV1GXSIILy+imX39FuDPslOmEfx8plwrNvIteA== +"@abp/jquery-validation-unobtrusive@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.1.tgz#7c5c31df1cd021b3eed618d914926b76dc7e9e6e" + integrity sha512-B5USCmF56eWQO+R4eZtMjURtoNGUEuAuBy4ltCPtZx0s6yn94Ooq4oYKqEbfnLoSsQshajUwBtqtlC6+YA612Q== dependencies: - "@abp/jquery-validation" "~5.3.0" + "@abp/jquery-validation" "~5.3.1" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.0.tgz#a21696e7d5d54ef8bcdc0e8bd2debb1da1f7f5cc" - integrity sha512-4z2I9iORf+z5SlN9crC/Gx3X5GAOVePD+WN8SaHSYr4VWYNe8TV8LvCZPilN56sIPt3jYvy0N+bI1tAuZPu/NQ== +"@abp/jquery-validation@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.1.tgz#b34c0e29e12843de4a407bc8775a2e560e4db923" + integrity sha512-lu2e47GwWmh/ahWA5bbeR9Gqqsy4a3htTIvnwWbtu7dnHVHA6469+uCt+0f+sVthDIL+cMwoYgcygMLIUHoFxg== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.0.tgz#0279ee501ed774a788072c2ec8b003e348fec22c" - integrity sha512-rqYbU3LpsT7XT8ygn+TFVmjev5NlgEcDhGwQ8PraY1dEjlDbteeQ50N4adS8fdRfOM1UjGL19ueN3F8E5qNUSg== +"@abp/jquery@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.1.tgz#8f6032253d4c44b135c238a4efa010bee1ec5991" + integrity sha512-ngy9Kvy6lXrQBCxWi7t8I4Wudv87C2R50O/T4CZPfM2nwYLynopa+aI9r9VLhO/wIROyXX3C8UIpeLhQzm776w== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" jquery "~3.6.0" -"@abp/lodash@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.0.tgz#45f1dba7bb65b6599b4973d7e0c617dfd2c46c49" - integrity sha512-vQVMv58QuYttWBfLjJzIsw92JunGbWYsqk6pp6/JuoBls5UJtdP1F7vM4JgQxsscGYHFRZB3F4a3h1cxZ+dblQ== +"@abp/lodash@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.1.tgz#49c0806bae0858047faed75b6e9ed6207dc4cffc" + integrity sha512-QQshVHkNlunbhcmBG5E2wdZNcHYrTsNQjJNF6IZkeFszNRHu/k0u1bhszDwjPgEzeewTqMu8n44TzkbA8yP5GA== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" lodash "^4.17.21" -"@abp/luxon@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.0.tgz#8a6277046f6e38c3affbf79c06f8ac00d1ca8098" - integrity sha512-6tETR03i1NPJuDqSQWtpkOykdq/84awifQUqRyh+b8340wV7P54NqUMDXDit9sjITFDhq99V/R+Rj3PVjvJD3A== +"@abp/luxon@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.1.tgz#8d843023b05b157ff9ab23548c8d8c4e7101ae88" + integrity sha512-Jw8p5S9qHZkUrD1fx3nvpnBqn8Zb9jDiG6xdc6tY+v1aqDDwEqPUr7TqaLnY9GnZefiM3sYVwAh42nzPOwg9aQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.0.tgz#e6e12162aa50d3c3d98629378cec2f6fd5964338" - integrity sha512-GVwgAZQurH/tr4Hgmuby2dun//v1dT+wLGV4ZvjCJzBRs4FgrB+25pj4qKm20j6/NKRKc4V5re/b1y6njCubFQ== +"@abp/malihu-custom-scrollbar-plugin@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.1.tgz#7f0e4f2df325345a8e3be67456522cb035e3e962" + integrity sha512-ll49qD7bslt7+deMAFZ0DfveH/5ZsHyL2RLDg796ARz+H7fQpEhyNFeGETGj+HSOvAl3ivux2mxNCMYbXHR4RQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.0.tgz#aae202b87dc23dfc7c8fd933413a8dbeb2f5b683" - integrity sha512-0aIxdtzgONkrYnUN5ACkIIIhsC9e61QLRq3K+/98fjf7NkHOjG3Sptr8EKu5U3IQ2hNHgqBjPGYjkztGuxZ9kw== +"@abp/select2@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.1.tgz#9a49aa983d52eecbd2dc2160349d45bd46324e36" + integrity sha512-ne4LJJy9n3V8BPtyU6voX4Bo0/GUrZBnI4Mkb0wRKNt1rxj7PhPXebsYYz090QJuJh8fuF2OHteNMBA7gMryLQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" select2 "^4.0.13" -"@abp/sweetalert2@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.0.tgz#67379cfa4cb8884cb66b58f4cafa79960cf8426a" - integrity sha512-EBr8J7MDsYmSvOYxTbqsSmw6c2yLokHZe8A+EW2vsY9VYFXkoOJLVpCkCK4fhvHUv8/+Y5QnHW7bs1I6SKYXOw== +"@abp/sweetalert2@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.1.tgz#676a3269fe4511fc4f81c3231ed9a96fe4c8f006" + integrity sha512-UDQrJiq8OfIDy3GSq7NJ4TKKEihzp6Qc06KGRdnN74lm4JsxxGUToSaD1AbyrLt53jZlRZK2NNc8IiyqPvyfbQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.0.tgz#3aaef3edca333224ba6b3e81c8ad1ebaae51a2f4" - integrity sha512-FxtoPYxyk2CHeoloC6kaeCj5YtXH0rebhOEaCjrfyg9/Ec6LEkvpfC7RWlcsHaEUAtFXZegJDfOk066EPH7RHQ== +"@abp/timeago@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.1.tgz#069a4eb2725b0a183cb7609e1f48d8d857a606ba" + integrity sha512-+QWO9MTuf6X7sUXxoUGyoQ0EhoQUlRDdCPmwwcZyBzBf8q9A3hS+Rtmex3BqwRLDxL2vL78gbDpIBgPn/kFuUA== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" timeago "^1.6.7" -"@abp/toastr@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.0.tgz#8a002c19ea25ac6b042a25c0f9d289d03c93c2fb" - integrity sha512-gjb2O/XrYkX8IeCERIqlOYPh15WlF9LxGR6t9jeVF/p6BTX/yaWabYCFfB9SkU2pQ6xrGl7WmSTAC06JOAtPTA== +"@abp/toastr@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.1.tgz#4a18b293444f7f8a523b7255ea61fed838131f1c" + integrity sha512-gz5cl6sPu6b65h8VJ6ne+dkM0oVXSYBlDoKBYbDRjhH6i7yWUpcylY/lrOvWacNQBOagBy5bep1937aec1/BXQ== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" toastr "^2.1.4" -"@abp/utils@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.0.tgz#e93739074a3cd445a5a221209506b7e663050ca0" - integrity sha512-Nm+h+3PL10+rBFSh8UUuenmGM+OBlEoNQeGzHRmhOc6hJ3oqCogPzY+zkq0e4pksrwhjxAu/cgCEGLAoEXXycw== +"@abp/utils@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.1.tgz#ff238e3b70c6fffb1600d845c202961e1179c813" + integrity sha512-XVYrygoWq1ZHz4N7BSJ4P77wmd0geRhpyR5ztzyP1WaF2LaCRS63BjZ/a7xKdtioUby9GP5jSvMjBvwqVviYIQ== dependencies: just-compare "^1.3.0" diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json b/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json index cc93b1db85..de939989de 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.1" } } diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock b/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock index 7b87df9c6c..54ca3aa193 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.0.tgz#dcdd73d8582c4d14438f70d765170398d5d582fb" - integrity sha512-H6UrafHRI1DHfIoi47gZWHKSanlyAkghtGgUO6GTmPqTubBXjl7Ky3owVUAXvFd49+72gwdCLA/DB0Khjc3Ayw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.0" - -"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.0.tgz#84e94845a247815ce981cda2d195944a350530b9" - integrity sha512-RwXxlncjidvh8Hgw91Hz1f5rnfG9hlNROr5bD/kxTUB47vIh/TIBd06UYrYw2/lqFLw5d6wd8q7VLuDjGUQbpg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.0" - "@abp/bootstrap" "~5.3.0" - "@abp/bootstrap-datepicker" "~5.3.0" - "@abp/datatables.net-bs5" "~5.3.0" - "@abp/font-awesome" "~5.3.0" - "@abp/jquery-form" "~5.3.0" - "@abp/jquery-validation-unobtrusive" "~5.3.0" - "@abp/lodash" "~5.3.0" - "@abp/luxon" "~5.3.0" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.0" - "@abp/select2" "~5.3.0" - "@abp/sweetalert2" "~5.3.0" - "@abp/timeago" "~5.3.0" - "@abp/toastr" "~5.3.0" - -"@abp/aspnetcore.mvc.ui@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.0.tgz#e947fd1aecbd2aabc5db4c6a64b78f2690fcf0d4" - integrity sha512-en2YDb/hRG1MKkbli1PYcoeU9OLU0YPSahkIBSfOmMLntAe8y0c2+Xe09chXP4r+GoZu0zd9FM3qqCRZojrlug== +"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.1.tgz#469befe88cd7d3362112db9a5ce7cf3eae328b3e" + integrity sha512-qvzNICtvrNVllo7c8khvKw4LQ6MxwWcJar8PyOhgS+Pgtn4lT5rQqzGvaYKMiDyj5gjWGzPOzjU/vgR1uiGYNg== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.1" + +"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.1.tgz#7fe0aba80670bf4326251138dc7e12ea5830c919" + integrity sha512-ieS54bLQr4Aa96CnFEmuxe0ndeJpJMkq5eYSWAziH4i15jm7o+K2ouIL0K606lk1Sn/UrP8Yl+DRhxr4i4P8ow== + dependencies: + "@abp/aspnetcore.mvc.ui" "~5.3.1" + "@abp/bootstrap" "~5.3.1" + "@abp/bootstrap-datepicker" "~5.3.1" + "@abp/datatables.net-bs5" "~5.3.1" + "@abp/font-awesome" "~5.3.1" + "@abp/jquery-form" "~5.3.1" + "@abp/jquery-validation-unobtrusive" "~5.3.1" + "@abp/lodash" "~5.3.1" + "@abp/luxon" "~5.3.1" + "@abp/malihu-custom-scrollbar-plugin" "~5.3.1" + "@abp/select2" "~5.3.1" + "@abp/sweetalert2" "~5.3.1" + "@abp/timeago" "~5.3.1" + "@abp/toastr" "~5.3.1" + +"@abp/aspnetcore.mvc.ui@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.1.tgz#17ccf9a2a40cbd79e670a0cb5be74ac9eb17b963" + integrity sha512-UuXH0Lz7DqiGp47BC7xllT3Imf2Nk+eccOiVRwc9PAfHKnNOOJYxvDlHS0x8CM09qxM5EVaH7tfwOLSS09HXpg== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,144 +41,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.0.tgz#09c44954774d8f52ca8ff6699ad4dbb7cc0308c2" - integrity sha512-AQ26I0jgoCioW1/4XmQIyn1c1+CLv8KTb4Vd4ZbtdYGBkkkUe+JEAWpJSeXlJRr/XrOs0BKWp/fa7Nnwx8srLg== +"@abp/bootstrap-datepicker@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.1.tgz#241aebfbae0fa451d3e719776096b14bf77c08fa" + integrity sha512-gvP7SNEnPFYuLmIBp7QobveAGv8Rm/8JTmixCChQPPP9XX3u82ilKP2cgxVXm/4/jf0Gy7Gusn7urmTbTxeGEw== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.0.tgz#42dac2d2d6374f39d068a638687039c5c74df123" - integrity sha512-rg9mLcvT4JQRc1rIAhGYK1P2eMRJ1+GArQXV5l7k3FrVU+bRLKdoE6PNpuwXHpdlom4/dOgekfuWH/SAuY5kyw== +"@abp/bootstrap@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.1.tgz#f941afe2be2deaa1962a3626593451847dee5bd6" + integrity sha512-qPGeNFEaQF57b0viA0eHKA0cZ9b0gscOqE0o4ewHxnlRoRYiY3Ob9V6x6S85n2b7H6tDZOWAePXEgkV40yK/Bg== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" bootstrap "^5.1.3" -"@abp/core@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.0.tgz#032724dd0c0b850204896ce0275c7f9c8f516740" - integrity sha512-Uk9h98jiEF1dItWrvWnYB6s/UNZZapvFSyJ4+piAsZmXOSAbrObV+s19n5xfUagQQTWn4+aU5+aChEcfWpYv9A== +"@abp/core@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.1.tgz#26890ab049d43db58f3a0fba2f4c50bd2fbf7811" + integrity sha512-7PBPDYq/s0T5H0iYaeCzqWF44jbiOkFlwGnXqZeKHt2cKZaMyCStgotrpap8qoZKlxuyxudFIzJrzJIEP0AN/Q== dependencies: - "@abp/utils" "~5.3.0" + "@abp/utils" "~5.3.1" -"@abp/datatables.net-bs5@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.0.tgz#84771ce4eb7229bed347a5904c891b08e3230422" - integrity sha512-FpKrgrjaBKVgFAnbBsrvDIJJOy8gbWCEHm5Jy2vFWXmx25fITMw/2ckBDH87yrZtCNVTSUbMIdHYOIHMPfSavQ== +"@abp/datatables.net-bs5@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.1.tgz#e380cc253a837a0629baec9dabb4e8919878cc38" + integrity sha512-LpGPWLvFsLkQjo5RTgEl24LbBokgsO1gv7/pVy/1oiXXCLTuVwJ8vYYKfDNkrrSLDUOJ9cCC0YUE5SRfDUystA== dependencies: - "@abp/datatables.net" "~5.3.0" + "@abp/datatables.net" "~5.3.1" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.0.tgz#dd27ae451df9551f5b815e10c87a8a89c6a38293" - integrity sha512-d4lQ09G7HY2gEN1lRAteCZzY0Fv3gPuUM+icgWm+UkmDZV9lhvovTQ58Xkwayw8vf+NPlit1eGMMQedn6MbeAQ== +"@abp/datatables.net@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.1.tgz#8200b5a3a719f51d21670b1420e3df48af4de42e" + integrity sha512-v30gkk4dcmWz260C8BA7uaU4kqpiC1wkgMvdzjPGefzYXsMftlcoX7GUvByWwTzlJnTphGvnIVJhnhX73VVDHg== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" datatables.net "^1.11.4" -"@abp/font-awesome@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.0.tgz#ce1d5bb59bd597cc9717885917d4dd2eae1f8b9c" - integrity sha512-JX62EVfZSJ7pv75Gd3ya/3c3He0hXF7KmpTizUNd/EbeHuNJoCND5wwq5OAFV9Ld3vdcGJChNTydNa5RsBzrpg== +"@abp/font-awesome@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.1.tgz#2b4654b463b7858fc237219fd852ca0f41e4e062" + integrity sha512-LFKPjQgJmQ6GNqW3geluHMgV3WbisniAaK9tl6Pv8WOvPluvZGHTK5qjcAQVwM6Bj944VYeuvLo1ZCOoC/rWLg== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.0.tgz#5ae9906f0cffaf3e043681a5dd80a014b4860f6b" - integrity sha512-ZTpXCImHirJDZjfnJRtSEHLIbWMTYkqtTv7Z3GMRKnI4fllpmuco9EWLAKjAfYPyc/QpTx+MYnUg5SsXORhJyQ== +"@abp/jquery-form@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.1.tgz#e17367af8dafcfbb352775fb6ab9182d1fd9cd63" + integrity sha512-s8XItBHKJuehprFy7xePWHxt8jMvjDmkmk2nEuJXj+gcZyVEEa3hBd4ykKDXFfmNrfS8aMy+VqA+VEA24Cmpww== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.0.tgz#ccf90a7840398e69e0a91ed6c32b80fa2eb82d14" - integrity sha512-6B3ywnpvPxpnxkrcXzjTjMWgKRImbzNPOZvv5ant/kQv3zXedV1GXSIILy+imX39FuDPslOmEfx8plwrNvIteA== +"@abp/jquery-validation-unobtrusive@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.1.tgz#7c5c31df1cd021b3eed618d914926b76dc7e9e6e" + integrity sha512-B5USCmF56eWQO+R4eZtMjURtoNGUEuAuBy4ltCPtZx0s6yn94Ooq4oYKqEbfnLoSsQshajUwBtqtlC6+YA612Q== dependencies: - "@abp/jquery-validation" "~5.3.0" + "@abp/jquery-validation" "~5.3.1" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.0.tgz#a21696e7d5d54ef8bcdc0e8bd2debb1da1f7f5cc" - integrity sha512-4z2I9iORf+z5SlN9crC/Gx3X5GAOVePD+WN8SaHSYr4VWYNe8TV8LvCZPilN56sIPt3jYvy0N+bI1tAuZPu/NQ== +"@abp/jquery-validation@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.1.tgz#b34c0e29e12843de4a407bc8775a2e560e4db923" + integrity sha512-lu2e47GwWmh/ahWA5bbeR9Gqqsy4a3htTIvnwWbtu7dnHVHA6469+uCt+0f+sVthDIL+cMwoYgcygMLIUHoFxg== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.0.tgz#0279ee501ed774a788072c2ec8b003e348fec22c" - integrity sha512-rqYbU3LpsT7XT8ygn+TFVmjev5NlgEcDhGwQ8PraY1dEjlDbteeQ50N4adS8fdRfOM1UjGL19ueN3F8E5qNUSg== +"@abp/jquery@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.1.tgz#8f6032253d4c44b135c238a4efa010bee1ec5991" + integrity sha512-ngy9Kvy6lXrQBCxWi7t8I4Wudv87C2R50O/T4CZPfM2nwYLynopa+aI9r9VLhO/wIROyXX3C8UIpeLhQzm776w== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" jquery "~3.6.0" -"@abp/lodash@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.0.tgz#45f1dba7bb65b6599b4973d7e0c617dfd2c46c49" - integrity sha512-vQVMv58QuYttWBfLjJzIsw92JunGbWYsqk6pp6/JuoBls5UJtdP1F7vM4JgQxsscGYHFRZB3F4a3h1cxZ+dblQ== +"@abp/lodash@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.1.tgz#49c0806bae0858047faed75b6e9ed6207dc4cffc" + integrity sha512-QQshVHkNlunbhcmBG5E2wdZNcHYrTsNQjJNF6IZkeFszNRHu/k0u1bhszDwjPgEzeewTqMu8n44TzkbA8yP5GA== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" lodash "^4.17.21" -"@abp/luxon@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.0.tgz#8a6277046f6e38c3affbf79c06f8ac00d1ca8098" - integrity sha512-6tETR03i1NPJuDqSQWtpkOykdq/84awifQUqRyh+b8340wV7P54NqUMDXDit9sjITFDhq99V/R+Rj3PVjvJD3A== +"@abp/luxon@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.1.tgz#8d843023b05b157ff9ab23548c8d8c4e7101ae88" + integrity sha512-Jw8p5S9qHZkUrD1fx3nvpnBqn8Zb9jDiG6xdc6tY+v1aqDDwEqPUr7TqaLnY9GnZefiM3sYVwAh42nzPOwg9aQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.0.tgz#e6e12162aa50d3c3d98629378cec2f6fd5964338" - integrity sha512-GVwgAZQurH/tr4Hgmuby2dun//v1dT+wLGV4ZvjCJzBRs4FgrB+25pj4qKm20j6/NKRKc4V5re/b1y6njCubFQ== +"@abp/malihu-custom-scrollbar-plugin@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.1.tgz#7f0e4f2df325345a8e3be67456522cb035e3e962" + integrity sha512-ll49qD7bslt7+deMAFZ0DfveH/5ZsHyL2RLDg796ARz+H7fQpEhyNFeGETGj+HSOvAl3ivux2mxNCMYbXHR4RQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.0.tgz#aae202b87dc23dfc7c8fd933413a8dbeb2f5b683" - integrity sha512-0aIxdtzgONkrYnUN5ACkIIIhsC9e61QLRq3K+/98fjf7NkHOjG3Sptr8EKu5U3IQ2hNHgqBjPGYjkztGuxZ9kw== +"@abp/select2@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.1.tgz#9a49aa983d52eecbd2dc2160349d45bd46324e36" + integrity sha512-ne4LJJy9n3V8BPtyU6voX4Bo0/GUrZBnI4Mkb0wRKNt1rxj7PhPXebsYYz090QJuJh8fuF2OHteNMBA7gMryLQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" select2 "^4.0.13" -"@abp/sweetalert2@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.0.tgz#67379cfa4cb8884cb66b58f4cafa79960cf8426a" - integrity sha512-EBr8J7MDsYmSvOYxTbqsSmw6c2yLokHZe8A+EW2vsY9VYFXkoOJLVpCkCK4fhvHUv8/+Y5QnHW7bs1I6SKYXOw== +"@abp/sweetalert2@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.1.tgz#676a3269fe4511fc4f81c3231ed9a96fe4c8f006" + integrity sha512-UDQrJiq8OfIDy3GSq7NJ4TKKEihzp6Qc06KGRdnN74lm4JsxxGUToSaD1AbyrLt53jZlRZK2NNc8IiyqPvyfbQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.0.tgz#3aaef3edca333224ba6b3e81c8ad1ebaae51a2f4" - integrity sha512-FxtoPYxyk2CHeoloC6kaeCj5YtXH0rebhOEaCjrfyg9/Ec6LEkvpfC7RWlcsHaEUAtFXZegJDfOk066EPH7RHQ== +"@abp/timeago@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.1.tgz#069a4eb2725b0a183cb7609e1f48d8d857a606ba" + integrity sha512-+QWO9MTuf6X7sUXxoUGyoQ0EhoQUlRDdCPmwwcZyBzBf8q9A3hS+Rtmex3BqwRLDxL2vL78gbDpIBgPn/kFuUA== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" timeago "^1.6.7" -"@abp/toastr@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.0.tgz#8a002c19ea25ac6b042a25c0f9d289d03c93c2fb" - integrity sha512-gjb2O/XrYkX8IeCERIqlOYPh15WlF9LxGR6t9jeVF/p6BTX/yaWabYCFfB9SkU2pQ6xrGl7WmSTAC06JOAtPTA== +"@abp/toastr@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.1.tgz#4a18b293444f7f8a523b7255ea61fed838131f1c" + integrity sha512-gz5cl6sPu6b65h8VJ6ne+dkM0oVXSYBlDoKBYbDRjhH6i7yWUpcylY/lrOvWacNQBOagBy5bep1937aec1/BXQ== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" toastr "^2.1.4" -"@abp/utils@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.0.tgz#e93739074a3cd445a5a221209506b7e663050ca0" - integrity sha512-Nm+h+3PL10+rBFSh8UUuenmGM+OBlEoNQeGzHRmhOc6hJ3oqCogPzY+zkq0e4pksrwhjxAu/cgCEGLAoEXXycw== +"@abp/utils@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.1.tgz#ff238e3b70c6fffb1600d845c202961e1179c813" + integrity sha512-XVYrygoWq1ZHz4N7BSJ4P77wmd0geRhpyR5ztzyP1WaF2LaCRS63BjZ/a7xKdtioUby9GP5jSvMjBvwqVviYIQ== dependencies: just-compare "^1.3.0" diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json index 933390e8f8..5342df3536 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.0", - "@abp/cms-kit": "5.3.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.1", + "@abp/cms-kit": "5.3.1" } } diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock index 6b13c7cede..e00c1a0aa3 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.0.tgz#dcdd73d8582c4d14438f70d765170398d5d582fb" - integrity sha512-H6UrafHRI1DHfIoi47gZWHKSanlyAkghtGgUO6GTmPqTubBXjl7Ky3owVUAXvFd49+72gwdCLA/DB0Khjc3Ayw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.0" - -"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.0.tgz#84e94845a247815ce981cda2d195944a350530b9" - integrity sha512-RwXxlncjidvh8Hgw91Hz1f5rnfG9hlNROr5bD/kxTUB47vIh/TIBd06UYrYw2/lqFLw5d6wd8q7VLuDjGUQbpg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.0" - "@abp/bootstrap" "~5.3.0" - "@abp/bootstrap-datepicker" "~5.3.0" - "@abp/datatables.net-bs5" "~5.3.0" - "@abp/font-awesome" "~5.3.0" - "@abp/jquery-form" "~5.3.0" - "@abp/jquery-validation-unobtrusive" "~5.3.0" - "@abp/lodash" "~5.3.0" - "@abp/luxon" "~5.3.0" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.0" - "@abp/select2" "~5.3.0" - "@abp/sweetalert2" "~5.3.0" - "@abp/timeago" "~5.3.0" - "@abp/toastr" "~5.3.0" - -"@abp/aspnetcore.mvc.ui@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.0.tgz#e947fd1aecbd2aabc5db4c6a64b78f2690fcf0d4" - integrity sha512-en2YDb/hRG1MKkbli1PYcoeU9OLU0YPSahkIBSfOmMLntAe8y0c2+Xe09chXP4r+GoZu0zd9FM3qqCRZojrlug== +"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.1.tgz#469befe88cd7d3362112db9a5ce7cf3eae328b3e" + integrity sha512-qvzNICtvrNVllo7c8khvKw4LQ6MxwWcJar8PyOhgS+Pgtn4lT5rQqzGvaYKMiDyj5gjWGzPOzjU/vgR1uiGYNg== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.1" + +"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.1.tgz#7fe0aba80670bf4326251138dc7e12ea5830c919" + integrity sha512-ieS54bLQr4Aa96CnFEmuxe0ndeJpJMkq5eYSWAziH4i15jm7o+K2ouIL0K606lk1Sn/UrP8Yl+DRhxr4i4P8ow== + dependencies: + "@abp/aspnetcore.mvc.ui" "~5.3.1" + "@abp/bootstrap" "~5.3.1" + "@abp/bootstrap-datepicker" "~5.3.1" + "@abp/datatables.net-bs5" "~5.3.1" + "@abp/font-awesome" "~5.3.1" + "@abp/jquery-form" "~5.3.1" + "@abp/jquery-validation-unobtrusive" "~5.3.1" + "@abp/lodash" "~5.3.1" + "@abp/luxon" "~5.3.1" + "@abp/malihu-custom-scrollbar-plugin" "~5.3.1" + "@abp/select2" "~5.3.1" + "@abp/sweetalert2" "~5.3.1" + "@abp/timeago" "~5.3.1" + "@abp/toastr" "~5.3.1" + +"@abp/aspnetcore.mvc.ui@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.1.tgz#17ccf9a2a40cbd79e670a0cb5be74ac9eb17b963" + integrity sha512-UuXH0Lz7DqiGp47BC7xllT3Imf2Nk+eccOiVRwc9PAfHKnNOOJYxvDlHS0x8CM09qxM5EVaH7tfwOLSS09HXpg== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,243 +41,243 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.0.tgz#09c44954774d8f52ca8ff6699ad4dbb7cc0308c2" - integrity sha512-AQ26I0jgoCioW1/4XmQIyn1c1+CLv8KTb4Vd4ZbtdYGBkkkUe+JEAWpJSeXlJRr/XrOs0BKWp/fa7Nnwx8srLg== +"@abp/bootstrap-datepicker@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.1.tgz#241aebfbae0fa451d3e719776096b14bf77c08fa" + integrity sha512-gvP7SNEnPFYuLmIBp7QobveAGv8Rm/8JTmixCChQPPP9XX3u82ilKP2cgxVXm/4/jf0Gy7Gusn7urmTbTxeGEw== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.0.tgz#42dac2d2d6374f39d068a638687039c5c74df123" - integrity sha512-rg9mLcvT4JQRc1rIAhGYK1P2eMRJ1+GArQXV5l7k3FrVU+bRLKdoE6PNpuwXHpdlom4/dOgekfuWH/SAuY5kyw== +"@abp/bootstrap@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.1.tgz#f941afe2be2deaa1962a3626593451847dee5bd6" + integrity sha512-qPGeNFEaQF57b0viA0eHKA0cZ9b0gscOqE0o4ewHxnlRoRYiY3Ob9V6x6S85n2b7H6tDZOWAePXEgkV40yK/Bg== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" bootstrap "^5.1.3" -"@abp/clipboard@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-5.3.0.tgz#579bbc786d32c4e07c969073872b936575df7a9c" - integrity sha512-J55jQnzPOOAwo70GK9hAB3JxG7rz75tex+17QSFjW7/dXVWt1bPIDRHh/a1wiLEgYc6btsSGhptLtkYAfWpq6w== +"@abp/clipboard@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-5.3.1.tgz#aede839bfba487461d31589092a3f2b0a75a2925" + integrity sha512-XKxxjjT2x7+a6vrw2x6G//ntQGmRcvBz8KcxCXuWJ8cCrHb1x7ZEzIUU4rF6ee7BlnLoEIZ/dCF+s/93yPs9ng== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" clipboard "^2.0.8" -"@abp/cms-kit.admin@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/cms-kit.admin/-/cms-kit.admin-5.3.0.tgz#5cdb2df086887009a6cf96743586df513a1741ce" - integrity sha512-dO68zu1q5iE8xVY5YUFyl8OLeHcqIRc8/JmGDalhPF+714aQEWEB1OtLBPjyadLzaYZkoIbppePW1E0zGtwtog== +"@abp/cms-kit.admin@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/cms-kit.admin/-/cms-kit.admin-5.3.1.tgz#0c7517fa022f4885d66f582a2081a76ec7def76b" + integrity sha512-5sgCDlj/QFESxKbjSZjfQx6VyGJfdo2e5ehSBDvrabewP2YUTk8CcKyewCsPTdTb2LFuCawg6ZEJOhev+5eVUw== dependencies: - "@abp/codemirror" "~5.3.0" - "@abp/jstree" "~5.3.0" - "@abp/slugify" "~5.3.0" - "@abp/tui-editor" "~5.3.0" - "@abp/uppy" "~5.3.0" + "@abp/codemirror" "~5.3.1" + "@abp/jstree" "~5.3.1" + "@abp/slugify" "~5.3.1" + "@abp/tui-editor" "~5.3.1" + "@abp/uppy" "~5.3.1" -"@abp/cms-kit.public@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/cms-kit.public/-/cms-kit.public-5.3.0.tgz#c545edbb4d2ee0c4d4d99cb597353635a336f607" - integrity sha512-hY+1j3ZqgU2D86/677yGEbbbMntqEy+drbqcj/DkG+YT/pXndJG3XwKZQ/fMpyD4+f9uvTnM1SBdQzvyFSRtMw== +"@abp/cms-kit.public@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/cms-kit.public/-/cms-kit.public-5.3.1.tgz#f455d98846121e92b78ae82134e949b57450be85" + integrity sha512-N0BoSqh3HcKxyX29fMClwsYwALJFXFT8TcRwvJj+3jPkIqqWJ9nR9JefZVJ54l8FzkxBiYFJ33FLFI0tSDB8Qw== dependencies: - "@abp/highlight.js" "~5.3.0" - "@abp/star-rating-svg" "~5.3.0" + "@abp/highlight.js" "~5.3.1" + "@abp/star-rating-svg" "~5.3.1" -"@abp/cms-kit@5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/cms-kit/-/cms-kit-5.3.0.tgz#5bc0635bcb79615578bf7c86f2b3ee1113e6d5c5" - integrity sha512-1LMeGa/dCaVmrMBdFsYV7DwlAtK4wktrb6SAHYTVDEdbvR306hjvYZBa99w20oXNlmvWDTs/EW5ZPbSyjF+ILw== +"@abp/cms-kit@5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/cms-kit/-/cms-kit-5.3.1.tgz#db1a900d27a706d2dceb3e0958d5a5600663f1a8" + integrity sha512-qswqY9smSgZ60gSIPMzByLDXxUIuNIE3YeK9xRnOXAs/S7SMp228Q9zPX0hUM07mA+k9Xll7KgnedS5trthHKQ== dependencies: - "@abp/cms-kit.admin" "~5.3.0" - "@abp/cms-kit.public" "~5.3.0" + "@abp/cms-kit.admin" "~5.3.1" + "@abp/cms-kit.public" "~5.3.1" -"@abp/codemirror@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-5.3.0.tgz#16fc4b0158b32d1505d3c3c5adaa4eddbc9f225c" - integrity sha512-xw802zydI4OHk9P2rI4vKgT8wKDAK/JQlEEPIZvPFXNvmfIkV2CDJr0AZkrhYw0AB07EzAQkndPFia8TyW82Pw== +"@abp/codemirror@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-5.3.1.tgz#d476e285f3c1f7c8680dd0595d6ce011aec0bdc9" + integrity sha512-G5COI/GzE+wYpgkPmdph+PRf9Dg7CF4iEcKHusk7FunOikUOU2RX/PG2Yx20JWkvsVdEIcFWG4y9oPEk2ziUhQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" codemirror "^5.65.1" -"@abp/core@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.0.tgz#032724dd0c0b850204896ce0275c7f9c8f516740" - integrity sha512-Uk9h98jiEF1dItWrvWnYB6s/UNZZapvFSyJ4+piAsZmXOSAbrObV+s19n5xfUagQQTWn4+aU5+aChEcfWpYv9A== +"@abp/core@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.1.tgz#26890ab049d43db58f3a0fba2f4c50bd2fbf7811" + integrity sha512-7PBPDYq/s0T5H0iYaeCzqWF44jbiOkFlwGnXqZeKHt2cKZaMyCStgotrpap8qoZKlxuyxudFIzJrzJIEP0AN/Q== dependencies: - "@abp/utils" "~5.3.0" + "@abp/utils" "~5.3.1" -"@abp/datatables.net-bs5@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.0.tgz#84771ce4eb7229bed347a5904c891b08e3230422" - integrity sha512-FpKrgrjaBKVgFAnbBsrvDIJJOy8gbWCEHm5Jy2vFWXmx25fITMw/2ckBDH87yrZtCNVTSUbMIdHYOIHMPfSavQ== +"@abp/datatables.net-bs5@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.1.tgz#e380cc253a837a0629baec9dabb4e8919878cc38" + integrity sha512-LpGPWLvFsLkQjo5RTgEl24LbBokgsO1gv7/pVy/1oiXXCLTuVwJ8vYYKfDNkrrSLDUOJ9cCC0YUE5SRfDUystA== dependencies: - "@abp/datatables.net" "~5.3.0" + "@abp/datatables.net" "~5.3.1" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.0.tgz#dd27ae451df9551f5b815e10c87a8a89c6a38293" - integrity sha512-d4lQ09G7HY2gEN1lRAteCZzY0Fv3gPuUM+icgWm+UkmDZV9lhvovTQ58Xkwayw8vf+NPlit1eGMMQedn6MbeAQ== +"@abp/datatables.net@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.1.tgz#8200b5a3a719f51d21670b1420e3df48af4de42e" + integrity sha512-v30gkk4dcmWz260C8BA7uaU4kqpiC1wkgMvdzjPGefzYXsMftlcoX7GUvByWwTzlJnTphGvnIVJhnhX73VVDHg== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" datatables.net "^1.11.4" -"@abp/font-awesome@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.0.tgz#ce1d5bb59bd597cc9717885917d4dd2eae1f8b9c" - integrity sha512-JX62EVfZSJ7pv75Gd3ya/3c3He0hXF7KmpTizUNd/EbeHuNJoCND5wwq5OAFV9Ld3vdcGJChNTydNa5RsBzrpg== +"@abp/font-awesome@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.1.tgz#2b4654b463b7858fc237219fd852ca0f41e4e062" + integrity sha512-LFKPjQgJmQ6GNqW3geluHMgV3WbisniAaK9tl6Pv8WOvPluvZGHTK5qjcAQVwM6Bj944VYeuvLo1ZCOoC/rWLg== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/highlight.js@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-5.3.0.tgz#651817b146b9305ea07938ecceef160ff83413bd" - integrity sha512-bcbz67DzyE5pN+/FsyKEX860j7KUDwL3qot1IH995bGT538Fso6xwwA5r4TpR/A/nEx2frmgljU0erX/9MgKew== +"@abp/highlight.js@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-5.3.1.tgz#13a1b4fa61cdec947a548080e853c984b51394b9" + integrity sha512-/yIIOJaxwCoVJF6e1pJfP9/dSx9dWYXAE0C8WxSa2bi+3CnaNPCZ6joJtbFbtOBxs3ctY/qS7NVULeKaiUw+vg== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" "@highlightjs/cdn-assets" "~11.4.0" -"@abp/jquery-form@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.0.tgz#5ae9906f0cffaf3e043681a5dd80a014b4860f6b" - integrity sha512-ZTpXCImHirJDZjfnJRtSEHLIbWMTYkqtTv7Z3GMRKnI4fllpmuco9EWLAKjAfYPyc/QpTx+MYnUg5SsXORhJyQ== +"@abp/jquery-form@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.1.tgz#e17367af8dafcfbb352775fb6ab9182d1fd9cd63" + integrity sha512-s8XItBHKJuehprFy7xePWHxt8jMvjDmkmk2nEuJXj+gcZyVEEa3hBd4ykKDXFfmNrfS8aMy+VqA+VEA24Cmpww== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.0.tgz#ccf90a7840398e69e0a91ed6c32b80fa2eb82d14" - integrity sha512-6B3ywnpvPxpnxkrcXzjTjMWgKRImbzNPOZvv5ant/kQv3zXedV1GXSIILy+imX39FuDPslOmEfx8plwrNvIteA== +"@abp/jquery-validation-unobtrusive@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.1.tgz#7c5c31df1cd021b3eed618d914926b76dc7e9e6e" + integrity sha512-B5USCmF56eWQO+R4eZtMjURtoNGUEuAuBy4ltCPtZx0s6yn94Ooq4oYKqEbfnLoSsQshajUwBtqtlC6+YA612Q== dependencies: - "@abp/jquery-validation" "~5.3.0" + "@abp/jquery-validation" "~5.3.1" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.0.tgz#a21696e7d5d54ef8bcdc0e8bd2debb1da1f7f5cc" - integrity sha512-4z2I9iORf+z5SlN9crC/Gx3X5GAOVePD+WN8SaHSYr4VWYNe8TV8LvCZPilN56sIPt3jYvy0N+bI1tAuZPu/NQ== +"@abp/jquery-validation@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.1.tgz#b34c0e29e12843de4a407bc8775a2e560e4db923" + integrity sha512-lu2e47GwWmh/ahWA5bbeR9Gqqsy4a3htTIvnwWbtu7dnHVHA6469+uCt+0f+sVthDIL+cMwoYgcygMLIUHoFxg== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.0.tgz#0279ee501ed774a788072c2ec8b003e348fec22c" - integrity sha512-rqYbU3LpsT7XT8ygn+TFVmjev5NlgEcDhGwQ8PraY1dEjlDbteeQ50N4adS8fdRfOM1UjGL19ueN3F8E5qNUSg== +"@abp/jquery@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.1.tgz#8f6032253d4c44b135c238a4efa010bee1ec5991" + integrity sha512-ngy9Kvy6lXrQBCxWi7t8I4Wudv87C2R50O/T4CZPfM2nwYLynopa+aI9r9VLhO/wIROyXX3C8UIpeLhQzm776w== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" jquery "~3.6.0" -"@abp/jstree@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jstree/-/jstree-5.3.0.tgz#20127f006dec2589c76deaf39227af95253952c6" - integrity sha512-ipiXKUAJjqiph4V7qtSfDr9/nU0UViu+zG+GeKdqxgVxFKR92hsisDOKrPJF+XmprLu7o9T7bxsFgS/B6ko4Og== +"@abp/jstree@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jstree/-/jstree-5.3.1.tgz#0c6d8ee49204951a26daf617d816469b8be2e7ac" + integrity sha512-WOubLE7meyOm/ftX5D5HBCOtzLhgB6XfFV6ZJgQyO/FeZlKP4GVj+u4imXKD4bl43zGD8SLmjL6Xn3c1V+fMSA== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" jstree "^3.3.12" -"@abp/lodash@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.0.tgz#45f1dba7bb65b6599b4973d7e0c617dfd2c46c49" - integrity sha512-vQVMv58QuYttWBfLjJzIsw92JunGbWYsqk6pp6/JuoBls5UJtdP1F7vM4JgQxsscGYHFRZB3F4a3h1cxZ+dblQ== +"@abp/lodash@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.1.tgz#49c0806bae0858047faed75b6e9ed6207dc4cffc" + integrity sha512-QQshVHkNlunbhcmBG5E2wdZNcHYrTsNQjJNF6IZkeFszNRHu/k0u1bhszDwjPgEzeewTqMu8n44TzkbA8yP5GA== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" lodash "^4.17.21" -"@abp/luxon@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.0.tgz#8a6277046f6e38c3affbf79c06f8ac00d1ca8098" - integrity sha512-6tETR03i1NPJuDqSQWtpkOykdq/84awifQUqRyh+b8340wV7P54NqUMDXDit9sjITFDhq99V/R+Rj3PVjvJD3A== +"@abp/luxon@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.1.tgz#8d843023b05b157ff9ab23548c8d8c4e7101ae88" + integrity sha512-Jw8p5S9qHZkUrD1fx3nvpnBqn8Zb9jDiG6xdc6tY+v1aqDDwEqPUr7TqaLnY9GnZefiM3sYVwAh42nzPOwg9aQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.0.tgz#e6e12162aa50d3c3d98629378cec2f6fd5964338" - integrity sha512-GVwgAZQurH/tr4Hgmuby2dun//v1dT+wLGV4ZvjCJzBRs4FgrB+25pj4qKm20j6/NKRKc4V5re/b1y6njCubFQ== +"@abp/malihu-custom-scrollbar-plugin@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.1.tgz#7f0e4f2df325345a8e3be67456522cb035e3e962" + integrity sha512-ll49qD7bslt7+deMAFZ0DfveH/5ZsHyL2RLDg796ARz+H7fQpEhyNFeGETGj+HSOvAl3ivux2mxNCMYbXHR4RQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/prismjs@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-5.3.0.tgz#658a371023d9a3de9ecfff1f10bae7a83064fac7" - integrity sha512-NPsYJ9oj/57vG+eVGpDkJcdPAx4WlXTVEUZWWxmaXuM9sHY1/2av975Qk8R5HG6fC74w3DrVCP8YQvU6jlaF1w== +"@abp/prismjs@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-5.3.1.tgz#46b7a7f456b60f3f0f3b92b0a645f30495db571b" + integrity sha512-21h2L4XTIKAuWqYCGKC/MrqledtWsToGLs8Tkk4ML9eQgnpOwGvWyD/5wywlA7zfKKaeOAC9/7Ga7+qckQoQvg== dependencies: - "@abp/clipboard" "~5.3.0" - "@abp/core" "~5.3.0" + "@abp/clipboard" "~5.3.1" + "@abp/core" "~5.3.1" prismjs "^1.26.0" -"@abp/select2@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.0.tgz#aae202b87dc23dfc7c8fd933413a8dbeb2f5b683" - integrity sha512-0aIxdtzgONkrYnUN5ACkIIIhsC9e61QLRq3K+/98fjf7NkHOjG3Sptr8EKu5U3IQ2hNHgqBjPGYjkztGuxZ9kw== +"@abp/select2@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.1.tgz#9a49aa983d52eecbd2dc2160349d45bd46324e36" + integrity sha512-ne4LJJy9n3V8BPtyU6voX4Bo0/GUrZBnI4Mkb0wRKNt1rxj7PhPXebsYYz090QJuJh8fuF2OHteNMBA7gMryLQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" select2 "^4.0.13" -"@abp/slugify@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/slugify/-/slugify-5.3.0.tgz#b805f0c2965382607ce031b949b01ac82dfaa68c" - integrity sha512-N2SUiYDMAyDrs+a35yTsSknFfGDmWtq1IUcOnb6D0WdGyhOTdeBzn5zAQPXYBH6buAjsQQT5mR1tWS0phICVdg== +"@abp/slugify@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/slugify/-/slugify-5.3.1.tgz#f08b62550d9c7b24d3caeff98570debcfb795d32" + integrity sha512-GFOqhxUgXfG4WOegZCJI3l1Dx2V06Bz7AW8hfyIHzpHGW5MilHecHWyqkYTU2QbdVukhADSM0eVd1JiJ4n1FnQ== dependencies: slugify "^1.6.5" -"@abp/star-rating-svg@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/star-rating-svg/-/star-rating-svg-5.3.0.tgz#9a5544b3a62df467d04f8c5b73fb6f056cafc8ad" - integrity sha512-DbzCtZE41ELMf22XOXAHbe8zzRuA/BW6s4PxDgk8JEJHAx/BaPOHxauEkd3dpmxBSZGUVaX3RedofnJgIBREEg== +"@abp/star-rating-svg@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/star-rating-svg/-/star-rating-svg-5.3.1.tgz#c87bebfdfbbe3db4132fe2f658fe5702dc83bcb6" + integrity sha512-jxx8dUUpwSUPSvMCJ5yHs0FLglCCtFWUBIW6q/41wi8f6erEVCTm7ClmyVTnVjdn8Nugwu3uxnGVipcEqe9ZAg== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" star-rating-svg "^3.5.0" -"@abp/sweetalert2@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.0.tgz#67379cfa4cb8884cb66b58f4cafa79960cf8426a" - integrity sha512-EBr8J7MDsYmSvOYxTbqsSmw6c2yLokHZe8A+EW2vsY9VYFXkoOJLVpCkCK4fhvHUv8/+Y5QnHW7bs1I6SKYXOw== +"@abp/sweetalert2@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.1.tgz#676a3269fe4511fc4f81c3231ed9a96fe4c8f006" + integrity sha512-UDQrJiq8OfIDy3GSq7NJ4TKKEihzp6Qc06KGRdnN74lm4JsxxGUToSaD1AbyrLt53jZlRZK2NNc8IiyqPvyfbQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.0.tgz#3aaef3edca333224ba6b3e81c8ad1ebaae51a2f4" - integrity sha512-FxtoPYxyk2CHeoloC6kaeCj5YtXH0rebhOEaCjrfyg9/Ec6LEkvpfC7RWlcsHaEUAtFXZegJDfOk066EPH7RHQ== +"@abp/timeago@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.1.tgz#069a4eb2725b0a183cb7609e1f48d8d857a606ba" + integrity sha512-+QWO9MTuf6X7sUXxoUGyoQ0EhoQUlRDdCPmwwcZyBzBf8q9A3hS+Rtmex3BqwRLDxL2vL78gbDpIBgPn/kFuUA== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" timeago "^1.6.7" -"@abp/toastr@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.0.tgz#8a002c19ea25ac6b042a25c0f9d289d03c93c2fb" - integrity sha512-gjb2O/XrYkX8IeCERIqlOYPh15WlF9LxGR6t9jeVF/p6BTX/yaWabYCFfB9SkU2pQ6xrGl7WmSTAC06JOAtPTA== +"@abp/toastr@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.1.tgz#4a18b293444f7f8a523b7255ea61fed838131f1c" + integrity sha512-gz5cl6sPu6b65h8VJ6ne+dkM0oVXSYBlDoKBYbDRjhH6i7yWUpcylY/lrOvWacNQBOagBy5bep1937aec1/BXQ== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" toastr "^2.1.4" -"@abp/tui-editor@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-5.3.0.tgz#99969b636687a6ca4fc651129d12b8a19499c32c" - integrity sha512-FldoVDpVnbBd7jirGnsVDho9hV6Qg2lU4YB5iUgkuMjAEVO/QOb25FK4Fei1jwioE6fjbyF9cwG7WDnG/YEc3g== +"@abp/tui-editor@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-5.3.1.tgz#8906a1f7b307aa2d734954dce1d7c679d6fcf94d" + integrity sha512-+3XNcf2fnVw4L6R40LQ4W4UCgmoajM6SLys3O4NSbx7+JnOV6Wnz3ToiDDFcZESzFWyfejmPGY2EiC7WIN+8RQ== dependencies: - "@abp/jquery" "~5.3.0" - "@abp/prismjs" "~5.3.0" + "@abp/jquery" "~5.3.1" + "@abp/prismjs" "~5.3.1" -"@abp/uppy@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/uppy/-/uppy-5.3.0.tgz#af4174021849538fe54a46be9325bb6419618ac8" - integrity sha512-5fP/Warb1SWk+ChkMOLa400uv6S5UTC0ujvDUtkPmR6Q7TY4gtg8Eg9VNQJMLBtcC9t3431OjOfP6J+MdUt8CQ== +"@abp/uppy@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/uppy/-/uppy-5.3.1.tgz#5ab60946781e2a615139ecd77dd058324d77f37d" + integrity sha512-fUbfmy88tsPyYy0qAvPG9d3T3BNBNWbI56lAzsyyXkLVZ1lG+7YaV+Yvh0W4W8DqX23f3lLakksszBuSAQMwHg== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" uppy "^1.16.1" -"@abp/utils@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.0.tgz#e93739074a3cd445a5a221209506b7e663050ca0" - integrity sha512-Nm+h+3PL10+rBFSh8UUuenmGM+OBlEoNQeGzHRmhOc6hJ3oqCogPzY+zkq0e4pksrwhjxAu/cgCEGLAoEXXycw== +"@abp/utils@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.1.tgz#ff238e3b70c6fffb1600d845c202961e1179c813" + integrity sha512-XVYrygoWq1ZHz4N7BSJ4P77wmd0geRhpyR5ztzyP1WaF2LaCRS63BjZ/a7xKdtioUby9GP5jSvMjBvwqVviYIQ== dependencies: just-compare "^1.3.0" diff --git a/modules/docs/app/VoloDocs.Web/package.json b/modules/docs/app/VoloDocs.Web/package.json index ea4be778d9..b180689a91 100644 --- a/modules/docs/app/VoloDocs.Web/package.json +++ b/modules/docs/app/VoloDocs.Web/package.json @@ -3,7 +3,7 @@ "name": "volo.docstestapp", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.0", - "@abp/docs": "^5.3.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.1", + "@abp/docs": "^5.3.1" } } diff --git a/modules/docs/app/VoloDocs.Web/yarn.lock b/modules/docs/app/VoloDocs.Web/yarn.lock index dc26bd6af4..19fc6428ef 100644 --- a/modules/docs/app/VoloDocs.Web/yarn.lock +++ b/modules/docs/app/VoloDocs.Web/yarn.lock @@ -2,45 +2,45 @@ # yarn lockfile v1 -"@abp/anchor-js@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/anchor-js/-/anchor-js-5.3.0.tgz#a6786ffc7c646179cdabd6ad05e8801ab9520d1c" - integrity sha512-4mBV86YzkhHbSyMSUGQLmZ2TYGzTQJjO+2TI86BGTwcrEyuuLo0Hbdi6bvSpdctQeQnuQaIREE0nEpPPMwjsDQ== +"@abp/anchor-js@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/anchor-js/-/anchor-js-5.3.1.tgz#6a3a6b499c4eb728dbb7f07f4fc083e6ba1ef093" + integrity sha512-+eTWfaYsJeYnpcvibcUcRmnPjXEtnaPnGF4AfZL4+RhKtMFSEu+GXu8ANN5crEa+ZvXhN7l9xarvopQA4cJsjQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" anchor-js "^4.3.1" -"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.0.tgz#dcdd73d8582c4d14438f70d765170398d5d582fb" - integrity sha512-H6UrafHRI1DHfIoi47gZWHKSanlyAkghtGgUO6GTmPqTubBXjl7Ky3owVUAXvFd49+72gwdCLA/DB0Khjc3Ayw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.0" - -"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.0.tgz#84e94845a247815ce981cda2d195944a350530b9" - integrity sha512-RwXxlncjidvh8Hgw91Hz1f5rnfG9hlNROr5bD/kxTUB47vIh/TIBd06UYrYw2/lqFLw5d6wd8q7VLuDjGUQbpg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.0" - "@abp/bootstrap" "~5.3.0" - "@abp/bootstrap-datepicker" "~5.3.0" - "@abp/datatables.net-bs5" "~5.3.0" - "@abp/font-awesome" "~5.3.0" - "@abp/jquery-form" "~5.3.0" - "@abp/jquery-validation-unobtrusive" "~5.3.0" - "@abp/lodash" "~5.3.0" - "@abp/luxon" "~5.3.0" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.0" - "@abp/select2" "~5.3.0" - "@abp/sweetalert2" "~5.3.0" - "@abp/timeago" "~5.3.0" - "@abp/toastr" "~5.3.0" - -"@abp/aspnetcore.mvc.ui@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.0.tgz#e947fd1aecbd2aabc5db4c6a64b78f2690fcf0d4" - integrity sha512-en2YDb/hRG1MKkbli1PYcoeU9OLU0YPSahkIBSfOmMLntAe8y0c2+Xe09chXP4r+GoZu0zd9FM3qqCRZojrlug== +"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.1.tgz#469befe88cd7d3362112db9a5ce7cf3eae328b3e" + integrity sha512-qvzNICtvrNVllo7c8khvKw4LQ6MxwWcJar8PyOhgS+Pgtn4lT5rQqzGvaYKMiDyj5gjWGzPOzjU/vgR1uiGYNg== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.1" + +"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.1.tgz#7fe0aba80670bf4326251138dc7e12ea5830c919" + integrity sha512-ieS54bLQr4Aa96CnFEmuxe0ndeJpJMkq5eYSWAziH4i15jm7o+K2ouIL0K606lk1Sn/UrP8Yl+DRhxr4i4P8ow== + dependencies: + "@abp/aspnetcore.mvc.ui" "~5.3.1" + "@abp/bootstrap" "~5.3.1" + "@abp/bootstrap-datepicker" "~5.3.1" + "@abp/datatables.net-bs5" "~5.3.1" + "@abp/font-awesome" "~5.3.1" + "@abp/jquery-form" "~5.3.1" + "@abp/jquery-validation-unobtrusive" "~5.3.1" + "@abp/lodash" "~5.3.1" + "@abp/luxon" "~5.3.1" + "@abp/malihu-custom-scrollbar-plugin" "~5.3.1" + "@abp/select2" "~5.3.1" + "@abp/sweetalert2" "~5.3.1" + "@abp/timeago" "~5.3.1" + "@abp/toastr" "~5.3.1" + +"@abp/aspnetcore.mvc.ui@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.1.tgz#17ccf9a2a40cbd79e670a0cb5be74ac9eb17b963" + integrity sha512-UuXH0Lz7DqiGp47BC7xllT3Imf2Nk+eccOiVRwc9PAfHKnNOOJYxvDlHS0x8CM09qxM5EVaH7tfwOLSS09HXpg== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -49,180 +49,180 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.0.tgz#09c44954774d8f52ca8ff6699ad4dbb7cc0308c2" - integrity sha512-AQ26I0jgoCioW1/4XmQIyn1c1+CLv8KTb4Vd4ZbtdYGBkkkUe+JEAWpJSeXlJRr/XrOs0BKWp/fa7Nnwx8srLg== +"@abp/bootstrap-datepicker@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.1.tgz#241aebfbae0fa451d3e719776096b14bf77c08fa" + integrity sha512-gvP7SNEnPFYuLmIBp7QobveAGv8Rm/8JTmixCChQPPP9XX3u82ilKP2cgxVXm/4/jf0Gy7Gusn7urmTbTxeGEw== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.0.tgz#42dac2d2d6374f39d068a638687039c5c74df123" - integrity sha512-rg9mLcvT4JQRc1rIAhGYK1P2eMRJ1+GArQXV5l7k3FrVU+bRLKdoE6PNpuwXHpdlom4/dOgekfuWH/SAuY5kyw== +"@abp/bootstrap@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.1.tgz#f941afe2be2deaa1962a3626593451847dee5bd6" + integrity sha512-qPGeNFEaQF57b0viA0eHKA0cZ9b0gscOqE0o4ewHxnlRoRYiY3Ob9V6x6S85n2b7H6tDZOWAePXEgkV40yK/Bg== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" bootstrap "^5.1.3" -"@abp/clipboard@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-5.3.0.tgz#579bbc786d32c4e07c969073872b936575df7a9c" - integrity sha512-J55jQnzPOOAwo70GK9hAB3JxG7rz75tex+17QSFjW7/dXVWt1bPIDRHh/a1wiLEgYc6btsSGhptLtkYAfWpq6w== +"@abp/clipboard@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-5.3.1.tgz#aede839bfba487461d31589092a3f2b0a75a2925" + integrity sha512-XKxxjjT2x7+a6vrw2x6G//ntQGmRcvBz8KcxCXuWJ8cCrHb1x7ZEzIUU4rF6ee7BlnLoEIZ/dCF+s/93yPs9ng== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" clipboard "^2.0.8" -"@abp/core@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.0.tgz#032724dd0c0b850204896ce0275c7f9c8f516740" - integrity sha512-Uk9h98jiEF1dItWrvWnYB6s/UNZZapvFSyJ4+piAsZmXOSAbrObV+s19n5xfUagQQTWn4+aU5+aChEcfWpYv9A== +"@abp/core@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.1.tgz#26890ab049d43db58f3a0fba2f4c50bd2fbf7811" + integrity sha512-7PBPDYq/s0T5H0iYaeCzqWF44jbiOkFlwGnXqZeKHt2cKZaMyCStgotrpap8qoZKlxuyxudFIzJrzJIEP0AN/Q== dependencies: - "@abp/utils" "~5.3.0" + "@abp/utils" "~5.3.1" -"@abp/datatables.net-bs5@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.0.tgz#84771ce4eb7229bed347a5904c891b08e3230422" - integrity sha512-FpKrgrjaBKVgFAnbBsrvDIJJOy8gbWCEHm5Jy2vFWXmx25fITMw/2ckBDH87yrZtCNVTSUbMIdHYOIHMPfSavQ== +"@abp/datatables.net-bs5@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.1.tgz#e380cc253a837a0629baec9dabb4e8919878cc38" + integrity sha512-LpGPWLvFsLkQjo5RTgEl24LbBokgsO1gv7/pVy/1oiXXCLTuVwJ8vYYKfDNkrrSLDUOJ9cCC0YUE5SRfDUystA== dependencies: - "@abp/datatables.net" "~5.3.0" + "@abp/datatables.net" "~5.3.1" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.0.tgz#dd27ae451df9551f5b815e10c87a8a89c6a38293" - integrity sha512-d4lQ09G7HY2gEN1lRAteCZzY0Fv3gPuUM+icgWm+UkmDZV9lhvovTQ58Xkwayw8vf+NPlit1eGMMQedn6MbeAQ== +"@abp/datatables.net@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.1.tgz#8200b5a3a719f51d21670b1420e3df48af4de42e" + integrity sha512-v30gkk4dcmWz260C8BA7uaU4kqpiC1wkgMvdzjPGefzYXsMftlcoX7GUvByWwTzlJnTphGvnIVJhnhX73VVDHg== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" datatables.net "^1.11.4" -"@abp/docs@^5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/docs/-/docs-5.3.0.tgz#6d579324861e19fe04026557b078924482832cd3" - integrity sha512-MJNFP6qRdIoZHiBmydniHb8fXVdn1TwCvHL3nTH8efOeRXfj985LXLDwIhem3sOUdJ/bnpRDS8camObScdYWRQ== +"@abp/docs@^5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/docs/-/docs-5.3.1.tgz#399fc35f8c58161a476b705c1f09242feebf9afa" + integrity sha512-lBmgv23tMXtfO6HxfANMZ4WxahghGYGBMqkfbvmN1wyrxvR4Yf4As3oA1cJcK1flWEMY5ZPV/TamDPBdvc74Jg== dependencies: - "@abp/anchor-js" "~5.3.0" - "@abp/clipboard" "~5.3.0" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.0" - "@abp/popper.js" "~5.3.0" - "@abp/prismjs" "~5.3.0" + "@abp/anchor-js" "~5.3.1" + "@abp/clipboard" "~5.3.1" + "@abp/malihu-custom-scrollbar-plugin" "~5.3.1" + "@abp/popper.js" "~5.3.1" + "@abp/prismjs" "~5.3.1" -"@abp/font-awesome@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.0.tgz#ce1d5bb59bd597cc9717885917d4dd2eae1f8b9c" - integrity sha512-JX62EVfZSJ7pv75Gd3ya/3c3He0hXF7KmpTizUNd/EbeHuNJoCND5wwq5OAFV9Ld3vdcGJChNTydNa5RsBzrpg== +"@abp/font-awesome@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.1.tgz#2b4654b463b7858fc237219fd852ca0f41e4e062" + integrity sha512-LFKPjQgJmQ6GNqW3geluHMgV3WbisniAaK9tl6Pv8WOvPluvZGHTK5qjcAQVwM6Bj944VYeuvLo1ZCOoC/rWLg== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.0.tgz#5ae9906f0cffaf3e043681a5dd80a014b4860f6b" - integrity sha512-ZTpXCImHirJDZjfnJRtSEHLIbWMTYkqtTv7Z3GMRKnI4fllpmuco9EWLAKjAfYPyc/QpTx+MYnUg5SsXORhJyQ== +"@abp/jquery-form@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.1.tgz#e17367af8dafcfbb352775fb6ab9182d1fd9cd63" + integrity sha512-s8XItBHKJuehprFy7xePWHxt8jMvjDmkmk2nEuJXj+gcZyVEEa3hBd4ykKDXFfmNrfS8aMy+VqA+VEA24Cmpww== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.0.tgz#ccf90a7840398e69e0a91ed6c32b80fa2eb82d14" - integrity sha512-6B3ywnpvPxpnxkrcXzjTjMWgKRImbzNPOZvv5ant/kQv3zXedV1GXSIILy+imX39FuDPslOmEfx8plwrNvIteA== +"@abp/jquery-validation-unobtrusive@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.1.tgz#7c5c31df1cd021b3eed618d914926b76dc7e9e6e" + integrity sha512-B5USCmF56eWQO+R4eZtMjURtoNGUEuAuBy4ltCPtZx0s6yn94Ooq4oYKqEbfnLoSsQshajUwBtqtlC6+YA612Q== dependencies: - "@abp/jquery-validation" "~5.3.0" + "@abp/jquery-validation" "~5.3.1" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.0.tgz#a21696e7d5d54ef8bcdc0e8bd2debb1da1f7f5cc" - integrity sha512-4z2I9iORf+z5SlN9crC/Gx3X5GAOVePD+WN8SaHSYr4VWYNe8TV8LvCZPilN56sIPt3jYvy0N+bI1tAuZPu/NQ== +"@abp/jquery-validation@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.1.tgz#b34c0e29e12843de4a407bc8775a2e560e4db923" + integrity sha512-lu2e47GwWmh/ahWA5bbeR9Gqqsy4a3htTIvnwWbtu7dnHVHA6469+uCt+0f+sVthDIL+cMwoYgcygMLIUHoFxg== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.0.tgz#0279ee501ed774a788072c2ec8b003e348fec22c" - integrity sha512-rqYbU3LpsT7XT8ygn+TFVmjev5NlgEcDhGwQ8PraY1dEjlDbteeQ50N4adS8fdRfOM1UjGL19ueN3F8E5qNUSg== +"@abp/jquery@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.1.tgz#8f6032253d4c44b135c238a4efa010bee1ec5991" + integrity sha512-ngy9Kvy6lXrQBCxWi7t8I4Wudv87C2R50O/T4CZPfM2nwYLynopa+aI9r9VLhO/wIROyXX3C8UIpeLhQzm776w== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" jquery "~3.6.0" -"@abp/lodash@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.0.tgz#45f1dba7bb65b6599b4973d7e0c617dfd2c46c49" - integrity sha512-vQVMv58QuYttWBfLjJzIsw92JunGbWYsqk6pp6/JuoBls5UJtdP1F7vM4JgQxsscGYHFRZB3F4a3h1cxZ+dblQ== +"@abp/lodash@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.1.tgz#49c0806bae0858047faed75b6e9ed6207dc4cffc" + integrity sha512-QQshVHkNlunbhcmBG5E2wdZNcHYrTsNQjJNF6IZkeFszNRHu/k0u1bhszDwjPgEzeewTqMu8n44TzkbA8yP5GA== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" lodash "^4.17.21" -"@abp/luxon@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.0.tgz#8a6277046f6e38c3affbf79c06f8ac00d1ca8098" - integrity sha512-6tETR03i1NPJuDqSQWtpkOykdq/84awifQUqRyh+b8340wV7P54NqUMDXDit9sjITFDhq99V/R+Rj3PVjvJD3A== +"@abp/luxon@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.1.tgz#8d843023b05b157ff9ab23548c8d8c4e7101ae88" + integrity sha512-Jw8p5S9qHZkUrD1fx3nvpnBqn8Zb9jDiG6xdc6tY+v1aqDDwEqPUr7TqaLnY9GnZefiM3sYVwAh42nzPOwg9aQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.0.tgz#e6e12162aa50d3c3d98629378cec2f6fd5964338" - integrity sha512-GVwgAZQurH/tr4Hgmuby2dun//v1dT+wLGV4ZvjCJzBRs4FgrB+25pj4qKm20j6/NKRKc4V5re/b1y6njCubFQ== +"@abp/malihu-custom-scrollbar-plugin@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.1.tgz#7f0e4f2df325345a8e3be67456522cb035e3e962" + integrity sha512-ll49qD7bslt7+deMAFZ0DfveH/5ZsHyL2RLDg796ARz+H7fQpEhyNFeGETGj+HSOvAl3ivux2mxNCMYbXHR4RQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/popper.js@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/popper.js/-/popper.js-5.3.0.tgz#7042fc857ccc7a43f5c4d4411910e9e1b2e57384" - integrity sha512-+LQWbZGNCfxOGWHnP40R0SpG4O4ft0JPla9JCaKw0rFPyel0ih3M2gpUlKO1a6fKApDxTFQIvJYYRD1tLkMkvw== +"@abp/popper.js@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/popper.js/-/popper.js-5.3.1.tgz#f793f9bc3c0c046e397c868364462352bc9cf5bd" + integrity sha512-JPSaEJJB4S3VXYh5MKrMrtq4S1x0ltoenwQ8cZdXNHa0nBWvadjtnepSdpgoYQx2x0YxpQ3v7syqG/0nLGSv7g== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" "@popperjs/core" "^2.11.2" -"@abp/prismjs@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-5.3.0.tgz#658a371023d9a3de9ecfff1f10bae7a83064fac7" - integrity sha512-NPsYJ9oj/57vG+eVGpDkJcdPAx4WlXTVEUZWWxmaXuM9sHY1/2av975Qk8R5HG6fC74w3DrVCP8YQvU6jlaF1w== +"@abp/prismjs@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-5.3.1.tgz#46b7a7f456b60f3f0f3b92b0a645f30495db571b" + integrity sha512-21h2L4XTIKAuWqYCGKC/MrqledtWsToGLs8Tkk4ML9eQgnpOwGvWyD/5wywlA7zfKKaeOAC9/7Ga7+qckQoQvg== dependencies: - "@abp/clipboard" "~5.3.0" - "@abp/core" "~5.3.0" + "@abp/clipboard" "~5.3.1" + "@abp/core" "~5.3.1" prismjs "^1.26.0" -"@abp/select2@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.0.tgz#aae202b87dc23dfc7c8fd933413a8dbeb2f5b683" - integrity sha512-0aIxdtzgONkrYnUN5ACkIIIhsC9e61QLRq3K+/98fjf7NkHOjG3Sptr8EKu5U3IQ2hNHgqBjPGYjkztGuxZ9kw== +"@abp/select2@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.1.tgz#9a49aa983d52eecbd2dc2160349d45bd46324e36" + integrity sha512-ne4LJJy9n3V8BPtyU6voX4Bo0/GUrZBnI4Mkb0wRKNt1rxj7PhPXebsYYz090QJuJh8fuF2OHteNMBA7gMryLQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" select2 "^4.0.13" -"@abp/sweetalert2@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.0.tgz#67379cfa4cb8884cb66b58f4cafa79960cf8426a" - integrity sha512-EBr8J7MDsYmSvOYxTbqsSmw6c2yLokHZe8A+EW2vsY9VYFXkoOJLVpCkCK4fhvHUv8/+Y5QnHW7bs1I6SKYXOw== +"@abp/sweetalert2@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.1.tgz#676a3269fe4511fc4f81c3231ed9a96fe4c8f006" + integrity sha512-UDQrJiq8OfIDy3GSq7NJ4TKKEihzp6Qc06KGRdnN74lm4JsxxGUToSaD1AbyrLt53jZlRZK2NNc8IiyqPvyfbQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.0.tgz#3aaef3edca333224ba6b3e81c8ad1ebaae51a2f4" - integrity sha512-FxtoPYxyk2CHeoloC6kaeCj5YtXH0rebhOEaCjrfyg9/Ec6LEkvpfC7RWlcsHaEUAtFXZegJDfOk066EPH7RHQ== +"@abp/timeago@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.1.tgz#069a4eb2725b0a183cb7609e1f48d8d857a606ba" + integrity sha512-+QWO9MTuf6X7sUXxoUGyoQ0EhoQUlRDdCPmwwcZyBzBf8q9A3hS+Rtmex3BqwRLDxL2vL78gbDpIBgPn/kFuUA== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" timeago "^1.6.7" -"@abp/toastr@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.0.tgz#8a002c19ea25ac6b042a25c0f9d289d03c93c2fb" - integrity sha512-gjb2O/XrYkX8IeCERIqlOYPh15WlF9LxGR6t9jeVF/p6BTX/yaWabYCFfB9SkU2pQ6xrGl7WmSTAC06JOAtPTA== +"@abp/toastr@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.1.tgz#4a18b293444f7f8a523b7255ea61fed838131f1c" + integrity sha512-gz5cl6sPu6b65h8VJ6ne+dkM0oVXSYBlDoKBYbDRjhH6i7yWUpcylY/lrOvWacNQBOagBy5bep1937aec1/BXQ== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" toastr "^2.1.4" -"@abp/utils@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.0.tgz#e93739074a3cd445a5a221209506b7e663050ca0" - integrity sha512-Nm+h+3PL10+rBFSh8UUuenmGM+OBlEoNQeGzHRmhOc6hJ3oqCogPzY+zkq0e4pksrwhjxAu/cgCEGLAoEXXycw== +"@abp/utils@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.1.tgz#ff238e3b70c6fffb1600d845c202961e1179c813" + integrity sha512-XVYrygoWq1ZHz4N7BSJ4P77wmd0geRhpyR5ztzyP1WaF2LaCRS63BjZ/a7xKdtioUby9GP5jSvMjBvwqVviYIQ== dependencies: just-compare "^1.3.0" diff --git a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json index 39cd70cc25..4914c21812 100644 --- a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json +++ b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json @@ -3,6 +3,6 @@ "name": "demo-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.1" } } diff --git a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock index 3fd190f37e..4e5e2e6995 100644 --- a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock +++ b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.0.tgz#dcdd73d8582c4d14438f70d765170398d5d582fb" - integrity sha512-H6UrafHRI1DHfIoi47gZWHKSanlyAkghtGgUO6GTmPqTubBXjl7Ky3owVUAXvFd49+72gwdCLA/DB0Khjc3Ayw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.0" - -"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.0.tgz#84e94845a247815ce981cda2d195944a350530b9" - integrity sha512-RwXxlncjidvh8Hgw91Hz1f5rnfG9hlNROr5bD/kxTUB47vIh/TIBd06UYrYw2/lqFLw5d6wd8q7VLuDjGUQbpg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.0" - "@abp/bootstrap" "~5.3.0" - "@abp/bootstrap-datepicker" "~5.3.0" - "@abp/datatables.net-bs5" "~5.3.0" - "@abp/font-awesome" "~5.3.0" - "@abp/jquery-form" "~5.3.0" - "@abp/jquery-validation-unobtrusive" "~5.3.0" - "@abp/lodash" "~5.3.0" - "@abp/luxon" "~5.3.0" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.0" - "@abp/select2" "~5.3.0" - "@abp/sweetalert2" "~5.3.0" - "@abp/timeago" "~5.3.0" - "@abp/toastr" "~5.3.0" - -"@abp/aspnetcore.mvc.ui@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.0.tgz#e947fd1aecbd2aabc5db4c6a64b78f2690fcf0d4" - integrity sha512-en2YDb/hRG1MKkbli1PYcoeU9OLU0YPSahkIBSfOmMLntAe8y0c2+Xe09chXP4r+GoZu0zd9FM3qqCRZojrlug== +"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.1.tgz#469befe88cd7d3362112db9a5ce7cf3eae328b3e" + integrity sha512-qvzNICtvrNVllo7c8khvKw4LQ6MxwWcJar8PyOhgS+Pgtn4lT5rQqzGvaYKMiDyj5gjWGzPOzjU/vgR1uiGYNg== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.1" + +"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.1.tgz#7fe0aba80670bf4326251138dc7e12ea5830c919" + integrity sha512-ieS54bLQr4Aa96CnFEmuxe0ndeJpJMkq5eYSWAziH4i15jm7o+K2ouIL0K606lk1Sn/UrP8Yl+DRhxr4i4P8ow== + dependencies: + "@abp/aspnetcore.mvc.ui" "~5.3.1" + "@abp/bootstrap" "~5.3.1" + "@abp/bootstrap-datepicker" "~5.3.1" + "@abp/datatables.net-bs5" "~5.3.1" + "@abp/font-awesome" "~5.3.1" + "@abp/jquery-form" "~5.3.1" + "@abp/jquery-validation-unobtrusive" "~5.3.1" + "@abp/lodash" "~5.3.1" + "@abp/luxon" "~5.3.1" + "@abp/malihu-custom-scrollbar-plugin" "~5.3.1" + "@abp/select2" "~5.3.1" + "@abp/sweetalert2" "~5.3.1" + "@abp/timeago" "~5.3.1" + "@abp/toastr" "~5.3.1" + +"@abp/aspnetcore.mvc.ui@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.1.tgz#17ccf9a2a40cbd79e670a0cb5be74ac9eb17b963" + integrity sha512-UuXH0Lz7DqiGp47BC7xllT3Imf2Nk+eccOiVRwc9PAfHKnNOOJYxvDlHS0x8CM09qxM5EVaH7tfwOLSS09HXpg== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,144 +41,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.0.tgz#09c44954774d8f52ca8ff6699ad4dbb7cc0308c2" - integrity sha512-AQ26I0jgoCioW1/4XmQIyn1c1+CLv8KTb4Vd4ZbtdYGBkkkUe+JEAWpJSeXlJRr/XrOs0BKWp/fa7Nnwx8srLg== +"@abp/bootstrap-datepicker@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.1.tgz#241aebfbae0fa451d3e719776096b14bf77c08fa" + integrity sha512-gvP7SNEnPFYuLmIBp7QobveAGv8Rm/8JTmixCChQPPP9XX3u82ilKP2cgxVXm/4/jf0Gy7Gusn7urmTbTxeGEw== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.0.tgz#42dac2d2d6374f39d068a638687039c5c74df123" - integrity sha512-rg9mLcvT4JQRc1rIAhGYK1P2eMRJ1+GArQXV5l7k3FrVU+bRLKdoE6PNpuwXHpdlom4/dOgekfuWH/SAuY5kyw== +"@abp/bootstrap@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.1.tgz#f941afe2be2deaa1962a3626593451847dee5bd6" + integrity sha512-qPGeNFEaQF57b0viA0eHKA0cZ9b0gscOqE0o4ewHxnlRoRYiY3Ob9V6x6S85n2b7H6tDZOWAePXEgkV40yK/Bg== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" bootstrap "^5.1.3" -"@abp/core@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.0.tgz#032724dd0c0b850204896ce0275c7f9c8f516740" - integrity sha512-Uk9h98jiEF1dItWrvWnYB6s/UNZZapvFSyJ4+piAsZmXOSAbrObV+s19n5xfUagQQTWn4+aU5+aChEcfWpYv9A== +"@abp/core@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.1.tgz#26890ab049d43db58f3a0fba2f4c50bd2fbf7811" + integrity sha512-7PBPDYq/s0T5H0iYaeCzqWF44jbiOkFlwGnXqZeKHt2cKZaMyCStgotrpap8qoZKlxuyxudFIzJrzJIEP0AN/Q== dependencies: - "@abp/utils" "~5.3.0" + "@abp/utils" "~5.3.1" -"@abp/datatables.net-bs5@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.0.tgz#84771ce4eb7229bed347a5904c891b08e3230422" - integrity sha512-FpKrgrjaBKVgFAnbBsrvDIJJOy8gbWCEHm5Jy2vFWXmx25fITMw/2ckBDH87yrZtCNVTSUbMIdHYOIHMPfSavQ== +"@abp/datatables.net-bs5@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.1.tgz#e380cc253a837a0629baec9dabb4e8919878cc38" + integrity sha512-LpGPWLvFsLkQjo5RTgEl24LbBokgsO1gv7/pVy/1oiXXCLTuVwJ8vYYKfDNkrrSLDUOJ9cCC0YUE5SRfDUystA== dependencies: - "@abp/datatables.net" "~5.3.0" + "@abp/datatables.net" "~5.3.1" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.0.tgz#dd27ae451df9551f5b815e10c87a8a89c6a38293" - integrity sha512-d4lQ09G7HY2gEN1lRAteCZzY0Fv3gPuUM+icgWm+UkmDZV9lhvovTQ58Xkwayw8vf+NPlit1eGMMQedn6MbeAQ== +"@abp/datatables.net@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.1.tgz#8200b5a3a719f51d21670b1420e3df48af4de42e" + integrity sha512-v30gkk4dcmWz260C8BA7uaU4kqpiC1wkgMvdzjPGefzYXsMftlcoX7GUvByWwTzlJnTphGvnIVJhnhX73VVDHg== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" datatables.net "^1.11.4" -"@abp/font-awesome@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.0.tgz#ce1d5bb59bd597cc9717885917d4dd2eae1f8b9c" - integrity sha512-JX62EVfZSJ7pv75Gd3ya/3c3He0hXF7KmpTizUNd/EbeHuNJoCND5wwq5OAFV9Ld3vdcGJChNTydNa5RsBzrpg== +"@abp/font-awesome@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.1.tgz#2b4654b463b7858fc237219fd852ca0f41e4e062" + integrity sha512-LFKPjQgJmQ6GNqW3geluHMgV3WbisniAaK9tl6Pv8WOvPluvZGHTK5qjcAQVwM6Bj944VYeuvLo1ZCOoC/rWLg== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.0.tgz#5ae9906f0cffaf3e043681a5dd80a014b4860f6b" - integrity sha512-ZTpXCImHirJDZjfnJRtSEHLIbWMTYkqtTv7Z3GMRKnI4fllpmuco9EWLAKjAfYPyc/QpTx+MYnUg5SsXORhJyQ== +"@abp/jquery-form@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.1.tgz#e17367af8dafcfbb352775fb6ab9182d1fd9cd63" + integrity sha512-s8XItBHKJuehprFy7xePWHxt8jMvjDmkmk2nEuJXj+gcZyVEEa3hBd4ykKDXFfmNrfS8aMy+VqA+VEA24Cmpww== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.0.tgz#ccf90a7840398e69e0a91ed6c32b80fa2eb82d14" - integrity sha512-6B3ywnpvPxpnxkrcXzjTjMWgKRImbzNPOZvv5ant/kQv3zXedV1GXSIILy+imX39FuDPslOmEfx8plwrNvIteA== +"@abp/jquery-validation-unobtrusive@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.1.tgz#7c5c31df1cd021b3eed618d914926b76dc7e9e6e" + integrity sha512-B5USCmF56eWQO+R4eZtMjURtoNGUEuAuBy4ltCPtZx0s6yn94Ooq4oYKqEbfnLoSsQshajUwBtqtlC6+YA612Q== dependencies: - "@abp/jquery-validation" "~5.3.0" + "@abp/jquery-validation" "~5.3.1" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.0.tgz#a21696e7d5d54ef8bcdc0e8bd2debb1da1f7f5cc" - integrity sha512-4z2I9iORf+z5SlN9crC/Gx3X5GAOVePD+WN8SaHSYr4VWYNe8TV8LvCZPilN56sIPt3jYvy0N+bI1tAuZPu/NQ== +"@abp/jquery-validation@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.1.tgz#b34c0e29e12843de4a407bc8775a2e560e4db923" + integrity sha512-lu2e47GwWmh/ahWA5bbeR9Gqqsy4a3htTIvnwWbtu7dnHVHA6469+uCt+0f+sVthDIL+cMwoYgcygMLIUHoFxg== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.0.tgz#0279ee501ed774a788072c2ec8b003e348fec22c" - integrity sha512-rqYbU3LpsT7XT8ygn+TFVmjev5NlgEcDhGwQ8PraY1dEjlDbteeQ50N4adS8fdRfOM1UjGL19ueN3F8E5qNUSg== +"@abp/jquery@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.1.tgz#8f6032253d4c44b135c238a4efa010bee1ec5991" + integrity sha512-ngy9Kvy6lXrQBCxWi7t8I4Wudv87C2R50O/T4CZPfM2nwYLynopa+aI9r9VLhO/wIROyXX3C8UIpeLhQzm776w== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" jquery "~3.6.0" -"@abp/lodash@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.0.tgz#45f1dba7bb65b6599b4973d7e0c617dfd2c46c49" - integrity sha512-vQVMv58QuYttWBfLjJzIsw92JunGbWYsqk6pp6/JuoBls5UJtdP1F7vM4JgQxsscGYHFRZB3F4a3h1cxZ+dblQ== +"@abp/lodash@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.1.tgz#49c0806bae0858047faed75b6e9ed6207dc4cffc" + integrity sha512-QQshVHkNlunbhcmBG5E2wdZNcHYrTsNQjJNF6IZkeFszNRHu/k0u1bhszDwjPgEzeewTqMu8n44TzkbA8yP5GA== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" lodash "^4.17.21" -"@abp/luxon@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.0.tgz#8a6277046f6e38c3affbf79c06f8ac00d1ca8098" - integrity sha512-6tETR03i1NPJuDqSQWtpkOykdq/84awifQUqRyh+b8340wV7P54NqUMDXDit9sjITFDhq99V/R+Rj3PVjvJD3A== +"@abp/luxon@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.1.tgz#8d843023b05b157ff9ab23548c8d8c4e7101ae88" + integrity sha512-Jw8p5S9qHZkUrD1fx3nvpnBqn8Zb9jDiG6xdc6tY+v1aqDDwEqPUr7TqaLnY9GnZefiM3sYVwAh42nzPOwg9aQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.0.tgz#e6e12162aa50d3c3d98629378cec2f6fd5964338" - integrity sha512-GVwgAZQurH/tr4Hgmuby2dun//v1dT+wLGV4ZvjCJzBRs4FgrB+25pj4qKm20j6/NKRKc4V5re/b1y6njCubFQ== +"@abp/malihu-custom-scrollbar-plugin@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.1.tgz#7f0e4f2df325345a8e3be67456522cb035e3e962" + integrity sha512-ll49qD7bslt7+deMAFZ0DfveH/5ZsHyL2RLDg796ARz+H7fQpEhyNFeGETGj+HSOvAl3ivux2mxNCMYbXHR4RQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.0.tgz#aae202b87dc23dfc7c8fd933413a8dbeb2f5b683" - integrity sha512-0aIxdtzgONkrYnUN5ACkIIIhsC9e61QLRq3K+/98fjf7NkHOjG3Sptr8EKu5U3IQ2hNHgqBjPGYjkztGuxZ9kw== +"@abp/select2@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.1.tgz#9a49aa983d52eecbd2dc2160349d45bd46324e36" + integrity sha512-ne4LJJy9n3V8BPtyU6voX4Bo0/GUrZBnI4Mkb0wRKNt1rxj7PhPXebsYYz090QJuJh8fuF2OHteNMBA7gMryLQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" select2 "^4.0.13" -"@abp/sweetalert2@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.0.tgz#67379cfa4cb8884cb66b58f4cafa79960cf8426a" - integrity sha512-EBr8J7MDsYmSvOYxTbqsSmw6c2yLokHZe8A+EW2vsY9VYFXkoOJLVpCkCK4fhvHUv8/+Y5QnHW7bs1I6SKYXOw== +"@abp/sweetalert2@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.1.tgz#676a3269fe4511fc4f81c3231ed9a96fe4c8f006" + integrity sha512-UDQrJiq8OfIDy3GSq7NJ4TKKEihzp6Qc06KGRdnN74lm4JsxxGUToSaD1AbyrLt53jZlRZK2NNc8IiyqPvyfbQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.0.tgz#3aaef3edca333224ba6b3e81c8ad1ebaae51a2f4" - integrity sha512-FxtoPYxyk2CHeoloC6kaeCj5YtXH0rebhOEaCjrfyg9/Ec6LEkvpfC7RWlcsHaEUAtFXZegJDfOk066EPH7RHQ== +"@abp/timeago@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.1.tgz#069a4eb2725b0a183cb7609e1f48d8d857a606ba" + integrity sha512-+QWO9MTuf6X7sUXxoUGyoQ0EhoQUlRDdCPmwwcZyBzBf8q9A3hS+Rtmex3BqwRLDxL2vL78gbDpIBgPn/kFuUA== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" timeago "^1.6.7" -"@abp/toastr@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.0.tgz#8a002c19ea25ac6b042a25c0f9d289d03c93c2fb" - integrity sha512-gjb2O/XrYkX8IeCERIqlOYPh15WlF9LxGR6t9jeVF/p6BTX/yaWabYCFfB9SkU2pQ6xrGl7WmSTAC06JOAtPTA== +"@abp/toastr@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.1.tgz#4a18b293444f7f8a523b7255ea61fed838131f1c" + integrity sha512-gz5cl6sPu6b65h8VJ6ne+dkM0oVXSYBlDoKBYbDRjhH6i7yWUpcylY/lrOvWacNQBOagBy5bep1937aec1/BXQ== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" toastr "^2.1.4" -"@abp/utils@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.0.tgz#e93739074a3cd445a5a221209506b7e663050ca0" - integrity sha512-Nm+h+3PL10+rBFSh8UUuenmGM+OBlEoNQeGzHRmhOc6hJ3oqCogPzY+zkq0e4pksrwhjxAu/cgCEGLAoEXXycw== +"@abp/utils@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.1.tgz#ff238e3b70c6fffb1600d845c202961e1179c813" + integrity sha512-XVYrygoWq1ZHz4N7BSJ4P77wmd0geRhpyR5ztzyP1WaF2LaCRS63BjZ/a7xKdtioUby9GP5jSvMjBvwqVviYIQ== dependencies: just-compare "^1.3.0" diff --git a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/package.json b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/package.json index 63b2dfd644..5f846222c6 100644 --- a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/package.json +++ b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/package.json @@ -3,7 +3,7 @@ "version": "1.0.0", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.0", - "@abp/virtual-file-explorer": "^5.3.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.1", + "@abp/virtual-file-explorer": "^5.3.1" } } diff --git a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/yarn.lock b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/yarn.lock index 5fb94c335b..fadeda9b76 100644 --- a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/yarn.lock +++ b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.0.tgz#dcdd73d8582c4d14438f70d765170398d5d582fb" - integrity sha512-H6UrafHRI1DHfIoi47gZWHKSanlyAkghtGgUO6GTmPqTubBXjl7Ky3owVUAXvFd49+72gwdCLA/DB0Khjc3Ayw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.0" - -"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.0.tgz#84e94845a247815ce981cda2d195944a350530b9" - integrity sha512-RwXxlncjidvh8Hgw91Hz1f5rnfG9hlNROr5bD/kxTUB47vIh/TIBd06UYrYw2/lqFLw5d6wd8q7VLuDjGUQbpg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.0" - "@abp/bootstrap" "~5.3.0" - "@abp/bootstrap-datepicker" "~5.3.0" - "@abp/datatables.net-bs5" "~5.3.0" - "@abp/font-awesome" "~5.3.0" - "@abp/jquery-form" "~5.3.0" - "@abp/jquery-validation-unobtrusive" "~5.3.0" - "@abp/lodash" "~5.3.0" - "@abp/luxon" "~5.3.0" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.0" - "@abp/select2" "~5.3.0" - "@abp/sweetalert2" "~5.3.0" - "@abp/timeago" "~5.3.0" - "@abp/toastr" "~5.3.0" - -"@abp/aspnetcore.mvc.ui@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.0.tgz#e947fd1aecbd2aabc5db4c6a64b78f2690fcf0d4" - integrity sha512-en2YDb/hRG1MKkbli1PYcoeU9OLU0YPSahkIBSfOmMLntAe8y0c2+Xe09chXP4r+GoZu0zd9FM3qqCRZojrlug== +"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.1.tgz#469befe88cd7d3362112db9a5ce7cf3eae328b3e" + integrity sha512-qvzNICtvrNVllo7c8khvKw4LQ6MxwWcJar8PyOhgS+Pgtn4lT5rQqzGvaYKMiDyj5gjWGzPOzjU/vgR1uiGYNg== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.1" + +"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.1.tgz#7fe0aba80670bf4326251138dc7e12ea5830c919" + integrity sha512-ieS54bLQr4Aa96CnFEmuxe0ndeJpJMkq5eYSWAziH4i15jm7o+K2ouIL0K606lk1Sn/UrP8Yl+DRhxr4i4P8ow== + dependencies: + "@abp/aspnetcore.mvc.ui" "~5.3.1" + "@abp/bootstrap" "~5.3.1" + "@abp/bootstrap-datepicker" "~5.3.1" + "@abp/datatables.net-bs5" "~5.3.1" + "@abp/font-awesome" "~5.3.1" + "@abp/jquery-form" "~5.3.1" + "@abp/jquery-validation-unobtrusive" "~5.3.1" + "@abp/lodash" "~5.3.1" + "@abp/luxon" "~5.3.1" + "@abp/malihu-custom-scrollbar-plugin" "~5.3.1" + "@abp/select2" "~5.3.1" + "@abp/sweetalert2" "~5.3.1" + "@abp/timeago" "~5.3.1" + "@abp/toastr" "~5.3.1" + +"@abp/aspnetcore.mvc.ui@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.1.tgz#17ccf9a2a40cbd79e670a0cb5be74ac9eb17b963" + integrity sha512-UuXH0Lz7DqiGp47BC7xllT3Imf2Nk+eccOiVRwc9PAfHKnNOOJYxvDlHS0x8CM09qxM5EVaH7tfwOLSS09HXpg== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,171 +41,171 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.0.tgz#09c44954774d8f52ca8ff6699ad4dbb7cc0308c2" - integrity sha512-AQ26I0jgoCioW1/4XmQIyn1c1+CLv8KTb4Vd4ZbtdYGBkkkUe+JEAWpJSeXlJRr/XrOs0BKWp/fa7Nnwx8srLg== +"@abp/bootstrap-datepicker@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.1.tgz#241aebfbae0fa451d3e719776096b14bf77c08fa" + integrity sha512-gvP7SNEnPFYuLmIBp7QobveAGv8Rm/8JTmixCChQPPP9XX3u82ilKP2cgxVXm/4/jf0Gy7Gusn7urmTbTxeGEw== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.0.tgz#42dac2d2d6374f39d068a638687039c5c74df123" - integrity sha512-rg9mLcvT4JQRc1rIAhGYK1P2eMRJ1+GArQXV5l7k3FrVU+bRLKdoE6PNpuwXHpdlom4/dOgekfuWH/SAuY5kyw== +"@abp/bootstrap@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.1.tgz#f941afe2be2deaa1962a3626593451847dee5bd6" + integrity sha512-qPGeNFEaQF57b0viA0eHKA0cZ9b0gscOqE0o4ewHxnlRoRYiY3Ob9V6x6S85n2b7H6tDZOWAePXEgkV40yK/Bg== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" bootstrap "^5.1.3" -"@abp/clipboard@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-5.3.0.tgz#579bbc786d32c4e07c969073872b936575df7a9c" - integrity sha512-J55jQnzPOOAwo70GK9hAB3JxG7rz75tex+17QSFjW7/dXVWt1bPIDRHh/a1wiLEgYc6btsSGhptLtkYAfWpq6w== +"@abp/clipboard@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-5.3.1.tgz#aede839bfba487461d31589092a3f2b0a75a2925" + integrity sha512-XKxxjjT2x7+a6vrw2x6G//ntQGmRcvBz8KcxCXuWJ8cCrHb1x7ZEzIUU4rF6ee7BlnLoEIZ/dCF+s/93yPs9ng== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" clipboard "^2.0.8" -"@abp/core@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.0.tgz#032724dd0c0b850204896ce0275c7f9c8f516740" - integrity sha512-Uk9h98jiEF1dItWrvWnYB6s/UNZZapvFSyJ4+piAsZmXOSAbrObV+s19n5xfUagQQTWn4+aU5+aChEcfWpYv9A== +"@abp/core@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.1.tgz#26890ab049d43db58f3a0fba2f4c50bd2fbf7811" + integrity sha512-7PBPDYq/s0T5H0iYaeCzqWF44jbiOkFlwGnXqZeKHt2cKZaMyCStgotrpap8qoZKlxuyxudFIzJrzJIEP0AN/Q== dependencies: - "@abp/utils" "~5.3.0" + "@abp/utils" "~5.3.1" -"@abp/datatables.net-bs5@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.0.tgz#84771ce4eb7229bed347a5904c891b08e3230422" - integrity sha512-FpKrgrjaBKVgFAnbBsrvDIJJOy8gbWCEHm5Jy2vFWXmx25fITMw/2ckBDH87yrZtCNVTSUbMIdHYOIHMPfSavQ== +"@abp/datatables.net-bs5@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.1.tgz#e380cc253a837a0629baec9dabb4e8919878cc38" + integrity sha512-LpGPWLvFsLkQjo5RTgEl24LbBokgsO1gv7/pVy/1oiXXCLTuVwJ8vYYKfDNkrrSLDUOJ9cCC0YUE5SRfDUystA== dependencies: - "@abp/datatables.net" "~5.3.0" + "@abp/datatables.net" "~5.3.1" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.0.tgz#dd27ae451df9551f5b815e10c87a8a89c6a38293" - integrity sha512-d4lQ09G7HY2gEN1lRAteCZzY0Fv3gPuUM+icgWm+UkmDZV9lhvovTQ58Xkwayw8vf+NPlit1eGMMQedn6MbeAQ== +"@abp/datatables.net@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.1.tgz#8200b5a3a719f51d21670b1420e3df48af4de42e" + integrity sha512-v30gkk4dcmWz260C8BA7uaU4kqpiC1wkgMvdzjPGefzYXsMftlcoX7GUvByWwTzlJnTphGvnIVJhnhX73VVDHg== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" datatables.net "^1.11.4" -"@abp/font-awesome@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.0.tgz#ce1d5bb59bd597cc9717885917d4dd2eae1f8b9c" - integrity sha512-JX62EVfZSJ7pv75Gd3ya/3c3He0hXF7KmpTizUNd/EbeHuNJoCND5wwq5OAFV9Ld3vdcGJChNTydNa5RsBzrpg== +"@abp/font-awesome@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.1.tgz#2b4654b463b7858fc237219fd852ca0f41e4e062" + integrity sha512-LFKPjQgJmQ6GNqW3geluHMgV3WbisniAaK9tl6Pv8WOvPluvZGHTK5qjcAQVwM6Bj944VYeuvLo1ZCOoC/rWLg== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.0.tgz#5ae9906f0cffaf3e043681a5dd80a014b4860f6b" - integrity sha512-ZTpXCImHirJDZjfnJRtSEHLIbWMTYkqtTv7Z3GMRKnI4fllpmuco9EWLAKjAfYPyc/QpTx+MYnUg5SsXORhJyQ== +"@abp/jquery-form@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.1.tgz#e17367af8dafcfbb352775fb6ab9182d1fd9cd63" + integrity sha512-s8XItBHKJuehprFy7xePWHxt8jMvjDmkmk2nEuJXj+gcZyVEEa3hBd4ykKDXFfmNrfS8aMy+VqA+VEA24Cmpww== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.0.tgz#ccf90a7840398e69e0a91ed6c32b80fa2eb82d14" - integrity sha512-6B3ywnpvPxpnxkrcXzjTjMWgKRImbzNPOZvv5ant/kQv3zXedV1GXSIILy+imX39FuDPslOmEfx8plwrNvIteA== +"@abp/jquery-validation-unobtrusive@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.1.tgz#7c5c31df1cd021b3eed618d914926b76dc7e9e6e" + integrity sha512-B5USCmF56eWQO+R4eZtMjURtoNGUEuAuBy4ltCPtZx0s6yn94Ooq4oYKqEbfnLoSsQshajUwBtqtlC6+YA612Q== dependencies: - "@abp/jquery-validation" "~5.3.0" + "@abp/jquery-validation" "~5.3.1" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.0.tgz#a21696e7d5d54ef8bcdc0e8bd2debb1da1f7f5cc" - integrity sha512-4z2I9iORf+z5SlN9crC/Gx3X5GAOVePD+WN8SaHSYr4VWYNe8TV8LvCZPilN56sIPt3jYvy0N+bI1tAuZPu/NQ== +"@abp/jquery-validation@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.1.tgz#b34c0e29e12843de4a407bc8775a2e560e4db923" + integrity sha512-lu2e47GwWmh/ahWA5bbeR9Gqqsy4a3htTIvnwWbtu7dnHVHA6469+uCt+0f+sVthDIL+cMwoYgcygMLIUHoFxg== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.0.tgz#0279ee501ed774a788072c2ec8b003e348fec22c" - integrity sha512-rqYbU3LpsT7XT8ygn+TFVmjev5NlgEcDhGwQ8PraY1dEjlDbteeQ50N4adS8fdRfOM1UjGL19ueN3F8E5qNUSg== +"@abp/jquery@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.1.tgz#8f6032253d4c44b135c238a4efa010bee1ec5991" + integrity sha512-ngy9Kvy6lXrQBCxWi7t8I4Wudv87C2R50O/T4CZPfM2nwYLynopa+aI9r9VLhO/wIROyXX3C8UIpeLhQzm776w== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" jquery "~3.6.0" -"@abp/lodash@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.0.tgz#45f1dba7bb65b6599b4973d7e0c617dfd2c46c49" - integrity sha512-vQVMv58QuYttWBfLjJzIsw92JunGbWYsqk6pp6/JuoBls5UJtdP1F7vM4JgQxsscGYHFRZB3F4a3h1cxZ+dblQ== +"@abp/lodash@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.1.tgz#49c0806bae0858047faed75b6e9ed6207dc4cffc" + integrity sha512-QQshVHkNlunbhcmBG5E2wdZNcHYrTsNQjJNF6IZkeFszNRHu/k0u1bhszDwjPgEzeewTqMu8n44TzkbA8yP5GA== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" lodash "^4.17.21" -"@abp/luxon@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.0.tgz#8a6277046f6e38c3affbf79c06f8ac00d1ca8098" - integrity sha512-6tETR03i1NPJuDqSQWtpkOykdq/84awifQUqRyh+b8340wV7P54NqUMDXDit9sjITFDhq99V/R+Rj3PVjvJD3A== +"@abp/luxon@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.1.tgz#8d843023b05b157ff9ab23548c8d8c4e7101ae88" + integrity sha512-Jw8p5S9qHZkUrD1fx3nvpnBqn8Zb9jDiG6xdc6tY+v1aqDDwEqPUr7TqaLnY9GnZefiM3sYVwAh42nzPOwg9aQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.0.tgz#e6e12162aa50d3c3d98629378cec2f6fd5964338" - integrity sha512-GVwgAZQurH/tr4Hgmuby2dun//v1dT+wLGV4ZvjCJzBRs4FgrB+25pj4qKm20j6/NKRKc4V5re/b1y6njCubFQ== +"@abp/malihu-custom-scrollbar-plugin@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.1.tgz#7f0e4f2df325345a8e3be67456522cb035e3e962" + integrity sha512-ll49qD7bslt7+deMAFZ0DfveH/5ZsHyL2RLDg796ARz+H7fQpEhyNFeGETGj+HSOvAl3ivux2mxNCMYbXHR4RQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/prismjs@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-5.3.0.tgz#658a371023d9a3de9ecfff1f10bae7a83064fac7" - integrity sha512-NPsYJ9oj/57vG+eVGpDkJcdPAx4WlXTVEUZWWxmaXuM9sHY1/2av975Qk8R5HG6fC74w3DrVCP8YQvU6jlaF1w== +"@abp/prismjs@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-5.3.1.tgz#46b7a7f456b60f3f0f3b92b0a645f30495db571b" + integrity sha512-21h2L4XTIKAuWqYCGKC/MrqledtWsToGLs8Tkk4ML9eQgnpOwGvWyD/5wywlA7zfKKaeOAC9/7Ga7+qckQoQvg== dependencies: - "@abp/clipboard" "~5.3.0" - "@abp/core" "~5.3.0" + "@abp/clipboard" "~5.3.1" + "@abp/core" "~5.3.1" prismjs "^1.26.0" -"@abp/select2@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.0.tgz#aae202b87dc23dfc7c8fd933413a8dbeb2f5b683" - integrity sha512-0aIxdtzgONkrYnUN5ACkIIIhsC9e61QLRq3K+/98fjf7NkHOjG3Sptr8EKu5U3IQ2hNHgqBjPGYjkztGuxZ9kw== +"@abp/select2@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.1.tgz#9a49aa983d52eecbd2dc2160349d45bd46324e36" + integrity sha512-ne4LJJy9n3V8BPtyU6voX4Bo0/GUrZBnI4Mkb0wRKNt1rxj7PhPXebsYYz090QJuJh8fuF2OHteNMBA7gMryLQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" select2 "^4.0.13" -"@abp/sweetalert2@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.0.tgz#67379cfa4cb8884cb66b58f4cafa79960cf8426a" - integrity sha512-EBr8J7MDsYmSvOYxTbqsSmw6c2yLokHZe8A+EW2vsY9VYFXkoOJLVpCkCK4fhvHUv8/+Y5QnHW7bs1I6SKYXOw== +"@abp/sweetalert2@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.1.tgz#676a3269fe4511fc4f81c3231ed9a96fe4c8f006" + integrity sha512-UDQrJiq8OfIDy3GSq7NJ4TKKEihzp6Qc06KGRdnN74lm4JsxxGUToSaD1AbyrLt53jZlRZK2NNc8IiyqPvyfbQ== dependencies: - "@abp/core" "~5.3.0" + "@abp/core" "~5.3.1" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.0.tgz#3aaef3edca333224ba6b3e81c8ad1ebaae51a2f4" - integrity sha512-FxtoPYxyk2CHeoloC6kaeCj5YtXH0rebhOEaCjrfyg9/Ec6LEkvpfC7RWlcsHaEUAtFXZegJDfOk066EPH7RHQ== +"@abp/timeago@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.1.tgz#069a4eb2725b0a183cb7609e1f48d8d857a606ba" + integrity sha512-+QWO9MTuf6X7sUXxoUGyoQ0EhoQUlRDdCPmwwcZyBzBf8q9A3hS+Rtmex3BqwRLDxL2vL78gbDpIBgPn/kFuUA== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" timeago "^1.6.7" -"@abp/toastr@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.0.tgz#8a002c19ea25ac6b042a25c0f9d289d03c93c2fb" - integrity sha512-gjb2O/XrYkX8IeCERIqlOYPh15WlF9LxGR6t9jeVF/p6BTX/yaWabYCFfB9SkU2pQ6xrGl7WmSTAC06JOAtPTA== +"@abp/toastr@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.1.tgz#4a18b293444f7f8a523b7255ea61fed838131f1c" + integrity sha512-gz5cl6sPu6b65h8VJ6ne+dkM0oVXSYBlDoKBYbDRjhH6i7yWUpcylY/lrOvWacNQBOagBy5bep1937aec1/BXQ== dependencies: - "@abp/jquery" "~5.3.0" + "@abp/jquery" "~5.3.1" toastr "^2.1.4" -"@abp/utils@~5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.0.tgz#e93739074a3cd445a5a221209506b7e663050ca0" - integrity sha512-Nm+h+3PL10+rBFSh8UUuenmGM+OBlEoNQeGzHRmhOc6hJ3oqCogPzY+zkq0e4pksrwhjxAu/cgCEGLAoEXXycw== +"@abp/utils@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.1.tgz#ff238e3b70c6fffb1600d845c202961e1179c813" + integrity sha512-XVYrygoWq1ZHz4N7BSJ4P77wmd0geRhpyR5ztzyP1WaF2LaCRS63BjZ/a7xKdtioUby9GP5jSvMjBvwqVviYIQ== dependencies: just-compare "^1.3.0" -"@abp/virtual-file-explorer@^5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@abp/virtual-file-explorer/-/virtual-file-explorer-5.3.0.tgz#ae7b39a9c0f43a56072cbad01765636c30f626f4" - integrity sha512-jfzQTS8uHAwmC2jKZHvk1CnTV4eiCRt847LDSmzGAcnxg5vho8/6HzkdcZgCOHDVjxwoEjzKgfjJMLRa2kjjcA== +"@abp/virtual-file-explorer@^5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/virtual-file-explorer/-/virtual-file-explorer-5.3.1.tgz#13c8e7f40120b4372f2e23c4c0bc318ceb3c8559" + integrity sha512-bvBlJjycRVnRx9T3DzpP/vIJy1XAu8BDz5IebJZw4wyyR98pNtRr26E/2svuXVL9ot2gsdCNNs1WusiCwyPvyQ== dependencies: - "@abp/clipboard" "~5.3.0" - "@abp/prismjs" "~5.3.0" + "@abp/clipboard" "~5.3.1" + "@abp/prismjs" "~5.3.1" "@fortawesome/fontawesome-free@^5.15.4": version "5.15.4" diff --git a/npm/lerna.json b/npm/lerna.json index dfe3d14a47..72df32bfb7 100644 --- a/npm/lerna.json +++ b/npm/lerna.json @@ -1,5 +1,5 @@ { - "version": "5.3.0", + "version": "5.3.1", "packages": [ "packs/*" ], diff --git a/npm/ng-packs/lerna.version.json b/npm/ng-packs/lerna.version.json index ab9656b953..05d6729efc 100644 --- a/npm/ng-packs/lerna.version.json +++ b/npm/ng-packs/lerna.version.json @@ -1,5 +1,5 @@ { - "version": "5.3.0", + "version": "5.3.1", "packages": [ "packages/*" ], diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index 4b54af0085..9e55c586ea 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -38,7 +38,7 @@ }, "private": true, "devDependencies": { - "@abp/utils": "~5.3.0", + "@abp/utils": "~5.3.1", "@angular-devkit/build-angular": "13.3.5", "@angular-devkit/build-ng-packagr": "^0.1002.0", "@angular-devkit/schematics-cli": "~12.2.0", @@ -57,17 +57,17 @@ "@angular/platform-browser": "13.3.6", "@angular/platform-browser-dynamic": "13.3.6", "@angular/router": "13.3.6", - "@abp/ng.account": "~5.3.0", - "@abp/ng.account.core": "~5.3.0", - "@abp/ng.core": "~5.3.0", - "@abp/ng.feature-management": "~5.3.0", - "@abp/ng.identity": "~5.3.0", - "@abp/ng.permission-management": "~5.3.0", - "@abp/ng.schematics": "~5.3.0", - "@abp/ng.setting-management": "~5.3.0", - "@abp/ng.tenant-management": "~5.3.0", - "@abp/ng.theme.basic": "~5.3.0", - "@abp/ng.theme.shared": "~5.3.0", + "@abp/ng.account": "~5.3.1", + "@abp/ng.account.core": "~5.3.1", + "@abp/ng.core": "~5.3.1", + "@abp/ng.feature-management": "~5.3.1", + "@abp/ng.identity": "~5.3.1", + "@abp/ng.permission-management": "~5.3.1", + "@abp/ng.schematics": "~5.3.1", + "@abp/ng.setting-management": "~5.3.1", + "@abp/ng.tenant-management": "~5.3.1", + "@abp/ng.theme.basic": "~5.3.1", + "@abp/ng.theme.shared": "~5.3.1", "@fortawesome/fontawesome-free": "^5.15.4", "@ng-bootstrap/ng-bootstrap": "~12.0.0-beta.4", "@ngneat/spectator": "^10.0.0", diff --git a/npm/ng-packs/packages/account-core/package.json b/npm/ng-packs/packages/account-core/package.json index 09e56e7fc3..0148bcdef2 100644 --- a/npm/ng-packs/packages/account-core/package.json +++ b/npm/ng-packs/packages/account-core/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.account.core", - "version": "5.3.0", + "version": "5.3.1", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "peerDependencies": { - "@abp/ng.core": "~5.3.0", - "@abp/ng.theme.shared": "~5.3.0", + "@abp/ng.core": "~5.3.1", + "@abp/ng.theme.shared": "~5.3.1", "@angular/common": ">=12.0.0", "@angular/core": ">=12.0.0" }, diff --git a/npm/ng-packs/packages/account/package.json b/npm/ng-packs/packages/account/package.json index 41ba99dc88..b26b8eb100 100644 --- a/npm/ng-packs/packages/account/package.json +++ b/npm/ng-packs/packages/account/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.account", - "version": "5.3.0", + "version": "5.3.1", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.account.core": "~5.3.0", - "@abp/ng.theme.shared": "~5.3.0", + "@abp/ng.account.core": "~5.3.1", + "@abp/ng.theme.shared": "~5.3.1", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/components/package.json b/npm/ng-packs/packages/components/package.json index f436d4f2e2..5ab44664f1 100644 --- a/npm/ng-packs/packages/components/package.json +++ b/npm/ng-packs/packages/components/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.components", - "version": "5.3.0", + "version": "5.3.1", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "peerDependencies": { - "@abp/ng.core": ">=5.3.0", - "@abp/ng.theme.shared": ">=5.3.0", + "@abp/ng.core": ">=5.3.1", + "@abp/ng.theme.shared": ">=5.3.1", "@ng-bootstrap/ng-bootstrap": ">=10.0.0" }, "dependencies": { diff --git a/npm/ng-packs/packages/core/package.json b/npm/ng-packs/packages/core/package.json index 6b3f1b2555..d4279bd318 100644 --- a/npm/ng-packs/packages/core/package.json +++ b/npm/ng-packs/packages/core/package.json @@ -1,13 +1,13 @@ { "name": "@abp/ng.core", - "version": "5.3.0", + "version": "5.3.1", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/utils": "~5.3.0", + "@abp/utils": "~5.3.1", "angular-oauth2-oidc": "^13.0.1", "just-clone": "^3.2.1", "just-compare": "^1.4.0", diff --git a/npm/ng-packs/packages/feature-management/package.json b/npm/ng-packs/packages/feature-management/package.json index 6378d4975f..e99cbe27b3 100644 --- a/npm/ng-packs/packages/feature-management/package.json +++ b/npm/ng-packs/packages/feature-management/package.json @@ -1,13 +1,13 @@ { "name": "@abp/ng.feature-management", - "version": "5.3.0", + "version": "5.3.1", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.theme.shared": "~5.3.0", + "@abp/ng.theme.shared": "~5.3.1", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/identity/package.json b/npm/ng-packs/packages/identity/package.json index fe59ac25ef..6ee9fb27d3 100644 --- a/npm/ng-packs/packages/identity/package.json +++ b/npm/ng-packs/packages/identity/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.identity", - "version": "5.3.0", + "version": "5.3.1", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.permission-management": "~5.3.0", - "@abp/ng.theme.shared": "~5.3.0", + "@abp/ng.permission-management": "~5.3.1", + "@abp/ng.theme.shared": "~5.3.1", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/permission-management/package.json b/npm/ng-packs/packages/permission-management/package.json index 901170d545..48ed8e7b79 100644 --- a/npm/ng-packs/packages/permission-management/package.json +++ b/npm/ng-packs/packages/permission-management/package.json @@ -1,13 +1,13 @@ { "name": "@abp/ng.permission-management", - "version": "5.3.0", + "version": "5.3.1", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.theme.shared": "~5.3.0", + "@abp/ng.theme.shared": "~5.3.1", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/schematics/package.json b/npm/ng-packs/packages/schematics/package.json index 31ec87551d..a4bf27bbc8 100644 --- a/npm/ng-packs/packages/schematics/package.json +++ b/npm/ng-packs/packages/schematics/package.json @@ -1,6 +1,6 @@ { "name": "@abp/ng.schematics", - "version": "5.3.0", + "version": "5.3.1", "description": "Schematics that works with ABP Backend", "keywords": [ "schematics" diff --git a/npm/ng-packs/packages/setting-management/package.json b/npm/ng-packs/packages/setting-management/package.json index 488c355b2f..e4bab64bd4 100644 --- a/npm/ng-packs/packages/setting-management/package.json +++ b/npm/ng-packs/packages/setting-management/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.setting-management", - "version": "5.3.0", + "version": "5.3.1", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.components": "~5.3.0", - "@abp/ng.theme.shared": "~5.3.0", + "@abp/ng.components": "~5.3.1", + "@abp/ng.theme.shared": "~5.3.1", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/tenant-management/package.json b/npm/ng-packs/packages/tenant-management/package.json index 5cd7770df6..5d475ba9ad 100644 --- a/npm/ng-packs/packages/tenant-management/package.json +++ b/npm/ng-packs/packages/tenant-management/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.tenant-management", - "version": "5.3.0", + "version": "5.3.1", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.feature-management": "~5.3.0", - "@abp/ng.theme.shared": "~5.3.0", + "@abp/ng.feature-management": "~5.3.1", + "@abp/ng.theme.shared": "~5.3.1", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/theme-basic/package.json b/npm/ng-packs/packages/theme-basic/package.json index 29baf31d16..4f576fad72 100644 --- a/npm/ng-packs/packages/theme-basic/package.json +++ b/npm/ng-packs/packages/theme-basic/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.theme.basic", - "version": "5.3.0", + "version": "5.3.1", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.account.core": "~5.3.0", - "@abp/ng.theme.shared": "~5.3.0", + "@abp/ng.account.core": "~5.3.1", + "@abp/ng.theme.shared": "~5.3.1", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/theme-shared/package.json b/npm/ng-packs/packages/theme-shared/package.json index 05fd52a9d3..dbca9eb2ab 100644 --- a/npm/ng-packs/packages/theme-shared/package.json +++ b/npm/ng-packs/packages/theme-shared/package.json @@ -1,13 +1,13 @@ { "name": "@abp/ng.theme.shared", - "version": "5.3.0", + "version": "5.3.1", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.core": "~5.3.0", + "@abp/ng.core": "~5.3.1", "@fortawesome/fontawesome-free": "^5.15.4", "@ng-bootstrap/ng-bootstrap": "~12.0.0-beta.4", "@ngx-validate/core": "^0.1.2", diff --git a/npm/packs/anchor-js/package.json b/npm/packs/anchor-js/package.json index 0ad689a590..80130d7800 100644 --- a/npm/packs/anchor-js/package.json +++ b/npm/packs/anchor-js/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/anchor-js", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~5.3.0", + "@abp/core": "~5.3.1", "anchor-js": "^4.3.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/aspnetcore.components.server.basictheme/package.json b/npm/packs/aspnetcore.components.server.basictheme/package.json index 8bd48c5e79..0fdf8ca0c5 100644 --- a/npm/packs/aspnetcore.components.server.basictheme/package.json +++ b/npm/packs/aspnetcore.components.server.basictheme/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/aspnetcore.components.server.basictheme", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/aspnetcore.components.server.theming": "~5.3.0" + "@abp/aspnetcore.components.server.theming": "~5.3.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/aspnetcore.components.server.theming/package.json b/npm/packs/aspnetcore.components.server.theming/package.json index d2780c6a3e..4c592bcc4d 100644 --- a/npm/packs/aspnetcore.components.server.theming/package.json +++ b/npm/packs/aspnetcore.components.server.theming/package.json @@ -1,12 +1,12 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/aspnetcore.components.server.theming", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/bootstrap": "~5.3.0", - "@abp/font-awesome": "~5.3.0" + "@abp/bootstrap": "~5.3.1", + "@abp/font-awesome": "~5.3.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json b/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json index cebc908052..055c05e2b0 100644 --- a/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json +++ b/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/aspnetcore.mvc.ui.theme.basic", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.shared": "~5.3.0" + "@abp/aspnetcore.mvc.ui.theme.shared": "~5.3.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json index 1f6ff1df6b..7dbd1e0fce 100644 --- a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json +++ b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/aspnetcore.mvc.ui.theme.shared", "repository": { "type": "git", @@ -10,20 +10,20 @@ "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui": "~5.3.0", - "@abp/bootstrap": "~5.3.0", - "@abp/bootstrap-datepicker": "~5.3.0", - "@abp/datatables.net-bs5": "~5.3.0", - "@abp/font-awesome": "~5.3.0", - "@abp/jquery-form": "~5.3.0", - "@abp/jquery-validation-unobtrusive": "~5.3.0", - "@abp/lodash": "~5.3.0", - "@abp/luxon": "~5.3.0", - "@abp/malihu-custom-scrollbar-plugin": "~5.3.0", - "@abp/select2": "~5.3.0", - "@abp/sweetalert2": "~5.3.0", - "@abp/timeago": "~5.3.0", - "@abp/toastr": "~5.3.0" + "@abp/aspnetcore.mvc.ui": "~5.3.1", + "@abp/bootstrap": "~5.3.1", + "@abp/bootstrap-datepicker": "~5.3.1", + "@abp/datatables.net-bs5": "~5.3.1", + "@abp/font-awesome": "~5.3.1", + "@abp/jquery-form": "~5.3.1", + "@abp/jquery-validation-unobtrusive": "~5.3.1", + "@abp/lodash": "~5.3.1", + "@abp/luxon": "~5.3.1", + "@abp/malihu-custom-scrollbar-plugin": "~5.3.1", + "@abp/select2": "~5.3.1", + "@abp/sweetalert2": "~5.3.1", + "@abp/timeago": "~5.3.1", + "@abp/toastr": "~5.3.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/aspnetcore.mvc.ui/package-lock.json b/npm/packs/aspnetcore.mvc.ui/package-lock.json index ca2dc16c3a..f64285f8de 100644 --- a/npm/packs/aspnetcore.mvc.ui/package-lock.json +++ b/npm/packs/aspnetcore.mvc.ui/package-lock.json @@ -1,6 +1,6 @@ { "name": "@abp/aspnetcore.mvc.ui", - "version": "5.3.0", + "version": "5.3.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/npm/packs/aspnetcore.mvc.ui/package.json b/npm/packs/aspnetcore.mvc.ui/package.json index 6b9a58957d..3b8e3936de 100644 --- a/npm/packs/aspnetcore.mvc.ui/package.json +++ b/npm/packs/aspnetcore.mvc.ui/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/aspnetcore.mvc.ui", "repository": { "type": "git", diff --git a/npm/packs/blogging/package.json b/npm/packs/blogging/package.json index fba8d57049..b6bbb933b0 100644 --- a/npm/packs/blogging/package.json +++ b/npm/packs/blogging/package.json @@ -1,14 +1,14 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/blogging", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.shared": "~5.3.0", - "@abp/owl.carousel": "~5.3.0", - "@abp/prismjs": "~5.3.0", - "@abp/tui-editor": "~5.3.0" + "@abp/aspnetcore.mvc.ui.theme.shared": "~5.3.1", + "@abp/owl.carousel": "~5.3.1", + "@abp/prismjs": "~5.3.1", + "@abp/tui-editor": "~5.3.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/bootstrap-datepicker/package.json b/npm/packs/bootstrap-datepicker/package.json index 3b7b5f6f8c..6999f8eba9 100644 --- a/npm/packs/bootstrap-datepicker/package.json +++ b/npm/packs/bootstrap-datepicker/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/bootstrap-datepicker", "repository": { "type": "git", diff --git a/npm/packs/bootstrap/package.json b/npm/packs/bootstrap/package.json index bc0efafa12..e2ea3d850f 100644 --- a/npm/packs/bootstrap/package.json +++ b/npm/packs/bootstrap/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/bootstrap", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~5.3.0", + "@abp/core": "~5.3.1", "bootstrap": "^5.1.3" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/chart.js/package.json b/npm/packs/chart.js/package.json index 7a7b44325c..e005d9077e 100644 --- a/npm/packs/chart.js/package.json +++ b/npm/packs/chart.js/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/chart.js", "publishConfig": { "access": "public" diff --git a/npm/packs/clipboard/package.json b/npm/packs/clipboard/package.json index 9e8757e702..23f1abc0dc 100644 --- a/npm/packs/clipboard/package.json +++ b/npm/packs/clipboard/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/clipboard", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~5.3.0", + "@abp/core": "~5.3.1", "clipboard": "^2.0.8" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/cms-kit.admin/package.json b/npm/packs/cms-kit.admin/package.json index 00734ad9fd..8543f7a91d 100644 --- a/npm/packs/cms-kit.admin/package.json +++ b/npm/packs/cms-kit.admin/package.json @@ -1,15 +1,15 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/cms-kit.admin", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/codemirror": "~5.3.0", - "@abp/jstree": "~5.3.0", - "@abp/slugify": "~5.3.0", - "@abp/tui-editor": "~5.3.0", - "@abp/uppy": "~5.3.0" + "@abp/codemirror": "~5.3.1", + "@abp/jstree": "~5.3.1", + "@abp/slugify": "~5.3.1", + "@abp/tui-editor": "~5.3.1", + "@abp/uppy": "~5.3.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/cms-kit.public/package.json b/npm/packs/cms-kit.public/package.json index 69b733d615..200b97c27b 100644 --- a/npm/packs/cms-kit.public/package.json +++ b/npm/packs/cms-kit.public/package.json @@ -1,12 +1,12 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/cms-kit.public", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/highlight.js": "~5.3.0", - "@abp/star-rating-svg": "~5.3.0" + "@abp/highlight.js": "~5.3.1", + "@abp/star-rating-svg": "~5.3.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/cms-kit/package.json b/npm/packs/cms-kit/package.json index e20485355e..b79de8540d 100644 --- a/npm/packs/cms-kit/package.json +++ b/npm/packs/cms-kit/package.json @@ -1,12 +1,12 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/cms-kit", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/cms-kit.admin": "~5.3.0", - "@abp/cms-kit.public": "~5.3.0" + "@abp/cms-kit.admin": "~5.3.1", + "@abp/cms-kit.public": "~5.3.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/codemirror/package.json b/npm/packs/codemirror/package.json index 11bcd5c0fe..dbeca7425f 100644 --- a/npm/packs/codemirror/package.json +++ b/npm/packs/codemirror/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/codemirror", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~5.3.0", + "@abp/core": "~5.3.1", "codemirror": "^5.65.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/core/package.json b/npm/packs/core/package.json index 0c2787afef..ff63de5fbf 100644 --- a/npm/packs/core/package.json +++ b/npm/packs/core/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/core", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/utils": "~5.3.0" + "@abp/utils": "~5.3.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/cropperjs/package.json b/npm/packs/cropperjs/package.json index d4eb26e508..2618dd42eb 100644 --- a/npm/packs/cropperjs/package.json +++ b/npm/packs/cropperjs/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/cropperjs", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~5.3.0", + "@abp/core": "~5.3.1", "cropperjs": "^1.5.12" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/datatables.net-bs4/package.json b/npm/packs/datatables.net-bs4/package.json index 93a9405147..8e207d6e54 100644 --- a/npm/packs/datatables.net-bs4/package.json +++ b/npm/packs/datatables.net-bs4/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/datatables.net-bs4", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/datatables.net": "~5.3.0", + "@abp/datatables.net": "~5.3.1", "datatables.net-bs4": "^1.11.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/datatables.net-bs5/package.json b/npm/packs/datatables.net-bs5/package.json index 5b1b8c2231..35204a4f0d 100644 --- a/npm/packs/datatables.net-bs5/package.json +++ b/npm/packs/datatables.net-bs5/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/datatables.net-bs5", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/datatables.net": "~5.3.0", + "@abp/datatables.net": "~5.3.1", "datatables.net-bs5": "^1.11.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/datatables.net/package.json b/npm/packs/datatables.net/package.json index 988c161aad..ba75c25df3 100644 --- a/npm/packs/datatables.net/package.json +++ b/npm/packs/datatables.net/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/datatables.net", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~5.3.0", + "@abp/jquery": "~5.3.1", "datatables.net": "^1.11.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/docs/package.json b/npm/packs/docs/package.json index 45f9d003df..acfde3b3a6 100644 --- a/npm/packs/docs/package.json +++ b/npm/packs/docs/package.json @@ -1,15 +1,15 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/docs", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/anchor-js": "~5.3.0", - "@abp/clipboard": "~5.3.0", - "@abp/malihu-custom-scrollbar-plugin": "~5.3.0", - "@abp/popper.js": "~5.3.0", - "@abp/prismjs": "~5.3.0" + "@abp/anchor-js": "~5.3.1", + "@abp/clipboard": "~5.3.1", + "@abp/malihu-custom-scrollbar-plugin": "~5.3.1", + "@abp/popper.js": "~5.3.1", + "@abp/prismjs": "~5.3.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/flag-icon-css/package.json b/npm/packs/flag-icon-css/package.json index 6192a23df9..d4846993ad 100644 --- a/npm/packs/flag-icon-css/package.json +++ b/npm/packs/flag-icon-css/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/flag-icon-css", "publishConfig": { "access": "public" diff --git a/npm/packs/font-awesome/package.json b/npm/packs/font-awesome/package.json index ea1a9d8f64..044fa789c3 100644 --- a/npm/packs/font-awesome/package.json +++ b/npm/packs/font-awesome/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/font-awesome", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~5.3.0", + "@abp/core": "~5.3.1", "@fortawesome/fontawesome-free": "^5.15.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/highlight.js/package.json b/npm/packs/highlight.js/package.json index e50445e5c0..fa040605eb 100644 --- a/npm/packs/highlight.js/package.json +++ b/npm/packs/highlight.js/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/highlight.js", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~5.3.0", + "@abp/core": "~5.3.1", "@highlightjs/cdn-assets": "~11.4.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/jquery-form/package.json b/npm/packs/jquery-form/package.json index 9d74b86f95..7016e0cce6 100644 --- a/npm/packs/jquery-form/package.json +++ b/npm/packs/jquery-form/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/jquery-form", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~5.3.0", + "@abp/jquery": "~5.3.1", "jquery-form": "^4.3.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/jquery-validation-unobtrusive/package.json b/npm/packs/jquery-validation-unobtrusive/package.json index 7420e004d9..48072b2de3 100644 --- a/npm/packs/jquery-validation-unobtrusive/package.json +++ b/npm/packs/jquery-validation-unobtrusive/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/jquery-validation-unobtrusive", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery-validation": "~5.3.0", + "@abp/jquery-validation": "~5.3.1", "jquery-validation-unobtrusive": "^3.2.12" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/jquery-validation/package.json b/npm/packs/jquery-validation/package.json index 7209aa37b7..bd52068ca6 100644 --- a/npm/packs/jquery-validation/package.json +++ b/npm/packs/jquery-validation/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/jquery-validation", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~5.3.0", + "@abp/jquery": "~5.3.1", "jquery-validation": "^1.19.3" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/jquery/package.json b/npm/packs/jquery/package.json index 1ccfbe4be4..dcd865ee34 100644 --- a/npm/packs/jquery/package.json +++ b/npm/packs/jquery/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/jquery", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~5.3.0", + "@abp/core": "~5.3.1", "jquery": "~3.6.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/jstree/package.json b/npm/packs/jstree/package.json index 710a02a5b3..6794d39683 100644 --- a/npm/packs/jstree/package.json +++ b/npm/packs/jstree/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/jstree", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "~5.3.0", + "@abp/jquery": "~5.3.1", "jstree": "^3.3.12" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/lodash/package.json b/npm/packs/lodash/package.json index f25726b966..92927597f4 100644 --- a/npm/packs/lodash/package.json +++ b/npm/packs/lodash/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/lodash", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~5.3.0", + "@abp/core": "~5.3.1", "lodash": "^4.17.21" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/luxon/package.json b/npm/packs/luxon/package.json index 708b429dd3..43da28dfdc 100644 --- a/npm/packs/luxon/package.json +++ b/npm/packs/luxon/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/luxon", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~5.3.0", + "@abp/core": "~5.3.1", "luxon": "^2.3.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/malihu-custom-scrollbar-plugin/package.json b/npm/packs/malihu-custom-scrollbar-plugin/package.json index d053291381..bb092d210b 100644 --- a/npm/packs/malihu-custom-scrollbar-plugin/package.json +++ b/npm/packs/malihu-custom-scrollbar-plugin/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/malihu-custom-scrollbar-plugin", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~5.3.0", + "@abp/core": "~5.3.1", "malihu-custom-scrollbar-plugin": "^3.1.5" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/markdown-it/package.json b/npm/packs/markdown-it/package.json index 472d897107..496f4580d6 100644 --- a/npm/packs/markdown-it/package.json +++ b/npm/packs/markdown-it/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/markdown-it", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~5.3.0", + "@abp/core": "~5.3.1", "markdown-it": "^12.3.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/owl.carousel/package.json b/npm/packs/owl.carousel/package.json index 358ccf8a52..9e1eb89652 100644 --- a/npm/packs/owl.carousel/package.json +++ b/npm/packs/owl.carousel/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/owl.carousel", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~5.3.0", + "@abp/core": "~5.3.1", "owl.carousel": "^2.3.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/popper.js/package.json b/npm/packs/popper.js/package.json index ca9e46e8d0..290c1f75fb 100644 --- a/npm/packs/popper.js/package.json +++ b/npm/packs/popper.js/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/popper.js", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~5.3.0", + "@abp/core": "~5.3.1", "@popperjs/core": "^2.11.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/prismjs/package.json b/npm/packs/prismjs/package.json index e1b71b09b5..85099dbc14 100644 --- a/npm/packs/prismjs/package.json +++ b/npm/packs/prismjs/package.json @@ -1,12 +1,12 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/prismjs", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/clipboard": "~5.3.0", - "@abp/core": "~5.3.0", + "@abp/clipboard": "~5.3.1", + "@abp/core": "~5.3.1", "prismjs": "^1.26.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/select2/package.json b/npm/packs/select2/package.json index 9e5954fb6a..c70061f44c 100644 --- a/npm/packs/select2/package.json +++ b/npm/packs/select2/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/select2", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~5.3.0", + "@abp/core": "~5.3.1", "select2": "^4.0.13" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/signalr/package.json b/npm/packs/signalr/package.json index 33c0fcb4be..917ae913f9 100644 --- a/npm/packs/signalr/package.json +++ b/npm/packs/signalr/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/signalr", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~5.3.0", + "@abp/core": "~5.3.1", "@microsoft/signalr": "~6.0.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/slugify/package.json b/npm/packs/slugify/package.json index 65fca8e7a1..44afc4591d 100644 --- a/npm/packs/slugify/package.json +++ b/npm/packs/slugify/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/slugify", "publishConfig": { "access": "public" diff --git a/npm/packs/star-rating-svg/package.json b/npm/packs/star-rating-svg/package.json index 3250cd0539..0bf3649e7a 100644 --- a/npm/packs/star-rating-svg/package.json +++ b/npm/packs/star-rating-svg/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/star-rating-svg", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "~5.3.0", + "@abp/jquery": "~5.3.1", "star-rating-svg": "^3.5.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/sweetalert2/package.json b/npm/packs/sweetalert2/package.json index 6d946a53b8..20d0c42269 100644 --- a/npm/packs/sweetalert2/package.json +++ b/npm/packs/sweetalert2/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/sweetalert2", "publishConfig": { "access": "public" @@ -10,7 +10,7 @@ "directory": "npm/packs/sweetalert2" }, "dependencies": { - "@abp/core": "~5.3.0", + "@abp/core": "~5.3.1", "sweetalert2": "^11.3.6" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/timeago/package.json b/npm/packs/timeago/package.json index 6d8f19f982..edc55e433e 100644 --- a/npm/packs/timeago/package.json +++ b/npm/packs/timeago/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/timeago", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~5.3.0", + "@abp/jquery": "~5.3.1", "timeago": "^1.6.7" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/toastr/package.json b/npm/packs/toastr/package.json index bf9a07c0ca..e8084ad7bf 100644 --- a/npm/packs/toastr/package.json +++ b/npm/packs/toastr/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/toastr", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~5.3.0", + "@abp/jquery": "~5.3.1", "toastr": "^2.1.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/tui-editor/package.json b/npm/packs/tui-editor/package.json index 4c9cfeb833..611c6a9d9a 100644 --- a/npm/packs/tui-editor/package.json +++ b/npm/packs/tui-editor/package.json @@ -1,12 +1,12 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/tui-editor", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "~5.3.0", - "@abp/prismjs": "~5.3.0" + "@abp/jquery": "~5.3.1", + "@abp/prismjs": "~5.3.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/uppy/package.json b/npm/packs/uppy/package.json index cba488d4bb..d032e1b580 100644 --- a/npm/packs/uppy/package.json +++ b/npm/packs/uppy/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/uppy", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~5.3.0", + "@abp/core": "~5.3.1", "uppy": "^1.16.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/utils/package.json b/npm/packs/utils/package.json index 1252b15308..d2fc2e44ef 100644 --- a/npm/packs/utils/package.json +++ b/npm/packs/utils/package.json @@ -1,6 +1,6 @@ { "name": "@abp/utils", - "version": "5.3.0", + "version": "5.3.1", "scripts": { "prepublishOnly": "yarn install --ignore-scripts && node prepublish.js", "ng": "ng", diff --git a/npm/packs/vee-validate/package.json b/npm/packs/vee-validate/package.json index e545dc9b81..d356344ecf 100644 --- a/npm/packs/vee-validate/package.json +++ b/npm/packs/vee-validate/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/vee-validate", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/vue": "~5.3.0", + "@abp/vue": "~5.3.1", "vee-validate": "~3.4.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/virtual-file-explorer/package.json b/npm/packs/virtual-file-explorer/package.json index 4c6c3c8ad2..7bd5ff7e30 100644 --- a/npm/packs/virtual-file-explorer/package.json +++ b/npm/packs/virtual-file-explorer/package.json @@ -1,12 +1,12 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/virtual-file-explorer", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/clipboard": "~5.3.0", - "@abp/prismjs": "~5.3.0" + "@abp/clipboard": "~5.3.1", + "@abp/prismjs": "~5.3.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/vue/package.json b/npm/packs/vue/package.json index 6443b61942..5bde7df3eb 100644 --- a/npm/packs/vue/package.json +++ b/npm/packs/vue/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.0", + "version": "5.3.1", "name": "@abp/vue", "publishConfig": { "access": "public" diff --git a/templates/app-nolayers/angular/package.json b/templates/app-nolayers/angular/package.json index 1a11ae570d..f5b2ddb2d8 100644 --- a/templates/app-nolayers/angular/package.json +++ b/templates/app-nolayers/angular/package.json @@ -12,14 +12,14 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~5.3.0", - "@abp/ng.components": "~5.3.0", - "@abp/ng.core": "~5.3.0", - "@abp/ng.identity": "~5.3.0", - "@abp/ng.setting-management": "~5.3.0", - "@abp/ng.tenant-management": "~5.3.0", - "@abp/ng.theme.basic": "~5.3.0", - "@abp/ng.theme.shared": "~5.3.0", + "@abp/ng.account": "~5.3.1", + "@abp/ng.components": "~5.3.1", + "@abp/ng.core": "~5.3.1", + "@abp/ng.identity": "~5.3.1", + "@abp/ng.setting-management": "~5.3.1", + "@abp/ng.tenant-management": "~5.3.1", + "@abp/ng.theme.basic": "~5.3.1", + "@abp/ng.theme.shared": "~5.3.1", "@angular/animations": "~13.1.1", "@angular/common": "~13.1.1", "@angular/compiler": "~13.1.1", @@ -34,7 +34,7 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@abp/ng.schematics": "~5.3.0", + "@abp/ng.schematics": "~5.3.1", "@angular-devkit/build-angular": "~13.1.2", "@angular-eslint/builder": "~13.0.1", "@angular-eslint/eslint-plugin": "~13.0.1", diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json index 647a34ed6d..e40b8e406e 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.0", - "@abp/aspnetcore.components.server.basictheme": "^5.3.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.1", + "@abp/aspnetcore.components.server.basictheme": "^5.3.1" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json index 647a34ed6d..e40b8e406e 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.0", - "@abp/aspnetcore.components.server.basictheme": "^5.3.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.1", + "@abp/aspnetcore.components.server.basictheme": "^5.3.1" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json index cc93b1db85..de939989de 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.1" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json index cc93b1db85..de939989de 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.1" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json index fc1c0bb18f..035cbdf47f 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~5.3.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "~5.3.1" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json index fc1c0bb18f..035cbdf47f 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~5.3.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "~5.3.1" } } diff --git a/templates/app/angular/package.json b/templates/app/angular/package.json index 872d0536de..e7615d745f 100644 --- a/templates/app/angular/package.json +++ b/templates/app/angular/package.json @@ -12,14 +12,14 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~5.3.0", - "@abp/ng.components": "~5.3.0", - "@abp/ng.core": "~5.3.0", - "@abp/ng.identity": "~5.3.0", - "@abp/ng.setting-management": "~5.3.0", - "@abp/ng.tenant-management": "~5.3.0", - "@abp/ng.theme.basic": "~5.3.0", - "@abp/ng.theme.shared": "~5.3.0", + "@abp/ng.account": "~5.3.1", + "@abp/ng.components": "~5.3.1", + "@abp/ng.core": "~5.3.1", + "@abp/ng.identity": "~5.3.1", + "@abp/ng.setting-management": "~5.3.1", + "@abp/ng.tenant-management": "~5.3.1", + "@abp/ng.theme.basic": "~5.3.1", + "@abp/ng.theme.shared": "~5.3.1", "@angular/animations": "~13.3.3", "@angular/common": "~13.3.3", "@angular/compiler": "~13.3.3", @@ -34,7 +34,7 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@abp/ng.schematics": "~5.3.0", + "@abp/ng.schematics": "~5.3.1", "@angular-devkit/build-angular": "~13.3.3", "@angular-eslint/builder": "~13.2.1", "@angular-eslint/eslint-plugin": "~13.2.1", diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json index 647a34ed6d..e40b8e406e 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.0", - "@abp/aspnetcore.components.server.basictheme": "^5.3.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.1", + "@abp/aspnetcore.components.server.basictheme": "^5.3.1" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json index 647a34ed6d..e40b8e406e 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.0", - "@abp/aspnetcore.components.server.basictheme": "^5.3.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.1", + "@abp/aspnetcore.components.server.basictheme": "^5.3.1" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json index cc93b1db85..de939989de 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.1" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/package.json index 47538f5c37..8bd0871145 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/package.json @@ -3,6 +3,6 @@ "name": "my-app-identityserver", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.1" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json index cc93b1db85..de939989de 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.1" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json index cc93b1db85..de939989de 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.1" } } diff --git a/templates/module/angular/package.json b/templates/module/angular/package.json index 93698ccb95..39503a27a1 100644 --- a/templates/module/angular/package.json +++ b/templates/module/angular/package.json @@ -15,14 +15,14 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~5.3.0", - "@abp/ng.components": "~5.3.0", - "@abp/ng.core": "~5.3.0", - "@abp/ng.identity": "~5.3.0", - "@abp/ng.setting-management": "~5.3.0", - "@abp/ng.tenant-management": "~5.3.0", - "@abp/ng.theme.basic": "~5.3.0", - "@abp/ng.theme.shared": "~5.3.0", + "@abp/ng.account": "~5.3.1", + "@abp/ng.components": "~5.3.1", + "@abp/ng.core": "~5.3.1", + "@abp/ng.identity": "~5.3.1", + "@abp/ng.setting-management": "~5.3.1", + "@abp/ng.tenant-management": "~5.3.1", + "@abp/ng.theme.basic": "~5.3.1", + "@abp/ng.theme.shared": "~5.3.1", "@angular/animations": "~13.3.3", "@angular/common": "~13.3.3", "@angular/compiler": "~13.3.3", @@ -37,7 +37,7 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@abp/ng.schematics": "~5.3.0", + "@abp/ng.schematics": "~5.3.1", "@angular-devkit/build-angular": "~13.3.3", "@angular-eslint/builder": "~13.2.1", "@angular-eslint/eslint-plugin": "~13.2.1", diff --git a/templates/module/angular/projects/my-project-name/package.json b/templates/module/angular/projects/my-project-name/package.json index 57f8f84e4f..2fb3b9d3df 100644 --- a/templates/module/angular/projects/my-project-name/package.json +++ b/templates/module/angular/projects/my-project-name/package.json @@ -4,8 +4,8 @@ "peerDependencies": { "@angular/common": ">=9", "@angular/core": ">=9", - "@abp/ng.core": ">=5.3.0", - "@abp/ng.theme.shared": ">=5.3.0" + "@abp/ng.core": ">=5.3.1", + "@abp/ng.theme.shared": ">=5.3.1" }, "dependencies": { "tslib": "^2.1.0" diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json index 647a34ed6d..e40b8e406e 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.0", - "@abp/aspnetcore.components.server.basictheme": "^5.3.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.1", + "@abp/aspnetcore.components.server.basictheme": "^5.3.1" } } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/package.json index 47538f5c37..8bd0871145 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/package.json @@ -3,6 +3,6 @@ "name": "my-app-identityserver", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.1" } } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json index cc93b1db85..de939989de 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.1" } } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json index cc93b1db85..de939989de 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.1" } } From cd8b553d12ecb0e63baac6b0d959edd8e1698d84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Wed, 29 Jun 2022 22:22:38 +0300 Subject: [PATCH 050/110] Make SolutionRenamer public. --- .../Building/Steps/SolutionRenameStep.cs | 65 +------------------ .../Building/Steps/SolutionRenamer.cs | 63 ++++++++++++++++++ .../Cli/ProjectBuilding/Files/FileEntry.cs | 7 +- 3 files changed, 71 insertions(+), 64 deletions(-) create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/SolutionRenamer.cs diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/SolutionRenameStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/SolutionRenameStep.cs index d584611186..0b8e115dfb 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/SolutionRenameStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/SolutionRenameStep.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using Volo.Abp.Cli.ProjectBuilding.Files; -using Volo.Abp.Cli.ProjectBuilding.Templates.Microservice; +using Volo.Abp.Cli.ProjectBuilding.Templates.Microservice; namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps; @@ -46,62 +43,4 @@ public class SolutionRenameStep : ProjectBuildPipelineStep ).Run(); } } - - private class SolutionRenamer - { - private readonly List _entries; - private readonly string _companyNamePlaceHolder; - private readonly string _projectNamePlaceHolder; - - private readonly string _companyName; - private readonly string _projectName; - - public SolutionRenamer(List entries, string companyNamePlaceHolder, string projectNamePlaceHolder, string companyName, string projectName) - { - if (string.IsNullOrWhiteSpace(companyName)) - { - companyName = null; - } - - if (companyNamePlaceHolder == null && companyName != null) - { - throw new UserFriendlyException($"Can not set {nameof(companyName)} if {nameof(companyNamePlaceHolder)} is null."); - } - - _entries = entries; - - _companyNamePlaceHolder = companyNamePlaceHolder; - _projectNamePlaceHolder = projectNamePlaceHolder ?? throw new ArgumentNullException(nameof(projectNamePlaceHolder)); - - _companyName = companyName; - _projectName = projectName ?? throw new ArgumentNullException(nameof(projectName)); - } - - public void Run() - { - if (_companyNamePlaceHolder != null) - { - if (_companyName != null) - { - RenameHelper.RenameAll(_entries, _companyNamePlaceHolder, _companyName); - RenameHelper.RenameAll(_entries, _companyNamePlaceHolder.ToCamelCase(), _companyName.ToCamelCase()); - RenameHelper.RenameAll(_entries, _companyNamePlaceHolder.ToKebabCase(), _companyName.ToKebabCase()); - RenameHelper.RenameAll(_entries, _companyNamePlaceHolder.ToLowerInvariant(), _companyName.ToLowerInvariant()); - } - else - { - RenameHelper.RenameAll(_entries, _companyNamePlaceHolder + "." + _projectNamePlaceHolder, _projectNamePlaceHolder); - RenameHelper.RenameAll(_entries, _companyNamePlaceHolder.ToCamelCase() + "." + _projectNamePlaceHolder.ToCamelCase(), _projectNamePlaceHolder.ToCamelCase()); - RenameHelper.RenameAll(_entries, _companyNamePlaceHolder.ToLowerInvariant() + "." + _projectNamePlaceHolder.ToLowerInvariant(), _projectNamePlaceHolder.ToLowerInvariant()); - RenameHelper.RenameAll(_entries, _companyNamePlaceHolder.ToKebabCase() + "/" + _projectNamePlaceHolder.ToKebabCase(), _projectNamePlaceHolder.ToKebabCase()); - } - } - - RenameHelper.RenameAll(_entries, _projectNamePlaceHolder, _projectName); - RenameHelper.RenameAll(_entries, _projectNamePlaceHolder.ToCamelCase(), _projectName.ToCamelCase()); - RenameHelper.RenameAll(_entries, _projectNamePlaceHolder.ToKebabCase(), _projectName.ToKebabCase()); - RenameHelper.RenameAll(_entries, _projectNamePlaceHolder.ToLowerInvariant(), _projectName.ToLowerInvariant()); - RenameHelper.RenameAll(_entries, _projectNamePlaceHolder.ToSnakeCase().ToUpper(), _projectName.ToSnakeCase().ToUpper()); - } - } -} +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/SolutionRenamer.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/SolutionRenamer.cs new file mode 100644 index 0000000000..36006ecd18 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/SolutionRenamer.cs @@ -0,0 +1,63 @@ +using System; +using System.Collections.Generic; +using Volo.Abp.Cli.ProjectBuilding.Files; + +namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps; + +public class SolutionRenamer +{ + private readonly List _entries; + private readonly string _companyNamePlaceHolder; + private readonly string _projectNamePlaceHolder; + + private readonly string _companyName; + private readonly string _projectName; + + public SolutionRenamer(List entries, string companyNamePlaceHolder, string projectNamePlaceHolder, string companyName, string projectName) + { + if (string.IsNullOrWhiteSpace(companyName)) + { + companyName = null; + } + + if (companyNamePlaceHolder == null && companyName != null) + { + throw new UserFriendlyException($"Can not set {nameof(companyName)} if {nameof(companyNamePlaceHolder)} is null."); + } + + _entries = entries; + + _companyNamePlaceHolder = companyNamePlaceHolder; + _projectNamePlaceHolder = projectNamePlaceHolder ?? throw new ArgumentNullException(nameof(projectNamePlaceHolder)); + + _companyName = companyName; + _projectName = projectName ?? throw new ArgumentNullException(nameof(projectName)); + } + + public void Run() + { + if (_companyNamePlaceHolder != null) + { + if (_companyName != null) + { + RenameHelper.RenameAll(_entries, _companyNamePlaceHolder, _companyName); + RenameHelper.RenameAll(_entries, _companyNamePlaceHolder.ToCamelCase(), _companyName.ToCamelCase()); + RenameHelper.RenameAll(_entries, _companyNamePlaceHolder.ToKebabCase(), _companyName.ToKebabCase()); + RenameHelper.RenameAll(_entries, _companyNamePlaceHolder.ToLowerInvariant(), _companyName.ToLowerInvariant()); + } + else + { + RenameHelper.RenameAll(_entries, _companyNamePlaceHolder + "." + _projectNamePlaceHolder, _projectNamePlaceHolder); + RenameHelper.RenameAll(_entries, _companyNamePlaceHolder.ToCamelCase() + "." + _projectNamePlaceHolder.ToCamelCase(), _projectNamePlaceHolder.ToCamelCase()); + RenameHelper.RenameAll(_entries, _companyNamePlaceHolder.ToLowerInvariant() + "." + _projectNamePlaceHolder.ToLowerInvariant(), _projectNamePlaceHolder.ToLowerInvariant()); + RenameHelper.RenameAll(_entries, _companyNamePlaceHolder.ToKebabCase() + "/" + _projectNamePlaceHolder.ToKebabCase(), _projectNamePlaceHolder.ToKebabCase()); + } + } + + RenameHelper.RenameAll(_entries, _projectNamePlaceHolder, _projectName); + RenameHelper.RenameAll(_entries, _projectNamePlaceHolder.ToCamelCase(), _projectName.ToCamelCase()); + RenameHelper.RenameAll(_entries, _projectNamePlaceHolder.ToKebabCase(), _projectName.ToKebabCase()); + RenameHelper.RenameAll(_entries, _projectNamePlaceHolder.ToLowerInvariant(), _projectName.ToLowerInvariant()); + RenameHelper.RenameAll(_entries, _projectNamePlaceHolder.ToSnakeCase().ToUpper(), _projectName.ToSnakeCase().ToUpper()); + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Files/FileEntry.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Files/FileEntry.cs index 799c2e2755..c634f09fa8 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Files/FileEntry.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Files/FileEntry.cs @@ -33,10 +33,15 @@ public class FileEntry IsDirectory = isDirectory; Encoding = CalculateEncoding(); - Content = Encoding.GetString(bytes); + Content = GetContent(); IsBinaryFile = CalculateIsBinaryFile(); } + private string GetContent() + { + return Bytes == null ? null : Encoding.GetString(Bytes); + } + public void SetContent(string fileContent) { Content = fileContent; From eef2e295fc7ca29be65213a95b23da4b2b2dd753 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Thu, 30 Jun 2022 10:30:03 +0800 Subject: [PATCH 051/110] Enhance MongoDbRepository --- .../Repositories/MongoDB/IMongoDbRepository.cs | 4 ++-- .../Repositories/MongoDB/MongoDbRepository.cs | 16 ++++++++-------- .../MongoDbCoreRepositoryExtensions.cs | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/IMongoDbRepository.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/IMongoDbRepository.cs index a0cd792b21..eeac0dc2e2 100644 --- a/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/IMongoDbRepository.cs +++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/IMongoDbRepository.cs @@ -23,9 +23,9 @@ public interface IMongoDbRepository : IRepository [Obsolete("Use GetMongoQueryableAsync method.")] IMongoQueryable GetMongoQueryable(); - Task> GetMongoQueryableAsync(CancellationToken cancellationToken = default); + Task> GetMongoQueryableAsync(CancellationToken cancellationToken = default, AggregateOptions options = null); - Task> GetAggregateAsync(CancellationToken cancellationToken = default); + Task> GetAggregateAsync(CancellationToken cancellationToken = default, AggregateOptions options = null); } public interface IMongoDbRepository : IMongoDbRepository, IRepository diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs index 102564f8c9..0485dd74bc 100644 --- a/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs +++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs @@ -518,12 +518,12 @@ public class MongoDbRepository ); } - public virtual Task> GetMongoQueryableAsync(CancellationToken cancellationToken = default) + public virtual Task> GetMongoQueryableAsync(CancellationToken cancellationToken = default, AggregateOptions aggregateOptions = null) { - return GetMongoQueryableAsync(cancellationToken); + return GetMongoQueryableAsync(cancellationToken, aggregateOptions); } - protected virtual async Task> GetMongoQueryableAsync(CancellationToken cancellationToken = default) + protected virtual async Task> GetMongoQueryableAsync(CancellationToken cancellationToken = default, AggregateOptions aggregateOptions = null) { cancellationToken = GetCancellationToken(cancellationToken); @@ -532,12 +532,12 @@ public class MongoDbRepository return ApplyDataFilters, TOtherEntity>( dbContext.SessionHandle != null - ? collection.AsQueryable(dbContext.SessionHandle) - : collection.AsQueryable() + ? collection.AsQueryable(dbContext.SessionHandle, aggregateOptions) + : collection.AsQueryable(aggregateOptions) ); } - public virtual async Task> GetAggregateAsync(CancellationToken cancellationToken = default) + public virtual async Task> GetAggregateAsync(CancellationToken cancellationToken = default, AggregateOptions aggregateOptions = null) { cancellationToken = GetCancellationToken(cancellationToken); @@ -545,8 +545,8 @@ public class MongoDbRepository var collection = await GetCollectionAsync(cancellationToken); var aggregate = dbContext.SessionHandle != null - ? collection.Aggregate(dbContext.SessionHandle) - : collection.Aggregate(); + ? collection.Aggregate(dbContext.SessionHandle, aggregateOptions) + : collection.Aggregate(aggregateOptions); if (typeof(ISoftDelete).IsAssignableFrom(typeof(TEntity)) && DataFilter.IsEnabled()) { diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDbCoreRepositoryExtensions.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDbCoreRepositoryExtensions.cs index 6a59640c70..c71c3e991d 100644 --- a/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDbCoreRepositoryExtensions.cs +++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDbCoreRepositoryExtensions.cs @@ -43,16 +43,16 @@ public static class MongoDbCoreRepositoryExtensions return repository.ToMongoDbRepository().GetMongoQueryable(); } - public static Task> GetMongoQueryableAsync(this IReadOnlyBasicRepository repository, CancellationToken cancellationToken = default) + public static Task> GetMongoQueryableAsync(this IReadOnlyBasicRepository repository, CancellationToken cancellationToken = default, AggregateOptions aggregateOptions = null) where TEntity : class, IEntity { - return repository.ToMongoDbRepository().GetMongoQueryableAsync(cancellationToken); + return repository.ToMongoDbRepository().GetMongoQueryableAsync(cancellationToken, aggregateOptions); } - public static Task> GetAggregateAsync(this IReadOnlyBasicRepository repository, CancellationToken cancellationToken = default) + public static Task> GetAggregateAsync(this IReadOnlyBasicRepository repository, CancellationToken cancellationToken = default, AggregateOptions aggregateOptions = null) where TEntity : class, IEntity { - return repository.ToMongoDbRepository().GetAggregateAsync(cancellationToken); + return repository.ToMongoDbRepository().GetAggregateAsync(cancellationToken, aggregateOptions); } public static IMongoDbRepository ToMongoDbRepository(this IReadOnlyBasicRepository repository) From daa4f69b5055389234a2da4665c5bebef3693019 Mon Sep 17 00:00:00 2001 From: malik masis Date: Thu, 30 Jun 2022 11:17:16 +0300 Subject: [PATCH 052/110] Added select-box instead on input --- .../CmsKit/Contents/AddWidgetModal.cshtml | 14 +++++------ .../Pages/CmsKit/Contents/addWidgetModal.js | 25 +++++++++++++++---- 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml index 2b402c9353..7b50394b02 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml @@ -16,15 +16,16 @@ } - -
    - @if(Model.Widgets.Count() > 1){ - -
    -
    + @if(Model.Widgets.Count() > 1) + { + + + @**@ +
    +
    } else @@ -33,5 +34,4 @@ }
    -     diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js index 8785add3b7..16a79d127e 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js @@ -12,16 +12,31 @@ $(function () { volo.cmsKit.admin.contents.contentAdmin.getWidgets().then(function (data) { var widgetTypes = data.items.filter(v => v.key === widgetType); var firstWidgetType = widgetTypes[0]; - for (const property of firstWidgetType.properties) { - let html = "
    " + - " " + - " " + - "
    "; + if (firstWidgetType.key == "Poll") { + $("#polls").removeAttr("hidden"); + let widgetKey = $('#Widget').find('option:selected').val(); + let html = " " $("#PropertySideId").append(html); } + else { + for (const property of firstWidgetType.properties) { + let html = "
    " + + " " + + " " + + "
    "; + $("#PropertySideId").append(html); + } + } }); }); + $("#Widget").change(function () { + $("#PropertySideId").html(''); + let widgetKey = $(this).find('option:selected').val(); + let html = " " + $("#PropertySideId").append(html); + }); + $("#save-changes").click(function () { var keys = []; var values = []; From 42546d6cae7e5e0ba6808b5ead52f833ec781524 Mon Sep 17 00:00:00 2001 From: Ebicoglu Date: Thu, 30 Jun 2022 12:24:25 +0300 Subject: [PATCH 053/110] fixes #13183 --- .../Abp/AspNetCore/Mvc/Localization/AbpLanguagesController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Localization/AbpLanguagesController.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Localization/AbpLanguagesController.cs index b697d1b194..dc44f12124 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Localization/AbpLanguagesController.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Localization/AbpLanguagesController.cs @@ -25,7 +25,7 @@ public class AbpLanguagesController : AbpController { if (!CultureHelper.IsValidCultureCode(culture)) { - throw new AbpException("Unknown language: " + culture + ". It must be a valid culture!"); + throw new AbpException("The selected culture is not valid! Make sure you enter a valid culture code."); } AbpRequestCultureCookieHelper.SetCultureCookie( From 04198364c3c281c0e686d9a927d0e933f4778648 Mon Sep 17 00:00:00 2001 From: Engincan VESKE Date: Thu, 30 Jun 2022 13:49:10 +0300 Subject: [PATCH 054/110] Update Volo.Abp.OpenIddict.AspNetCore.csproj --- .../Volo.Abp.OpenIddict.AspNetCore.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo.Abp.OpenIddict.AspNetCore.csproj b/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo.Abp.OpenIddict.AspNetCore.csproj index b704e64cf7..fabcb8116b 100644 --- a/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo.Abp.OpenIddict.AspNetCore.csproj +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo.Abp.OpenIddict.AspNetCore.csproj @@ -6,6 +6,7 @@ net6.0 Library + true From 4727a5343797b2c72616f7c8a8198e9b3f79d4ff Mon Sep 17 00:00:00 2001 From: Engincan VESKE <43685404+EngincanV@users.noreply.github.com> Date: Thu, 30 Jun 2022 14:16:45 +0300 Subject: [PATCH 055/110] Update common.ps1 --- nupkg/common.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/nupkg/common.ps1 b/nupkg/common.ps1 index d0dc8e9359..f13746aed0 100644 --- a/nupkg/common.ps1 +++ b/nupkg/common.ps1 @@ -79,6 +79,7 @@ $solutions = ( "modules/feature-management", "modules/identity", "modules/identityserver", + "modules/openiddict", "modules/permission-management", "modules/setting-management", "modules/tenant-management", From 2e4b431a8b58ddef0cfde65e6174c3691ca76c68 Mon Sep 17 00:00:00 2001 From: selman koc <64414348+skoc10@users.noreply.github.com> Date: Fri, 1 Jul 2022 09:42:53 +0300 Subject: [PATCH 056/110] Update common.props --- common.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.props b/common.props index e372fe23a8..21e0344fc6 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 5.3.1 + 5.3.2 $(NoWarn);CS1591;CS0436 https://abp.io/assets/abp_nupkg.png https://abp.io/ From c3319c221eb3a4627c1d5210b4d7bd61cdb2de3f Mon Sep 17 00:00:00 2001 From: Engincan VESKE Date: Fri, 1 Jul 2022 10:09:23 +0300 Subject: [PATCH 057/110] Update Nightly-Builds.md --- docs/en/Nightly-Builds.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/docs/en/Nightly-Builds.md b/docs/en/Nightly-Builds.md index f835dcda9e..cdde8459f4 100644 --- a/docs/en/Nightly-Builds.md +++ b/docs/en/Nightly-Builds.md @@ -1,15 +1,21 @@ # Nightly Builds -All framework & module packages are deployed to MyGet every night in weekdays. So, you can use or test the latest code without waiting the next release. +All framework & module packages are deployed to MyGet every night in weekdays. So, you can use or test the latest code without waiting for the next release. ## Install & Uninstall Nightly Preview Packages -The latest version of nightly preview packages can be installed by the running below command in the root folder of application: +> This command doesn't create a project with nightly preview packages. Instead, it switches package versions of a project with the nightly preview packages. + +The latest version of nightly preview packages can be installed by the running below command in the root folder of the application: ```bash abp switch-to-nightly ``` +After this command, a new NuGet feed will be added to the `NuGet.Config` file of your project. Then, you can get the latest code of ABP Framework without waiting for the next release. + +> You can check the [abp-nightly gallery](https://www.myget.org/gallery/abp-nightly) to see the all nightly preview packages. + If you're using the ABP Framework nightly preview packages, you can switch back to stable version using this command: ```bash From c89429e667b2385b28d0f4e6874b8ae0d623c1c0 Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 1 Jul 2022 15:51:05 +0800 Subject: [PATCH 058/110] Prevent loading of ABP assemblies in LeptonXLite. --- ...yCompanyName.MyProjectName.Blazor.Server.Mongo.csproj | 9 ++++++++- .../MyCompanyName.MyProjectName.Blazor.Server.csproj | 9 ++++++++- .../MyCompanyName.MyProjectName.Host.Mongo.csproj | 5 +++++ .../MyCompanyName.MyProjectName.Host.csproj | 5 +++++ .../MyCompanyName.MyProjectName.Mvc.Mongo.csproj | 7 ++++++- .../MyCompanyName.MyProjectName.Mvc.csproj | 7 ++++++- .../MyCompanyName.MyProjectName.AuthServer.csproj | 7 ++++++- ...CompanyName.MyProjectName.Blazor.Server.Tiered.csproj | 9 ++++++++- .../MyCompanyName.MyProjectName.Blazor.Server.csproj | 9 ++++++++- .../MyCompanyName.MyProjectName.Blazor.csproj | 6 +++++- ...yCompanyName.MyProjectName.HttpApi.HostWithIds.csproj | 7 ++++++- .../MyCompanyName.MyProjectName.Web.Host.csproj | 7 ++++++- .../MyCompanyName.MyProjectName.Web.csproj | 7 ++++++- 13 files changed, 83 insertions(+), 11 deletions(-) diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj index 41ca3c0a32..f42cc58487 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj @@ -12,8 +12,15 @@ - + + + + + + + + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj index f132ca1ca3..c3ec889f82 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj @@ -12,8 +12,15 @@ - + + + + + + + + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj index 2fa6956c31..978df94edb 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj @@ -64,6 +64,11 @@ + + + + + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj index 86b9f762ec..0f547bba68 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj @@ -65,6 +65,11 @@ + + + + + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj index 7593435403..58c74a49e6 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj @@ -10,8 +10,13 @@ - + + + + + + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj index 1bf1cf825a..9ec32bfe17 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj @@ -10,8 +10,13 @@ - + + + + + + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj index 9d012f8de6..6c8f6bfe74 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj @@ -35,8 +35,13 @@ - + + + + + + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj index a007569a70..aaabc7601b 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj @@ -19,8 +19,15 @@ - + + + + + + + + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj index b4e11ed8fc..c1340c2023 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj @@ -18,8 +18,15 @@ - + + + + + + + + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj index 9715a1ebbd..baaa9b8e89 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj @@ -16,8 +16,12 @@ - + + + + + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj index f9cc06ec6d..81ce83baca 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj @@ -18,8 +18,13 @@ - + + + + + + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj index 15452637ad..1f23858ef6 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj @@ -19,8 +19,13 @@ - + + + + + + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj index 7f1a62a473..9d2ddf2ce2 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj @@ -34,8 +34,13 @@ - + + + + + + From 6609569afa6116cf9f95a3f47ca4c5f936978db5 Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 1 Jul 2022 15:53:59 +0800 Subject: [PATCH 059/110] Fix path issue. --- .../MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj | 2 +- .../MyCompanyName.MyProjectName.Blazor.Server.csproj | 2 +- .../MyCompanyName.MyProjectName.Host.Mongo.csproj | 2 +- .../MyCompanyName.MyProjectName.Host.csproj | 2 +- .../MyCompanyName.MyProjectName.Mvc.Mongo.csproj | 2 +- .../MyCompanyName.MyProjectName.Mvc.csproj | 2 +- .../MyCompanyName.MyProjectName.AuthServer.csproj | 2 +- .../MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj | 2 +- .../MyCompanyName.MyProjectName.Blazor.Server.csproj | 2 +- .../MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj | 2 +- .../MyCompanyName.MyProjectName.Web.Host.csproj | 2 +- .../MyCompanyName.MyProjectName.Web.csproj | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj index f42cc58487..4ad807d5c4 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj @@ -16,7 +16,7 @@ - + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj index c3ec889f82..c8b5b2dfc6 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj @@ -16,7 +16,7 @@ - + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj index 978df94edb..c4dd1d4885 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj @@ -66,7 +66,7 @@ - + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj index 0f547bba68..5568cdfeca 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj @@ -67,7 +67,7 @@ - + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj index 58c74a49e6..2d5f627ec6 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj @@ -14,7 +14,7 @@ - + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj index 9ec32bfe17..c283934d50 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj @@ -14,7 +14,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj index 6c8f6bfe74..339b838734 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj @@ -39,7 +39,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj index aaabc7601b..7c51990b58 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj @@ -23,7 +23,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj index c1340c2023..007229c6c1 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj @@ -22,7 +22,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj index 81ce83baca..5134c74851 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj @@ -22,7 +22,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj index 1f23858ef6..406db2d1a5 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj @@ -23,7 +23,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj index 9d2ddf2ce2..72660d318d 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj @@ -38,7 +38,7 @@ - + From cdb838cc5193c503485944b3820f341d3912e87a Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 1 Jul 2022 15:58:31 +0800 Subject: [PATCH 060/110] Update MyCompanyName.MyProjectName.Blazor.csproj --- .../MyCompanyName.MyProjectName.Blazor.csproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj index baaa9b8e89..358814ebe3 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj @@ -19,7 +19,8 @@ - + + From cfc2ebccdf5901019b03523f4c6ccf20a5d6b01a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alper=20Ebi=C3=A7o=C4=9Flu?= <9526587+ebicoglu@users.noreply.github.com> Date: Fri, 1 Jul 2022 14:45:59 +0300 Subject: [PATCH 061/110] add NuGet feed --- docs/en/Nightly-Builds.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/en/Nightly-Builds.md b/docs/en/Nightly-Builds.md index cdde8459f4..cf44b51045 100644 --- a/docs/en/Nightly-Builds.md +++ b/docs/en/Nightly-Builds.md @@ -1,17 +1,17 @@ # Nightly Builds -All framework & module packages are deployed to MyGet every night in weekdays. So, you can use or test the latest code without waiting for the next release. +All framework & module packages are deployed to MyGet every night in weekdays. So, you can install the latest dev-brach builds to try out functionality prior to release. ## Install & Uninstall Nightly Preview Packages -> This command doesn't create a project with nightly preview packages. Instead, it switches package versions of a project with the nightly preview packages. - The latest version of nightly preview packages can be installed by the running below command in the root folder of the application: ```bash abp switch-to-nightly ``` +> Note that this command doesn't create a project with nightly preview packages. Instead, it switches package versions of a project with the nightly preview packages. + After this command, a new NuGet feed will be added to the `NuGet.Config` file of your project. Then, you can get the latest code of ABP Framework without waiting for the next release. > You can check the [abp-nightly gallery](https://www.myget.org/gallery/abp-nightly) to see the all nightly preview packages. @@ -22,4 +22,6 @@ If you're using the ABP Framework nightly preview packages, you can switch back abp switch-to-stable ``` +ABP nightly NuGet feed is [https://www.myget.org/F/abp-nightly/api/v3/index.json](https://www.myget.org/F/abp-nightly/api/v3/index.json). + See the [ABP CLI documentation](./CLI.md) for more information. From c8131f8bc6c2c2cd3cd579e70eceb9f548b55795 Mon Sep 17 00:00:00 2001 From: malik masis Date: Fri, 1 Jul 2022 17:01:28 +0300 Subject: [PATCH 062/110] changed select to autocompleted --- .../Pages/CmsKit/Contents/AddWidgetModal.cshtml | 15 +++++++-------- .../Pages/CmsKit/Contents/addWidgetModal.js | 7 ++----- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml index 7b50394b02..04c4cbc2ae 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml @@ -11,19 +11,18 @@ } @section scripts -{ + { } - - - -
    - @if(Model.Widgets.Count() > 1) + + + +
    + @if (Model.Widgets.Count() > 1) { - - @**@ +
    @await Component.InvokeAsync("CmsPolls")
    diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js index 16a79d127e..acb44044c5 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js @@ -14,9 +14,6 @@ $(function () { var firstWidgetType = widgetTypes[0]; if (firstWidgetType.key == "Poll") { $("#polls").removeAttr("hidden"); - let widgetKey = $('#Widget').find('option:selected').val(); - let html = " " - $("#PropertySideId").append(html); } else { for (const property of firstWidgetType.properties) { @@ -30,9 +27,9 @@ $(function () { }); }); - $("#Widget").change(function () { + $("#WidgetCode").keyup(function (e) { $("#PropertySideId").html(''); - let widgetKey = $(this).find('option:selected').val(); + let widgetKey = $(this).val(); let html = " " $("#PropertySideId").append(html); }); From 2b9ee2cd202a548f1f422a78a05c65f37111caf9 Mon Sep 17 00:00:00 2001 From: malik masis Date: Sat, 2 Jul 2022 11:19:27 +0300 Subject: [PATCH 063/110] Added dynamic js files --- .../Pages/CmsKit/Contents/addWidgetModal.js | 5 +++++ .../src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js | 1 + 2 files changed, 6 insertions(+) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js index acb44044c5..83fe4c3685 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js @@ -4,6 +4,11 @@ $(function () { var initModal = function () { + + $('head').append(''); + $('head').append(''); + $('head').append(''); + let widgetType; $("#ViewModel_Widget").change(function () { widgetType = this.value; diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js index 3fd4df2c06..be705d6316 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js @@ -172,6 +172,7 @@ $(function () { } function createLastButton() { + //TODO add auth const button = document.createElement('button'); button.className = 'toastui-editor-toolbar-icons last dropdown'; From 8f8c7166689fcee3c9980790153685e6758f7cf8 Mon Sep 17 00:00:00 2001 From: leolaw Date: Sat, 2 Jul 2022 18:03:31 +0800 Subject: [PATCH 064/110] Use Task.CompletedTask replace Task.FromResult(0) --- .../Volo/Abp/BackgroundJobs/InMemoryBackgroundJobStore.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/InMemoryBackgroundJobStore.cs b/framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/InMemoryBackgroundJobStore.cs index 9e7071c89a..726d65d513 100644 --- a/framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/InMemoryBackgroundJobStore.cs +++ b/framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/InMemoryBackgroundJobStore.cs @@ -32,7 +32,7 @@ public class InMemoryBackgroundJobStore : IBackgroundJobStore, ISingletonDepende { _jobs[jobInfo.Id] = jobInfo; - return Task.FromResult(0); + return Task.CompletedTask; } public virtual Task> GetWaitingJobsAsync(int maxResultCount) @@ -53,7 +53,7 @@ public class InMemoryBackgroundJobStore : IBackgroundJobStore, ISingletonDepende { _jobs.TryRemove(jobId, out _); - return Task.FromResult(0); + return Task.CompletedTask; } public virtual Task UpdateAsync(BackgroundJobInfo jobInfo) @@ -63,6 +63,6 @@ public class InMemoryBackgroundJobStore : IBackgroundJobStore, ISingletonDepende return DeleteAsync(jobInfo.Id); } - return Task.FromResult(0); + return Task.CompletedTask; } } From eb96830ee55c8ab7c6fa2d93443f38b274a3a258 Mon Sep 17 00:00:00 2001 From: naveen <172697+naveensrinivasan@users.noreply.github.com> Date: Sun, 3 Jul 2022 00:30:40 +0000 Subject: [PATCH 065/110] chore: Set permissions for GitHub actions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Restrict the GitHub token permissions only to the required ones; this way, even if the attackers will succeed in compromising your workflow, they won’t be able to do much. - Included permissions for the action. https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs [Keeping your GitHub Actions and workflows secure Part 1: Preventing pwn requests](https://securitylab.github.com/research/github-actions-preventing-pwn-requests/) Signed-off-by: naveen <172697+naveensrinivasan@users.noreply.github.com> --- .github/workflows/angular.yml | 3 +++ .github/workflows/auto-pr.yml | 6 ++++++ .github/workflows/build-and-test.yml | 3 +++ .github/workflows/cancel-workflow.yml | 5 +++++ .github/workflows/codeql-analysis.yml | 7 +++++++ 5 files changed, 24 insertions(+) diff --git a/.github/workflows/angular.yml b/.github/workflows/angular.yml index 0c0f8d5b6c..e42f3e58dd 100644 --- a/.github/workflows/angular.yml +++ b/.github/workflows/angular.yml @@ -10,6 +10,9 @@ on: branches: - 'rel-*' - 'dev' +permissions: + contents: read + jobs: build-test-lint: runs-on: ubuntu-latest diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index 084b0977d0..081275ca08 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -3,8 +3,14 @@ on: push: branches: - rel-5.3 +permissions: + contents: read + jobs: merge-rel-5-3-with-rel-5-2: + permissions: + contents: write # for peter-evans/create-pull-request to create branch + pull-requests: write # for peter-evans/create-pull-request to create a PR runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 0210efcec9..b88900019b 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -31,6 +31,9 @@ on: - 'templates/**/*.cshtml' - 'templates/**/*.csproj' - 'templates/**/*.razor' +permissions: + contents: read + jobs: build-test: runs-on: windows-latest diff --git a/.github/workflows/cancel-workflow.yml b/.github/workflows/cancel-workflow.yml index 78bbf94b3b..039943ad66 100644 --- a/.github/workflows/cancel-workflow.yml +++ b/.github/workflows/cancel-workflow.yml @@ -1,7 +1,12 @@ name: cancel-workflow on: [push] +permissions: + contents: read + jobs: cancel: + permissions: + actions: write # for styfle/cancel-workflow-action to cancel/stop running workflows name: 'Cancel Previous Runs' runs-on: ubuntu-latest timeout-minutes: 3 diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 7aaad739e9..e3127f21b1 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -24,8 +24,15 @@ on: - 'abp/**/*.csproj' - 'abp/**/*.razor' +permissions: + contents: read + jobs: analyze: + permissions: + actions: read # for github/codeql-action/init to get workflow details + contents: read # for actions/checkout to fetch code + security-events: write # for github/codeql-action/autobuild to send a status report name: Analyze runs-on: ubuntu-latest From 9a2b28a412c53d016c0160b4f31507b6246a5edd Mon Sep 17 00:00:00 2001 From: malik masis Date: Sun, 3 Jul 2022 13:26:45 +0300 Subject: [PATCH 066/110] Removed the unnecessary event for widget keyup --- .../Pages/CmsKit/Contents/AddWidgetModal.cshtml | 2 +- .../Pages/CmsKit/Contents/addWidgetModal.js | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml index 04c4cbc2ae..3c4286dd8f 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml @@ -22,7 +22,7 @@ @if (Model.Widgets.Count() > 1) { -
    @await Component.InvokeAsync("CmsPolls")
    +
    diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js index 83fe4c3685..58764af867 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js @@ -4,7 +4,6 @@ $(function () { var initModal = function () { - $('head').append(''); $('head').append(''); $('head').append(''); @@ -32,14 +31,13 @@ $(function () { }); }); - $("#WidgetCode").keyup(function (e) { - $("#PropertySideId").html(''); - let widgetKey = $(this).val(); - let html = " " - $("#PropertySideId").append(html); - }); - $("#save-changes").click(function () { + var widgetKey = $('#WidgetCodes option').attr("data-key"); + if (widgetKey != undefined) { + let html = " " + $("#PropertySideId").append(html); + } + var keys = []; var values = []; $(".properties").each(function () { From 400152a6797265aa494ba94f5b2df22af99ed13b Mon Sep 17 00:00:00 2001 From: maliming Date: Mon, 4 Jul 2022 09:23:04 +0800 Subject: [PATCH 067/110] Update AbpTestModule.cs --- framework/test/Volo.Abp.Core.Tests/Volo/Abp/AbpTestModule.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/framework/test/Volo.Abp.Core.Tests/Volo/Abp/AbpTestModule.cs b/framework/test/Volo.Abp.Core.Tests/Volo/Abp/AbpTestModule.cs index b3e78aea07..85a36c6698 100644 --- a/framework/test/Volo.Abp.Core.Tests/Volo/Abp/AbpTestModule.cs +++ b/framework/test/Volo.Abp.Core.Tests/Volo/Abp/AbpTestModule.cs @@ -4,5 +4,4 @@ namespace Volo.Abp; public class AbpTestModule : AbpModule { - } From e1b40584b3234abef815a61d58892ba96cf92908 Mon Sep 17 00:00:00 2001 From: maliming Date: Mon, 4 Jul 2022 09:29:16 +0800 Subject: [PATCH 068/110] Update AbpTestModule.cs --- framework/test/Volo.Abp.Core.Tests/Volo/Abp/AbpTestModule.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/framework/test/Volo.Abp.Core.Tests/Volo/Abp/AbpTestModule.cs b/framework/test/Volo.Abp.Core.Tests/Volo/Abp/AbpTestModule.cs index 85a36c6698..b3e78aea07 100644 --- a/framework/test/Volo.Abp.Core.Tests/Volo/Abp/AbpTestModule.cs +++ b/framework/test/Volo.Abp.Core.Tests/Volo/Abp/AbpTestModule.cs @@ -4,4 +4,5 @@ namespace Volo.Abp; public class AbpTestModule : AbpModule { + } From ce08df352556f6d96f769665f32d1db5da0e49ad Mon Sep 17 00:00:00 2001 From: maliming Date: Mon, 4 Jul 2022 10:38:37 +0800 Subject: [PATCH 069/110] Add `Microsoft.Bcl.AsyncInterfaces` package to `Volo.Abp.DistributedLocking.Abstractions`. --- .../Volo.Abp.DistributedLocking.Abstractions.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/framework/src/Volo.Abp.DistributedLocking.Abstractions/Volo.Abp.DistributedLocking.Abstractions.csproj b/framework/src/Volo.Abp.DistributedLocking.Abstractions/Volo.Abp.DistributedLocking.Abstractions.csproj index ab828ee9d3..19c1b4f869 100644 --- a/framework/src/Volo.Abp.DistributedLocking.Abstractions/Volo.Abp.DistributedLocking.Abstractions.csproj +++ b/framework/src/Volo.Abp.DistributedLocking.Abstractions/Volo.Abp.DistributedLocking.Abstractions.csproj @@ -16,6 +16,7 @@ + From 4c947ddd591d04bbe528170007386fe0363f4ff9 Mon Sep 17 00:00:00 2001 From: malik masis Date: Mon, 4 Jul 2022 09:48:48 +0300 Subject: [PATCH 070/110] Added some hiding/showing elements --- .../Pages/CmsKit/Contents/addWidgetModal.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js index 58764af867..fa1a1ad92d 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js @@ -13,14 +13,21 @@ $(function () { widgetType = this.value; $("#PropertySideId").html(''); + $("#WidgetCode").attr("hidden", "true"); + volo.cmsKit.admin.contents.contentAdmin.getWidgets().then(function (data) { var widgetTypes = data.items.filter(v => v.key === widgetType); var firstWidgetType = widgetTypes[0]; if (firstWidgetType.key == "Poll") { $("#polls").removeAttr("hidden"); + $("#WidgetCode").removeAttr("hidden"); } else { + + $("#WidgetCode").attr("hidden", "true"); + for (const property of firstWidgetType.properties) { + let html = "
    " + " " + " " + From 0e39d7b75956170c72ee49c6d2208337abfaa3f7 Mon Sep 17 00:00:00 2001 From: maliming Date: Mon, 4 Jul 2022 14:50:59 +0800 Subject: [PATCH 071/110] Rename `AllowTenantsToChangeEmailSettings` to `AllowChangingEmailSettings`. --- ...llowChangingEmailSettingsFeatureSimpleStateChecker.cs} | 4 ++-- .../SettingManagementPermissionDefinitionProvider.cs | 4 ++-- .../Volo/Abp/SettingManagement/EmailSettingsAppService.cs | 2 +- .../Settings/EmailingPageContributor.cs | 2 +- ...bp.SettingManagement.Domain.Shared.abppkg.analyze.json | 6 +++--- .../Localization/Resources/AbpSettingManagement/ar.json | 6 +++--- .../Localization/Resources/AbpSettingManagement/cs.json | 6 +++--- .../Resources/AbpSettingManagement/de-DE.json | 6 +++--- .../Localization/Resources/AbpSettingManagement/el.json | 8 ++++---- .../Localization/Resources/AbpSettingManagement/en.json | 4 ++-- .../Localization/Resources/AbpSettingManagement/es.json | 6 +++--- .../Localization/Resources/AbpSettingManagement/fi.json | 6 +++--- .../Localization/Resources/AbpSettingManagement/fr.json | 6 +++--- .../Localization/Resources/AbpSettingManagement/hi.json | 6 +++--- .../Localization/Resources/AbpSettingManagement/hu.json | 6 +++--- .../Localization/Resources/AbpSettingManagement/is.json | 6 +++--- .../Localization/Resources/AbpSettingManagement/it.json | 6 +++--- .../Localization/Resources/AbpSettingManagement/nl.json | 6 +++--- .../Resources/AbpSettingManagement/pl-PL.json | 6 +++--- .../Resources/AbpSettingManagement/pt-BR.json | 6 +++--- .../Resources/AbpSettingManagement/ro-RO.json | 6 +++--- .../Localization/Resources/AbpSettingManagement/ru.json | 6 +++--- .../Localization/Resources/AbpSettingManagement/sk.json | 6 +++--- .../Localization/Resources/AbpSettingManagement/sl.json | 6 +++--- .../Localization/Resources/AbpSettingManagement/tr.json | 6 +++--- .../Localization/Resources/AbpSettingManagement/vi.json | 6 +++--- .../Resources/AbpSettingManagement/zh-Hans.json | 4 ++-- .../Resources/AbpSettingManagement/zh-Hant.json | 6 +++--- .../SettingManagementFeatureDefinitionProvider.cs | 4 ++-- .../Abp/SettingManagement/SettingManagementFeatures.cs | 2 +- .../Settings/EmailingPageContributor.cs | 2 +- 31 files changed, 81 insertions(+), 81 deletions(-) rename modules/setting-management/src/Volo.Abp.SettingManagement.Application.Contracts/Volo/Abp/SettingManagement/{AllowTenantsToChangeEmailSettingsFeatureSimpleStateChecker.cs => AllowChangingEmailSettingsFeatureSimpleStateChecker.cs} (80%) diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Application.Contracts/Volo/Abp/SettingManagement/AllowTenantsToChangeEmailSettingsFeatureSimpleStateChecker.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Application.Contracts/Volo/Abp/SettingManagement/AllowChangingEmailSettingsFeatureSimpleStateChecker.cs similarity index 80% rename from modules/setting-management/src/Volo.Abp.SettingManagement.Application.Contracts/Volo/Abp/SettingManagement/AllowTenantsToChangeEmailSettingsFeatureSimpleStateChecker.cs rename to modules/setting-management/src/Volo.Abp.SettingManagement.Application.Contracts/Volo/Abp/SettingManagement/AllowChangingEmailSettingsFeatureSimpleStateChecker.cs index 5633b2491e..58144ec4d1 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Application.Contracts/Volo/Abp/SettingManagement/AllowTenantsToChangeEmailSettingsFeatureSimpleStateChecker.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Application.Contracts/Volo/Abp/SettingManagement/AllowChangingEmailSettingsFeatureSimpleStateChecker.cs @@ -7,7 +7,7 @@ using Volo.Abp.SimpleStateChecking; namespace Volo.Abp.SettingManagement; -public class AllowTenantsToChangeEmailSettingsFeatureSimpleStateChecker : ISimpleStateChecker +public class AllowChangingEmailSettingsFeatureSimpleStateChecker : ISimpleStateChecker { public async Task IsEnabledAsync(SimpleStateCheckerContext context) { @@ -19,6 +19,6 @@ public class AllowTenantsToChangeEmailSettingsFeatureSimpleStateChecker : ISimpl } var featureChecker = context.ServiceProvider.GetRequiredService(); - return await featureChecker.IsEnabledAsync(SettingManagementFeatures.AllowTenantsToChangeEmailSettings); + return await featureChecker.IsEnabledAsync(SettingManagementFeatures.AllowChangingEmailSettings); } } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Application.Contracts/Volo/Abp/SettingManagement/SettingManagementPermissionDefinitionProvider.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Application.Contracts/Volo/Abp/SettingManagement/SettingManagementPermissionDefinitionProvider.cs index 81e58503e7..db0b8dd907 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Application.Contracts/Volo/Abp/SettingManagement/SettingManagementPermissionDefinitionProvider.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Application.Contracts/Volo/Abp/SettingManagement/SettingManagementPermissionDefinitionProvider.cs @@ -12,8 +12,8 @@ public class SettingManagementPermissionDefinitionProvider : PermissionDefinitio var emailPermission = moduleGroup .AddPermission(SettingManagementPermissions.Emailing, L("Permission:Emailing")); - emailPermission.StateCheckers.Add(new AllowTenantsToChangeEmailSettingsFeatureSimpleStateChecker()); - + emailPermission.StateCheckers.Add(new AllowChangingEmailSettingsFeatureSimpleStateChecker()); + emailPermission.AddChild(SettingManagementPermissions.EmailingTest, L("Permission:EmailingTest")); } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo/Abp/SettingManagement/EmailSettingsAppService.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo/Abp/SettingManagement/EmailSettingsAppService.cs index fe67975517..2d15cb09fb 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo/Abp/SettingManagement/EmailSettingsAppService.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo/Abp/SettingManagement/EmailSettingsAppService.cs @@ -76,7 +76,7 @@ public class EmailSettingsAppService : SettingManagementAppServiceBase, IEmailSe await FeatureChecker.CheckEnabledAsync(SettingManagementFeatures.Enable); if (CurrentTenant.IsAvailable) { - await FeatureChecker.CheckEnabledAsync(SettingManagementFeatures.AllowTenantsToChangeEmailSettings); + await FeatureChecker.CheckEnabledAsync(SettingManagementFeatures.AllowChangingEmailSettings); } } } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Settings/EmailingPageContributor.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Settings/EmailingPageContributor.cs index c21a5a7467..aec58c8ca8 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Settings/EmailingPageContributor.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Settings/EmailingPageContributor.cs @@ -56,7 +56,7 @@ public class EmailingPageContributor : ISettingComponentContributor var featureCheck = context.ServiceProvider.GetRequiredService(); - return await featureCheck.IsEnabledAsync(SettingManagementFeatures.AllowTenantsToChangeEmailSettings); + return await featureCheck.IsEnabledAsync(SettingManagementFeatures.AllowChangingEmailSettings); } } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo.Abp.SettingManagement.Domain.Shared.abppkg.analyze.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo.Abp.SettingManagement.Domain.Shared.abppkg.analyze.json index 268983d702..f8fae91f28 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo.Abp.SettingManagement.Domain.Shared.abppkg.analyze.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo.Abp.SettingManagement.Domain.Shared.abppkg.analyze.json @@ -21,11 +21,11 @@ "valueType": "ToggleStringValueType", "defaultValue": "false", "displayName": "Allow tenants to change email settings.", - "description": "AllowTenantsToChangeEmailSettingsDescription", + "description": "AllowChangingEmailSettingsDescription", "isAvailableToHost": false, "isVisibleToClients": true, "contentType": "feature", - "name": "SettingManagement.AllowTenantsToChangeEmailSettings" + "name": "SettingManagement.AllowChangingEmailSettings" } ] -} \ No newline at end of file +} diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/ar.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/ar.json index 5dc7c60779..59a074e147 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/ar.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/ar.json @@ -18,7 +18,7 @@ "Feature:SettingManagementGroup": "إدارة الإعداد", "Feature:SettingManagementEnable": "تمكين إدارة الإعداد", "Feature:SettingManagementEnableDescription": "تفعيل إعداد نظام الإدارة في التطبيق.", - "Feature:AllowTenantsToChangeEmailSettings": "السماح للمستأجرين بتغيير إعدادات البريد الإلكتروني.", - "Feature:AllowTenantsToChangeEmailSettingsDescription": "السماح للمستأجرين بتغيير إعدادات البريد الإلكتروني." + "Feature:AllowChangingEmailSettings": "السماح لتغيير إعدادات البريد الإلكتروني.", + "Feature:AllowChangingEmailSettingsDescription": "السماح لتغيير إعدادات البريد الإلكتروني." } -} \ No newline at end of file +} diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/cs.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/cs.json index 9ba822b712..f029bff08c 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/cs.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/cs.json @@ -18,7 +18,7 @@ "Feature:SettingManagementGroup": "Správa nastavení", "Feature:SettingManagementEnable": "Povolit správu nastavení", "Feature:SettingManagementEnableDescription": "Povolit systém správy nastavení v aplikaci.", - "Feature:AllowTenantsToChangeEmailSettings": "Povolit nájemcům měnit nastavení e-mailu.", - "Feature:AllowTenantsToChangeEmailSettingsDescription": "Povolit nájemcům měnit nastavení e-mailu." + "Feature:AllowChangingEmailSettings": "Povolit změnu nastavení e-mailu.", + "Feature:AllowChangingEmailSettingsDescription": "Povolit změnu nastavení e-mailu." } -} \ No newline at end of file +} diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/de-DE.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/de-DE.json index a4716e8218..5aac7a3ba2 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/de-DE.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/de-DE.json @@ -18,7 +18,7 @@ "Feature:SettingManagementGroup": "Einstellungsverwaltung", "Feature:SettingManagementEnable": "Einstellungsverwaltung aktivieren", "Feature:SettingManagementEnableDescription": "Aktivieren Sie das Einstellungsverwaltungssystem in der Anwendung.", - "Feature:AllowTenantsToChangeEmailSettings": "Erlauben Sie Mietern, E-Mail-Einstellungen zu ändern.", - "Feature:AllowTenantsToChangeEmailSettingsDescription": "Erlauben Sie Mietern, E-Mail-Einstellungen zu ändern." + "Feature:AllowChangingEmailSettings": "Änderung der E-Mail-Einstellungen zulassen.", + "Feature:AllowChangingEmailSettingsDescription": "Änderung der E-Mail-Einstellungen zulassen." } -} \ No newline at end of file +} diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/el.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/el.json index a8f44b4bbb..03846bbea2 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/el.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/el.json @@ -10,7 +10,7 @@ "SenderEmailAddress": "Διεύθυνση email αποστολέα", "TargetEmailAddress": "Διεύθυνση email παραλήπτη", "Subject": "Θέμα", - "Body": "Κείμενο", + "Body": "Κείμενο", "TestEmailSubject": "Δοκιμαστικό email {0}", "TestEmailBody": "Δοκιμαστικό κείμενο email εδώ", "SuccessfullySent": "Στάλθηκε με επιτυχία", @@ -28,7 +28,7 @@ "Feature:SettingManagementGroup": "Διαχείριση ρυθμίσεων", "Feature:SettingManagementEnable": "Ενεργοποίηση διαχείρισης ρυθμίσεων", "Feature:SettingManagementEnableDescription": "Ενεργοποίηση συστήματος διαχείρισης ρυθμίσεων στην εφαρμογή.", - "Feature:AllowTenantsToChangeEmailSettings": "Επιτρέψτε στους μισθωτές να αλλάξουν τις ρυθμίσεις email.", - "Feature:AllowTenantsToChangeEmailSettingsDescription": "Επιτρέψτε στους μισθωτές να αλλάξουν τις ρυθμίσεις email." + "Feature:AllowChangingEmailSettings": "Επιτρέψτε την αλλαγή των ρυθμίσεων email.", + "Feature:AllowChangingEmailSettingsDescription": "Επιτρέψτε την αλλαγή των ρυθμίσεων email." } -} \ No newline at end of file +} diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/en.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/en.json index d947142885..b6de38e979 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/en.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/en.json @@ -28,7 +28,7 @@ "Feature:SettingManagementGroup": "Setting Management", "Feature:SettingManagementEnable": "Enable setting management", "Feature:SettingManagementEnableDescription": "Enable setting management system in the application.", - "Feature:AllowTenantsToChangeEmailSettings": "Allow tenants to change email settings.", - "Feature:AllowTenantsToChangeEmailSettingsDescription": "Allow tenants to change email settings." + "Feature:AllowChangingEmailSettings": "Allow changing email settings.", + "Feature:AllowChangingEmailSettingsDescription": "Allow changing email settings." } } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/es.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/es.json index 45781c674a..60f8ce712f 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/es.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/es.json @@ -18,7 +18,7 @@ "Feature:SettingManagementGroup": "Gestión de la configuración", "Feature:SettingManagementEnable": "Habilitar la gestión de la configuración", "Feature:SettingManagementEnableDescription": "Habilite el sistema de gestión de la configuración en la aplicación.", - "Feature:AllowTenantsToChangeEmailSettings": "Permitir que los inquilinos cambien la configuración del correo electrónico.", - "Feature:AllowTenantsToChangeEmailSettingsDescription": "Permitir que los inquilinos cambien la configuración del correo electrónico." + "Feature:AllowChangingEmailSettings": "Permitir cambiar la configuración de correo electrónico.", + "Feature:AllowChangingEmailSettingsDescription": "Permitir cambiar la configuración de correo electrónico." } -} \ No newline at end of file +} diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/fi.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/fi.json index 90caad467a..70eef69695 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/fi.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/fi.json @@ -18,7 +18,7 @@ "Feature:SettingManagementGroup": "Asetusten hallinta", "Feature:SettingManagementEnable": "Ota asetusten hallinta käyttöön", "Feature:SettingManagementEnableDescription": "Ota asetustenhallintajärjestelmä käyttöön sovelluksessa.", - "Feature:AllowTenantsToChangeEmailSettings": "Salli vuokralaisten muuttaa sähköpostiasetuksia.", - "Feature:AllowTenantsToChangeEmailSettingsDescription": "Salli vuokralaisten muuttaa sähköpostiasetuksia." + "Feature:AllowChangingEmailSettings": "Salli sähköpostiasetusten muuttaminen.", + "Feature:AllowChangingEmailSettingsDescription": "Salli sähköpostiasetusten muuttaminen." } -} \ No newline at end of file +} diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/fr.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/fr.json index c1df790587..0aa479b4f9 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/fr.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/fr.json @@ -18,7 +18,7 @@ "Feature:SettingManagementGroup": "Gestion des paramètres", "Feature:SettingManagementEnable": "Activer la gestion des paramètres", "Feature:SettingManagementEnableDescription": "Activer le système de gestion des paramètres dans l'application.", - "Feature:AllowTenantsToChangeEmailSettings": "Autoriser les locataires à modifier les paramètres de messagerie.", - "Feature:AllowTenantsToChangeEmailSettingsDescription": "Autoriser les locataires à modifier les paramètres de messagerie." + "Feature:AllowChangingEmailSettings": "Autoriser la modification des paramètres de messagerie.", + "Feature:AllowChangingEmailSettingsDescription": "Autoriser la modification des paramètres de messagerie." } -} \ No newline at end of file +} diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/hi.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/hi.json index c862f785d3..efca2681f1 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/hi.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/hi.json @@ -18,7 +18,7 @@ "Feature:SettingManagementGroup": "सेटिंग प्रबंधन", "Feature:SettingManagementEnable": "सेटिंग प्रबंधन सक्षम करें", "Feature:SettingManagementEnableDescription": "एप्लिकेशन में सेटिंग प्रबंधन प्रणाली सक्षम करें।", - "Feature:AllowTenantsToChangeEmailSettings": "किरायेदारों को ईमेल सेटिंग बदलने की अनुमति दें।", - "Feature:AllowTenantsToChangeEmailSettingsDescription": "किरायेदारों को ईमेल सेटिंग बदलने की अनुमति दें।" + "Feature:AllowChangingEmailSettings": "ईमेल सेटिंग्स बदलने की अनुमति दें।", + "Feature:AllowChangingEmailSettingsDescription": "ईमेल सेटिंग्स बदलने की अनुमति दें।" } -} \ No newline at end of file +} diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/hu.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/hu.json index bb3cabf0c7..cc88fc4412 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/hu.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/hu.json @@ -18,7 +18,7 @@ "Feature:SettingManagementGroup": "Beállításkezelés", "Feature:SettingManagementEnable": "Beállításkezelés engedélyezése", "Feature:SettingManagementEnableDescription": "A beállításkezelő rendszer engedélyezése az alkalmazásban.", - "Feature:AllowTenantsToChangeEmailSettings": "Engedélyezze a bérlőknek az e-mail beállítások módosítását.", - "Feature:AllowTenantsToChangeEmailSettingsDescription": "Engedélyezze a bérlőknek az e-mail beállítások módosítását." + "Feature:AllowChangingEmailSettings": "Az e-mail beállítások módosításának engedélyezése.", + "Feature:AllowChangingEmailSettingsDescription": "Az e-mail beállítások módosításának engedélyezése." } -} \ No newline at end of file +} diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/is.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/is.json index 8910c4d438..1de09db58f 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/is.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/is.json @@ -18,7 +18,7 @@ "Feature:SettingManagementGroup": "Stillingar", "Feature:SettingManagementEnable": "Virkja stillingar", "Feature:SettingManagementEnableDescription": "Virkja stillingar í forritinu.", - "Feature:AllowTenantsToChangeEmailSettings": "Leyfa tenentum að breyta tölvupóststillingum.", - "Feature:AllowTenantsToChangeEmailSettingsDescription": "Leyfa tenentum að breyta tölvupóststillingum." + "Feature:AllowChangingEmailSettings": "Leyfa að breyta stillingum tölvupósts.", + "Feature:AllowChangingEmailSettingsDescription": "Leyfa að breyta stillingum tölvupósts." } -} \ No newline at end of file +} diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/it.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/it.json index 23ed55207c..09fc3e8f45 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/it.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/it.json @@ -18,7 +18,7 @@ "Feature:SettingManagementGroup": "Gestione Impostazioni", "Feature:SettingManagementEnable": "Abilita gestione impostazioni", "Feature:SettingManagementEnableDescription": "Abilita sistema gestione impostazioni nell'applicazione", - "Feature:AllowTenantsToChangeEmailSettings": "Consenti agli inquilini di modificare le impostazioni della posta elettronica.", - "Feature:AllowTenantsToChangeEmailSettingsDescription": "Consenti agli inquilini di modificare le impostazioni della posta elettronica." + "Feature:AllowChangingEmailSettings": "Consenti di modificare le loro impostazioni e-mail.", + "Feature:AllowChangingEmailSettingsDescription": "Consenti di modificare le loro impostazioni e-mail." } -} \ No newline at end of file +} diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/nl.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/nl.json index 59dbc4ebb5..e89b43c6b8 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/nl.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/nl.json @@ -18,7 +18,7 @@ "Feature:SettingManagementGroup": "Instellingsbeheer", "Feature:SettingManagementEnable": "Instellingenbeheer inschakelen", "Feature:SettingManagementEnableDescription": "Schakel het instellingsbeheersysteem in de toepassing in.", - "Feature:AllowTenantsToChangeEmailSettings": "Sta huurders toe om e-mailinstellingen te wijzigen.", - "Feature:AllowTenantsToChangeEmailSettingsDescription": "Sta huurders toe om e-mailinstellingen te wijzigen." + "Feature:AllowChangingEmailSettings": "Toestaan om e-mailinstellingen te wijzigen.", + "Feature:AllowChangingEmailSettingsDescription": "Toestaan om e-mailinstellingen te wijzigen." } -} \ No newline at end of file +} diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/pl-PL.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/pl-PL.json index e57242ae2e..90ebf15d24 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/pl-PL.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/pl-PL.json @@ -18,7 +18,7 @@ "Feature:SettingManagementGroup": "Zarządzanie ustawieniami", "Feature:SettingManagementEnable": "Włącz zarządzanie ustawieniami", "Feature:SettingManagementEnableDescription": "Włącz system zarządzania ustawieniami w aplikacji.", - "Feature:AllowTenantsToChangeEmailSettings": "Zezwalaj najemcom na zmianę ustawień poczty e-mail.", - "Feature:AllowTenantsToChangeEmailSettingsDescription": "Zezwalaj najemcom na zmianę ustawień poczty e-mail." + "Feature:AllowChangingEmailSettings": "Zezwól na zmianę ustawień poczty e-mail.", + "Feature:AllowChangingEmailSettingsDescription": "Zezwól na zmianę ustawień poczty e-mail." } -} \ No newline at end of file +} diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/pt-BR.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/pt-BR.json index 4237afe6ea..b609a6e762 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/pt-BR.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/pt-BR.json @@ -28,7 +28,7 @@ "Feature:SettingManagementGroup": "Gestão de Cenários", "Feature:SettingManagementEnable": "Habilitar gerenciamento de configuração", "Feature:SettingManagementEnableDescription": "Habilite o sistema de gerenciamento de configuração no aplicativo.", - "Feature:AllowTenantsToChangeEmailSettings": "Permitir que os inquilinos alterem as configurações de e-mail.", - "Feature:AllowTenantsToChangeEmailSettingsDescription": "Permitir que os inquilinos alterem as configurações de e-mail." + "Feature:AllowChangingEmailSettings": "Permitir alterar as configurações de e-mail.", + "Feature:AllowChangingEmailSettingsDescription": "Permitir alterar as configurações de e-mail." } -} \ No newline at end of file +} diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/ro-RO.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/ro-RO.json index da6f81ec56..edbc533607 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/ro-RO.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/ro-RO.json @@ -18,7 +18,7 @@ "Feature:SettingManagementGroup": "Administrarea setărilor", "Feature:SettingManagementEnable": "Activează administrarea setărilor", "Feature:SettingManagementEnableDescription": "Activează sistemul de administrare a setărilor în aplicaţie.", - "Feature:AllowTenantsToChangeEmailSettings": "Permiteți chiriașilor să modifice setările de e-mail.", - "Feature:AllowTenantsToChangeEmailSettingsDescription": "Permiteți chiriașilor să modifice setările de e-mail." + "Feature:AllowChangingEmailSettings": "Permiteți modificarea setărilor de e-mail.", + "Feature:AllowChangingEmailSettingsDescription": "Permiteți modificarea setărilor de e-mail." } -} \ No newline at end of file +} diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/ru.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/ru.json index d7e9c15976..c51a42f6f9 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/ru.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/ru.json @@ -18,7 +18,7 @@ "Feature:SettingManagementGroup": "Управление настройками", "Feature:SettingManagementEnable": "Включить управление настройками", "Feature:SettingManagementEnableDescription": "Включите систему управления настройками в приложении.", - "Feature:AllowTenantsToChangeEmailSettings": "Разрешить арендаторам изменять настройки электронной почты.", - "Feature:AllowTenantsToChangeEmailSettingsDescription": "Разрешить арендаторам изменять настройки электронной почты." + "Feature:AllowChangingEmailSettings": "Разрешить изменение настроек электронной почты.", + "Feature:AllowChangingEmailSettingsDescription": "Разрешить изменение настроек электронной почты." } -} \ No newline at end of file +} diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/sk.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/sk.json index 3caf40676e..11a750558e 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/sk.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/sk.json @@ -18,7 +18,7 @@ "Feature:SettingManagementGroup": "Správa nastavení", "Feature:SettingManagementEnable": "Povoliť správu nastavení", "Feature:SettingManagementEnableDescription": "Povoliť systém správy nastavení v aplikácii.", - "Feature:AllowTenantsToChangeEmailSettings": "Povoliť nájomníkom zmeniť nastavenia e-mailu.", - "Feature:AllowTenantsToChangeEmailSettingsDescription": "Povoliť nájomníkom zmeniť nastavenia e-mailu." + "Feature:AllowChangingEmailSettings": "Povoliť zmenu nastavení e-mailu.", + "Feature:AllowChangingEmailSettingsDescription": "Povoliť zmenu nastavení e-mailu." } -} \ No newline at end of file +} diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/sl.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/sl.json index dfa2d30dd2..e860f2dfba 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/sl.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/sl.json @@ -18,7 +18,7 @@ "Feature:SettingManagementGroup": "Upravljanje nastavitev", "Feature:SettingManagementEnable": "Omogoči upravljanje nastavitev", "Feature:SettingManagementEnableDescription": "Omogočite nastavitev sistema upravljanja v aplikaciji.", - "Feature:AllowTenantsToChangeEmailSettings": "Dovoli najemnikom, da spremenijo nastavitve e-pošte.", - "Feature:AllowTenantsToChangeEmailSettingsDescription": "Dovoli najemnikom, da spremenijo nastavitve e-pošte." + "Feature:AllowChangingEmailSettings": "Dovoli spreminjanje e-poštnih nastavitev.", + "Feature:AllowChangingEmailSettingsDescription": "Dovoli spreminjanje e-poštnih nastavitev." } -} \ No newline at end of file +} diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/tr.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/tr.json index 925825e3cc..f050801fe5 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/tr.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/tr.json @@ -28,7 +28,7 @@ "Feature:SettingManagementGroup": "Ayar yönetimi", "Feature:SettingManagementEnable": "Ayar yönetimini etkinleştir", "Feature:SettingManagementEnableDescription": "Uygulamada ayar yönetim sistemini etkinleştirin.", - "Feature:AllowTenantsToChangeEmailSettings": "Kiracıların e-posta ayarlarını değiştirmesine izin verin.", - "Feature:AllowTenantsToChangeEmailSettingsDescription": "Kiracıların e-posta ayarlarını değiştirmesine izin verin." + "Feature:AllowChangingEmailSettings": "E-posta ayarlarını değiştirmeye izin verin.", + "Feature:AllowChangingEmailSettingsDescription": "E-posta ayarlarını değiştirmeye izin verin." } -} \ No newline at end of file +} diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/vi.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/vi.json index f0880309de..744620abc6 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/vi.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/vi.json @@ -18,7 +18,7 @@ "Feature:SettingManagementGroup": "Cài đặt quản lý", "Feature:SettingManagementEnable": "Bật quản lý cài đặt", "Feature:SettingManagementEnableDescription": "Bật cài đặt hệ thống quản lý trong ứng dụng.", - "Feature:AllowTenantsToChangeEmailSettings": "Cho phép người thuê thay đổi cài đặt email.", - "Feature:AllowTenantsToChangeEmailSettingsDescription": "Cho phép người thuê thay đổi cài đặt email." + "Feature:AllowChangingEmailSettings": "Cho phép thay đổi cài đặt email.", + "Feature:AllowChangingEmailSettingsDescription": "Cho phép thay đổi cài đặt email." } -} \ No newline at end of file +} diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/zh-Hans.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/zh-Hans.json index 34ab12a79c..4399439eed 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/zh-Hans.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/zh-Hans.json @@ -28,7 +28,7 @@ "Feature:SettingManagementGroup": "设置管理", "Feature:SettingManagementEnable": "启用设置管理", "Feature:SettingManagementEnableDescription": "在应用程序中启用设置管理系统.", - "Feature:AllowTenantsToChangeEmailSettings": "允许租户更改邮件设置.", - "Feature:AllowTenantsToChangeEmailSettingsDescription": "允许租户更改邮件设置." + "Feature:AllowChangingEmailSettings": "允许更改邮件设置.", + "Feature:AllowChangingEmailSettingsDescription": "允许更改邮件设置." } } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/zh-Hant.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/zh-Hant.json index 9cd5350bc9..d4fc96239a 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/zh-Hant.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/zh-Hant.json @@ -28,7 +28,7 @@ "Feature:SettingManagementGroup": "設定管理", "Feature:SettingManagementEnable": "啟用設定管理", "Feature:SettingManagementEnableDescription": "在應用程序中啟用設定管理系統.", - "Feature:AllowTenantsToChangeEmailSettings": "允許租戶更改電子郵件設置。", - "Feature:AllowTenantsToChangeEmailSettingsDescription": "允許租戶更改電子郵件設置。" + "Feature:AllowChangingEmailSettings": "允許更改電子郵件設置。", + "Feature:AllowChangingEmailSettingsDescription": "允許更改電子郵件設置。" } -} \ No newline at end of file +} diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/SettingManagementFeatureDefinitionProvider.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/SettingManagementFeatureDefinitionProvider.cs index 3c7b3cd4a7..6b763a1472 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/SettingManagementFeatureDefinitionProvider.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/SettingManagementFeatureDefinitionProvider.cs @@ -20,9 +20,9 @@ public class SettingManagementFeatureDefinitionProvider : FeatureDefinitionProvi new ToggleStringValueType()); settingEnableFeature.CreateChild( - SettingManagementFeatures.AllowTenantsToChangeEmailSettings, + SettingManagementFeatures.AllowChangingEmailSettings, "false", - L("Feature:AllowTenantsToChangeEmailSettings"), + L("Feature:AllowChangingEmailSettings"), null, new ToggleStringValueType(), isAvailableToHost: false); diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/SettingManagementFeatures.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/SettingManagementFeatures.cs index e0c91d6435..3769852bed 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/SettingManagementFeatures.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/SettingManagementFeatures.cs @@ -6,5 +6,5 @@ public class SettingManagementFeatures public const string Enable = GroupName + ".Enable"; - public const string AllowTenantsToChangeEmailSettings = GroupName + ".AllowTenantsToChangeEmailSettings"; + public const string AllowChangingEmailSettings = GroupName + ".AllowChangingEmailSettings"; } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Settings/EmailingPageContributor.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Settings/EmailingPageContributor.cs index 773088d140..c166ad873e 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Settings/EmailingPageContributor.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Settings/EmailingPageContributor.cs @@ -12,7 +12,7 @@ public class EmailingPageContributor : SettingPageContributorBase public EmailingPageContributor() { RequiredFeatures(SettingManagementFeatures.Enable); - RequiredTenantSideFeatures(SettingManagementFeatures.AllowTenantsToChangeEmailSettings); + RequiredTenantSideFeatures(SettingManagementFeatures.AllowChangingEmailSettings); RequiredPermissions(SettingManagementPermissions.Emailing); } public override Task ConfigureAsync(SettingPageCreationContext context) From ff52499302baa3a6bccb0523d48079d6df67bcc3 Mon Sep 17 00:00:00 2001 From: maliming Date: Mon, 4 Jul 2022 15:01:46 +0800 Subject: [PATCH 072/110] Update zh-Hans.json --- .../Commercial/Localization/Resources/zh-Hans.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/zh-Hans.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/zh-Hans.json index 5930a69a6f..8a32760beb 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/zh-Hans.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/zh-Hans.json @@ -109,7 +109,7 @@ "LightTheme": "浅色主题", "ProudToWorkWith": "荣幸与你合作", "OurConsumers": "全球70多个国家的数百家企业和开发商使用ABP商业版.", - "JoinOurConsumers": "加它他们并快速构建令人惊叹的产品.", + "JoinOurConsumers": "加入他们并快速构建令人惊叹的产品.", "AdditionalServicesExplanation": "你是否需要额外或自定义的服务? 我们和我们的合作伙伴可以提供;", "CustomProjectDevelopment": "自定义项目开发", "CustomProjectDevelopmentExplanation": "专为你的自定义的开发人员.", @@ -713,4 +713,4 @@ "Landing_Page_PaymentModuleDescription_3": "该模块支持以下支付网关", "Welcome_Page_UseSameCredentialForCommercialWebsites": "commercial.abp.io 和 support.abp.io使用相同的凭据。" } -} \ No newline at end of file +} From fae54453870b1271726b9f91586c5c20ed693acb Mon Sep 17 00:00:00 2001 From: Engincan VESKE Date: Mon, 4 Jul 2022 10:18:17 +0300 Subject: [PATCH 073/110] Update leptonx theme versions to 1.0.0-beta.3 for templates --- templates/app-nolayers/angular/package.json | 2 +- .../package.json | 4 +- .../package.json | 4 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- templates/app/angular/package.json | 2 +- .../package.json | 2 +- .../yarn.lock | 238 ++++++++-------- .../package.json | 4 +- .../yarn.lock | 268 +++++++++--------- .../package.json | 4 +- .../yarn.lock | 268 +++++++++--------- .../wwwroot/global.css | 10 +- .../wwwroot/global.js | 2 +- .../wwwroot/index.html | 4 +- .../package.json | 2 +- .../yarn.lock | 238 ++++++++-------- .../package.json | 2 +- .../yarn.lock | 238 ++++++++-------- .../package.json | 2 +- .../MyCompanyName.MyProjectName.Web/yarn.lock | 238 ++++++++-------- 23 files changed, 770 insertions(+), 770 deletions(-) diff --git a/templates/app-nolayers/angular/package.json b/templates/app-nolayers/angular/package.json index 1b19989395..13ac33a2c7 100644 --- a/templates/app-nolayers/angular/package.json +++ b/templates/app-nolayers/angular/package.json @@ -19,7 +19,7 @@ "@abp/ng.setting-management": "~5.3.0", "@abp/ng.tenant-management": "~5.3.0", "@abp/ng.theme.shared": "~5.3.0", - "@abp/ng.theme.lepton-x": "~1.0.0-beta.2", + "@abp/ng.theme.lepton-x": "~1.0.0-beta.3", "@angular/animations": "~13.1.1", "@angular/common": "~13.1.1", "@angular/compiler": "~13.1.1", diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json index 21d924ec29..44170e65a7 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0", - "@abp/aspnetcore.components.server.leptonxlitetheme": "^1.0.0" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0-beta.3", + "@abp/aspnetcore.components.server.leptonxlitetheme": "^1.0.0-beta.3" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json index 21d924ec29..44170e65a7 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0", - "@abp/aspnetcore.components.server.leptonxlitetheme": "^1.0.0" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0-beta.3", + "@abp/aspnetcore.components.server.leptonxlitetheme": "^1.0.0-beta.3" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json index 2ed9d9973a..0ea1cb8a5a 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~1.0.0" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~1.0.0-beta.3" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json index 2ed9d9973a..0ea1cb8a5a 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~1.0.0" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~1.0.0-beta.3" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json index 2ed9d9973a..0ea1cb8a5a 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~1.0.0" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~1.0.0-beta.3" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json index 2ed9d9973a..0ea1cb8a5a 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~1.0.0" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~1.0.0-beta.3" } } diff --git a/templates/app/angular/package.json b/templates/app/angular/package.json index 12f3575a0f..1616cbc92d 100644 --- a/templates/app/angular/package.json +++ b/templates/app/angular/package.json @@ -19,7 +19,7 @@ "@abp/ng.setting-management": "~5.3.0", "@abp/ng.tenant-management": "~5.3.0", "@abp/ng.theme.shared": "~5.3.0", - "@abp/ng.theme.lepton-x": "~1.0.0-beta.2", + "@abp/ng.theme.lepton-x": "~1.0.0-beta.3", "@angular/animations": "~13.3.3", "@angular/common": "~13.3.3", "@angular/compiler": "~13.3.3", diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json index d356b498f3..41f65e5538 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json @@ -3,6 +3,6 @@ "name": "my-app-authserver", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0-beta.3" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/yarn.lock b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/yarn.lock index f531fff53b..81ef453636 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/yarn.lock +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.0-rc.1.tgz#dc27eb79ba7353eb6b16e4a2f50d17c3cfc9157d" - integrity sha512-TEbz/ISsGhfTec66XSeivQjCOCpTidufdpZmj8JRyrbQvhXOYohJs3ImrGJOIxUwo6nuzagGpotqXryjIF+jrg== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.0-rc.1.tgz#ed993befe99682baee55ea8771f983980ba8f93f" - integrity sha512-kL4CXe0YoZ4wJ4XvutqLPkv4fMuFeRJFzdix6lx4dPAArnPu69n3P4qFhokPkcoGpB2KTRqyn9fHQs8g2FCGQw== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.0-rc.1" - "@abp/bootstrap" "~5.3.0-rc.1" - "@abp/bootstrap-datepicker" "~5.3.0-rc.1" - "@abp/datatables.net-bs5" "~5.3.0-rc.1" - "@abp/font-awesome" "~5.3.0-rc.1" - "@abp/jquery-form" "~5.3.0-rc.1" - "@abp/jquery-validation-unobtrusive" "~5.3.0-rc.1" - "@abp/lodash" "~5.3.0-rc.1" - "@abp/luxon" "~5.3.0-rc.1" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.0-rc.1" - "@abp/select2" "~5.3.0-rc.1" - "@abp/sweetalert2" "~5.3.0-rc.1" - "@abp/timeago" "~5.3.0-rc.1" - "@abp/toastr" "~5.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.0-rc.1.tgz#5205d3a5ea500ff3b8d525dcc11a2ce4cfccdfd3" - integrity sha512-mIefq3QSVtP7heNl0ocHiSKLU+DwN5/TDvvPj2L3IZkCzuOrDxoBUIBIciea4k10HIQzqo6gmm1YOw0CEfzNHg== +"@abp/aspnetcore.mvc.ui.theme.leptonxlite@^1.0.0-beta.3": + version "1.0.0-beta.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-1.0.0-beta.3.tgz#a7402f4d58b54c4f7f468ac281dc2da1eab0b011" + integrity sha512-2I91dBke89Qiri/aDQuPajrdA1WPU+69ljSbm3MmvnOUijm2E3XtBqUkr5v4PWSOU2dvzrUHnhUNgDmSIdWRjA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.0" + +"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.0": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.1.tgz#7fe0aba80670bf4326251138dc7e12ea5830c919" + integrity sha512-ieS54bLQr4Aa96CnFEmuxe0ndeJpJMkq5eYSWAziH4i15jm7o+K2ouIL0K606lk1Sn/UrP8Yl+DRhxr4i4P8ow== + dependencies: + "@abp/aspnetcore.mvc.ui" "~5.3.1" + "@abp/bootstrap" "~5.3.1" + "@abp/bootstrap-datepicker" "~5.3.1" + "@abp/datatables.net-bs5" "~5.3.1" + "@abp/font-awesome" "~5.3.1" + "@abp/jquery-form" "~5.3.1" + "@abp/jquery-validation-unobtrusive" "~5.3.1" + "@abp/lodash" "~5.3.1" + "@abp/luxon" "~5.3.1" + "@abp/malihu-custom-scrollbar-plugin" "~5.3.1" + "@abp/select2" "~5.3.1" + "@abp/sweetalert2" "~5.3.1" + "@abp/timeago" "~5.3.1" + "@abp/toastr" "~5.3.1" + +"@abp/aspnetcore.mvc.ui@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.1.tgz#17ccf9a2a40cbd79e670a0cb5be74ac9eb17b963" + integrity sha512-UuXH0Lz7DqiGp47BC7xllT3Imf2Nk+eccOiVRwc9PAfHKnNOOJYxvDlHS0x8CM09qxM5EVaH7tfwOLSS09HXpg== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,144 +41,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.0-rc.1.tgz#1a5a29d7f9904e8d99c7085bc4545ad2665195cb" - integrity sha512-Y5QLLNd2UpbzbWSh+5nKdpAdz2i3V8+feTHTpAxnPgYRabPGqAFiOrty8KZ1MJEgjQFWC1ypGHYII7GWVyIS6Q== +"@abp/bootstrap-datepicker@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.1.tgz#241aebfbae0fa451d3e719776096b14bf77c08fa" + integrity sha512-gvP7SNEnPFYuLmIBp7QobveAGv8Rm/8JTmixCChQPPP9XX3u82ilKP2cgxVXm/4/jf0Gy7Gusn7urmTbTxeGEw== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.0-rc.1.tgz#977d579f59e18b1eb2c9b43612d525a859a575a4" - integrity sha512-dpY0bPHdhUI5yL23+EsR6w/KjoPyehaEgHLLKQDERdubX1Zk/SDWrhrYXnXxtJ0fvxG2aRVOEBMULmHD3m/PoA== +"@abp/bootstrap@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.1.tgz#f941afe2be2deaa1962a3626593451847dee5bd6" + integrity sha512-qPGeNFEaQF57b0viA0eHKA0cZ9b0gscOqE0o4ewHxnlRoRYiY3Ob9V6x6S85n2b7H6tDZOWAePXEgkV40yK/Bg== dependencies: - "@abp/core" "~5.3.0-rc.1" + "@abp/core" "~5.3.1" bootstrap "^5.1.3" -"@abp/core@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.0-rc.1.tgz#4ede309ccfab440deb66fecb091273027483676a" - integrity sha512-cTw9xaWMkRDQjXRtkB5zx4Za0CPx7yvCRnTngIJs7xO86lRMVnuiwVGjP66vYTmiiu2ulGFgCeuw1AaK5t+g4Q== +"@abp/core@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.1.tgz#26890ab049d43db58f3a0fba2f4c50bd2fbf7811" + integrity sha512-7PBPDYq/s0T5H0iYaeCzqWF44jbiOkFlwGnXqZeKHt2cKZaMyCStgotrpap8qoZKlxuyxudFIzJrzJIEP0AN/Q== dependencies: - "@abp/utils" "~5.3.0-rc.1" + "@abp/utils" "~5.3.1" -"@abp/datatables.net-bs5@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.0-rc.1.tgz#ca624d788acdcc547d0bdf1f76ba3ffc105dfd52" - integrity sha512-uyFBkD9rM3wGve0ZKrr7bEbC0Z/ywi8S/EYL6GwLzGNtogSsVj5HGtSvifKjCBn7KmAvo54skKoVgVEn77dlWQ== +"@abp/datatables.net-bs5@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.1.tgz#e380cc253a837a0629baec9dabb4e8919878cc38" + integrity sha512-LpGPWLvFsLkQjo5RTgEl24LbBokgsO1gv7/pVy/1oiXXCLTuVwJ8vYYKfDNkrrSLDUOJ9cCC0YUE5SRfDUystA== dependencies: - "@abp/datatables.net" "~5.3.0-rc.1" + "@abp/datatables.net" "~5.3.1" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.0-rc.1.tgz#38c0f6323f7e6305a50f7de9885b8a3f440cdf15" - integrity sha512-lecJ9Yelgey/nfSscsUHET0gyB6pZgkhnJXu3u8d9XhV2M5sc/WSnnCO3bgVBqMDImprR4GFPFw2cUlWkb8QBg== +"@abp/datatables.net@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.1.tgz#8200b5a3a719f51d21670b1420e3df48af4de42e" + integrity sha512-v30gkk4dcmWz260C8BA7uaU4kqpiC1wkgMvdzjPGefzYXsMftlcoX7GUvByWwTzlJnTphGvnIVJhnhX73VVDHg== dependencies: - "@abp/jquery" "~5.3.0-rc.1" + "@abp/jquery" "~5.3.1" datatables.net "^1.11.4" -"@abp/font-awesome@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.0-rc.1.tgz#de14dca2b33fdc098d2325c5047e030a3927bfa9" - integrity sha512-tIuDwo+L5CuLpQ+ARsaTYmxuqpSJLqcaXuoFfk6JAC20bw881t7y8w4xWy1PUs0+SEQwTT7diZjQrcA/xxlMUQ== +"@abp/font-awesome@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.1.tgz#2b4654b463b7858fc237219fd852ca0f41e4e062" + integrity sha512-LFKPjQgJmQ6GNqW3geluHMgV3WbisniAaK9tl6Pv8WOvPluvZGHTK5qjcAQVwM6Bj944VYeuvLo1ZCOoC/rWLg== dependencies: - "@abp/core" "~5.3.0-rc.1" + "@abp/core" "~5.3.1" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.0-rc.1.tgz#0a363d8e4814651e0c46e2109d19dcc84fc884b0" - integrity sha512-IWazO6BW5rHJ+ODk4haEqWzfzHvbxtW2+T1o534Lr7d+LI9yabNiQmRZ24yzNDb6SmRvDUVsumZ+lxPn2WBhIw== +"@abp/jquery-form@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.1.tgz#e17367af8dafcfbb352775fb6ab9182d1fd9cd63" + integrity sha512-s8XItBHKJuehprFy7xePWHxt8jMvjDmkmk2nEuJXj+gcZyVEEa3hBd4ykKDXFfmNrfS8aMy+VqA+VEA24Cmpww== dependencies: - "@abp/jquery" "~5.3.0-rc.1" + "@abp/jquery" "~5.3.1" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.0-rc.1.tgz#0aa2a5535acd79b5288ef04a0dc1b83a7a57b4b9" - integrity sha512-Qv/+nrd+ZeUs/2mCMahpQFqEguMOcmHrLg7hcw0LgcHr+MmEcG4WDcijTY6suFyekaf0DZD6vsFZjdvZmhsVYQ== +"@abp/jquery-validation-unobtrusive@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.1.tgz#7c5c31df1cd021b3eed618d914926b76dc7e9e6e" + integrity sha512-B5USCmF56eWQO+R4eZtMjURtoNGUEuAuBy4ltCPtZx0s6yn94Ooq4oYKqEbfnLoSsQshajUwBtqtlC6+YA612Q== dependencies: - "@abp/jquery-validation" "~5.3.0-rc.1" + "@abp/jquery-validation" "~5.3.1" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.0-rc.1.tgz#d05afbe0209c0815afe3a7cb0cf811256e9905fc" - integrity sha512-3DoRX6c8duRx1/g7MFuPAO/qesJCFqbVbw+x0+QnKmCkVZmz5VFAqdO9yFMxDFRbBAtyp7faaarc0lOtAcBsoA== +"@abp/jquery-validation@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.1.tgz#b34c0e29e12843de4a407bc8775a2e560e4db923" + integrity sha512-lu2e47GwWmh/ahWA5bbeR9Gqqsy4a3htTIvnwWbtu7dnHVHA6469+uCt+0f+sVthDIL+cMwoYgcygMLIUHoFxg== dependencies: - "@abp/jquery" "~5.3.0-rc.1" + "@abp/jquery" "~5.3.1" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.0-rc.1.tgz#26e5d5761f2629d02b2534ad964080221d536308" - integrity sha512-//bqInarV6XOs8+I5GW1q/c05sjnCq/Z0vuzFW1i1NDrQ2Q5kqF5leMV9hhGEZmfR+yG1T0MsbVvueieRkV/cA== +"@abp/jquery@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.1.tgz#8f6032253d4c44b135c238a4efa010bee1ec5991" + integrity sha512-ngy9Kvy6lXrQBCxWi7t8I4Wudv87C2R50O/T4CZPfM2nwYLynopa+aI9r9VLhO/wIROyXX3C8UIpeLhQzm776w== dependencies: - "@abp/core" "~5.3.0-rc.1" + "@abp/core" "~5.3.1" jquery "~3.6.0" -"@abp/lodash@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.0-rc.1.tgz#c53304fbd9b1c885a9a812c681c3698dd8ecea47" - integrity sha512-yBvUB05z/SSEEbZ79nFfb0cKwWVFbrt9OtUkQHy9ER7ip0R9escG2n1djFtAA33yZr/NLzSUh+vVBYsEhk8MOA== +"@abp/lodash@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.1.tgz#49c0806bae0858047faed75b6e9ed6207dc4cffc" + integrity sha512-QQshVHkNlunbhcmBG5E2wdZNcHYrTsNQjJNF6IZkeFszNRHu/k0u1bhszDwjPgEzeewTqMu8n44TzkbA8yP5GA== dependencies: - "@abp/core" "~5.3.0-rc.1" + "@abp/core" "~5.3.1" lodash "^4.17.21" -"@abp/luxon@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.0-rc.1.tgz#bcb4de01b20a8e4da8db186e88fdebfcde47fb8f" - integrity sha512-SLozcDvCL/2jyvG2ZU+DHjzbfHYdmwiRjWu7gWyNjaY2e6D3NraHHjpMQ7ubObXZRlhhvfcp0i6eeKKoZNJtEQ== +"@abp/luxon@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.1.tgz#8d843023b05b157ff9ab23548c8d8c4e7101ae88" + integrity sha512-Jw8p5S9qHZkUrD1fx3nvpnBqn8Zb9jDiG6xdc6tY+v1aqDDwEqPUr7TqaLnY9GnZefiM3sYVwAh42nzPOwg9aQ== dependencies: - "@abp/core" "~5.3.0-rc.1" + "@abp/core" "~5.3.1" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.0-rc.1.tgz#398181c7c6cc1805544e7a1ccd0423ed96005e0b" - integrity sha512-KZar881wtotKc+1bqDlBWo2vLUEeeqEpMBg8+BiXsGofp5ovudifVPM6mHZ9Gi29U9LAMyI0VEGwLJctgB/UoA== +"@abp/malihu-custom-scrollbar-plugin@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.1.tgz#7f0e4f2df325345a8e3be67456522cb035e3e962" + integrity sha512-ll49qD7bslt7+deMAFZ0DfveH/5ZsHyL2RLDg796ARz+H7fQpEhyNFeGETGj+HSOvAl3ivux2mxNCMYbXHR4RQ== dependencies: - "@abp/core" "~5.3.0-rc.1" + "@abp/core" "~5.3.1" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.0-rc.1.tgz#b2ce00b6545674d6bccc10fdfe4626a4598a0cdc" - integrity sha512-frE5jia7bBdZinW4LqD5JR+wknWu2ARX3L3pPiQ080ulB+P58gRj07ZPd1BWgRcvutnuANYyP9rZtDA18Ls+9Q== +"@abp/select2@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.1.tgz#9a49aa983d52eecbd2dc2160349d45bd46324e36" + integrity sha512-ne4LJJy9n3V8BPtyU6voX4Bo0/GUrZBnI4Mkb0wRKNt1rxj7PhPXebsYYz090QJuJh8fuF2OHteNMBA7gMryLQ== dependencies: - "@abp/core" "~5.3.0-rc.1" + "@abp/core" "~5.3.1" select2 "^4.0.13" -"@abp/sweetalert2@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.0-rc.1.tgz#6eb10b257e7f256da64ff6fe248a370671a26920" - integrity sha512-g9nddGcDGaG6EmjX7qpRcLzy3F38BTtFc0RBWApH7Da1o/LMYFYa6xGfS7ouIynZBM9j/BRP12CVTR+Y9qqbGg== +"@abp/sweetalert2@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.1.tgz#676a3269fe4511fc4f81c3231ed9a96fe4c8f006" + integrity sha512-UDQrJiq8OfIDy3GSq7NJ4TKKEihzp6Qc06KGRdnN74lm4JsxxGUToSaD1AbyrLt53jZlRZK2NNc8IiyqPvyfbQ== dependencies: - "@abp/core" "~5.3.0-rc.1" + "@abp/core" "~5.3.1" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.0-rc.1.tgz#2702a0f22db52dbf4c0717e4abcd317c56d10563" - integrity sha512-XRc4D98FIZR0YTXIoV0+OxVJTdixtNDiwatZRffopHT4Kpptmpj6O9KMcB4SngCH99/TrUFdEUnA2CgszxiEOA== +"@abp/timeago@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.1.tgz#069a4eb2725b0a183cb7609e1f48d8d857a606ba" + integrity sha512-+QWO9MTuf6X7sUXxoUGyoQ0EhoQUlRDdCPmwwcZyBzBf8q9A3hS+Rtmex3BqwRLDxL2vL78gbDpIBgPn/kFuUA== dependencies: - "@abp/jquery" "~5.3.0-rc.1" + "@abp/jquery" "~5.3.1" timeago "^1.6.7" -"@abp/toastr@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.0-rc.1.tgz#ec3a3d302ac91d5393c3caeb8b4884ad811b6edb" - integrity sha512-InZweYuBkrNZNBQKp6A+6gxGdO/lB0XsrXaa+CIVe55p8aNJPzE0mnvSfKWhN5G273wR08AD9RjR22kYS+bgFA== +"@abp/toastr@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.1.tgz#4a18b293444f7f8a523b7255ea61fed838131f1c" + integrity sha512-gz5cl6sPu6b65h8VJ6ne+dkM0oVXSYBlDoKBYbDRjhH6i7yWUpcylY/lrOvWacNQBOagBy5bep1937aec1/BXQ== dependencies: - "@abp/jquery" "~5.3.0-rc.1" + "@abp/jquery" "~5.3.1" toastr "^2.1.4" -"@abp/utils@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.0-rc.1.tgz#3fa758944e7325e7b3f528141e03bb71f8e04d24" - integrity sha512-/8BTYZomNMdy+RpYXWLp5dg0lRhmfiguciZEVWo4qRw1lCXm/JR+0842XT1XYE1dQ4orNNJ3/H86eRX8Ab6Yfg== +"@abp/utils@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.1.tgz#ff238e3b70c6fffb1600d845c202961e1179c813" + integrity sha512-XVYrygoWq1ZHz4N7BSJ4P77wmd0geRhpyR5ztzyP1WaF2LaCRS63BjZ/a7xKdtioUby9GP5jSvMjBvwqVviYIQ== dependencies: just-compare "^1.3.0" diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json index 21d924ec29..44170e65a7 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0", - "@abp/aspnetcore.components.server.leptonxlitetheme": "^1.0.0" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0-beta.3", + "@abp/aspnetcore.components.server.leptonxlitetheme": "^1.0.0-beta.3" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/yarn.lock b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/yarn.lock index 64fd8e6b93..71bed3c0d5 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/yarn.lock +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/yarn.lock @@ -2,52 +2,52 @@ # yarn lockfile v1 -"@abp/aspnetcore.components.server.basictheme@^5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.components.server.basictheme/-/aspnetcore.components.server.basictheme-5.3.0-rc.1.tgz#8fa1db4fbe2a9ac58db3fefd25e1b60cdb9fa0d5" - integrity sha512-92kD2PPtvyaeNEvSQRAVRj/BEetitRwbuYqM9PHdaLXeNdnGo/C6JGej9sc488KKxdRq2uaVrMY2xlDUEYc9vw== - dependencies: - "@abp/aspnetcore.components.server.theming" "~5.3.0-rc.1" - -"@abp/aspnetcore.components.server.theming@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.components.server.theming/-/aspnetcore.components.server.theming-5.3.0-rc.1.tgz#654dc4f4ba7f37b12e900fbeaf5c8ac57cb192ec" - integrity sha512-csXYJGwcwLv6/75euEi5g6HUxAG/Q47ZtQfema5HL7TV/zz+8T1Z4uuUy+NTyuK7MQpRaO0QBTvn4n4FVnmE0w== - dependencies: - "@abp/bootstrap" "~5.3.0-rc.1" - "@abp/font-awesome" "~5.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.0-rc.1.tgz#dc27eb79ba7353eb6b16e4a2f50d17c3cfc9157d" - integrity sha512-TEbz/ISsGhfTec66XSeivQjCOCpTidufdpZmj8JRyrbQvhXOYohJs3ImrGJOIxUwo6nuzagGpotqXryjIF+jrg== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.0-rc.1.tgz#ed993befe99682baee55ea8771f983980ba8f93f" - integrity sha512-kL4CXe0YoZ4wJ4XvutqLPkv4fMuFeRJFzdix6lx4dPAArnPu69n3P4qFhokPkcoGpB2KTRqyn9fHQs8g2FCGQw== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.0-rc.1" - "@abp/bootstrap" "~5.3.0-rc.1" - "@abp/bootstrap-datepicker" "~5.3.0-rc.1" - "@abp/datatables.net-bs5" "~5.3.0-rc.1" - "@abp/font-awesome" "~5.3.0-rc.1" - "@abp/jquery-form" "~5.3.0-rc.1" - "@abp/jquery-validation-unobtrusive" "~5.3.0-rc.1" - "@abp/lodash" "~5.3.0-rc.1" - "@abp/luxon" "~5.3.0-rc.1" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.0-rc.1" - "@abp/select2" "~5.3.0-rc.1" - "@abp/sweetalert2" "~5.3.0-rc.1" - "@abp/timeago" "~5.3.0-rc.1" - "@abp/toastr" "~5.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.0-rc.1.tgz#5205d3a5ea500ff3b8d525dcc11a2ce4cfccdfd3" - integrity sha512-mIefq3QSVtP7heNl0ocHiSKLU+DwN5/TDvvPj2L3IZkCzuOrDxoBUIBIciea4k10HIQzqo6gmm1YOw0CEfzNHg== +"@abp/aspnetcore.components.server.leptonxlitetheme@^1.0.0-beta.3": + version "1.0.0-beta.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.components.server.leptonxlitetheme/-/aspnetcore.components.server.leptonxlitetheme-1.0.0-beta.3.tgz#cff3c7feb4d1827de78df87c571cc206a1fa761f" + integrity sha512-biZhq9XZNDc7bvis1ibPnmZBXPBy26Z7E6N6RB+N7156h9W6nKP4sqOPrsJ5p/GehxiOnNrkWOibBtzTgTfqkg== + dependencies: + "@abp/aspnetcore.components.server.theming" "~5.3.0" + +"@abp/aspnetcore.components.server.theming@~5.3.0": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.components.server.theming/-/aspnetcore.components.server.theming-5.3.1.tgz#3cb7faba30bd4b6b66050d42b23d70a2186e32a0" + integrity sha512-Vm/TrAQUAynXz18CRfeEc14My0B+Q9qBYhPNXhRWQSfdfPnPD360e+LSocUkZrUfPTm7sT6Wa3MGV5Jvf44nYQ== + dependencies: + "@abp/bootstrap" "~5.3.1" + "@abp/font-awesome" "~5.3.1" + +"@abp/aspnetcore.mvc.ui.theme.leptonxlite@^1.0.0-beta.3": + version "1.0.0-beta.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-1.0.0-beta.3.tgz#a7402f4d58b54c4f7f468ac281dc2da1eab0b011" + integrity sha512-2I91dBke89Qiri/aDQuPajrdA1WPU+69ljSbm3MmvnOUijm2E3XtBqUkr5v4PWSOU2dvzrUHnhUNgDmSIdWRjA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.0" + +"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.0": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.1.tgz#7fe0aba80670bf4326251138dc7e12ea5830c919" + integrity sha512-ieS54bLQr4Aa96CnFEmuxe0ndeJpJMkq5eYSWAziH4i15jm7o+K2ouIL0K606lk1Sn/UrP8Yl+DRhxr4i4P8ow== + dependencies: + "@abp/aspnetcore.mvc.ui" "~5.3.1" + "@abp/bootstrap" "~5.3.1" + "@abp/bootstrap-datepicker" "~5.3.1" + "@abp/datatables.net-bs5" "~5.3.1" + "@abp/font-awesome" "~5.3.1" + "@abp/jquery-form" "~5.3.1" + "@abp/jquery-validation-unobtrusive" "~5.3.1" + "@abp/lodash" "~5.3.1" + "@abp/luxon" "~5.3.1" + "@abp/malihu-custom-scrollbar-plugin" "~5.3.1" + "@abp/select2" "~5.3.1" + "@abp/sweetalert2" "~5.3.1" + "@abp/timeago" "~5.3.1" + "@abp/toastr" "~5.3.1" + +"@abp/aspnetcore.mvc.ui@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.1.tgz#17ccf9a2a40cbd79e670a0cb5be74ac9eb17b963" + integrity sha512-UuXH0Lz7DqiGp47BC7xllT3Imf2Nk+eccOiVRwc9PAfHKnNOOJYxvDlHS0x8CM09qxM5EVaH7tfwOLSS09HXpg== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -56,144 +56,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.0-rc.1.tgz#1a5a29d7f9904e8d99c7085bc4545ad2665195cb" - integrity sha512-Y5QLLNd2UpbzbWSh+5nKdpAdz2i3V8+feTHTpAxnPgYRabPGqAFiOrty8KZ1MJEgjQFWC1ypGHYII7GWVyIS6Q== +"@abp/bootstrap-datepicker@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.1.tgz#241aebfbae0fa451d3e719776096b14bf77c08fa" + integrity sha512-gvP7SNEnPFYuLmIBp7QobveAGv8Rm/8JTmixCChQPPP9XX3u82ilKP2cgxVXm/4/jf0Gy7Gusn7urmTbTxeGEw== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.0-rc.1.tgz#977d579f59e18b1eb2c9b43612d525a859a575a4" - integrity sha512-dpY0bPHdhUI5yL23+EsR6w/KjoPyehaEgHLLKQDERdubX1Zk/SDWrhrYXnXxtJ0fvxG2aRVOEBMULmHD3m/PoA== +"@abp/bootstrap@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.1.tgz#f941afe2be2deaa1962a3626593451847dee5bd6" + integrity sha512-qPGeNFEaQF57b0viA0eHKA0cZ9b0gscOqE0o4ewHxnlRoRYiY3Ob9V6x6S85n2b7H6tDZOWAePXEgkV40yK/Bg== dependencies: - "@abp/core" "~5.3.0-rc.1" + "@abp/core" "~5.3.1" bootstrap "^5.1.3" -"@abp/core@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.0-rc.1.tgz#4ede309ccfab440deb66fecb091273027483676a" - integrity sha512-cTw9xaWMkRDQjXRtkB5zx4Za0CPx7yvCRnTngIJs7xO86lRMVnuiwVGjP66vYTmiiu2ulGFgCeuw1AaK5t+g4Q== +"@abp/core@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.1.tgz#26890ab049d43db58f3a0fba2f4c50bd2fbf7811" + integrity sha512-7PBPDYq/s0T5H0iYaeCzqWF44jbiOkFlwGnXqZeKHt2cKZaMyCStgotrpap8qoZKlxuyxudFIzJrzJIEP0AN/Q== dependencies: - "@abp/utils" "~5.3.0-rc.1" + "@abp/utils" "~5.3.1" -"@abp/datatables.net-bs5@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.0-rc.1.tgz#ca624d788acdcc547d0bdf1f76ba3ffc105dfd52" - integrity sha512-uyFBkD9rM3wGve0ZKrr7bEbC0Z/ywi8S/EYL6GwLzGNtogSsVj5HGtSvifKjCBn7KmAvo54skKoVgVEn77dlWQ== +"@abp/datatables.net-bs5@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.1.tgz#e380cc253a837a0629baec9dabb4e8919878cc38" + integrity sha512-LpGPWLvFsLkQjo5RTgEl24LbBokgsO1gv7/pVy/1oiXXCLTuVwJ8vYYKfDNkrrSLDUOJ9cCC0YUE5SRfDUystA== dependencies: - "@abp/datatables.net" "~5.3.0-rc.1" + "@abp/datatables.net" "~5.3.1" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.0-rc.1.tgz#38c0f6323f7e6305a50f7de9885b8a3f440cdf15" - integrity sha512-lecJ9Yelgey/nfSscsUHET0gyB6pZgkhnJXu3u8d9XhV2M5sc/WSnnCO3bgVBqMDImprR4GFPFw2cUlWkb8QBg== +"@abp/datatables.net@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.1.tgz#8200b5a3a719f51d21670b1420e3df48af4de42e" + integrity sha512-v30gkk4dcmWz260C8BA7uaU4kqpiC1wkgMvdzjPGefzYXsMftlcoX7GUvByWwTzlJnTphGvnIVJhnhX73VVDHg== dependencies: - "@abp/jquery" "~5.3.0-rc.1" + "@abp/jquery" "~5.3.1" datatables.net "^1.11.4" -"@abp/font-awesome@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.0-rc.1.tgz#de14dca2b33fdc098d2325c5047e030a3927bfa9" - integrity sha512-tIuDwo+L5CuLpQ+ARsaTYmxuqpSJLqcaXuoFfk6JAC20bw881t7y8w4xWy1PUs0+SEQwTT7diZjQrcA/xxlMUQ== +"@abp/font-awesome@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.1.tgz#2b4654b463b7858fc237219fd852ca0f41e4e062" + integrity sha512-LFKPjQgJmQ6GNqW3geluHMgV3WbisniAaK9tl6Pv8WOvPluvZGHTK5qjcAQVwM6Bj944VYeuvLo1ZCOoC/rWLg== dependencies: - "@abp/core" "~5.3.0-rc.1" + "@abp/core" "~5.3.1" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.0-rc.1.tgz#0a363d8e4814651e0c46e2109d19dcc84fc884b0" - integrity sha512-IWazO6BW5rHJ+ODk4haEqWzfzHvbxtW2+T1o534Lr7d+LI9yabNiQmRZ24yzNDb6SmRvDUVsumZ+lxPn2WBhIw== +"@abp/jquery-form@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.1.tgz#e17367af8dafcfbb352775fb6ab9182d1fd9cd63" + integrity sha512-s8XItBHKJuehprFy7xePWHxt8jMvjDmkmk2nEuJXj+gcZyVEEa3hBd4ykKDXFfmNrfS8aMy+VqA+VEA24Cmpww== dependencies: - "@abp/jquery" "~5.3.0-rc.1" + "@abp/jquery" "~5.3.1" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.0-rc.1.tgz#0aa2a5535acd79b5288ef04a0dc1b83a7a57b4b9" - integrity sha512-Qv/+nrd+ZeUs/2mCMahpQFqEguMOcmHrLg7hcw0LgcHr+MmEcG4WDcijTY6suFyekaf0DZD6vsFZjdvZmhsVYQ== +"@abp/jquery-validation-unobtrusive@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.1.tgz#7c5c31df1cd021b3eed618d914926b76dc7e9e6e" + integrity sha512-B5USCmF56eWQO+R4eZtMjURtoNGUEuAuBy4ltCPtZx0s6yn94Ooq4oYKqEbfnLoSsQshajUwBtqtlC6+YA612Q== dependencies: - "@abp/jquery-validation" "~5.3.0-rc.1" + "@abp/jquery-validation" "~5.3.1" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.0-rc.1.tgz#d05afbe0209c0815afe3a7cb0cf811256e9905fc" - integrity sha512-3DoRX6c8duRx1/g7MFuPAO/qesJCFqbVbw+x0+QnKmCkVZmz5VFAqdO9yFMxDFRbBAtyp7faaarc0lOtAcBsoA== +"@abp/jquery-validation@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.1.tgz#b34c0e29e12843de4a407bc8775a2e560e4db923" + integrity sha512-lu2e47GwWmh/ahWA5bbeR9Gqqsy4a3htTIvnwWbtu7dnHVHA6469+uCt+0f+sVthDIL+cMwoYgcygMLIUHoFxg== dependencies: - "@abp/jquery" "~5.3.0-rc.1" + "@abp/jquery" "~5.3.1" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.0-rc.1.tgz#26e5d5761f2629d02b2534ad964080221d536308" - integrity sha512-//bqInarV6XOs8+I5GW1q/c05sjnCq/Z0vuzFW1i1NDrQ2Q5kqF5leMV9hhGEZmfR+yG1T0MsbVvueieRkV/cA== +"@abp/jquery@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.1.tgz#8f6032253d4c44b135c238a4efa010bee1ec5991" + integrity sha512-ngy9Kvy6lXrQBCxWi7t8I4Wudv87C2R50O/T4CZPfM2nwYLynopa+aI9r9VLhO/wIROyXX3C8UIpeLhQzm776w== dependencies: - "@abp/core" "~5.3.0-rc.1" + "@abp/core" "~5.3.1" jquery "~3.6.0" -"@abp/lodash@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.0-rc.1.tgz#c53304fbd9b1c885a9a812c681c3698dd8ecea47" - integrity sha512-yBvUB05z/SSEEbZ79nFfb0cKwWVFbrt9OtUkQHy9ER7ip0R9escG2n1djFtAA33yZr/NLzSUh+vVBYsEhk8MOA== +"@abp/lodash@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.1.tgz#49c0806bae0858047faed75b6e9ed6207dc4cffc" + integrity sha512-QQshVHkNlunbhcmBG5E2wdZNcHYrTsNQjJNF6IZkeFszNRHu/k0u1bhszDwjPgEzeewTqMu8n44TzkbA8yP5GA== dependencies: - "@abp/core" "~5.3.0-rc.1" + "@abp/core" "~5.3.1" lodash "^4.17.21" -"@abp/luxon@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.0-rc.1.tgz#bcb4de01b20a8e4da8db186e88fdebfcde47fb8f" - integrity sha512-SLozcDvCL/2jyvG2ZU+DHjzbfHYdmwiRjWu7gWyNjaY2e6D3NraHHjpMQ7ubObXZRlhhvfcp0i6eeKKoZNJtEQ== +"@abp/luxon@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.1.tgz#8d843023b05b157ff9ab23548c8d8c4e7101ae88" + integrity sha512-Jw8p5S9qHZkUrD1fx3nvpnBqn8Zb9jDiG6xdc6tY+v1aqDDwEqPUr7TqaLnY9GnZefiM3sYVwAh42nzPOwg9aQ== dependencies: - "@abp/core" "~5.3.0-rc.1" + "@abp/core" "~5.3.1" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.0-rc.1.tgz#398181c7c6cc1805544e7a1ccd0423ed96005e0b" - integrity sha512-KZar881wtotKc+1bqDlBWo2vLUEeeqEpMBg8+BiXsGofp5ovudifVPM6mHZ9Gi29U9LAMyI0VEGwLJctgB/UoA== +"@abp/malihu-custom-scrollbar-plugin@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.1.tgz#7f0e4f2df325345a8e3be67456522cb035e3e962" + integrity sha512-ll49qD7bslt7+deMAFZ0DfveH/5ZsHyL2RLDg796ARz+H7fQpEhyNFeGETGj+HSOvAl3ivux2mxNCMYbXHR4RQ== dependencies: - "@abp/core" "~5.3.0-rc.1" + "@abp/core" "~5.3.1" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.0-rc.1.tgz#b2ce00b6545674d6bccc10fdfe4626a4598a0cdc" - integrity sha512-frE5jia7bBdZinW4LqD5JR+wknWu2ARX3L3pPiQ080ulB+P58gRj07ZPd1BWgRcvutnuANYyP9rZtDA18Ls+9Q== +"@abp/select2@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.1.tgz#9a49aa983d52eecbd2dc2160349d45bd46324e36" + integrity sha512-ne4LJJy9n3V8BPtyU6voX4Bo0/GUrZBnI4Mkb0wRKNt1rxj7PhPXebsYYz090QJuJh8fuF2OHteNMBA7gMryLQ== dependencies: - "@abp/core" "~5.3.0-rc.1" + "@abp/core" "~5.3.1" select2 "^4.0.13" -"@abp/sweetalert2@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.0-rc.1.tgz#6eb10b257e7f256da64ff6fe248a370671a26920" - integrity sha512-g9nddGcDGaG6EmjX7qpRcLzy3F38BTtFc0RBWApH7Da1o/LMYFYa6xGfS7ouIynZBM9j/BRP12CVTR+Y9qqbGg== +"@abp/sweetalert2@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.1.tgz#676a3269fe4511fc4f81c3231ed9a96fe4c8f006" + integrity sha512-UDQrJiq8OfIDy3GSq7NJ4TKKEihzp6Qc06KGRdnN74lm4JsxxGUToSaD1AbyrLt53jZlRZK2NNc8IiyqPvyfbQ== dependencies: - "@abp/core" "~5.3.0-rc.1" + "@abp/core" "~5.3.1" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.0-rc.1.tgz#2702a0f22db52dbf4c0717e4abcd317c56d10563" - integrity sha512-XRc4D98FIZR0YTXIoV0+OxVJTdixtNDiwatZRffopHT4Kpptmpj6O9KMcB4SngCH99/TrUFdEUnA2CgszxiEOA== +"@abp/timeago@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.1.tgz#069a4eb2725b0a183cb7609e1f48d8d857a606ba" + integrity sha512-+QWO9MTuf6X7sUXxoUGyoQ0EhoQUlRDdCPmwwcZyBzBf8q9A3hS+Rtmex3BqwRLDxL2vL78gbDpIBgPn/kFuUA== dependencies: - "@abp/jquery" "~5.3.0-rc.1" + "@abp/jquery" "~5.3.1" timeago "^1.6.7" -"@abp/toastr@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.0-rc.1.tgz#ec3a3d302ac91d5393c3caeb8b4884ad811b6edb" - integrity sha512-InZweYuBkrNZNBQKp6A+6gxGdO/lB0XsrXaa+CIVe55p8aNJPzE0mnvSfKWhN5G273wR08AD9RjR22kYS+bgFA== +"@abp/toastr@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.1.tgz#4a18b293444f7f8a523b7255ea61fed838131f1c" + integrity sha512-gz5cl6sPu6b65h8VJ6ne+dkM0oVXSYBlDoKBYbDRjhH6i7yWUpcylY/lrOvWacNQBOagBy5bep1937aec1/BXQ== dependencies: - "@abp/jquery" "~5.3.0-rc.1" + "@abp/jquery" "~5.3.1" toastr "^2.1.4" -"@abp/utils@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.0-rc.1.tgz#3fa758944e7325e7b3f528141e03bb71f8e04d24" - integrity sha512-/8BTYZomNMdy+RpYXWLp5dg0lRhmfiguciZEVWo4qRw1lCXm/JR+0842XT1XYE1dQ4orNNJ3/H86eRX8Ab6Yfg== +"@abp/utils@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.1.tgz#ff238e3b70c6fffb1600d845c202961e1179c813" + integrity sha512-XVYrygoWq1ZHz4N7BSJ4P77wmd0geRhpyR5ztzyP1WaF2LaCRS63BjZ/a7xKdtioUby9GP5jSvMjBvwqVviYIQ== dependencies: just-compare "^1.3.0" diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json index 21d924ec29..44170e65a7 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0", - "@abp/aspnetcore.components.server.leptonxlitetheme": "^1.0.0" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0-beta.3", + "@abp/aspnetcore.components.server.leptonxlitetheme": "^1.0.0-beta.3" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/yarn.lock b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/yarn.lock index 64fd8e6b93..71bed3c0d5 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/yarn.lock +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/yarn.lock @@ -2,52 +2,52 @@ # yarn lockfile v1 -"@abp/aspnetcore.components.server.basictheme@^5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.components.server.basictheme/-/aspnetcore.components.server.basictheme-5.3.0-rc.1.tgz#8fa1db4fbe2a9ac58db3fefd25e1b60cdb9fa0d5" - integrity sha512-92kD2PPtvyaeNEvSQRAVRj/BEetitRwbuYqM9PHdaLXeNdnGo/C6JGej9sc488KKxdRq2uaVrMY2xlDUEYc9vw== - dependencies: - "@abp/aspnetcore.components.server.theming" "~5.3.0-rc.1" - -"@abp/aspnetcore.components.server.theming@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.components.server.theming/-/aspnetcore.components.server.theming-5.3.0-rc.1.tgz#654dc4f4ba7f37b12e900fbeaf5c8ac57cb192ec" - integrity sha512-csXYJGwcwLv6/75euEi5g6HUxAG/Q47ZtQfema5HL7TV/zz+8T1Z4uuUy+NTyuK7MQpRaO0QBTvn4n4FVnmE0w== - dependencies: - "@abp/bootstrap" "~5.3.0-rc.1" - "@abp/font-awesome" "~5.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.0-rc.1.tgz#dc27eb79ba7353eb6b16e4a2f50d17c3cfc9157d" - integrity sha512-TEbz/ISsGhfTec66XSeivQjCOCpTidufdpZmj8JRyrbQvhXOYohJs3ImrGJOIxUwo6nuzagGpotqXryjIF+jrg== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.0-rc.1.tgz#ed993befe99682baee55ea8771f983980ba8f93f" - integrity sha512-kL4CXe0YoZ4wJ4XvutqLPkv4fMuFeRJFzdix6lx4dPAArnPu69n3P4qFhokPkcoGpB2KTRqyn9fHQs8g2FCGQw== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.0-rc.1" - "@abp/bootstrap" "~5.3.0-rc.1" - "@abp/bootstrap-datepicker" "~5.3.0-rc.1" - "@abp/datatables.net-bs5" "~5.3.0-rc.1" - "@abp/font-awesome" "~5.3.0-rc.1" - "@abp/jquery-form" "~5.3.0-rc.1" - "@abp/jquery-validation-unobtrusive" "~5.3.0-rc.1" - "@abp/lodash" "~5.3.0-rc.1" - "@abp/luxon" "~5.3.0-rc.1" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.0-rc.1" - "@abp/select2" "~5.3.0-rc.1" - "@abp/sweetalert2" "~5.3.0-rc.1" - "@abp/timeago" "~5.3.0-rc.1" - "@abp/toastr" "~5.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.0-rc.1.tgz#5205d3a5ea500ff3b8d525dcc11a2ce4cfccdfd3" - integrity sha512-mIefq3QSVtP7heNl0ocHiSKLU+DwN5/TDvvPj2L3IZkCzuOrDxoBUIBIciea4k10HIQzqo6gmm1YOw0CEfzNHg== +"@abp/aspnetcore.components.server.leptonxlitetheme@^1.0.0-beta.3": + version "1.0.0-beta.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.components.server.leptonxlitetheme/-/aspnetcore.components.server.leptonxlitetheme-1.0.0-beta.3.tgz#cff3c7feb4d1827de78df87c571cc206a1fa761f" + integrity sha512-biZhq9XZNDc7bvis1ibPnmZBXPBy26Z7E6N6RB+N7156h9W6nKP4sqOPrsJ5p/GehxiOnNrkWOibBtzTgTfqkg== + dependencies: + "@abp/aspnetcore.components.server.theming" "~5.3.0" + +"@abp/aspnetcore.components.server.theming@~5.3.0": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.components.server.theming/-/aspnetcore.components.server.theming-5.3.1.tgz#3cb7faba30bd4b6b66050d42b23d70a2186e32a0" + integrity sha512-Vm/TrAQUAynXz18CRfeEc14My0B+Q9qBYhPNXhRWQSfdfPnPD360e+LSocUkZrUfPTm7sT6Wa3MGV5Jvf44nYQ== + dependencies: + "@abp/bootstrap" "~5.3.1" + "@abp/font-awesome" "~5.3.1" + +"@abp/aspnetcore.mvc.ui.theme.leptonxlite@^1.0.0-beta.3": + version "1.0.0-beta.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-1.0.0-beta.3.tgz#a7402f4d58b54c4f7f468ac281dc2da1eab0b011" + integrity sha512-2I91dBke89Qiri/aDQuPajrdA1WPU+69ljSbm3MmvnOUijm2E3XtBqUkr5v4PWSOU2dvzrUHnhUNgDmSIdWRjA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.0" + +"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.0": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.1.tgz#7fe0aba80670bf4326251138dc7e12ea5830c919" + integrity sha512-ieS54bLQr4Aa96CnFEmuxe0ndeJpJMkq5eYSWAziH4i15jm7o+K2ouIL0K606lk1Sn/UrP8Yl+DRhxr4i4P8ow== + dependencies: + "@abp/aspnetcore.mvc.ui" "~5.3.1" + "@abp/bootstrap" "~5.3.1" + "@abp/bootstrap-datepicker" "~5.3.1" + "@abp/datatables.net-bs5" "~5.3.1" + "@abp/font-awesome" "~5.3.1" + "@abp/jquery-form" "~5.3.1" + "@abp/jquery-validation-unobtrusive" "~5.3.1" + "@abp/lodash" "~5.3.1" + "@abp/luxon" "~5.3.1" + "@abp/malihu-custom-scrollbar-plugin" "~5.3.1" + "@abp/select2" "~5.3.1" + "@abp/sweetalert2" "~5.3.1" + "@abp/timeago" "~5.3.1" + "@abp/toastr" "~5.3.1" + +"@abp/aspnetcore.mvc.ui@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.1.tgz#17ccf9a2a40cbd79e670a0cb5be74ac9eb17b963" + integrity sha512-UuXH0Lz7DqiGp47BC7xllT3Imf2Nk+eccOiVRwc9PAfHKnNOOJYxvDlHS0x8CM09qxM5EVaH7tfwOLSS09HXpg== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -56,144 +56,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.0-rc.1.tgz#1a5a29d7f9904e8d99c7085bc4545ad2665195cb" - integrity sha512-Y5QLLNd2UpbzbWSh+5nKdpAdz2i3V8+feTHTpAxnPgYRabPGqAFiOrty8KZ1MJEgjQFWC1ypGHYII7GWVyIS6Q== +"@abp/bootstrap-datepicker@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.1.tgz#241aebfbae0fa451d3e719776096b14bf77c08fa" + integrity sha512-gvP7SNEnPFYuLmIBp7QobveAGv8Rm/8JTmixCChQPPP9XX3u82ilKP2cgxVXm/4/jf0Gy7Gusn7urmTbTxeGEw== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.0-rc.1.tgz#977d579f59e18b1eb2c9b43612d525a859a575a4" - integrity sha512-dpY0bPHdhUI5yL23+EsR6w/KjoPyehaEgHLLKQDERdubX1Zk/SDWrhrYXnXxtJ0fvxG2aRVOEBMULmHD3m/PoA== +"@abp/bootstrap@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.1.tgz#f941afe2be2deaa1962a3626593451847dee5bd6" + integrity sha512-qPGeNFEaQF57b0viA0eHKA0cZ9b0gscOqE0o4ewHxnlRoRYiY3Ob9V6x6S85n2b7H6tDZOWAePXEgkV40yK/Bg== dependencies: - "@abp/core" "~5.3.0-rc.1" + "@abp/core" "~5.3.1" bootstrap "^5.1.3" -"@abp/core@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.0-rc.1.tgz#4ede309ccfab440deb66fecb091273027483676a" - integrity sha512-cTw9xaWMkRDQjXRtkB5zx4Za0CPx7yvCRnTngIJs7xO86lRMVnuiwVGjP66vYTmiiu2ulGFgCeuw1AaK5t+g4Q== +"@abp/core@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.1.tgz#26890ab049d43db58f3a0fba2f4c50bd2fbf7811" + integrity sha512-7PBPDYq/s0T5H0iYaeCzqWF44jbiOkFlwGnXqZeKHt2cKZaMyCStgotrpap8qoZKlxuyxudFIzJrzJIEP0AN/Q== dependencies: - "@abp/utils" "~5.3.0-rc.1" + "@abp/utils" "~5.3.1" -"@abp/datatables.net-bs5@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.0-rc.1.tgz#ca624d788acdcc547d0bdf1f76ba3ffc105dfd52" - integrity sha512-uyFBkD9rM3wGve0ZKrr7bEbC0Z/ywi8S/EYL6GwLzGNtogSsVj5HGtSvifKjCBn7KmAvo54skKoVgVEn77dlWQ== +"@abp/datatables.net-bs5@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.1.tgz#e380cc253a837a0629baec9dabb4e8919878cc38" + integrity sha512-LpGPWLvFsLkQjo5RTgEl24LbBokgsO1gv7/pVy/1oiXXCLTuVwJ8vYYKfDNkrrSLDUOJ9cCC0YUE5SRfDUystA== dependencies: - "@abp/datatables.net" "~5.3.0-rc.1" + "@abp/datatables.net" "~5.3.1" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.0-rc.1.tgz#38c0f6323f7e6305a50f7de9885b8a3f440cdf15" - integrity sha512-lecJ9Yelgey/nfSscsUHET0gyB6pZgkhnJXu3u8d9XhV2M5sc/WSnnCO3bgVBqMDImprR4GFPFw2cUlWkb8QBg== +"@abp/datatables.net@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.1.tgz#8200b5a3a719f51d21670b1420e3df48af4de42e" + integrity sha512-v30gkk4dcmWz260C8BA7uaU4kqpiC1wkgMvdzjPGefzYXsMftlcoX7GUvByWwTzlJnTphGvnIVJhnhX73VVDHg== dependencies: - "@abp/jquery" "~5.3.0-rc.1" + "@abp/jquery" "~5.3.1" datatables.net "^1.11.4" -"@abp/font-awesome@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.0-rc.1.tgz#de14dca2b33fdc098d2325c5047e030a3927bfa9" - integrity sha512-tIuDwo+L5CuLpQ+ARsaTYmxuqpSJLqcaXuoFfk6JAC20bw881t7y8w4xWy1PUs0+SEQwTT7diZjQrcA/xxlMUQ== +"@abp/font-awesome@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.1.tgz#2b4654b463b7858fc237219fd852ca0f41e4e062" + integrity sha512-LFKPjQgJmQ6GNqW3geluHMgV3WbisniAaK9tl6Pv8WOvPluvZGHTK5qjcAQVwM6Bj944VYeuvLo1ZCOoC/rWLg== dependencies: - "@abp/core" "~5.3.0-rc.1" + "@abp/core" "~5.3.1" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.0-rc.1.tgz#0a363d8e4814651e0c46e2109d19dcc84fc884b0" - integrity sha512-IWazO6BW5rHJ+ODk4haEqWzfzHvbxtW2+T1o534Lr7d+LI9yabNiQmRZ24yzNDb6SmRvDUVsumZ+lxPn2WBhIw== +"@abp/jquery-form@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.1.tgz#e17367af8dafcfbb352775fb6ab9182d1fd9cd63" + integrity sha512-s8XItBHKJuehprFy7xePWHxt8jMvjDmkmk2nEuJXj+gcZyVEEa3hBd4ykKDXFfmNrfS8aMy+VqA+VEA24Cmpww== dependencies: - "@abp/jquery" "~5.3.0-rc.1" + "@abp/jquery" "~5.3.1" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.0-rc.1.tgz#0aa2a5535acd79b5288ef04a0dc1b83a7a57b4b9" - integrity sha512-Qv/+nrd+ZeUs/2mCMahpQFqEguMOcmHrLg7hcw0LgcHr+MmEcG4WDcijTY6suFyekaf0DZD6vsFZjdvZmhsVYQ== +"@abp/jquery-validation-unobtrusive@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.1.tgz#7c5c31df1cd021b3eed618d914926b76dc7e9e6e" + integrity sha512-B5USCmF56eWQO+R4eZtMjURtoNGUEuAuBy4ltCPtZx0s6yn94Ooq4oYKqEbfnLoSsQshajUwBtqtlC6+YA612Q== dependencies: - "@abp/jquery-validation" "~5.3.0-rc.1" + "@abp/jquery-validation" "~5.3.1" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.0-rc.1.tgz#d05afbe0209c0815afe3a7cb0cf811256e9905fc" - integrity sha512-3DoRX6c8duRx1/g7MFuPAO/qesJCFqbVbw+x0+QnKmCkVZmz5VFAqdO9yFMxDFRbBAtyp7faaarc0lOtAcBsoA== +"@abp/jquery-validation@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.1.tgz#b34c0e29e12843de4a407bc8775a2e560e4db923" + integrity sha512-lu2e47GwWmh/ahWA5bbeR9Gqqsy4a3htTIvnwWbtu7dnHVHA6469+uCt+0f+sVthDIL+cMwoYgcygMLIUHoFxg== dependencies: - "@abp/jquery" "~5.3.0-rc.1" + "@abp/jquery" "~5.3.1" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.0-rc.1.tgz#26e5d5761f2629d02b2534ad964080221d536308" - integrity sha512-//bqInarV6XOs8+I5GW1q/c05sjnCq/Z0vuzFW1i1NDrQ2Q5kqF5leMV9hhGEZmfR+yG1T0MsbVvueieRkV/cA== +"@abp/jquery@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.1.tgz#8f6032253d4c44b135c238a4efa010bee1ec5991" + integrity sha512-ngy9Kvy6lXrQBCxWi7t8I4Wudv87C2R50O/T4CZPfM2nwYLynopa+aI9r9VLhO/wIROyXX3C8UIpeLhQzm776w== dependencies: - "@abp/core" "~5.3.0-rc.1" + "@abp/core" "~5.3.1" jquery "~3.6.0" -"@abp/lodash@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.0-rc.1.tgz#c53304fbd9b1c885a9a812c681c3698dd8ecea47" - integrity sha512-yBvUB05z/SSEEbZ79nFfb0cKwWVFbrt9OtUkQHy9ER7ip0R9escG2n1djFtAA33yZr/NLzSUh+vVBYsEhk8MOA== +"@abp/lodash@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.1.tgz#49c0806bae0858047faed75b6e9ed6207dc4cffc" + integrity sha512-QQshVHkNlunbhcmBG5E2wdZNcHYrTsNQjJNF6IZkeFszNRHu/k0u1bhszDwjPgEzeewTqMu8n44TzkbA8yP5GA== dependencies: - "@abp/core" "~5.3.0-rc.1" + "@abp/core" "~5.3.1" lodash "^4.17.21" -"@abp/luxon@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.0-rc.1.tgz#bcb4de01b20a8e4da8db186e88fdebfcde47fb8f" - integrity sha512-SLozcDvCL/2jyvG2ZU+DHjzbfHYdmwiRjWu7gWyNjaY2e6D3NraHHjpMQ7ubObXZRlhhvfcp0i6eeKKoZNJtEQ== +"@abp/luxon@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.1.tgz#8d843023b05b157ff9ab23548c8d8c4e7101ae88" + integrity sha512-Jw8p5S9qHZkUrD1fx3nvpnBqn8Zb9jDiG6xdc6tY+v1aqDDwEqPUr7TqaLnY9GnZefiM3sYVwAh42nzPOwg9aQ== dependencies: - "@abp/core" "~5.3.0-rc.1" + "@abp/core" "~5.3.1" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.0-rc.1.tgz#398181c7c6cc1805544e7a1ccd0423ed96005e0b" - integrity sha512-KZar881wtotKc+1bqDlBWo2vLUEeeqEpMBg8+BiXsGofp5ovudifVPM6mHZ9Gi29U9LAMyI0VEGwLJctgB/UoA== +"@abp/malihu-custom-scrollbar-plugin@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.1.tgz#7f0e4f2df325345a8e3be67456522cb035e3e962" + integrity sha512-ll49qD7bslt7+deMAFZ0DfveH/5ZsHyL2RLDg796ARz+H7fQpEhyNFeGETGj+HSOvAl3ivux2mxNCMYbXHR4RQ== dependencies: - "@abp/core" "~5.3.0-rc.1" + "@abp/core" "~5.3.1" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.0-rc.1.tgz#b2ce00b6545674d6bccc10fdfe4626a4598a0cdc" - integrity sha512-frE5jia7bBdZinW4LqD5JR+wknWu2ARX3L3pPiQ080ulB+P58gRj07ZPd1BWgRcvutnuANYyP9rZtDA18Ls+9Q== +"@abp/select2@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.1.tgz#9a49aa983d52eecbd2dc2160349d45bd46324e36" + integrity sha512-ne4LJJy9n3V8BPtyU6voX4Bo0/GUrZBnI4Mkb0wRKNt1rxj7PhPXebsYYz090QJuJh8fuF2OHteNMBA7gMryLQ== dependencies: - "@abp/core" "~5.3.0-rc.1" + "@abp/core" "~5.3.1" select2 "^4.0.13" -"@abp/sweetalert2@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.0-rc.1.tgz#6eb10b257e7f256da64ff6fe248a370671a26920" - integrity sha512-g9nddGcDGaG6EmjX7qpRcLzy3F38BTtFc0RBWApH7Da1o/LMYFYa6xGfS7ouIynZBM9j/BRP12CVTR+Y9qqbGg== +"@abp/sweetalert2@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.1.tgz#676a3269fe4511fc4f81c3231ed9a96fe4c8f006" + integrity sha512-UDQrJiq8OfIDy3GSq7NJ4TKKEihzp6Qc06KGRdnN74lm4JsxxGUToSaD1AbyrLt53jZlRZK2NNc8IiyqPvyfbQ== dependencies: - "@abp/core" "~5.3.0-rc.1" + "@abp/core" "~5.3.1" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.0-rc.1.tgz#2702a0f22db52dbf4c0717e4abcd317c56d10563" - integrity sha512-XRc4D98FIZR0YTXIoV0+OxVJTdixtNDiwatZRffopHT4Kpptmpj6O9KMcB4SngCH99/TrUFdEUnA2CgszxiEOA== +"@abp/timeago@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.1.tgz#069a4eb2725b0a183cb7609e1f48d8d857a606ba" + integrity sha512-+QWO9MTuf6X7sUXxoUGyoQ0EhoQUlRDdCPmwwcZyBzBf8q9A3hS+Rtmex3BqwRLDxL2vL78gbDpIBgPn/kFuUA== dependencies: - "@abp/jquery" "~5.3.0-rc.1" + "@abp/jquery" "~5.3.1" timeago "^1.6.7" -"@abp/toastr@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.0-rc.1.tgz#ec3a3d302ac91d5393c3caeb8b4884ad811b6edb" - integrity sha512-InZweYuBkrNZNBQKp6A+6gxGdO/lB0XsrXaa+CIVe55p8aNJPzE0mnvSfKWhN5G273wR08AD9RjR22kYS+bgFA== +"@abp/toastr@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.1.tgz#4a18b293444f7f8a523b7255ea61fed838131f1c" + integrity sha512-gz5cl6sPu6b65h8VJ6ne+dkM0oVXSYBlDoKBYbDRjhH6i7yWUpcylY/lrOvWacNQBOagBy5bep1937aec1/BXQ== dependencies: - "@abp/jquery" "~5.3.0-rc.1" + "@abp/jquery" "~5.3.1" toastr "^2.1.4" -"@abp/utils@~5.3.0-rc.1": - version "5.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.0-rc.1.tgz#3fa758944e7325e7b3f528141e03bb71f8e04d24" - integrity sha512-/8BTYZomNMdy+RpYXWLp5dg0lRhmfiguciZEVWo4qRw1lCXm/JR+0842XT1XYE1dQ4orNNJ3/H86eRX8Ab6Yfg== +"@abp/utils@~5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.1.tgz#ff238e3b70c6fffb1600d845c202961e1179c813" + integrity sha512-XVYrygoWq1ZHz4N7BSJ4P77wmd0geRhpyR5ztzyP1WaF2LaCRS63BjZ/a7xKdtioUby9GP5jSvMjBvwqVviYIQ== dependencies: just-compare "^1.3.0" diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/global.css b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/global.css index c43ac39dc2..8b2a2db395 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/global.css +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/global.css @@ -5063,7 +5063,7 @@ select.form-select option:checked[selected], select.form-select option:focus[sel } .card .card-title { font-size: 1.25em; - font-weight: 600; + font-weight: 500; color: #161616; } .card.text-white .card-title, .card.text-white .card-text { @@ -11891,7 +11891,7 @@ body { background-color: #161616; } -li { +.lpx-breadcrumb li, .lpx-nav-menu li { list-style-type: none; } @@ -11948,11 +11948,11 @@ li { } .lpx-main-title { - font-size: 1.5em !important; + font-size: 1.5rem !important; font-weight: 600; color: #161616; - margin-bottom: 1em; - margin-top: 0.3333333333em; + margin-bottom: 0.75rem; + margin-top: 0.25rem; } .lpx-sidebar { diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/global.js b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/global.js index ed4491e7a5..67af6b3d71 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/global.js +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/global.js @@ -12,7 +12,7 @@ var abp=abp||{};(function(){abp.utils=abp.utils||{};abp.utils.updateHTMLDirAndLa */ (function(n,t){typeof exports=="object"&&typeof module!="undefined"?module.exports=t():typeof define=="function"&&define.amd?define(t):(n=typeof globalThis!="undefined"?globalThis:n||self,n.bootstrap=t())})(this,function(){"use strict";function oe(n,t){return t&&`${t}::${fe++}`||n.uidEvent||fe++}function se(n){const t=oe(n);return n.uidEvent=t,su[t]=su[t]||{},su[t]}function yl(t,i){return function r(u){return u.delegateTarget=t,r.oneOff&&n.off(t,u.type,i),i.apply(t,[u])}}function pl(t,i,r){return function u(f){const e=t.querySelectorAll(i);for(let{target:o}=f;o&&o!==this;o=o.parentNode)for(let s=e.length;s--;)if(e[s]===o)return f.delegateTarget=o,u.oneOff&&n.off(t,f.type,i,r),r.apply(o,[f]);return null}}function he(n,t,i=null){const r=Object.keys(n);for(let u=0,f=r.length;ufunction(t){if(!t.relatedTarget||t.relatedTarget!==t.delegateTarget&&!t.delegateTarget.contains(t.relatedTarget))return n.call(this,t)};r?r=n(r):i=n(i)}const[e,o,s]=ce(t,i,r),c=se(n),l=c[s]||(c[s]={}),h=he(l,o,e?i:null);if(h){h.oneOff=h.oneOff&&u;return}const a=oe(o,t.replace(hl,"")),f=e?pl(n,i,r):yl(n,i);f.delegationSelector=e?i:null;f.originalHandler=o;f.oneOff=u;f.uidEvent=a;l[a]=f;n.addEventListener(s,f,e)}}function hu(n,t,i,r,u){const f=he(t[i],r,u);f&&(n.removeEventListener(i,f,Boolean(u)),delete t[i][f.uidEvent])}function wl(n,t,i,r){const u=t[i]||{};Object.keys(u).forEach(f=>{if(f.includes(r)){const r=u[f];hu(n,t,i,r.originalHandler,r.delegationSelector)}})}function ae(n){return n=n.replace(cl,""),al[n]||n}function pe(n){return n==="true"?!0:n==="false"?!1:n===Number(n).toString()?Number(n):n===""||n==="null"?null:n}function cu(n){return n.replace(/[A-Z]/g,n=>`-${n.toLowerCase()}`)}function w(n){return n?(n.nodeName||"").toLowerCase():null}function y(n){if(n==null)return window;if(n.toString()!=="[object Window]"){var t=n.ownerDocument;return t?t.defaultView||window:window}return n}function yi(n){var t=y(n).Element;return n instanceof t||n instanceof Element}function c(n){var t=y(n).HTMLElement;return n instanceof t||n instanceof HTMLElement}function wo(n){if(typeof ShadowRoot=="undefined")return!1;var t=y(n).ShadowRoot;return n instanceof t||n instanceof ShadowRoot}function oy(n){var t=n.state;Object.keys(t.elements).forEach(function(n){var u=t.styles[n]||{},r=t.attributes[n]||{},i=t.elements[n];c(i)&&w(i)&&(Object.assign(i.style,u),Object.keys(r).forEach(function(n){var t=r[n];t===!1?i.removeAttribute(n):i.setAttribute(n,t===!0?"":t)}))})}function sy(n){var t=n.state,i={popper:{position:t.options.strategy,left:"0",top:"0",margin:"0"},arrow:{position:"absolute"},reference:{}};return Object.assign(t.elements.popper.style,i.popper),t.styles=i,t.elements.arrow&&Object.assign(t.elements.arrow.style,i.arrow),function(){Object.keys(t.elements).forEach(function(n){var r=t.elements[n],u=t.attributes[n]||{},f=Object.keys(t.styles.hasOwnProperty(n)?t.styles[n]:i[n]),e=f.reduce(function(n,t){return n[t]="",n},{});c(r)&&w(r)&&(Object.assign(r.style,e),Object.keys(u).forEach(function(n){r.removeAttribute(n)}))})}}function b(n){return n.split("-")[0]}function ri(n){var t=n.getBoundingClientRect(),i=1,r=1;return{width:t.width/i,height:t.height/r,top:t.top/r,right:t.right/i,bottom:t.bottom/r,left:t.left/i,x:t.left/i,y:t.top/r}}function bu(n){var t=ri(n),i=n.offsetWidth,r=n.offsetHeight;return Math.abs(t.width-i)<=1&&(i=t.width),Math.abs(t.height-r)<=1&&(r=t.height),{x:n.offsetLeft,y:n.offsetTop,width:i,height:r}}function bo(n,t){var r=t.getRootNode&&t.getRootNode(),i;if(n.contains(t))return!0;if(r&&wo(r)){i=t;do{if(i&&n.isSameNode(i))return!0;i=i.parentNode||i.host}while(i)}return!1}function nt(n){return y(n).getComputedStyle(n)}function hy(n){return["table","td","th"].indexOf(w(n))>=0}function ut(n){return((yi(n)?n.ownerDocument:n.document)||window.document).documentElement}function ar(n){return w(n)==="html"?n:n.assignedSlot||n.parentNode||(wo(n)?n.host:null)||ut(n)}function ko(n){return!c(n)||nt(n).position==="fixed"?null:n.offsetParent}function cy(n){var r=navigator.userAgent.toLowerCase().indexOf("firefox")!==-1,f=navigator.userAgent.indexOf("Trident")!==-1,u,i,t;if(f&&c(n)&&(u=nt(n),u.position==="fixed"))return null;for(i=ar(n);c(i)&&["html","body"].indexOf(w(i))<0;){if(t=nt(i),t.transform!=="none"||t.perspective!=="none"||t.contain==="paint"||["transform","perspective"].indexOf(t.willChange)!==-1||r&&t.willChange==="filter"||r&&t.filter&&t.filter!=="none")return i;i=i.parentNode}return null}function pi(n){for(var i=y(n),t=ko(n);t&&hy(t)&&nt(t).position==="static";)t=ko(t);return t&&(w(t)==="html"||w(t)==="body"&&nt(t).position==="static")?i:t||cy(n)||i}function ku(n){return["top","bottom"].indexOf(n)>=0?"x":"y"}function yr(n,t,i){return ft(n,wi(t,i))}function go(){return{top:0,right:0,bottom:0,left:0}}function ns(n){return Object.assign({},go(),n)}function ts(n,t){return t.reduce(function(t,i){return t[i]=n,t},{})}function ly(n){var r,t=n.state,d=n.name,g=n.options,h=t.elements.arrow,c=t.modifiersData.popperOffsets,a=b(t.placement),i=ku(a),nt=[f,s].indexOf(a)>=0,e=nt?"height":"width";if(h&&c){var v=is(g.padding,t),y=bu(h),tt=i==="y"?u:f,it=i==="y"?o:s,rt=t.rects.reference[e]+t.rects.reference[i]-c[i]-t.rects.popper[e],ut=c[i]-t.rects.reference[i],l=pi(h),p=l?i==="y"?l.clientHeight||0:l.clientWidth||0:0,ft=rt/2-ut/2,et=v[tt],ot=p-y[e]-v[it],w=p/2-y[e]/2+ft,k=yr(et,w,ot),st=i;t.modifiersData[d]=(r={},r[st]=k,r.centerOffset=k-w,r)}}function ay(n){var i=n.state,u=n.options,r=u.element,t=r===void 0?"[data-popper-arrow]":r;t!=null&&(typeof t!="string"||(t=i.elements.popper.querySelector(t),t))&&bo(i.elements.popper,t)&&(i.elements.arrow=t)}function ui(n){return n.split("-")[1]}function vy(n){var i=n.x,r=n.y,u=window,t=u.devicePixelRatio||1;return{x:vr(vr(i*t)/t)||0,y:vr(vr(r*t)/t)||0}}function fs(n){var r,a=n.popper,d=n.popperRect,i=n.placement,g=n.variation,e=n.offsets,tt=n.position,v=n.gpuAcceleration,it=n.adaptive,p=n.roundOffsets,rt=p===!0?vy(e):typeof p=="function"?p(e):e,ft=rt.x,h=ft===void 0?0:ft,et=rt.y,c=et===void 0?0:et,ot=e.hasOwnProperty("x"),st=e.hasOwnProperty("y"),w=f,b=u,lt=window,k,l;if(it){var t=pi(a),ht="clientHeight",ct="clientWidth";t===y(a)&&(t=ut(a),nt(t).position!=="static"&&tt==="absolute"&&(ht="scrollHeight",ct="scrollWidth"));t=t;(i===u||(i===f||i===s)&&g===ti)&&(b=o,c-=t[ht]-d.height,c*=v?1:-1);(i===f||(i===u||i===o)&&g===ti)&&(w=s,h-=t[ct]-d.width,h*=v?1:-1)}return(k=Object.assign({position:tt},it&&us),v)?Object.assign({},k,(l={},l[b]=st?"0":"",l[w]=ot?"0":"",l.transform=(lt.devicePixelRatio||1)<=1?"translate("+h+"px, "+c+"px)":"translate3d("+h+"px, "+c+"px, 0)",l)):Object.assign({},k,(r={},r[b]=st?c+"px":"",r[w]=ot?h+"px":"",r.transform="",r))}function yy(n){var t=n.state,i=n.options,r=i.gpuAcceleration,s=r===void 0?!0:r,u=i.adaptive,h=u===void 0?!0:u,f=i.roundOffsets,e=f===void 0?!0:f,o={placement:b(t.placement),variation:ui(t.placement),popper:t.elements.popper,popperRect:t.rects.popper,gpuAcceleration:s};t.modifiersData.popperOffsets!=null&&(t.styles.popper=Object.assign({},t.styles.popper,fs(Object.assign({},o,{offsets:t.modifiersData.popperOffsets,position:t.options.strategy,adaptive:h,roundOffsets:e}))));t.modifiersData.arrow!=null&&(t.styles.arrow=Object.assign({},t.styles.arrow,fs(Object.assign({},o,{offsets:t.modifiersData.arrow,position:"absolute",adaptive:!1,roundOffsets:e}))));t.attributes.popper=Object.assign({},t.attributes.popper,{"data-popper-placement":t.placement})}function py(n){var i=n.state,t=n.instance,r=n.options,u=r.scroll,f=u===void 0?!0:u,e=r.resize,o=e===void 0?!0:e,s=y(i.elements.popper),h=[].concat(i.scrollParents.reference,i.scrollParents.popper);return f&&h.forEach(function(n){n.addEventListener("scroll",t.update,bi)}),o&&s.addEventListener("resize",t.update,bi),function(){f&&h.forEach(function(n){n.removeEventListener("scroll",t.update,bi)});o&&s.removeEventListener("resize",t.update,bi)}}function pr(n){return n.replace(/left|right|bottom|top/g,function(n){return es[n]})}function ss(n){return n.replace(/start|end/g,function(n){return os[n]})}function nf(n){var t=y(n),i=t.pageXOffset,r=t.pageYOffset;return{scrollLeft:i,scrollTop:r}}function tf(n){return ri(ut(n)).left+nf(n).scrollLeft}function wy(n){var o=y(n),i=ut(n),t=o.visualViewport,r=i.clientWidth,u=i.clientHeight,f=0,e=0;return t&&(r=t.width,u=t.height,/^((?!chrome|android).)*safari/i.test(navigator.userAgent)||(f=t.offsetLeft,e=t.offsetTop)),{width:r,height:u,x:f+tf(n),y:e}}function by(n){var r,i=ut(n),u=nf(n),t=(r=n.ownerDocument)==null?void 0:r.body,f=ft(i.scrollWidth,i.clientWidth,t?t.scrollWidth:0,t?t.clientWidth:0),o=ft(i.scrollHeight,i.clientHeight,t?t.scrollHeight:0,t?t.clientHeight:0),e=-u.scrollLeft+tf(n),s=-u.scrollTop;return nt(t||i).direction==="rtl"&&(e+=ft(i.clientWidth,t?t.clientWidth:0)-f),{width:f,height:o,x:e,y:s}}function rf(n){var t=nt(n),i=t.overflow,r=t.overflowX,u=t.overflowY;return/auto|scroll|overlay|hidden/.test(i+u+r)}function hs(n){return["html","body","#document"].indexOf(w(n))>=0?n.ownerDocument.body:c(n)&&rf(n)?n:hs(ar(n))}function ki(n,t){var r;t===void 0&&(t=[]);var i=hs(n),u=i===((r=n.ownerDocument)==null?void 0:r.body),f=y(i),e=u?[f].concat(f.visualViewport||[],rf(i)?i:[]):i,o=t.concat(e);return u?o:o.concat(ki(ar(e)))}function uf(n){return Object.assign({},n,{left:n.x,top:n.y,right:n.x+n.width,bottom:n.y+n.height})}function ky(n){var t=ri(n);return t.top=t.top+n.clientTop,t.left=t.left+n.clientLeft,t.bottom=t.top+n.clientHeight,t.right=t.left+n.clientWidth,t.width=n.clientWidth,t.height=n.clientHeight,t.x=t.left,t.y=t.top,t}function cs(n,t){return t===vu?uf(wy(n)):c(t)?ky(t):uf(by(ut(n)))}function dy(n){var i=ki(ar(n)),r=["absolute","fixed"].indexOf(nt(n).position)>=0,t=r&&c(n)?pi(n):n;return yi(t)?i.filter(function(n){return yi(n)&&bo(n,t)&&w(n)!=="body"}):[]}function gy(n,t,i){var f=t==="clippingParents"?dy(n):[].concat(t),u=[].concat(f,[i]),e=u[0],r=u.reduce(function(t,i){var r=cs(n,i);return t.top=ft(r.top,t.top),t.right=wi(r.right,t.right),t.bottom=wi(r.bottom,t.bottom),t.left=ft(r.left,t.left),t},cs(n,e));return r.width=r.right-r.left,r.height=r.bottom-r.top,r.x=r.left,r.y=r.top,r}function ls(n){var t=n.reference,e=n.element,c=n.placement,l=c?b(c):null,y=c?ui(c):null,a=t.x+t.width/2-e.width/2,v=t.y+t.height/2-e.height/2,i,r,h;switch(l){case u:i={x:a,y:t.y-e.height};break;case o:i={x:a,y:t.y+t.height};break;case s:i={x:t.x+t.width,y:v};break;case f:i={x:t.x-e.width,y:v};break;default:i={x:t.x,y:t.y}}if(r=l?ku(l):null,r!=null){h=r==="y"?"height":"width";switch(y){case yt:i[r]=i[r]-(t[h]/2-e[h]/2);break;case ti:i[r]=i[r]+(t[h]/2-e[h]/2)}}return i}function fi(n,t){var it;t===void 0&&(t={});var i=t,v=i.placement,y=v===void 0?n.placement:v,p=i.boundary,rt=p===void 0?uo:p,w=i.rootBoundary,ft=w===void 0?vu:w,b=i.elementContext,r=b===void 0?ii:b,k=i.altBoundary,et=k===void 0?!1:k,d=i.padding,c=d===void 0?0:d,f=ns(typeof c!="number"?c:ts(c,ni)),ot=r===ii?fo:ii,g=n.rects.popper,l=n.elements[et?ot:r],e=gy(yi(l)?l:l.contextElement||ut(n.elements.popper),rt,ft),nt=ri(n.elements.reference),st=ls({reference:nt,element:g,strategy:"absolute",placement:y}),ht=uf(Object.assign({},g,st)),h=r===ii?ht:nt,a={top:e.top-h.top+f.top,bottom:h.bottom-e.bottom+f.bottom,left:e.left-h.left+f.left,right:h.right-e.right+f.right},tt=n.modifiersData.offset;return r===ii&&tt&&(it=tt[y],Object.keys(a).forEach(function(n){var t=[s,o].indexOf(n)>=0?1:-1,i=[u,o].indexOf(n)>=0?"y":"x";a[n]+=it[i]*t})),a}function np(n,t){var r;t===void 0&&(t={});var i=t,s=i.placement,h=i.boundary,c=i.rootBoundary,l=i.padding,a=i.flipVariations,f=i.allowedAutoPlacements,v=f===void 0?pu:f,e=ui(s),o=e?a?yu:yu.filter(function(n){return ui(n)===e}):ni,u=o.filter(function(n){return v.indexOf(n)>=0});return u.length===0&&(u=o),r=u.reduce(function(t,i){return t[i]=fi(n,{placement:i,boundary:h,rootBoundary:c,padding:l})[b(i)],t},{}),Object.keys(r).sort(function(n,t){return r[n]-r[t]})}function tp(n){if(b(n)===lr)return[];var t=pr(n);return[ss(n),t,ss(t)]}function ip(n){var t=n.state,i=n.options,k=n.name,a,ct,h,lt,at,y,vt;if(!t.modifiersData[k]._skip){var d=i.mainAxis,pt=d===void 0?!0:d,g=i.altAxis,wt=g===void 0?!0:g,bt=i.fallbackPlacements,nt=i.padding,tt=i.boundary,it=i.rootBoundary,kt=i.altBoundary,rt=i.flipVariations,p=rt===void 0?!0:rt,dt=i.allowedAutoPlacements,r=t.options.placement,gt=b(r),ni=gt===r,ti=bt||(ni||!p?[pr(r)]:tp(r)),c=[r].concat(ti).reduce(function(n,i){return n.concat(b(i)===lr?np(t,{placement:i,boundary:tt,rootBoundary:it,padding:nt,flipVariations:p,allowedAutoPlacements:dt}):i)},[]),ii=t.rects.reference,ri=t.rects.popper,ut=new Map,ft=!0,l=c[0];for(a=0;a=0,ht=st?"width":"height",w=fi(t,{placement:e,boundary:tt,rootBoundary:it,altBoundary:kt,padding:nt}),v=st?ot?s:f:ot?o:u;if(ii[ht]>ri[ht]&&(v=pr(v)),ct=pr(v),h=[],pt&&h.push(w[et]<=0),wt&&h.push(w[v]<=0,w[ct]<=0),h.every(function(n){return n})){l=e;ft=!1;break}ut.set(e,h)}if(ft)for(lt=p?3:1,at=function(n){var t=c.find(function(t){var i=ut.get(t);if(i)return i.slice(0,n).every(function(n){return n})});if(t)return l=t,"break"},y=lt;y>0;y--)if(vt=at(y),vt==="break")break;t.placement!==l&&(t.modifiersData[k]._skip=!0,t.placement=l,t.reset=!0)}}function vs(n,t,i){return i===void 0&&(i={x:0,y:0}),{top:n.top-t.height-i.y,right:n.right-t.width+i.x,bottom:n.bottom-t.height+i.y,left:n.left-t.width-i.x}}function ys(n){return[u,s,o,f].some(function(t){return n[t]>=0})}function rp(n){var t=n.state,e=n.name,o=t.rects.reference,s=t.rects.popper,h=t.modifiersData.preventOverflow,c=fi(t,{elementContext:"reference"}),l=fi(t,{altBoundary:!0}),i=vs(c,o),r=vs(l,s,h),u=ys(i),f=ys(r);t.modifiersData[e]={referenceClippingOffsets:i,popperEscapeOffsets:r,isReferenceHidden:u,hasPopperEscaped:f};t.attributes.popper=Object.assign({},t.attributes.popper,{"data-popper-reference-hidden":u,"data-popper-escaped":f})}function up(n,t,i){var o=b(n),c=[f,u].indexOf(o)>=0?-1:1,h=typeof i=="function"?i(Object.assign({},t,{placement:n})):i,r=h[0],e=h[1];return r=r||0,e=(e||0)*c,[f,s].indexOf(o)>=0?{x:e,y:r}:{x:r,y:e}}function fp(n){var t=n.state,f=n.options,e=n.name,i=f.offset,o=i===void 0?[0,0]:i,r=pu.reduce(function(n,i){return n[i]=up(i,t.rects,o),n},{}),u=r[t.placement],s=u.x,h=u.y;t.modifiersData.popperOffsets!=null&&(t.modifiersData.popperOffsets.x+=s,t.modifiersData.popperOffsets.y+=h);t.modifiersData[e]=r}function ep(n){var t=n.state,i=n.name;t.modifiersData[i]=ls({reference:t.rects.reference,element:t.rects.popper,strategy:"absolute",placement:t.placement})}function op(n){return n==="x"?"y":"x"}function sp(n){var t=n.state,h=n.options,hi=n.name,rt=h.mainAxis,ut=rt===void 0?!0:rt,et=h.altAxis,ot=et===void 0?!1:et,ci=h.boundary,li=h.rootBoundary,ai=h.altBoundary,vi=h.padding,st=h.tether,c=st===void 0?!0:st,ht=h.tetherOffset,w=ht===void 0?0:ht,a=fi(t,{boundary:ci,rootBoundary:li,padding:vi,altBoundary:ai}),yi=b(t.placement),k=ui(t.placement),ct=!k,i=ku(yi),d=op(i),r=t.modifiersData.popperOffsets,l=t.rects.reference,g=t.rects.popper,v=typeof w=="function"?w(Object.assign({},t.rects,{placement:t.placement})):w,nt={x:0,y:0},it;if(r){if(ut||ot){var lt=i==="y"?u:f,at=i==="y"?o:s,e=i==="y"?"height":"width",vt=r[i],pt=r[i]+a[lt],wt=r[i]-a[at],bt=c?-g[e]/2:0,bi=k===yt?l[e]:g[e],ki=k===yt?-g[e]:-l[e],kt=t.elements.arrow,di=c&&kt?bu(kt):{width:0,height:0},dt=t.modifiersData["arrow#persistent"]?t.modifiersData["arrow#persistent"].padding:go(),gt=dt[lt],ni=dt[at],y=yr(0,l[e],di[e]),gi=ct?l[e]/2-bt-y-gt-v:bi-y-gt-v,nr=ct?-l[e]/2+bt+y+ni+v:ki+y+ni+v,tt=t.elements.arrow&&pi(t.elements.arrow),tr=tt?i==="y"?tt.clientTop||0:tt.clientLeft||0:0,ti=t.modifiersData.offset?t.modifiersData.offset[t.placement][i]:0,ii=r[i]+gi-ti-tr,ri=r[i]+nr-ti;if(ut&&(it=yr(c?wi(pt,ii):pt,vt,c?ft(wt,ri):wt),r[i]=it,nt[i]=it-vt),ot){var ir=i==="x"?u:f,rr=i==="x"?o:s,p=r[d],ei=p+a[ir],oi=p-a[rr],si=yr(c?wi(ei,ii):ei,p,c?ft(oi,ri):oi);r[d]=si;nt[d]=si-p}}t.modifiersData[hi]=nt}}function hp(n){return{scrollLeft:n.scrollLeft,scrollTop:n.scrollTop}}function cp(n){return n!==y(n)&&c(n)?hp(n):nf(n)}function lp(n){var t=n.getBoundingClientRect(),i=t.width/n.offsetWidth||1,r=t.height/n.offsetHeight||1;return i!==1||r!==1}function ap(n,t,i){var f;i===void 0&&(i=!1);f=c(t);c(t)&&lp(t);var e=ut(t),u=ri(n),o={scrollLeft:0,scrollTop:0},r={x:0,y:0};return!f&&(f||i)||((w(t)!=="body"||rf(e))&&(o=cp(t)),c(t)?(r=ri(t),r.x+=t.clientLeft,r.y+=t.clientTop):e&&(r.x=tf(e))),{x:u.left+o.scrollLeft-r.x,y:u.top+o.scrollTop-r.y,width:u.width,height:u.height}}function vp(n){function u(n){t.add(n.name);var f=[].concat(n.requires||[],n.requiresIfExists||[]);f.forEach(function(n){if(!t.has(n)){var r=i.get(n);r&&u(r)}});r.push(n)}var i=new Map,t=new Set,r=[];return n.forEach(function(n){i.set(n.name,n)}),n.forEach(function(n){t.has(n.name)||u(n)}),r}function yp(n){var t=vp(n);return po.reduce(function(n,i){return n.concat(t.filter(function(n){return n.phase===i}))},[])}function pp(n){var t;return function(){return t||(t=new Promise(function(i){Promise.resolve().then(function(){t=undefined;i(n())})})),t}}function wp(n){var t=n.reduce(function(n,t){var i=n[t.name];return n[t.name]=i?Object.assign({},i,t,{options:Object.assign({},i.options,t.options),data:Object.assign({},i.data,t.data)}):t,n},{});return Object.keys(t).map(function(n){return t[n]})}function ks(){for(var t=arguments.length,i=new Array(t),n=0;n{lk(n,e)||i.removeAttribute(n.nodeName)})}return r.body.innerHTML}var is,us,bi,es,os,ef;const rl=1e6,ul=1e3,fu="transitionend",fl=n=>n===null||n===undefined?`${n}`:{}.toString.call(n).match(/\s([a-z]+)/i)[1].toLowerCase(),el=n=>{do n+=Math.floor(Math.random()*rl);while(document.getElementById(n));return n},gf=n=>{let t=n.getAttribute("data-bs-target");if(!t||t==="#"){let i=n.getAttribute("href");if(!i||!i.includes("#")&&!i.startsWith("."))return null;i.includes("#")&&!i.startsWith("#")&&(i=`#${i.split("#")[1]}`);t=i&&i!=="#"?i.trim():null}return t},eu=n=>{const t=gf(n);return t?document.querySelector(t)?t:null:null},tt=n=>{const t=gf(n);return t?document.querySelector(t):null},ol=n=>{if(!n)return 0;let{transitionDuration:t,transitionDelay:i}=window.getComputedStyle(n);const r=Number.parseFloat(t),u=Number.parseFloat(i);return!r&&!u?0:(t=t.split(",")[0],i=i.split(",")[0],(Number.parseFloat(t)+Number.parseFloat(i))*ul)},ne=n=>{n.dispatchEvent(new Event(fu))},ot=n=>!n||typeof n!="object"?!1:(typeof n.jquery!="undefined"&&(n=n[0]),typeof n.nodeType!="undefined"),it=n=>ot(n)?n.jquery?n[0]:n:typeof n=="string"&&n.length>0?document.querySelector(n):null,p=(n,t,i)=>{Object.keys(i).forEach(r=>{const f=i[r],u=t[r],e=u&&ot(u)?"element":fl(u);if(!new RegExp(f).test(e))throw new TypeError(`${n.toUpperCase()}: Option "${r}" provided type "${e}" but expected type "${f}".`);})},ci=n=>!ot(n)||n.getClientRects().length===0?!1:getComputedStyle(n).getPropertyValue("visibility")==="visible",st=n=>!n||n.nodeType!==Node.ELEMENT_NODE?!0:n.classList.contains("disabled")?!0:typeof n.disabled!="undefined"?n.disabled:n.hasAttribute("disabled")&&n.getAttribute("disabled")!=="false",te=n=>{if(!document.documentElement.attachShadow)return null;if(typeof n.getRootNode=="function"){const t=n.getRootNode();return t instanceof ShadowRoot?t:null}return n instanceof ShadowRoot?n:n.parentNode?te(n.parentNode):null},fr=()=>{},kt=n=>{n.offsetHeight},ie=()=>{const{jQuery:n}=window;return n&&!document.body.hasAttribute("data-bs-no-jquery")?n:null},ou=[],sl=n=>{document.readyState==="loading"?(ou.length||document.addEventListener("DOMContentLoaded",()=>{ou.forEach(n=>n())}),ou.push(n)):n()},r=()=>document.documentElement.dir==="rtl",h=n=>{sl(()=>{const t=ie();if(t){const i=n.NAME,r=t.fn[i];t.fn[i]=n.jQueryInterface;t.fn[i].Constructor=n;t.fn[i].noConflict=()=>(t.fn[i]=r,n.jQueryInterface)}})},ht=n=>{typeof n=="function"&&n()},re=(n,t,i=true)=>{if(!i){ht(n);return}const f=ol(t)+5;let r=!1;const u=({target:i})=>{i===t&&(r=!0,t.removeEventListener(fu,u),ht(n))};t.addEventListener(fu,u);setTimeout(()=>{r||ne(t)},f)},ue=(n,t,i,r)=>{let u=n.indexOf(t);if(u===-1)return n[!i&&r?n.length-1:0];const f=n.length;return u+=i?1:-1,r&&(u=(u+f)%f),n[Math.max(0,Math.min(u,f-1))]},hl=/[^.]*(?=\..*)\.|.*/,cl=/\..*/,ll=/::\d+$/,su={};let fe=1;const al={mouseenter:"mouseover",mouseleave:"mouseout"},vl=/^(mouseenter|mouseleave)/i,ee=new Set(["click","dblclick","mouseup","mousedown","contextmenu","mousewheel","DOMMouseScroll","mouseover","mouseout","mousemove","selectstart","selectend","keydown","keypress","keyup","orientationchange","touchstart","touchmove","touchend","touchcancel","pointerdown","pointermove","pointerup","pointerleave","pointercancel","gesturestart","gesturechange","gestureend","focus","blur","change","reset","select","submit","focusin","focusout","load","unload","beforeunload","resize","move","DOMContentLoaded","readystatechange","error","abort","scroll"]);const n={on(n,t,i,r){le(n,t,i,r,!1)},one(n,t,i,r){le(n,t,i,r,!0)},off(n,t,i,r){if(typeof t=="string"&&n){const[s,e,f]=ce(t,i,r),h=f!==t,u=se(n),c=t.startsWith(".");if(typeof e!="undefined"){if(!u||!u[f])return;hu(n,u,f,e,s?i:null);return}c&&Object.keys(u).forEach(i=>{wl(n,u,i,t.slice(1))});const o=u[f]||{};Object.keys(o).forEach(i=>{const r=i.replace(ll,"");if(!h||t.includes(r)){const t=o[i];hu(n,u,f,t.originalHandler,t.delegationSelector)}})}},trigger(n,t,i){if(typeof t!="string"||!n)return null;const f=ie(),e=ae(t),c=t!==e,l=ee.has(e);let u,o=!0,s=!0,h=!1,r=null;return c&&f&&(u=f.Event(t,i),f(n).trigger(u),o=!u.isPropagationStopped(),s=!u.isImmediatePropagationStopped(),h=u.isDefaultPrevented()),l?(r=document.createEvent("HTMLEvents"),r.initEvent(e,o,!0)):r=new CustomEvent(t,{bubbles:o,cancelable:!0}),typeof i!="undefined"&&Object.keys(i).forEach(n=>{Object.defineProperty(r,n,{get(){return i[n]}})}),h&&r.preventDefault(),s&&n.dispatchEvent(r),r.defaultPrevented&&typeof u!="undefined"&&u.preventDefault(),r}},rt=new Map,li={set(n,t,i){rt.has(n)||rt.set(n,new Map);const r=rt.get(n);if(!r.has(t)&&r.size!==0){console.error(`Bootstrap doesn't allow more than one instance per element. Bound instance: ${Array.from(r.keys())[0]}.`);return}r.set(t,i)},get(n,t){return rt.has(n)?rt.get(n).get(t)||null:null},remove(n,t){if(rt.has(n)){const i=rt.get(n);i.delete(t);i.size===0&&rt.delete(n)}}},bl="5.1.3";class v{constructor(n){(n=it(n),n)&&(this._element=n,li.set(this._element,this.constructor.DATA_KEY,this))}dispose(){li.remove(this._element,this.constructor.DATA_KEY);n.off(this._element,this.constructor.EVENT_KEY);Object.getOwnPropertyNames(this).forEach(n=>{this[n]=null})}_queueCallback(n,t,i=true){re(n,t,i)}static getInstance(n){return li.get(it(n),this.DATA_KEY)}static getOrCreateInstance(n,t={}){return this.getInstance(n)||new this(n,typeof t=="object"?t:null)}static get VERSION(){return bl}static get NAME(){throw new Error('You have to implement the static method "NAME", for each component!');}static get DATA_KEY(){return`bs.${this.NAME}`}static get EVENT_KEY(){return`.${this.DATA_KEY}`}}const er=(t,i="hide")=>{const u=`click.dismiss${t.EVENT_KEY}`,r=t.NAME;n.on(document,u,`[data-bs-dismiss="${r}"]`,function(n){if(["A","AREA"].includes(this.tagName)&&n.preventDefault(),!st(this)){const u=tt(this)||this.closest(`.${r}`),f=t.getOrCreateInstance(u);f[i]()}})},kl="alert",ve=`.${"bs.alert"}`,dl=`close${ve}`,gl=`closed${ve}`,na="fade",ta="show";class or extends v{static get NAME(){return kl}close(){const t=n.trigger(this._element,dl);if(!t.defaultPrevented){this._element.classList.remove(ta);const i=this._element.classList.contains(na);this._queueCallback(()=>this._destroyElement(),this._element,i)}}_destroyElement(){this._element.remove();n.trigger(this._element,gl);this.dispose()}static jQueryInterface(n){return this.each(function(){const t=or.getOrCreateInstance(this);if(typeof n=="string"){if(t[n]===undefined||n.startsWith("_")||n==="constructor")throw new TypeError(`No method named "${n}"`);t[n](this)}})}}er(or,"close");h(or);const ia="button",ra=`.${"bs.button"}`,ua="active",ye='[data-bs-toggle="button"]',fa=`click${ra}${".data-api"}`;class sr extends v{static get NAME(){return ia}toggle(){this._element.setAttribute("aria-pressed",this._element.classList.toggle(ua))}static jQueryInterface(n){return this.each(function(){const t=sr.getOrCreateInstance(this);n==="toggle"&&t[n]()})}}n.on(document,fa,ye,n=>{n.preventDefault();const t=n.target.closest(ye),i=sr.getOrCreateInstance(t);i.toggle()});h(sr);const i={setDataAttribute(n,t,i){n.setAttribute(`data-bs-${cu(t)}`,i)},removeDataAttribute(n,t){n.removeAttribute(`data-bs-${cu(t)}`)},getDataAttributes(n){if(!n)return{};const t={};return Object.keys(n.dataset).filter(n=>n.startsWith("bs")).forEach(i=>{let r=i.replace(/^bs/,"");r=r.charAt(0).toLowerCase()+r.slice(1,r.length);t[r]=pe(n.dataset[i])}),t},getDataAttribute(n,t){return pe(n.getAttribute(`data-bs-${cu(t)}`))},offset(n){const t=n.getBoundingClientRect();return{top:t.top+window.pageYOffset,left:t.left+window.pageXOffset}},position(n){return{top:n.offsetTop,left:n.offsetLeft}}},ea=3,t={find(n,t=document.documentElement){return[].concat(...Element.prototype.querySelectorAll.call(t,n))},findOne(n,t=document.documentElement){return Element.prototype.querySelector.call(t,n)},children(n,t){return[].concat(...n.children).filter(n=>n.matches(t))},parents(n,t){const r=[];let i=n.parentNode;while(i&&i.nodeType===Node.ELEMENT_NODE&&i.nodeType!==ea)i.matches(t)&&r.push(i),i=i.parentNode;return r},prev(n,t){let i=n.previousElementSibling;while(i){if(i.matches(t))return[i];i=i.previousElementSibling}return[]},next(n,t){let i=n.nextElementSibling;while(i){if(i.matches(t))return[i];i=i.nextElementSibling}return[]},focusableChildren(n){const t=["a","button","input","textarea","select","details","[tabindex]",'[contenteditable="true"]'].map(n=>`${n}:not([tabindex^="-"])`).join(", ");return this.find(t,n).filter(n=>!st(n)&&ci(n))}},we="carousel",e=`.${"bs.carousel"}`,be=".data-api",oa=500,sa=40,ke={interval:5e3,keyboard:!0,slide:!1,pause:"hover",wrap:!0,touch:!0},ha={interval:"(number|boolean)",keyboard:"boolean",slide:"(boolean|string)",pause:"(string|boolean)",wrap:"boolean",touch:"boolean"},ct="next",lt="prev",at="left",ai="right",ca={["ArrowLeft"]:ai,["ArrowRight"]:at},la=`slide${e}`,de=`slid${e}`,aa=`keydown${e}`,va=`mouseenter${e}`,ya=`mouseleave${e}`,pa=`touchstart${e}`,wa=`touchmove${e}`,ba=`touchend${e}`,ka=`pointerdown${e}`,da=`pointerup${e}`,ga=`dragstart${e}`,nv=`load${e}${be}`,tv=`click${e}${be}`,iv="carousel",vt="active",rv="slide",uv="carousel-item-end",fv="carousel-item-start",ev="carousel-item-next",ov="carousel-item-prev",sv="pointer-event",hv=".active",hr=".active.carousel-item",cv=".carousel-item",lv=".carousel-item img",av=".carousel-item-next, .carousel-item-prev",vv=".carousel-indicators",yv="[data-bs-target]",pv='[data-bs-ride="carousel"]',wv="touch",bv="pen";class g extends v{constructor(n,i){super(n);this._items=null;this._interval=null;this._activeElement=null;this._isPaused=!1;this._isSliding=!1;this.touchTimeout=null;this.touchStartX=0;this.touchDeltaX=0;this._config=this._getConfig(i);this._indicatorsElement=t.findOne(vv,this._element);this._touchSupported="ontouchstart"in document.documentElement||navigator.maxTouchPoints>0;this._pointerEvent=Boolean(window.PointerEvent);this._addEventListeners()}static get Default(){return ke}static get NAME(){return we}next(){this._slide(ct)}nextWhenVisible(){!document.hidden&&ci(this._element)&&this.next()}prev(){this._slide(lt)}pause(n){n||(this._isPaused=!0);t.findOne(av,this._element)&&(ne(this._element),this.cycle(!0));clearInterval(this._interval);this._interval=null}cycle(n){n||(this._isPaused=!1);this._interval&&(clearInterval(this._interval),this._interval=null);this._config&&this._config.interval&&!this._isPaused&&(this._updateInterval(),this._interval=setInterval((document.visibilityState?this.nextWhenVisible:this.next).bind(this),this._config.interval))}to(i){this._activeElement=t.findOne(hr,this._element);const r=this._getItemIndex(this._activeElement);if(!(i>this._items.length-1)&&!(i<0)){if(this._isSliding){n.one(this._element,de,()=>this.to(i));return}if(r===i){this.pause();this.cycle();return}const u=i>r?ct:lt;this._slide(u,this._items[i])}}_getConfig(n){return n={...ke,...i.getDataAttributes(this._element),...(typeof n=="object"?n:{})},p(we,n,ha),n}_handleSwipe(){const n=Math.abs(this.touchDeltaX);if(!(n<=sa)){const t=n/this.touchDeltaX;(this.touchDeltaX=0,t)&&this._slide(t>0?ai:at)}}_addEventListeners(){if(this._config.keyboard)n.on(this._element,aa,n=>this._keydown(n));if(this._config.pause==="hover"){n.on(this._element,va,n=>this.pause(n));n.on(this._element,ya,n=>this.cycle(n))}this._config.touch&&this._touchSupported&&this._addTouchEventListeners()}_addTouchEventListeners(){const i=n=>this._pointerEvent&&(n.pointerType===bv||n.pointerType===wv),r=n=>{i(n)?this.touchStartX=n.clientX:this._pointerEvent||(this.touchStartX=n.touches[0].clientX)},f=n=>{this.touchDeltaX=n.touches&&n.touches.length>1?0:n.touches[0].clientX-this.touchStartX},u=n=>{i(n)&&(this.touchDeltaX=n.clientX-this.touchStartX),this._handleSwipe(),this._config.pause==="hover"&&(this.pause(),this.touchTimeout&&clearTimeout(this.touchTimeout),this.touchTimeout=setTimeout(n=>this.cycle(n),oa+this._config.interval))};if(t.find(lv,this._element).forEach(t=>{n.on(t,ga,n=>n.preventDefault())}),this._pointerEvent){n.on(this._element,ka,n=>r(n));n.on(this._element,da,n=>u(n));this._element.classList.add(sv)}else{n.on(this._element,pa,n=>r(n));n.on(this._element,wa,n=>f(n));n.on(this._element,ba,n=>u(n))}}_keydown(n){if(!/input|textarea/i.test(n.target.tagName)){const t=ca[n.key];t&&(n.preventDefault(),this._slide(t))}}_getItemIndex(n){return this._items=n&&n.parentNode?t.find(cv,n.parentNode):[],this._items.indexOf(n)}_getItemByOrder(n,t){const i=n===ct;return ue(this._items,t,i,this._config.wrap)}_triggerSlideEvent(i,r){const u=this._getItemIndex(i),f=this._getItemIndex(t.findOne(hr,this._element));return n.trigger(this._element,la,{relatedTarget:i,direction:r,from:f,to:u})}_setActiveIndicatorElement(n){if(this._indicatorsElement){const r=t.findOne(hv,this._indicatorsElement);r.classList.remove(vt);r.removeAttribute("aria-current");const i=t.find(yv,this._indicatorsElement);for(let t=0;t{n.trigger(this._element,de,{relatedTarget:u,direction:l,from:v,to:y})};if(this._element.classList.contains(rv)){u.classList.add(s);kt(u);f.classList.add(e);u.classList.add(e);const n=()=>{u.classList.remove(e,s),u.classList.add(vt),f.classList.remove(vt,s,e),this._isSliding=!1,setTimeout(a,0)};this._queueCallback(n,f,!0)}else f.classList.remove(vt),u.classList.add(vt),this._isSliding=!1,a();h&&this.cycle()}}}_directionToOrder(n){return[ai,at].includes(n)?r()?n===at?lt:ct:n===at?ct:lt:n}_orderToDirection(n){return[ct,lt].includes(n)?r()?n===lt?at:ai:n===lt?ai:at:n}static carouselInterface(n,t){const i=g.getOrCreateInstance(n,t);let{_config:r}=i;typeof t=="object"&&(r={...r,...t});const u=typeof t=="string"?t:r.slide;if(typeof t=="number")i.to(t);else if(typeof u=="string"){if(typeof i[u]=="undefined")throw new TypeError(`No method named "${u}"`);i[u]()}else r.interval&&r.ride&&(i.pause(),i.cycle())}static jQueryInterface(n){return this.each(function(){g.carouselInterface(this,n)})}static dataApiClickHandler(n){const t=tt(this);if(t&&t.classList.contains(iv)){const u={...i.getDataAttributes(t),...i.getDataAttributes(this)},r=this.getAttribute("data-bs-slide-to");r&&(u.interval=!1);g.carouselInterface(t,u);r&&g.getInstance(t).to(r);n.preventDefault()}}}n.on(document,tv,"[data-bs-slide], [data-bs-slide-to]",g.dataApiClickHandler);n.on(window,nv,()=>{const n=t.find(pv);for(let t=0,i=n.length;tn===this._element);i!==null&&f.length&&(this._selector=i,this._triggerArray.push(u))}this._initializeChildren();this._config.parent||this._addAriaAndCollapsedClass(this._triggerArray,this._isShown());this._config.toggle&&this.toggle()}static get Default(){return to}static get NAME(){return ge}toggle(){this._isShown()?this.hide():this.show()}show(){if(!this._isTransitioning&&!this._isShown()){let r=[],u;if(this._config.parent){const n=t.find(ro,this._config.parent);r=t.find(ey,this._config.parent).filter(t=>!n.includes(t))}const f=t.findOne(this._selector);if(r.length){const n=r.find(n=>f!==n);if(u=n?gt.getInstance(n):null,u&&u._isTransitioning)return}const e=n.trigger(this._element,dv);if(!e.defaultPrevented){r.forEach(n=>{f!==n&>.getOrCreateInstance(n,{toggle:!1}).hide(),u||li.set(n,no,null)});const i=this._getDimension();this._element.classList.remove(dt);this._element.classList.add(cr);this._element.style[i]=0;this._addAriaAndCollapsedClass(this._triggerArray,!0);this._isTransitioning=!0;const o=()=>{this._isTransitioning=!1,this._element.classList.remove(cr),this._element.classList.add(dt,lu),this._element.style[i]="",n.trigger(this._element,gv)},s=i[0].toUpperCase()+i.slice(1),h=`scroll${s}`;this._queueCallback(o,this._element,!0);this._element.style[i]=`${this._element[h]}px`}}}hide(){if(!this._isTransitioning&&this._isShown()){const i=n.trigger(this._element,ny);if(!i.defaultPrevented){const t=this._getDimension();this._element.style[t]=`${this._element.getBoundingClientRect()[t]}px`;kt(this._element);this._element.classList.add(cr);this._element.classList.remove(dt,lu);const r=this._triggerArray.length;for(let n=0;n{this._isTransitioning=!1,this._element.classList.remove(cr),this._element.classList.add(dt),n.trigger(this._element,ty)};this._element.style[t]="";this._queueCallback(u,this._element,!0)}}}_isShown(n=this._element){return n.classList.contains(lu)}_getConfig(n){return n={...to,...i.getDataAttributes(this._element),...n},n.toggle=Boolean(n.toggle),n.parent=it(n.parent),p(ge,n,kv),n}_getDimension(){return this._element.classList.contains(ry)?uy:fy}_initializeChildren(){if(this._config.parent){const n=t.find(ro,this._config.parent);t.find(au,this._config.parent).filter(t=>!n.includes(t)).forEach(n=>{const t=tt(n);t&&this._addAriaAndCollapsedClass([n],this._isShown(t))})}}_addAriaAndCollapsedClass(n,t){n.length&&n.forEach(n=>{t?n.classList.remove(io):n.classList.add(io),n.setAttribute("aria-expanded",t)})}static jQueryInterface(n){return this.each(function(){const t={};typeof n=="string"&&/show|hide/.test(n)&&(t.toggle=!1);const i=gt.getOrCreateInstance(this,t);if(typeof n=="string"){if(typeof i[n]=="undefined")throw new TypeError(`No method named "${n}"`);i[n]()}})}}n.on(document,iy,au,function(n){(n.target.tagName==="A"||n.delegateTarget&&n.delegateTarget.tagName==="A")&&n.preventDefault();const i=eu(this),r=t.find(i);r.forEach(n=>{gt.getOrCreateInstance(n,{toggle:!1}).toggle()})});h(gt);var u="top",o="bottom",s="right",f="left",lr="auto",ni=[u,o,s,f],yt="start",ti="end",uo="clippingParents",vu="viewport",ii="popper",fo="reference",yu=ni.reduce(function(n,t){return n.concat([t+"-"+yt,t+"-"+ti])},[]),pu=[].concat(ni,[lr]).reduce(function(n,t){return n.concat([t,t+"-"+yt,t+"-"+ti])},[]),eo="beforeRead",oo="read",so="afterRead",ho="beforeMain",co="main",lo="afterMain",ao="beforeWrite",vo="write",yo="afterWrite",po=[eo,oo,so,ho,co,lo,ao,vo,yo];const wu={name:"applyStyles",enabled:!0,phase:"write",fn:oy,effect:sy,requires:["computeStyles"]};var ft=Math.max,wi=Math.min,vr=Math.round;is=function(n,t){return n=typeof n=="function"?n(Object.assign({},t.rects,{placement:t.placement})):n,ns(typeof n!="number"?n:ts(n,ni))};const rs={name:"arrow",enabled:!0,phase:"main",fn:ly,effect:ay,requires:["popperOffsets"],requiresIfExists:["preventOverflow"]};us={top:"auto",right:"auto",bottom:"auto",left:"auto"};const du={name:"computeStyles",enabled:!0,phase:"beforeWrite",fn:yy,data:{}};bi={passive:!0};const gu={name:"eventListeners",enabled:!0,phase:"write",fn:function(){},effect:py,data:{}};es={left:"right",right:"left",bottom:"top",top:"bottom"};os={start:"end",end:"start"};const as={name:"flip",enabled:!0,phase:"main",fn:ip,requiresIfExists:["offset"],data:{_skip:!1}};const ps={name:"hide",enabled:!0,phase:"main",requiresIfExists:["preventOverflow"],fn:rp};const ws={name:"offset",enabled:!0,phase:"main",requires:["popperOffsets"],fn:fp};const ff={name:"popperOffsets",enabled:!0,phase:"read",fn:ep,data:{}};const bs={name:"preventOverflow",enabled:!0,phase:"main",fn:sp,requiresIfExists:["offset"]};ef={placement:"bottom",modifiers:[],strategy:"absolute"};var bp=wr(),kp=[gu,ff,du,wu],dp=wr({defaultModifiers:kp}),gp=[gu,ff,du,wu,ws,as,bs,rs,ps],sf=wr({defaultModifiers:gp});const ds=Object.freeze({__proto__:null,popperGenerator:wr,detectOverflow:fi,createPopperBase:bp,createPopper:sf,createPopperLite:dp,top:u,bottom:o,right:s,left:f,auto:lr,basePlacements:ni,start:yt,end:ti,clippingParents:uo,viewport:vu,popper:ii,reference:fo,variationPlacements:yu,placements:pu,beforeRead:eo,read:oo,afterRead:so,beforeMain:ho,main:co,afterMain:lo,beforeWrite:ao,write:vo,afterWrite:yo,modifierPhases:po,applyStyles:wu,arrow:rs,computeStyles:du,eventListeners:gu,flip:as,hide:ps,offset:ws,popperOffsets:ff,preventOverflow:bs}),hf="dropdown",pt=`.${"bs.dropdown"}`,cf=".data-api",br="Escape",gs="Space",nh="Tab",lf="ArrowUp",kr="ArrowDown",nw=2,tw=new RegExp(`${lf}|${kr}|${br}`),iw=`hide${pt}`,rw=`hidden${pt}`,uw=`show${pt}`,fw=`shown${pt}`,th=`click${pt}${cf}`,ih=`keydown${pt}${cf}`,ew=`keyup${pt}${cf}`,ei="show",ow="dropup",sw="dropend",hw="dropstart",cw="navbar",di='[data-bs-toggle="dropdown"]',af=".dropdown-menu",lw=".navbar-nav",aw=".dropdown-menu .dropdown-item:not(.disabled):not(:disabled)",vw=r()?"top-end":"top-start",yw=r()?"top-start":"top-end",pw=r()?"bottom-end":"bottom-start",ww=r()?"bottom-start":"bottom-end",bw=r()?"left-start":"right-start",kw=r()?"right-start":"left-start",dw={offset:[0,2],boundary:"clippingParents",reference:"toggle",display:"dynamic",popperConfig:null,autoClose:!0},gw={offset:"(array|string|function)",boundary:"(string|element)",reference:"(string|element|object)",display:"string",popperConfig:"(null|object|function)",autoClose:"(boolean|string)"};class l extends v{constructor(n,t){super(n);this._popper=null;this._config=this._getConfig(t);this._menu=this._getMenuElement();this._inNavbar=this._detectNavbar()}static get Default(){return dw}static get DefaultType(){return gw}static get NAME(){return hf}toggle(){return this._isShown()?this.hide():this.show()}show(){if(!st(this._element)&&!this._isShown(this._menu)){const t={relatedTarget:this._element},u=n.trigger(this._element,uw,t);if(!u.defaultPrevented){const r=l.getParentFromElement(this._element);this._inNavbar?i.setDataAttribute(this._menu,"popper","none"):this._createPopper(r);"ontouchstart"in document.documentElement&&!r.closest(lw)&&[].concat(...document.body.children).forEach(t=>n.on(t,"mouseover",fr));this._element.focus();this._element.setAttribute("aria-expanded",!0);this._menu.classList.add(ei);this._element.classList.add(ei);n.trigger(this._element,fw,t)}}}hide(){if(!st(this._element)&&this._isShown(this._menu)){const n={relatedTarget:this._element};this._completeHide(n)}}dispose(){this._popper&&this._popper.destroy();super.dispose()}update(){this._inNavbar=this._detectNavbar();this._popper&&this._popper.update()}_completeHide(t){const r=n.trigger(this._element,iw,t);r.defaultPrevented||("ontouchstart"in document.documentElement&&[].concat(...document.body.children).forEach(t=>n.off(t,"mouseover",fr)),this._popper&&this._popper.destroy(),this._menu.classList.remove(ei),this._element.classList.remove(ei),this._element.setAttribute("aria-expanded","false"),i.removeDataAttribute(this._menu,"popper"),n.trigger(this._element,rw,t))}_getConfig(n){if(n={...this.constructor.Default,...i.getDataAttributes(this._element),...n},p(hf,n,this.constructor.DefaultType),typeof n.reference=="object"&&!ot(n.reference)&&typeof n.reference.getBoundingClientRect!="function")throw new TypeError(`${hf.toUpperCase()}: Option "reference" provided type "object" without a required "getBoundingClientRect" method.`);return n}_createPopper(n){if(typeof ds=="undefined")throw new TypeError("Bootstrap's dropdowns require Popper (https://popper.js.org)");let t=this._element;this._config.reference==="parent"?t=n:ot(this._config.reference)?t=it(this._config.reference):typeof this._config.reference=="object"&&(t=this._config.reference);const r=this._getPopperConfig(),u=r.modifiers.find(n=>n.name==="applyStyles"&&n.enabled===!1);this._popper=sf(t,this._menu,r);u&&i.setDataAttribute(this._menu,"popper","static")}_isShown(n=this._element){return n.classList.contains(ei)}_getMenuElement(){return t.next(this._element,af)[0]}_getPlacement(){const n=this._element.parentNode;if(n.classList.contains(sw))return bw;if(n.classList.contains(hw))return kw;const t=getComputedStyle(this._menu).getPropertyValue("--bs-position").trim()==="end";return n.classList.contains(ow)?t?yw:vw:t?ww:pw}_detectNavbar(){return this._element.closest(`.${cw}`)!==null}_getOffset(){const{offset:n}=this._config;return typeof n=="string"?n.split(",").map(n=>Number.parseInt(n,10)):typeof n=="function"?t=>n(t,this._element):n}_getPopperConfig(){const n={placement:this._getPlacement(),modifiers:[{name:"preventOverflow",options:{boundary:this._config.boundary}},{name:"offset",options:{offset:this._getOffset()}}]};return this._config.display==="static"&&(n.modifiers=[{name:"applyStyles",enabled:!1}]),{...n,...(typeof this._config.popperConfig=="function"?this._config.popperConfig(n):this._config.popperConfig)}}_selectMenuItem({key:n,target:i}){const r=t.find(aw,this._menu).filter(ci);r.length&&ue(r,i,n===kr,!r.includes(i)).focus()}static jQueryInterface(n){return this.each(function(){const t=l.getOrCreateInstance(this,n);if(typeof n=="string"){if(typeof t[n]=="undefined")throw new TypeError(`No method named "${n}"`);t[n]()}})}static clearMenus(n){if(!n||n.button!==nw&&(n.type!=="keyup"||n.key===nh)){const i=t.find(di);for(let t=0,r=i.length;tt+n);this._setElementAttributes(rh,"paddingRight",t=>t+n);this._setElementAttributes(uh,"marginRight",t=>t-n)}_disableOverFlow(){this._saveInitialAttribute(this._element,"overflow");this._element.style.overflow="hidden"}_setElementAttributes(n,t,i){const r=this.getWidth(),u=n=>{if(n===this._element||!(window.innerWidth>n.clientWidth+r)){this._saveInitialAttribute(n,t);const u=window.getComputedStyle(n)[t];n.style[t]=`${i(Number.parseFloat(u))}px`}};this._applyManipulationCallback(n,u)}reset(){this._resetElementAttributes(this._element,"overflow");this._resetElementAttributes(this._element,"paddingRight");this._resetElementAttributes(rh,"paddingRight");this._resetElementAttributes(uh,"marginRight")}_saveInitialAttribute(n,t){const r=n.style[t];r&&i.setDataAttribute(n,t,r)}_resetElementAttributes(n,t){const r=n=>{const r=i.getDataAttribute(n,t);typeof r=="undefined"?n.style.removeProperty(t):(i.removeDataAttribute(n,t),n.style[t]=r)};this._applyManipulationCallback(n,r)}_applyManipulationCallback(n,i){ot(n)?i(n):t.find(n,this._element).forEach(i)}isOverflowing(){return this.getWidth()>0}}const nb={className:"modal-backdrop",isVisible:!0,isAnimated:!1,rootElement:"body",clickCallback:null},tb={className:"string",isVisible:"boolean",isAnimated:"boolean",rootElement:"(element|string)",clickCallback:"(function|null)"},fh="backdrop",ib="fade",eh="show",oh=`mousedown.bs.${fh}`;class sh{constructor(n){this._config=this._getConfig(n);this._isAppended=!1;this._element=null}show(n){if(!this._config.isVisible){ht(n);return}this._append();this._config.isAnimated&&kt(this._getElement());this._getElement().classList.add(eh);this._emulateAnimation(()=>{ht(n)})}hide(n){if(!this._config.isVisible){ht(n);return}this._getElement().classList.remove(eh);this._emulateAnimation(()=>{this.dispose(),ht(n)})}_getElement(){if(!this._element){const n=document.createElement("div");n.className=this._config.className;this._config.isAnimated&&n.classList.add(ib);this._element=n}return this._element}_getConfig(n){return n={...nb,...(typeof n=="object"?n:{})},n.rootElement=it(n.rootElement),p(fh,n,tb),n}_append(){if(!this._isAppended){this._config.rootElement.append(this._getElement());n.on(this._getElement(),oh,()=>{ht(this._config.clickCallback)});this._isAppended=!0}}dispose(){this._isAppended&&(n.off(this._element,oh),this._element.remove(),this._isAppended=!1)}_emulateAnimation(n){re(n,this._getElement(),this._config.isAnimated)}}const rb={trapElement:null,autofocus:!0},ub={trapElement:"element",autofocus:"boolean"},fb="focustrap",dr=`.${"bs.focustrap"}`,eb=`focusin${dr}`,ob=`keydown.tab${dr}`,sb="Tab",hb="forward",hh="backward";class ch{constructor(n){this._config=this._getConfig(n);this._isActive=!1;this._lastTabNavDirection=null}activate(){const{trapElement:t,autofocus:i}=this._config;if(!this._isActive){i&&t.focus();n.off(document,dr);n.on(document,eb,n=>this._handleFocusin(n));n.on(document,ob,n=>this._handleKeydown(n));this._isActive=!0}}deactivate(){this._isActive&&(this._isActive=!1,n.off(document,dr))}_handleFocusin(n){const{target:u}=n,{trapElement:i}=this._config;if(u!==document&&u!==i&&!i.contains(u)){const r=t.focusableChildren(i);r.length===0?i.focus():this._lastTabNavDirection===hh?r[r.length-1].focus():r[0].focus()}}_handleKeydown(n){n.key===sb&&(this._lastTabNavDirection=n.shiftKey?hh:hb)}_getConfig(n){return n={...rb,...(typeof n=="object"?n:{})},p(fb,n,ub),n}}const lh="modal",a=`.${"bs.modal"}`,ah="Escape",vh={backdrop:!0,keyboard:!0,focus:!0},cb={backdrop:"(boolean|string)",keyboard:"boolean",focus:"boolean"},lb=`hide${a}`,ab=`hidePrevented${a}`,yh=`hidden${a}`,ph=`show${a}`,vb=`shown${a}`,wh=`resize${a}`,bh=`click.dismiss${a}`,kh=`keydown.dismiss${a}`,yb=`mouseup.dismiss${a}`,dh=`mousedown.dismiss${a}`,pb=`click${a}${".data-api"}`,gh="modal-open",wb="fade",nc="show",yf="modal-static",bb=".modal.show",kb=".modal-dialog",db=".modal-body";class oi extends v{constructor(n,i){super(n);this._config=this._getConfig(i);this._dialog=t.findOne(kb,this._element);this._backdrop=this._initializeBackDrop();this._focustrap=this._initializeFocusTrap();this._isShown=!1;this._ignoreBackdropClick=!1;this._isTransitioning=!1;this._scrollBar=new vf}static get Default(){return vh}static get NAME(){return lh}toggle(n){return this._isShown?this.hide():this.show(n)}show(t){if(!this._isShown&&!this._isTransitioning){const i=n.trigger(this._element,ph,{relatedTarget:t});if(!i.defaultPrevented){this._isShown=!0;this._isAnimated()&&(this._isTransitioning=!0);this._scrollBar.hide();document.body.classList.add(gh);this._adjustDialog();this._setEscapeEvent();this._setResizeEvent();n.on(this._dialog,dh,()=>{n.one(this._element,yb,n=>{n.target===this._element&&(this._ignoreBackdropClick=!0)})});this._showBackdrop(()=>this._showElement(t))}}}hide(){if(this._isShown&&!this._isTransitioning){const i=n.trigger(this._element,lb);if(!i.defaultPrevented){this._isShown=!1;const t=this._isAnimated();t&&(this._isTransitioning=!0);this._setEscapeEvent();this._setResizeEvent();this._focustrap.deactivate();this._element.classList.remove(nc);n.off(this._element,bh);n.off(this._dialog,dh);this._queueCallback(()=>this._hideModal(),this._element,t)}}}dispose(){[window,this._dialog].forEach(t=>n.off(t,a));this._backdrop.dispose();this._focustrap.deactivate();super.dispose()}handleUpdate(){this._adjustDialog()}_initializeBackDrop(){return new sh({isVisible:Boolean(this._config.backdrop),isAnimated:this._isAnimated()})}_initializeFocusTrap(){return new ch({trapElement:this._element})}_getConfig(n){return n={...vh,...i.getDataAttributes(this._element),...(typeof n=="object"?n:{})},p(lh,n,cb),n}_showElement(i){const r=this._isAnimated(),u=t.findOne(db,this._dialog);this._element.parentNode&&this._element.parentNode.nodeType===Node.ELEMENT_NODE||document.body.append(this._element);this._element.style.display="block";this._element.removeAttribute("aria-hidden");this._element.setAttribute("aria-modal",!0);this._element.setAttribute("role","dialog");this._element.scrollTop=0;u&&(u.scrollTop=0);r&&kt(this._element);this._element.classList.add(nc);const f=()=>{this._config.focus&&this._focustrap.activate(),this._isTransitioning=!1,n.trigger(this._element,vb,{relatedTarget:i})};this._queueCallback(f,this._dialog,r)}_setEscapeEvent(){if(this._isShown)n.on(this._element,kh,n=>{this._config.keyboard&&n.key===ah?(n.preventDefault(),this.hide()):this._config.keyboard||n.key!==ah||this._triggerBackdropTransition()});else n.off(this._element,kh)}_setResizeEvent(){if(this._isShown)n.on(window,wh,()=>this._adjustDialog());else n.off(window,wh)}_hideModal(){this._element.style.display="none";this._element.setAttribute("aria-hidden",!0);this._element.removeAttribute("aria-modal");this._element.removeAttribute("role");this._isTransitioning=!1;this._backdrop.hide(()=>{document.body.classList.remove(gh),this._resetAdjustments(),this._scrollBar.reset(),n.trigger(this._element,yh)})}_showBackdrop(t){n.on(this._element,bh,n=>{if(this._ignoreBackdropClick){this._ignoreBackdropClick=!1;return}n.target===n.currentTarget&&(this._config.backdrop===!0?this.hide():this._config.backdrop==="static"&&this._triggerBackdropTransition())});this._backdrop.show(t)}_isAnimated(){return this._element.classList.contains(wb)}_triggerBackdropTransition(){const u=n.trigger(this._element,ab);if(!u.defaultPrevented){const{classList:t,scrollHeight:f,style:i}=this._element,r=f>document.documentElement.clientHeight;(r||i.overflowY!=="hidden")&&!t.contains(yf)&&(r||(i.overflowY="hidden"),t.add(yf),this._queueCallback(()=>{t.remove(yf),r||this._queueCallback(()=>{i.overflowY=""},this._dialog)},this._dialog),this._element.focus())}}_adjustDialog(){const n=this._element.scrollHeight>document.documentElement.clientHeight,i=this._scrollBar.getWidth(),t=i>0;(!t&&n&&!r()||t&&!n&&r())&&(this._element.style.paddingLeft=`${i}px`);(t&&!n&&!r()||!t&&n&&r())&&(this._element.style.paddingRight=`${i}px`)}_resetAdjustments(){this._element.style.paddingLeft="";this._element.style.paddingRight=""}static jQueryInterface(n,t){return this.each(function(){const i=oi.getOrCreateInstance(this,n);if(typeof n=="string"){if(typeof i[n]=="undefined")throw new TypeError(`No method named "${n}"`);i[n](t)}})}}n.on(document,pb,'[data-bs-toggle="modal"]',function(i){const r=tt(this);["A","AREA"].includes(this.tagName)&&i.preventDefault();n.one(r,ph,t=>{if(!t.defaultPrevented)n.one(r,yh,()=>{ci(this)&&this.focus()})});const u=t.findOne(bb);u&&oi.getInstance(u).hide();const f=oi.getOrCreateInstance(r);f.toggle(this)});er(oi);h(oi);const tc="offcanvas",wt=`.${"bs.offcanvas"}`,ic=".data-api",gb=`load${wt}${ic}`,nk="Escape",rc={backdrop:!0,keyboard:!0,scroll:!1},tk={backdrop:"boolean",keyboard:"boolean",scroll:"boolean"},uc="show",ik="offcanvas-backdrop",fc=".offcanvas.show",rk=`show${wt}`,uk=`shown${wt}`,fk=`hide${wt}`,ec=`hidden${wt}`,ek=`click${wt}${ic}`,ok=`keydown.dismiss${wt}`;class bt extends v{constructor(n,t){super(n);this._config=this._getConfig(t);this._isShown=!1;this._backdrop=this._initializeBackDrop();this._focustrap=this._initializeFocusTrap();this._addEventListeners()}static get NAME(){return tc}static get Default(){return rc}toggle(n){return this._isShown?this.hide():this.show(n)}show(t){if(!this._isShown){const i=n.trigger(this._element,rk,{relatedTarget:t});if(!i.defaultPrevented){this._isShown=!0;this._element.style.visibility="visible";this._backdrop.show();this._config.scroll||(new vf).hide();this._element.removeAttribute("aria-hidden");this._element.setAttribute("aria-modal",!0);this._element.setAttribute("role","dialog");this._element.classList.add(uc);const r=()=>{this._config.scroll||this._focustrap.activate(),n.trigger(this._element,uk,{relatedTarget:t})};this._queueCallback(r,this._element,!0)}}}hide(){if(this._isShown){const t=n.trigger(this._element,fk);if(!t.defaultPrevented){this._focustrap.deactivate();this._element.blur();this._isShown=!1;this._element.classList.remove(uc);this._backdrop.hide();const i=()=>{this._element.setAttribute("aria-hidden",!0),this._element.removeAttribute("aria-modal"),this._element.removeAttribute("role"),this._element.style.visibility="hidden",this._config.scroll||(new vf).reset(),n.trigger(this._element,ec)};this._queueCallback(i,this._element,!0)}}}dispose(){this._backdrop.dispose();this._focustrap.deactivate();super.dispose()}_getConfig(n){return n={...rc,...i.getDataAttributes(this._element),...(typeof n=="object"?n:{})},p(tc,n,tk),n}_initializeBackDrop(){return new sh({className:ik,isVisible:this._config.backdrop,isAnimated:!0,rootElement:this._element.parentNode,clickCallback:()=>this.hide()})}_initializeFocusTrap(){return new ch({trapElement:this._element})}_addEventListeners(){n.on(this._element,ok,n=>{this._config.keyboard&&n.key===nk&&this.hide()})}static jQueryInterface(n){return this.each(function(){const t=bt.getOrCreateInstance(this,n);if(typeof n=="string"){if(t[n]===undefined||n.startsWith("_")||n==="constructor")throw new TypeError(`No method named "${n}"`);t[n](this)}})}}n.on(document,ek,'[data-bs-toggle="offcanvas"]',function(i){const r=tt(this);if(["A","AREA"].includes(this.tagName)&&i.preventDefault(),!st(this)){n.one(r,ec,()=>{ci(this)&&this.focus()});const u=t.findOne(fc);u&&u!==r&&bt.getInstance(u).hide();const f=bt.getOrCreateInstance(r);f.toggle(this)}});n.on(window,gb,()=>t.find(fc).forEach(n=>bt.getOrCreateInstance(n).show()));er(bt);h(bt);const sk=new Set(["background","cite","href","itemtype","longdesc","poster","src","xlink:href"]),hk=/^(?:(?:https?|mailto|ftp|tel|file|sms):|[^#&/:?]*(?:[#/?]|$))/i,ck=/^data:(?:image\/(?:bmp|gif|jpeg|jpg|png|tiff|webp)|video\/(?:mpeg|mp4|ogg|webm)|audio\/(?:mp3|oga|ogg|opus));base64,[\d+/a-z]+=*$/i,lk=(n,t)=>{const i=n.nodeName.toLowerCase();if(t.includes(i))return sk.has(i)?Boolean(hk.test(n.nodeValue)||ck.test(n.nodeValue)):!0;const r=t.filter(n=>n instanceof RegExp);for(let n=0,t=r.length;n
    <\/div>
    <\/div><\/div>',trigger:"hover focus",title:"",delay:0,html:!1,selector:!1,placement:"top",offset:[0,0],container:!1,fallbackPlacements:["top","right","bottom","left"],boundary:"clippingParents",customClass:"",sanitize:!0,sanitizeFn:null,allowList:{"*":["class","dir","id","lang","role",/^aria-[\w-]*$/i],a:["target","href","title","rel"],area:[],b:[],br:[],col:[],code:[],div:[],em:[],hr:[],h1:[],h2:[],h3:[],h4:[],h5:[],h6:[],i:[],img:["src","srcset","alt","title","width","height"],li:[],ol:[],p:[],pre:[],s:[],small:[],span:[],sub:[],sup:[],strong:[],u:[],ul:[]},popperConfig:null},bk={HIDE:`hide${k}`,HIDDEN:`hidden${k}`,SHOW:`show${k}`,SHOWN:`shown${k}`,INSERTED:`inserted${k}`,CLICK:`click${k}`,FOCUSIN:`focusin${k}`,FOCUSOUT:`focusout${k}`,MOUSEENTER:`mouseenter${k}`,MOUSELEAVE:`mouseleave${k}`},gr="fade",gi="show",nr="show",pf="out",hc=".tooltip-inner",cc=`.${"modal"}`,lc="hide.bs.modal",tr="hover",wf="focus",kk="click",dk="manual";class si extends v{constructor(n,t){if(typeof ds=="undefined")throw new TypeError("Bootstrap's tooltips require Popper (https://popper.js.org)");super(n);this._isEnabled=!0;this._timeout=0;this._hoverState="";this._activeTrigger={};this._popper=null;this._config=this._getConfig(t);this.tip=null;this._setListeners()}static get Default(){return wk}static get NAME(){return sc}static get Event(){return bk}static get DefaultType(){return yk}enable(){this._isEnabled=!0}disable(){this._isEnabled=!1}toggleEnabled(){this._isEnabled=!this._isEnabled}toggle(n){if(this._isEnabled)if(n){const t=this._initializeOnDelegatedTarget(n);t._activeTrigger.click=!t._activeTrigger.click;t._isWithActiveTrigger()?t._enter(null,t):t._leave(null,t)}else{if(this.getTipElement().classList.contains(gi)){this._leave(null,this);return}this._enter(null,this)}}dispose(){clearTimeout(this._timeout);n.off(this._element.closest(cc),lc,this._hideModalHandler);this.tip&&this.tip.remove();this._disposePopper();super.dispose()}show(){if(this._element.style.display==="none")throw new Error("Please use show on visible elements");if(this.isWithContent()&&this._isEnabled){const e=n.trigger(this._element,this.constructor.Event.SHOW),i=te(this._element),o=i===null?this._element.ownerDocument.documentElement.contains(this._element):i.contains(this._element);if(!e.defaultPrevented&&o){this.constructor.NAME==="tooltip"&&this.tip&&this.getTitle()!==this.tip.querySelector(hc).innerHTML&&(this._disposePopper(),this.tip.remove(),this.tip=null);const t=this.getTipElement(),r=el(this.constructor.NAME);t.setAttribute("id",r);this._element.setAttribute("aria-describedby",r);this._config.animation&&t.classList.add(gr);const s=typeof this._config.placement=="function"?this._config.placement.call(this,t,this._element):this._config.placement,u=this._getAttachment(s);this._addAttachmentClass(u);const{container:h}=this._config;li.set(t,this.constructor.DATA_KEY,this);this._element.ownerDocument.documentElement.contains(this.tip)||(h.append(t),n.trigger(this._element,this.constructor.Event.INSERTED));this._popper?this._popper.update():this._popper=sf(this._element,t,this._getPopperConfig(u));t.classList.add(gi);const f=this._resolvePossibleFunction(this._config.customClass);f&&t.classList.add(...f.split(" "));"ontouchstart"in document.documentElement&&[].concat(...document.body.children).forEach(t=>{n.on(t,"mouseover",fr)});const c=()=>{const t=this._hoverState;this._hoverState=null;n.trigger(this._element,this.constructor.Event.SHOWN);t===pf&&this._leave(null,this)},l=this.tip.classList.contains(gr);this._queueCallback(c,this.tip,l)}}}hide(){if(this._popper){const t=this.getTipElement(),i=()=>{this._isWithActiveTrigger()||(this._hoverState!==nr&&t.remove(),this._cleanTipClass(),this._element.removeAttribute("aria-describedby"),n.trigger(this._element,this.constructor.Event.HIDDEN),this._disposePopper())},r=n.trigger(this._element,this.constructor.Event.HIDE);if(!r.defaultPrevented){t.classList.remove(gi);"ontouchstart"in document.documentElement&&[].concat(...document.body.children).forEach(t=>n.off(t,"mouseover",fr));this._activeTrigger[kk]=!1;this._activeTrigger[wf]=!1;this._activeTrigger[tr]=!1;const u=this.tip.classList.contains(gr);this._queueCallback(i,this.tip,u);this._hoverState=""}}}update(){this._popper!==null&&this._popper.update()}isWithContent(){return Boolean(this.getTitle())}getTipElement(){if(this.tip)return this.tip;const t=document.createElement("div");t.innerHTML=this._config.template;const n=t.children[0];return this.setContent(n),n.classList.remove(gr,gi),this.tip=n,this.tip}setContent(n){this._sanitizeAndSetContent(n,this.getTitle(),hc)}_sanitizeAndSetContent(n,i,r){const u=t.findOne(r,n);if(!i&&u){u.remove();return}this.setElementContent(u,i)}setElementContent(n,t){if(n!==null){if(ot(t)){t=it(t);this._config.html?t.parentNode!==n&&(n.innerHTML="",n.append(t)):n.textContent=t.textContent;return}this._config.html?(this._config.sanitize&&(t=oc(t,this._config.allowList,this._config.sanitizeFn)),n.innerHTML=t):n.textContent=t}}getTitle(){const n=this._element.getAttribute("data-bs-original-title")||this._config.title;return this._resolvePossibleFunction(n)}updateAttachment(n){return n==="right"?"end":n==="left"?"start":n}_initializeOnDelegatedTarget(n,t){return t||this.constructor.getOrCreateInstance(n.delegateTarget,this._getDelegateConfig())}_getOffset(){const{offset:n}=this._config;return typeof n=="string"?n.split(",").map(n=>Number.parseInt(n,10)):typeof n=="function"?t=>n(t,this._element):n}_resolvePossibleFunction(n){return typeof n=="function"?n.call(this._element):n}_getPopperConfig(n){const t={placement:n,modifiers:[{name:"flip",options:{fallbackPlacements:this._config.fallbackPlacements}},{name:"offset",options:{offset:this._getOffset()}},{name:"preventOverflow",options:{boundary:this._config.boundary}},{name:"arrow",options:{element:`.${this.constructor.NAME}-arrow`}},{name:"onChange",enabled:!0,phase:"afterWrite",fn:n=>this._handlePopperPlacementChange(n)}],onFirstUpdate:n=>{n.options.placement!==n.placement&&this._handlePopperPlacementChange(n)}};return{...t,...(typeof this._config.popperConfig=="function"?this._config.popperConfig(t):this._config.popperConfig)}}_addAttachmentClass(n){this.getTipElement().classList.add(`${this._getBasicClassPrefix()}-${this.updateAttachment(n)}`)}_getAttachment(n){return pk[n.toUpperCase()]}_setListeners(){const t=this._config.trigger.split(" ");t.forEach(t=>{if(t==="click")n.on(this._element,this.constructor.Event.CLICK,this._config.selector,n=>this.toggle(n));else if(t!==dk){const i=t===tr?this.constructor.Event.MOUSEENTER:this.constructor.Event.FOCUSIN,r=t===tr?this.constructor.Event.MOUSELEAVE:this.constructor.Event.FOCUSOUT;n.on(this._element,i,this._config.selector,n=>this._enter(n));n.on(this._element,r,this._config.selector,n=>this._leave(n))}});this._hideModalHandler=()=>{this._element&&this.hide()};n.on(this._element.closest(cc),lc,this._hideModalHandler);this._config.selector?this._config={...this._config,trigger:"manual",selector:""}:this._fixTitle()}_fixTitle(){const n=this._element.getAttribute("title"),t=typeof this._element.getAttribute("data-bs-original-title");(n||t!=="string")&&(this._element.setAttribute("data-bs-original-title",n||""),!n||this._element.getAttribute("aria-label")||this._element.textContent||this._element.setAttribute("aria-label",n),this._element.setAttribute("title",""))}_enter(n,t){if(t=this._initializeOnDelegatedTarget(n,t),n&&(t._activeTrigger[n.type==="focusin"?wf:tr]=!0),t.getTipElement().classList.contains(gi)||t._hoverState===nr){t._hoverState=nr;return}if(clearTimeout(t._timeout),t._hoverState=nr,!t._config.delay||!t._config.delay.show){t.show();return}t._timeout=setTimeout(()=>{t._hoverState===nr&&t.show()},t._config.delay.show)}_leave(n,t){if(t=this._initializeOnDelegatedTarget(n,t),n&&(t._activeTrigger[n.type==="focusout"?wf:tr]=t._element.contains(n.relatedTarget)),!t._isWithActiveTrigger()){if(clearTimeout(t._timeout),t._hoverState=pf,!t._config.delay||!t._config.delay.hide){t.hide();return}t._timeout=setTimeout(()=>{t._hoverState===pf&&t.hide()},t._config.delay.hide)}}_isWithActiveTrigger(){for(const n in this._activeTrigger)if(this._activeTrigger[n])return!0;return!1}_getConfig(n){const t=i.getDataAttributes(this._element);return Object.keys(t).forEach(n=>{vk.has(n)&&delete t[n]}),n={...this.constructor.Default,...t,...(typeof n=="object"&&n?n:{})},n.container=n.container===!1?document.body:it(n.container),typeof n.delay=="number"&&(n.delay={show:n.delay,hide:n.delay}),typeof n.title=="number"&&(n.title=n.title.toString()),typeof n.content=="number"&&(n.content=n.content.toString()),p(sc,n,this.constructor.DefaultType),n.sanitize&&(n.template=oc(n.template,n.allowList,n.sanitizeFn)),n}_getDelegateConfig(){const n={};for(const t in this._config)this.constructor.Default[t]!==this._config[t]&&(n[t]=this._config[t]);return n}_cleanTipClass(){const t=this.getTipElement(),i=new RegExp(`(^|\\s)${this._getBasicClassPrefix()}\\S+`,"g"),n=t.getAttribute("class").match(i);n!==null&&n.length>0&&n.map(n=>n.trim()).forEach(n=>t.classList.remove(n))}_getBasicClassPrefix(){return ak}_handlePopperPlacementChange(n){const{state:t}=n;t&&(this.tip=t.elements.popper,this._cleanTipClass(),this._addAttachmentClass(this._getAttachment(t.placement)))}_disposePopper(){this._popper&&(this._popper.destroy(),this._popper=null)}static jQueryInterface(n){return this.each(function(){const t=si.getOrCreateInstance(this,n);if(typeof n=="string"){if(typeof t[n]=="undefined")throw new TypeError(`No method named "${n}"`);t[n]()}})}}h(si);const gk="popover",d=`.${"bs.popover"}`,nd="bs-popover",td={...si.Default,placement:"right",offset:[0,8],trigger:"click",content:"",template:'