diff --git a/Directory.Build.props b/Directory.Build.props index 6dd78ec400..52d15cad96 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -23,7 +23,7 @@ 2.4.3 - 3.0.0 + 3.1.1 \ No newline at end of file diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json index 5167f46080..0cfd2a477a 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json @@ -271,6 +271,12 @@ "PaymentDetails": "Payment Details", "PaymentProduct": "Payment Product", "ProductName": "Product Name", - "Code": "Code" + "Code": "Code", + "GenerateInvoice": "Generate Invoice", + "ExportOrganizationsToExcel": "Export to Excel", + "ThisExtensionIsNotAllowed": "This extension is not allowed.", + "TheFileIsTooLarge": "The file is too large!", + "ArticleDeletionConfirmationMessage": "Are you sure you want to hard delete this article?", + "ChooseCoverImage": "Choose a cover image..." } } diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/tr.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/tr.json index d6f086c1f6..c1253db259 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/tr.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/tr.json @@ -220,6 +220,13 @@ "PaymentDetails": "Ödeme Detayları", "PaymentProduct": "Ödeme Ürünü", "ProductName": "Ürün İsmi", - "Code": "Kod" + "Code": "Kod", + "GenerateInvoice": "Fatura Oluştur", + "ExportOrganizationsToExcel": "Excel'e aktar", + "ThisExtensionIsNotAllowed": "Bu uzantıya izin verilmiyor.", + "TheFileIsTooLarge": "Dosya çok büyük.", + "ArticleDeletionConfirmationMessage": "Bu makaleyi kalıcı olarak silmek istediğinizden emin misiniz?", + "ChooseCoverImage": "Bir kapak resmi seçin...", + "CoverImage": "Kapak Resmi" } -} \ No newline at end of file +} diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/zh-Hans.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/zh-Hans.json index 46ba210b74..40cd64838c 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/zh-Hans.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/zh-Hans.json @@ -255,6 +255,12 @@ "PaymentDetails": "付款详情", "PaymentProduct": "付款产品", "ProductName": "产品名称", - "Code": "代码" + "Code": "代码", + "GenerateInvoice": "生成发票", + "ExportOrganizationsToExcel": "将组织导出到Excel", + "ThisExtensionIsNotAllowed": "不允许此扩展名.", + "TheFileIsTooLarge": "文件过大.", + "ArticleDeletionConfirmationMessage": "您确定要硬删除这篇文章吗？", + "ChooseCoverImage": "选项一张封面图片" } } \ No newline at end of file diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json index 9b30514f03..3c2a7cc59c 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json @@ -7,7 +7,7 @@ "OrganizationNotFoundMessage": "No organization found!", "DeveloperCount": "Allocated / total developers", "QuestionCount": "Remaining / total questions", - "Unlimited": "Unlimited", + "Unlimited": "Unlimited", "Owners": "Owners", "AddMember": "Add member", "AddOwner": "Add owner", @@ -179,7 +179,9 @@ "LicenseExtendUpgradeDiff": "What is the difference between license extend and upgrade?", "LicenseExtendUpgradeDiffExplanation": "Extending: By extending/renewing your license, you will continue to get premium support and get major updates for the modules and themes. Besides, you will be able to continue creating new projects. And you will still be able to use ABP Suite which speeds up your development.
Upgrading: By upgrading your license, you will promote to a higher license plan which will allow you to get additional benefits. See the license comparison table to check the differences between the license plans.On the other hand, when you upgrade, your license expiry date will not change!To extend your license end date, you need to extend your license.", "LicenseRenewalCost": "What is the license renewal cost after 1 year?", - "LicenseRenewalCostExplanation": "You can renew (extend) your license by paying %80 of the current license price. For example; Standard ABP Team License is ${0} and renewal price of the Team License is ${1}.", + "LicenseRenewalCostExplanation": "The renewal (extend) rate of all ABP Commercial perpetual licenses is {0} of the license list price. The renewal price of the standard Team License is ${1}, standard Business License is ${2} and standard Enterprise License is ${3}. If you are already a customer, log into your account to review the available renewal pricing.", + "HowDoIRenewMyLicense": "How do I renew my license?", + "HowDoIRenewMyLicenseExplanation": "You can renew your license by navigating to the organization management page. In order to take advantage of our discounted Early Renewal rates, make sure you renew before your license expires. Don't worry about not knowing when your Early Renewal opportunity closes, however. You'll receive 2 reminder e-mails before your subscription expires. We'll send them at 30 days, 7 days before expiration.", "IsSourceCodeIncluded": "Does my license include the source code of the commercial modules and themes?", "IsSourceCodeIncludedExplanation1": "Depends on the license type you've purchased:", "IsSourceCodeIncludedExplanation2": "Team: Your solution uses the modules and the themes as NuGet and NPM packages. It doesn't include their source code. In this way, you can easily upgrade these modules and themes whenever a new version is available. However, you can not get the source code of the modules and the themes.", @@ -188,7 +190,7 @@ "ChangingDevelopers": "Can I change the registered developers of my organization in the future?", "ChangingDevelopersExplanation": "In addition to add new developers to your license, you can also change the existing developers (you can remove a developer and add a new one to the same seat) without any additional cost.", "WhatHappensWhenLicenseEnds": "What happens when my license period ends?", - "WhatHappensWhenLicenseEndsExplanation1": "ABP Commercial has perpetual license type.After your license expires, you can continue developing your project. And you are not obliged to renew your license. After your license expires;", + "WhatHappensWhenLicenseEndsExplanation1": "ABP Commercial license type is perpetual license. After your license expires, you can continue developing your project. And you are not obliged to renew your license. Your license comes with a one-year Updates and Support plan out of the box. To continue to receive new features, performance enhancements, bug fixes, support and continue to use ABP Suite, make sure to renew your plan each year. When your license expires, you will not be able to get more of the following benefits;", "WhatHappensWhenLicenseEndsExplanation2": "You can not create new solutions using the ABP Commercial, but you can continue to develop your existing applications forever.", "WhatHappensWhenLicenseEndsExplanation3": "You will be able to get updates for the modules and themes within your MAJOR version. For example; if you are using v3.2.0 of a module, you can still get updates for v3.x.x (v3.3.0, v3.5.2... etc.) of that module. But you cannot get updates for the next major version (like v4.x, v5.x)", "WhatHappensWhenLicenseEndsExplanation4": "You can not install new modules and themes added to the ABP Commercial platform after your license ends.", @@ -228,7 +230,7 @@ "HowCanIRefundVatExplanation2": "Log in into your 2Checkout account", "HowCanIRefundVatExplanation3": "Find the appropriate order and press \"Refund Belated VAT\" (enter your VAT ID)", "HowCanIGetMyInvoice": "How can I get my invoice?", - "HowCanIGetMyInvoiceExplanation": "There are 2 payment gateways for purchasing a license: PayU and 2Checkout. If you purchase your license through 2Checkout gateway, it sends the PDF invoice to your email address, see 2Checkout invoicing. If you purchase through the PayU gateway or via bank wire transfer, we will prepare and send your invoice. You can request your invoice from the organization management page.", + "HowCanIGetMyInvoiceExplanation": "There are 2 payment gateways for purchasing a license: PayU and 2Checkout. If you purchase your license through 2Checkout gateway, it sends the PDF invoice to your email address, see 2Checkout invoicing. If you purchase through the PayU gateway or via bank wire transfer, we will prepare and send your invoice. You can request your invoice from the organization management page.", "Forum": "Forum", "SupportExplanation": "ABP Commercial licenses provides a premium forum support by a team consists of the ABP Framework experts.", "PrivateTicket": "Private Ticket", 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 789e377e9d..e92e55bf6c 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/zh-Hans.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/zh-Hans.json @@ -179,7 +179,9 @@ "LicenseExtendUpgradeDiff": "许可扩展和升级有什么区别?", "LicenseExtendUpgradeDiffExplanation": "扩展: 通过扩展/更新许可,你将继续获得高级支持,并获得有关模块和主题的重大更新. 此外你将能够继续创建新项目. 而且你仍然可以使用ABP Suite来加快开发速度.
升级: 通过升级许可,你将升级到更高的许可计划,这将使你获得更多好处. 查看 许可比较表来检查许可计划之间的差异. 另一方面,当你升级时你的许可到期日期不会改变!要延长你的许可终止日期,你需要延长你的许可.", "LicenseRenewalCost": "一年后的许可续期费用是多少?", - "LicenseRenewalCostExplanation": "你可以通过支付当前许可价格的%80来续订(扩展)你的许可. 例如; 标准ABP团队许可为 ${0} 续订价格是 ${1}.", + "LicenseRenewalCostExplanation": "ABP商业版的续费价格均为原价的{0}. Team版本的续费价格是${1}, Business版本的续订价格是${2}, Enterprise版本的续订价格是${3}. 如果你已经购买了, 请登录帐户以查看续订价格.", + "HowDoIRenewMyLicense": "如何续费我的许可证?", + "HowDoIRenewMyLicenseExplanation": "你可以登录以进行续费. 为了享受我们的续费折扣, 请确保在许可证到期之前进行续费, 我们会在到期前7天和30天发送2封续费提醒邮件.", "IsSourceCodeIncluded": "我的许可是否包括商业模块和主题的源代码?", "IsSourceCodeIncludedExplanation1": "取决于你购买的许可类型:", "IsSourceCodeIncludedExplanation2": "团队: 你的解决方案将这些模块和主题作为NuGet和NPM包使用. 它不包括其源代码. 这样,只要有新版本可用,你就可以轻松升级这些模块和主题. 但是,你无法获取模块和主题的源代码.", @@ -228,7 +230,7 @@ "HowCanIRefundVatExplanation2": "登录到你的2Checkout账户", "HowCanIRefundVatExplanation3": "找到适当的订单,然后按\"退还已延期的增值税\"（输入你的增值税ID", "HowCanIGetMyInvoice": "我如何获得发票?", - "HowCanIGetMyInvoiceExplanation": "有两个用于购买许可的支付网关:PayU和2Checkout. 如果你通过2Checkout网关购买许可,则它将PDF发票发送到你的电子邮件地址,请参阅2Checkout发票.如果你是通过PayU网关或通过银行电汇购买的,我们将准备并发送你的发票. 你可以从组织管理页面索取发票.", + "HowCanIGetMyInvoiceExplanation": "有两个用于购买许可的支付网关:PayU和2Checkout. 如果你通过2Checkout网关购买许可,则它将PDF发票发送到你的电子邮件地址,请参阅2Checkout发票.如果你是通过PayU网关或通过银行电汇购买的,我们将准备并发送你的发票. 你可以从组织管理页面索取发票.", "Forum": "论坛", "SupportExplanation": "ABP商业版许可包含由ABP框架专家组成的团队提供的高级论坛支持.", "PrivateTicket": "私有票", diff --git a/common.props b/common.props index 987fa421a4..a62f5b67b2 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ - latest - 4.4.0 + latest + 4.4.0 $(NoWarn);CS1591;CS0436 https://abp.io/assets/abp_nupkg.png https://abp.io/ diff --git a/docs/en/CLI-New-Command-Samples.md b/docs/en/CLI-New-Command-Samples.md index 8ddd985e85..eedf03353c 100644 --- a/docs/en/CLI-New-Command-Samples.md +++ b/docs/en/CLI-New-Command-Samples.md @@ -167,7 +167,7 @@ ABP CLI always uses the latest version. In order to create a solution from a pre ## Choose database management system -The default database management system (DBMS) is `Entity Framework Core` / ` SQL Server`. You can choose a DBMS by passing `--database-management-system` parameter. Accepted values are `SqlServer`, `MySQL`, `SQLite`, `Oracle-Devart`, `PostgreSQL`. The default value is `SqlServer`. +The default database management system (DBMS) is `Entity Framework Core` / ` SQL Server`. You can choose a DBMS by passing `--database-management-system` parameter. [Accepted values](https://github.com/abpframework/abp/blob/dev/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/DatabaseManagementSystem.cs) are `SqlServer`, `MySQL`, `SQLite`, `Oracle`, `Oracle-Devart`, `PostgreSQL`. The default value is `SqlServer`. * Angular UI, **PostgreSQL** database, creates the project in a new folder: diff --git a/docs/en/Caching.md b/docs/en/Caching.md index 7dbf02d875..13129bbc95 100644 --- a/docs/en/Caching.md +++ b/docs/en/Caching.md @@ -262,7 +262,7 @@ Distributed cache service provides an interesting feature. Assume that you've up ### IDistributedCacheSerializer -`IDistributedCacheSerializer` service is used to serialize and deserialize the cache items. Default implementation is the `Utf8JsonDistributedCacheSerializer` class that uses `IJsonSerializer` service to convert objects to [JSON](Json.md) and vice verse. Then it uses UTC8 encoding to convert the JSON string to a byte array which is accepted by the distributed cache. +`IDistributedCacheSerializer` service is used to serialize and deserialize the cache items. Default implementation is the `Utf8JsonDistributedCacheSerializer` class that uses `IJsonSerializer` service to convert objects to [JSON](Json-Serialization.md) and vice verse. Then it uses UTC8 encoding to convert the JSON string to a byte array which is accepted by the distributed cache. You can [replace](Dependency-Injection.md) this service by your own implementation if you want to implement your own serialization logic. diff --git a/docs/en/Cancellation-Token-Provider.md b/docs/en/Cancellation-Token-Provider.md new file mode 100644 index 0000000000..7f7a78f8ad --- /dev/null +++ b/docs/en/Cancellation-Token-Provider.md @@ -0,0 +1,71 @@ +# Cancellation Token Provider + +A `CancellationToken` enables cooperative cancellation between threads, thread pool work items, or `Task` objects. To handle the possible cancellation of the operation, ABP Framework provides `ICancellationTokenProvider` to obtain the `CancellationToken` itself from the source. + +> To get more information about `CancellationToken`, see [Microsoft Documentation](https://docs.microsoft.com/en-us/dotnet/api/system.threading.cancellationtoken). + +## ICancellationTokenProvider + +`ICancellationTokenProvider` is an abstraction to provide `CancellationToken` for different scenarios. + +Generally, you should pass the `CancellationToken` as a parameter for your method to use it. With the `ICancellationTokenProvider` you don't need to pass `CancellationToken` for every method. `ICancellationTokenProvider` can be injected with the **dependency injection** and provides the token from it's source. + +**Example:** + +```csharp +using System.Threading.Tasks; +using Volo.Abp.DependencyInjection; +using Volo.Abp.Threading; + +namespace MyProject +{ + public class MyService : ITransientDependency + { + private readonly ICancellationTokenProvider _cancellationTokenProvider; + + public MyService(ICancellationTokenProvider cancellationTokenProvider) + { + _cancellationTokenProvider = cancellationTokenProvider; + } + + public async Task DoItAsync() + { + while (_cancellationTokenProvider.Token.IsCancellationRequested == false) + { + // ... + } + } + } +} +``` + +## Built-in providers + +- `NullCancellationTokenProvider` + + The `NullCancellationTokenProvider` is a built in provider and it supply always `CancellationToken.None`. + +- `HttpContextCancellationTokenProvider` + + The `HttpContextCancellationTokenProvider` is a built in default provider for ABP Web applications. It simply provides a `CancellationToken` that is source of the web request from the `HttpContext`. + +## Implementing the ICancellationTokenProvider + +You can easily create your CancellationTokenProvider by creating a class that implements the `ICancellationTokenProvider` interface, as shown below: + +```csharp +using System.Threading; + +namespace AbpDemo +{ + public class MyCancellationTokenProvider : ICancellationTokenProvider + { + public CancellationToken Token { get; } + + private MyCancellationTokenProvider() + { + + } + } +} +``` diff --git a/docs/en/Customizing-Application-Modules-Guide.md b/docs/en/Customizing-Application-Modules-Guide.md index 56b94ae4fc..438c087e0c 100644 --- a/docs/en/Customizing-Application-Modules-Guide.md +++ b/docs/en/Customizing-Application-Modules-Guide.md @@ -75,6 +75,7 @@ There are some low level systems that you can control entity actions, table colu Entity action extension system allows you to add a new action to the action menu for an entity on the user interface; * [Entity Action Extensions for ASP.NET Core UI](UI/AspNetCore/Entity-Action-Extensions.md) +* [Entity Action Extensions for Blazor UI](UI/Blazor/Entity-Action-Extensions.md) * [Entity Action Extensions for Angular](UI/Angular/Entity-Action-Extensions.md) #### Data Table Column Extensions @@ -82,6 +83,7 @@ Entity action extension system allows you to add a new action to the action menu Data table column extension system allows you to add a new column in the data table on the user interface; * [Data Table Column Extensions for ASP.NET Core UI](UI/AspNetCore/Data-Table-Column-Extensions.md) +* [Data Table Column Extensions for Blazor UI](UI/Blazor/Data-Table-Column-Extensions.md) * [Data Table Column Extensions for Angular](UI/Angular/Data-Table-Column-Extensions.md) #### Page Toolbar @@ -89,6 +91,7 @@ Data table column extension system allows you to add a new column in the data ta Page toolbar system allows you to add components to the toolbar of a page; * [Page Toolbar Extensions for ASP.NET Core UI](UI/AspNetCore/Page-Toolbar-Extensions.md) +* [Page Toolbar Extensions for Blazor UI](UI/Blazor/Page-Toolbar-Extensions.md) * [Page Toolbar Extensions for Angular](UI/Angular/Page-Toolbar-Extensions.md) #### Others diff --git a/docs/en/Emailing.md b/docs/en/Emailing.md index a98874165d..50e7afc213 100644 --- a/docs/en/Emailing.md +++ b/docs/en/Emailing.md @@ -94,7 +94,13 @@ Email sending uses the [setting system](Settings.md) to define settings and get * **Abp.Mailing.Smtp.EnableSsl**: A value that indicates if the SMTP server uses SSL or not ("true" or "false". Default: "false"). * **Abp.Mailing.Smtp.UseDefaultCredentials**: If true, uses default credentials instead of the provided username and password ("true" or "false". Default: "true"). -The easiest way to define these settings it to add them to the `appsettings.json` file. The [application startup template](Startup-Templates/Application.md) already has these settings in the `appsettings.json`: +Email settings can be managed from the *Settings Page* of the [Setting Management](Modules/Setting-Management.md) module: + +![email-settings](images/email-settings.png) + +> Setting Management module is already installed if you've created your solution from the ABP Startup template. + +If you don't use the Setting Management module, you can simply define the settings inside your `appsettings.json` file: ````json "Settings": { @@ -110,7 +116,7 @@ The easiest way to define these settings it to add them to the `appsettings.json } ```` -You can set/change these settings using the `ISettingManager` and store values in a database. See the [setting system document](Settings.md) to understand the setting system better. +You can set/change these settings programmatically using the `ISettingManager` and store values in a database. See the [setting system document](Settings.md) to understand the setting system better. ### Encrypt the SMTP Password diff --git a/docs/en/Entity-Framework-Core-Oracle.md b/docs/en/Entity-Framework-Core-Oracle.md index 02aaac305c..8c265149ba 100644 --- a/docs/en/Entity-Framework-Core-Oracle.md +++ b/docs/en/Entity-Framework-Core-Oracle.md @@ -4,7 +4,7 @@ This document explains how to switch to the **Oracle** database provider for **[ ABP Framework provides integrations for two different Oracle packages. See one of the following documents based on your provider decision: -* **[Volo.Abp.EntityFrameworkCore.Oracle](Entity-Framework-Core-Oracle-Official.md)** package uses the official & free oracle driver (which is **currently in beta**). +* **[Volo.Abp.EntityFrameworkCore.Oracle](Entity-Framework-Core-Oracle-Official.md)** package uses the official & free oracle driver. * **[Volo.Abp.EntityFrameworkCore.Oracle.Devart](Entity-Framework-Core-Oracle-Devart.md)** package uses the commercial (paid) driver of [Devart](https://www.devart.com/) company. > You can choose one of the package you want. If you don't know the differences of the packages, please search for it. ABP Framework only provides integrations it doesn't provide support for such 3rd-party libraries. diff --git a/docs/en/Features.md b/docs/en/Features.md index 1ec35f730a..b185eb2d74 100644 --- a/docs/en/Features.md +++ b/docs/en/Features.md @@ -326,20 +326,12 @@ if (feature != null) A feature value is available at the client side too, unless you set `IsVisibleToClients` to `false` on the feature definition. The feature values are exposed from the [Application Configuration API](API/Application-Configuration.md) and usable via some services on the UI. -### ASP.NET Core MVC / Razor Pages UI +See the following documents to learn how to check features in different UI types: -Use `abp.features` API to get the feature values. +* [ASP.NET Core MVC / Razor Pages / JavaScript API](UI/AspNetCore/JavaScript-API/Features.md) +* [Angular](UI/Angular/Features.md) -**Example: Get feature values in the JavaScript code** - -````js -var isEnabled = abp.features.values["MyApp.ExcelReporting"] === "true"; -var count = abp.features.values["MyApp.MaxProductCount"]; -```` - -### Angular UI - -See the [features](Features.md) document for the Angular UI. +**Blazor** applications can use the same `IFeatureChecker` service as explained above. ## Feature Management diff --git a/docs/en/Getting-Started-Create-Solution.md b/docs/en/Getting-Started-Create-Solution.md index aa3391adc5..8c62246010 100644 --- a/docs/en/Getting-Started-Create-Solution.md +++ b/docs/en/Getting-Started-Create-Solution.md @@ -15,12 +15,12 @@ We will use the ABP CLI to create a new ABP project. -> Alternatively, you can **create and download** projects from [ABP Framework website](https://abp.io/get-started) by easily selecting the all the options from the page. +> Alternatively, you can **create and download** projects from the [ABP Framework website](https://abp.io/get-started) by easily selecting all options from the page. Use the `new` command of the ABP CLI to create a new project: ````shell -abp new Acme.BookStore{{if UI == "NG"}} -u angular{{else if UI == "Blazor"}} -u blazor{{else if UI == "BlazorServer"}} -u blazor-server{{end}}{{if DB == "Mongo"}} -d mongodb{{end}}{{if Tiered == "Yes"}}{{if UI == "MVC"}} --tiered{{else}} --separate-identity-server{{end}}{{end}} +abp new Acme.BookStore{{if UI == "NG"}} -u angular{{else if UI == "Blazor"}} -u blazor{{else if UI == "BlazorServer"}} -u blazor-server{{end}}{{if DB == "Mongo"}} -d mongodb{{end}}{{if Tiered == "Yes"}}{{if UI == "MVC" || UI == "BlazorServer"}} --tiered{{else}} --separate-identity-server{{end}}{{end}} ```` *You can use different level of namespaces; e.g. BookStore, Acme.BookStore or Acme.Retail.BookStore.* @@ -41,6 +41,12 @@ abp new Acme.BookStore{{if UI == "NG"}} -u angular{{else if UI == "Blazor"}} -u > [ABP CLI document](./CLI.md) covers all of the available commands and options. +## Mobile Development + +If you want to include a [React Native](https://reactnative.dev/) project in your solution, add `-m react-native` (or `--mobile react-native`) argument to project creation command. This is a basic React Native startup template to develop mobile applications integrated to your ABP based backends. + +See the [Getting Started with the React Native](Getting-Started-React-Native.md) document to learn how to configure and run the React Native application. + ### The Solution Structure The solution has a layered structure (based on the [Domain Driven Design](Domain-Driven-Design.md)) and contains unit & integration test projects. See the [application template document](Startup-Templates/Application.md) to understand the solution structure in details. @@ -49,7 +55,7 @@ The solution has a layered structure (based on the [Domain Driven Design](Domain #### MongoDB Transactions -The [startup template](Startup-templates/Index.md) **disables** transactions in the `.MongoDB` project by default. If your MongoDB server supports transactions, you can enable the it in the *YourProjectMongoDbModule* class's `ConfigureServices` method: +The [startup template](Startup-templates/Index.md) **disables** transactions in the `.MongoDB` project by default. If your MongoDB server supports transactions, you can enable it in the *YourProjectMongoDbModule* class's `ConfigureServices` method: ```csharp Configure(options => diff --git a/docs/en/Getting-Started-Running-Solution.md b/docs/en/Getting-Started-Running-Solution.md index a195a4e2a2..3f508589a3 100644 --- a/docs/en/Getting-Started-Running-Solution.md +++ b/docs/en/Getting-Started-Running-Solution.md @@ -21,7 +21,7 @@ Check the **connection string** in the `appsettings.json` file under the {{if Ti ````json "ConnectionStrings": { - "Default": "Server=localhost;Database=BookStore;Trusted_Connection=True" + "Default": "Server=(LocalDb)\MSSQLLocalDB;Database=BookStore;Trusted_Connection=True" } ```` @@ -193,12 +193,6 @@ It may take a longer time for the first build. Once it finishes, it opens the An Enter **admin** as the username and **1q2w3E*** as the password to login to the application. The application is up and running. You can start developing your application based on this startup template. -## Mobile Development - -If you want to include a [React Native](https://reactnative.dev/) project in your solution, add `-m react-native` (or `--mobile react-native`) argument to project creation command. This is a basic React Native startup template to develop mobile applications integrated to your ABP based backends. - -See the [Getting Started with the React Native](Getting-Started-React-Native.md) document to learn how to configure and run the React Native application. - ## See Also * [Web Application Development Tutorial](Tutorials/Part-1.md) diff --git a/docs/en/Global-Features.md b/docs/en/Global-Features.md index a0a593288c..cfbf3f98b7 100644 --- a/docs/en/Global-Features.md +++ b/docs/en/Global-Features.md @@ -1,3 +1,117 @@ # Global Features +The purpose of the Global Feature System is to **add a module to your application but disable the features you don't want to use** (or enable only the ones you need). Notice that the features are not determined on runtime, you must select the features **on development time**. Because it will not create database tables, APIs and other stuff for unused features, which is not possible to change then on the runtime. -TODO (see [#5061](https://github.com/abpframework/abp/issues/5061) until this is documented). \ No newline at end of file +## Installation +> This package is already installed by default with the startup template. So, most of the time, you don't need to install it manually. + +### Using the ABP CLI + +Open a command line window in the folder of the project (.csproj file) and type the following command: + +```bash +abp add-package Volo.Abp.GlobalFeatures +``` + +## Implementation + +Global Feature system aims module based feature management . A module has to have own Global Features itself. + +### Define a Global Feature + +A feature class is something like that: + +```csharp +[GlobalFeatureName(Name)] +public class PaymentFeature : GlobalFeature +{ + public const string Name = "Shopping.Payment"; + + public PaymentFeature(GlobalModuleFeatures module) : base(module) + { + } +} +``` + +### Define Global Module Features + +All features of a module have to be defined in a Global Module Features class. + +```csharp +public class GlobalShoppingFeatures : GlobalModuleFeatures +{ + public const string ModuleName = "Shopping"; + + public GlobalShoppingFeatures(GlobalFeatureManager featureManager) : base(featureManager) + { + AddFeature(new PaymentFeature(this)); + // And more features... + } +} +``` + +## Usage + +### Enable/Disable Features + +Global features are managed by modules. Module Features have to be added to Modules of GlobalFeatureManager. + +```csharp +// GerOrAdd might be useful to be sure module features are added. +var shoppingGlobalFeatures = GlobalFeatureManager.Instance.Modules + .GetOrAdd( + GlobalShoppingFeatures.ModuleName, + ()=> new GlobalShoppingFeatures(GlobalFeatureManager.Instance)); + +// Able to Enable/Disable with generic type parameter. +shoppingGlobalFeatures.Enable(); +shoppingGlobalFeatures.Disable(); + +// Also able to Enable/Disable with string feature name. +shoppingGlobalFeatures.Enable(PaymentFeature.Name); +shoppingGlobalFeatures.Disable("Shopping.Payment"); +``` + +### Check if a feature is enabled + +```csharp +GlobalFeatureManager.Instance.IsEnabled() +GlobalFeatureManager.Instance.IsEnabled("Shopping.Payment") +``` + +Both methods return `bool`. + +```csharp +if (GlobalFeatureManager.Instance.IsEnabled()) +{ + // Some strong payment codes here... +} +``` + +Beside the manual check, there is `[RequiresGlobalFeature]` attribute to check it declaratively for a controller or page. ABP returns 404 if the related feature was disabled. + +```csharp +[RequiresGlobalFeature(typeof(CommentsFeature))] +public class PaymentController : AbpController +{ + // ... +} +``` + +## When to configure Global Features? +Global Features have to be configured before application startup. So best place to configuring it is `PreConfigureServices` with **OneTimeRunner** to make sure it runs one time. + +```csharp +private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner(); +public override void PreConfigureServices(ServiceConfigurationContext context) +{ + OneTimeRunner.Run(() => + { + GlobalFeatureManager.Instance.Modules.Foo().EnableAll(); + }); +} +``` + +## Features vs Global Features +[Features](Features.md) & [Global Features](Global-Features.md) are totally different systems. + +Features are used to switch on/off application feature for each tenant. So Features, only hides disabled ones, but with Global Features, disabled features pretends like never existed in application. \ No newline at end of file diff --git a/docs/en/Index.md b/docs/en/Index.md index 95052add38..cdd0908821 100644 --- a/docs/en/Index.md +++ b/docs/en/Index.md @@ -4,8 +4,9 @@ ABP Framework is a complete **infrastructure** based on the **ASP.NET Core** to ## Getting Started -* [Getting Started Guide](Getting-Started.md) is the easiest way to start a new web application with the ABP Framework. -* [Web Application Development Tutorial](Tutorials/Part-1.md) is a complete tutorial to develop a full stack web application. +* [Quick Start](Tutorials/Todo/Index.md) is a single-part, quick-start tutorial to build a simple application with the ABP Framework. Start with this tutorial if you want to quickly understand how ABP works. +* [Getting Started](Getting-Started.md) guide can be used to create and run ABP based solutions with different options and details. +* [Web Application Development Tutorial](Tutorials/Part-1.md) is a complete tutorial to develop a full stack web application with all aspects of a real-life solution. ### UI Framework Options diff --git a/docs/en/Json.md b/docs/en/Json-Serialization.md similarity index 100% rename from docs/en/Json.md rename to docs/en/Json-Serialization.md diff --git a/docs/en/Module-Entity-Extensions.md b/docs/en/Module-Entity-Extensions.md index dc23d1e663..f160f98b1a 100644 --- a/docs/en/Module-Entity-Extensions.md +++ b/docs/en/Module-Entity-Extensions.md @@ -1,9 +1,5 @@ # Module Entity Extensions -> This feature is not supported by the Blazor UI yet. - -## Introduction - Module entity extension system is a **high level** extension system that allows you to **define new properties** for existing entities of the depended modules. It automatically **adds properties to the entity, database, HTTP API and the user interface** in a single point. > The module must be developed the *Module Entity Extensions* system in mind. All the **official modules** supports this system wherever possible. diff --git a/docs/en/Modules/Blogging.md b/docs/en/Modules/Blogging.md deleted file mode 100644 index 32d2e023ea..0000000000 --- a/docs/en/Modules/Blogging.md +++ /dev/null @@ -1,3 +0,0 @@ -# Blogging Module - -TODO \ No newline at end of file diff --git a/docs/en/Modules/Client-Simulation.md b/docs/en/Modules/Client-Simulation.md deleted file mode 100644 index bc5d38e814..0000000000 --- a/docs/en/Modules/Client-Simulation.md +++ /dev/null @@ -1,3 +0,0 @@ -# Client Simulation Module - -TODO \ No newline at end of file diff --git a/docs/en/Modules/Index.md b/docs/en/Modules/Index.md index 8851f8b554..fbebf9fa0f 100644 --- a/docs/en/Modules/Index.md +++ b/docs/en/Modules/Index.md @@ -14,8 +14,6 @@ There are some **free and open source** application modules developed and mainta * [**Account**](Account.md): Provides UI for the account management and allows user to login/register to the application. * [**Audit Logging**](Audit-Logging.md): Persists audit logs to a database. * [**Background Jobs**](Background-Jobs.md): Persist background jobs when using the default background job manager. -* [**Blogging**](Blogging.md): Used to create fancy blogs. ABP's [own blog](https://blog.abp.io/) already using this module. -* [**Client Simulation**](Client-Simulation.md): A simple web UI to stress test HTTP APIs by simulating concurrent clients. * [**CMS Kit**](Cms-Kit.md): A set of reusable *Content Management System* features. * [**Docs**](Docs.md): Used to create technical documentation website. ABP's [own documentation](https://docs.abp.io) already using this module. * [**Feature Management**](Feature-Management.md): Used to persist and manage the [features](../Features.md). @@ -24,7 +22,6 @@ There are some **free and open source** application modules developed and mainta * [**Permission Management**](Permission-Management.md): Used to persist permissions. * **[Setting Management](Setting-Management.md)**: Used to persist and manage the [settings](../Settings.md). * [**Tenant Management**](Tenant-Management.md): Manages tenants for a [multi-tenant](../Multi-Tenancy.md) application. -* [**Users**](Users.md): Abstract users, so other modules can depend on this module instead of the Identity module. * [**Virtual File Explorer**](Virtual-File-Explorer.md): Provided a simple UI to view files in [virtual file system](../Virtual-File-System.md). See [the GitHub repository](https://github.com/abpframework/abp/tree/master/modules) for source code of all modules. diff --git a/docs/en/Modules/Users.md b/docs/en/Modules/Users.md deleted file mode 100644 index 1cb0f4b701..0000000000 --- a/docs/en/Modules/Users.md +++ /dev/null @@ -1,3 +0,0 @@ -# Users Module - -TODO \ No newline at end of file diff --git a/docs/en/Road-Map.md b/docs/en/Road-Map.md index 0920639106..02fba61320 100644 --- a/docs/en/Road-Map.md +++ b/docs/en/Road-Map.md @@ -1,14 +1,52 @@ # ABP Framework Road Map -You can always check the milestone planning and the prioritized backlog issues on [the GitHub repository](https://github.com/abpframework/abp/milestones) for a detailed road map. Here, a list of some major items in the backlog; +This document provides a road map, release schedule and planned features for the ABP Framework. -* CMS Kit: A set of reusable, extensible and composable Content Management System features. +## Next Versions + +### v4.4 + +This version will focus on **documentation** and **improvements** of current features. In addition, the following features are planned; + +* Publishing distributed events as transactional ([#6126](https://github.com/abpframework/abp/issues/6126)) +* Revisit the microservice demo solution ([#8385](https://github.com/abpframework/abp/issues/8385)) +* A new UI Theme alternative to the Basic Theme ([#6132](https://github.com/abpframework/abp/issues/6132)) +* Improvements and new features to the [CMS Kit](Modules/Cms-Kit.md) module ([#8380](https://github.com/abpframework/abp/issues/8380) [#8381](https://github.com/abpframework/abp/issues/8381)) +* Pre-configured test project for the [Blazor UI](UI/Blazor/Overall.md) ([#5516](https://github.com/abpframework/abp/issues/5516)) +* Razor engine support for text templating ([#8373](https://github.com/abpframework/abp/issues/8373)) + +**Planned release date**: End of Quarter 2, 2021. + +### v4.5 + +We planned to focus on v5.0 after 4.4 release. However, we may release v4.5 if we see it necessary. + +### v5.0 + +This version will focus on .NET 6 and performance improvements. + +* Upgrading to .NET 6 +* .NET Trimming compatibility +* Using source generators and reducing reflection usage +* Performance improvements +* Improving the abp.io platform +* API Versioning system: finalize & document ([#497](https://github.com/abpframework/abp/issues/497)) + +**Planned release date**: End of Quarter 4, 2021. + +> Note: v5.0 features will be more clear in the next months. We will consider to add new features from the *Backlog Items*. + +## Backlog Items + +The *Next Versions* section above shows the main focus of the planned versions. However, in each release we add new features to the core framework and the [application modules](Modules/Index.md). + +Here, a list of major items in the backlog we are considering to work on in the next versions. + +* [#2183](https://github.com/abpframework/abp/issues/2183) / Dapr integration * [#2882](https://github.com/abpframework/abp/issues/2882) / Providing a gRPC integration infrastructure (while it is [already possible](https://github.com/abpframework/abp-samples/tree/master/GrpcDemo) to create or consume gRPC endpoints for your application, we plan to create endpoints for the [standard application modules](https://docs.abp.io/en/abp/latest/Modules/Index)) -* [#236](https://github.com/abpframework/abp/issues/236) Resource based authorization system -* [#6132](https://github.com/abpframework/abp/issues/6132) A New Theme alternative to the Basic Theme -* [#1754](https://github.com/abpframework/abp/issues/1754) / Multi-lingual entities -* [#497](https://github.com/abpframework/abp/issues/497) API Versioning system finalize & document * [#633](https://github.com/abpframework/abp/issues/633) / Realtime notification system +* [#236](https://github.com/abpframework/abp/issues/236) / Resource based authorization system +* [#1754](https://github.com/abpframework/abp/issues/1754) / Multi-lingual entities * [#57](https://github.com/abpframework/abp/issues/57) / Built-in CQRS infrastructure * [#336](https://github.com/abpframework/abp/issues/336) / Health Check abstraction * [#2532](https://github.com/abpframework/abp/issues/2532), [#2564](https://github.com/abpframework/abp/issues/2465) / CosmosDB integration with EF Core and MongoDB API @@ -16,6 +54,9 @@ You can always check the milestone planning and the prioritized backlog issues o * [#162](https://github.com/abpframework/abp/issues/162) / Azure ElasticDB Integration for multitenancy * [#2296](https://github.com/abpframework/abp/issues/2296) / Feature toggling infrastructure -The backlog items are subject to change. We are adding new items and changing priorities based on the community feedbacks and goals of the project. +You can always check the milestone planning and the prioritized backlog issues on [the GitHub repository](https://github.com/abpframework/abp/milestones) for a detailed road map. The backlog items are subject to change. We are adding new items and changing priorities based on the community feedbacks and goals of the project. + +## Feature Requests Vote for your favorite feature on the related GitHub issues (and write your thoughts). You can create an issue on [the GitHub repository](https://github.com/abpframework/abp) for your feature requests, but first search in the existing issues. + diff --git a/docs/en/SMS-Sending.md b/docs/en/SMS-Sending.md index 75069aacbe..bf37814100 100644 --- a/docs/en/SMS-Sending.md +++ b/docs/en/SMS-Sending.md @@ -1,3 +1,111 @@ -# Emailing +# SMS Sending -TODO! \ No newline at end of file +The ABP Framework provides an abstraction to sending SMS. Having such an abstraction has some benefits; + +- You can then **easily change** your SMS sender without changing your application code. +- If you want to create **reusable application modules**, you don't need to make assumption about how the SMS are sent. + +## Installation + +It is suggested to use the [ABP CLI](CLI.md) to install this package. + +### Using the ABP CLI + +Open a command line window in the folder of the project (.csproj file) and type the following command: + +```bash +abp add-package Volo.Abp.Sms +``` + +### Manual Installation + +If you want to manually install; + +1. Add the [Volo.Abp.Sms](https://www.nuget.org/packages/Volo.Abp.Sms) NuGet package to your project: + +``` +Install-Package Volo.Abp.Sms +``` + +2. Add the `AbpSmsModule` to the dependency list of your module: + +```csharp +[DependsOn( + //...other dependencies + typeof(AbpSmsModule) //Add the new module dependency + )] +public class YourModule : AbpModule +{ +} +``` + +## Sending SMS + +[Inject](Dependency-Injection.md) the `ISmsSender` into any service and use the `SendAsync` method to send a SMS. + +**Example:** + +```csharp +using System.Threading.Tasks; +using Volo.Abp.DependencyInjection; +using Volo.Abp.Sms; + +namespace MyProject +{ + public class MyService : ITransientDependency + { + private readonly ISmsSender _smsSender; + + public MyService(ISmsSender smsSender) + { + _smsSender = smsSender; + } + + public async Task DoItAsync() + { + await _smsSender.SendAsync( + "+012345678901", // target phone number + "This is test sms..." // message text + ); + } + } +} +``` + +The given `SendAsync` method in the example is an extension method to send an SMS with primitive parameters. In addition, you can pass an `SmsMessage` object which has the following properties: + +- `PhoneNumber` (`string`): Target phone number +- `Text` (`string`): Message text +- `Properties` (`Dictionary`): Key-value pairs to pass custom arguments + +## NullSmsSender + +`NullSmsSender` is a the default implementation of the `ISmsSender`. It writes SMS content to the [standard logler](Logging.md), rather than actually sending the SMS. + +This class can be useful especially in development time where you generally don't want to send real SMS. **However, if you want to actually send SMS, you should implement the `ISmsSender` in your application code.** + +## Implementing the ISmsSender + +You can easily create your SMS sending implementation by creating a class that implements the `ISmsSender` interface, as shown below: + +```csharp +using System.IO; +using System.Threading.Tasks; +using Volo.Abp.Sms; +using Volo.Abp.DependencyInjection; + +namespace AbpDemo +{ + public class MyCustomSmsSender : ISmsSender, ITransientDependency + { + public async Task SendAsync(SmsMessage smsMessage) + { + // Send sms + } + } +} +``` + +## More + +[ABP Commercial](https://commercial.abp.io/) provides Twilio integration package to send SMS over [Twilio service](https://docs.abp.io/en/commercial/latest/modules/twilio-sms). diff --git a/docs/en/Timing.md b/docs/en/Timing.md index afa4abda71..790721e7a8 100644 --- a/docs/en/Timing.md +++ b/docs/en/Timing.md @@ -83,7 +83,7 @@ var normalizedDateTime = Clock.Normalize(dateTime) * `DateTime` type binding in the ASP.NET Core MVC model binding. * Saving data to and reading data from database via [Entity Framework Core](Entity-Framework-Core.md). -* Working with `DateTime` objects on [JSON deserialization](Json.md). +* Working with `DateTime` objects on [JSON deserialization](Json-Serialization.md). #### DisableDateTimeNormalization Attribute diff --git a/docs/en/Tutorials/Part-1.md b/docs/en/Tutorials/Part-1.md index 4667b8e539..26d6e51c1a 100644 --- a/docs/en/Tutorials/Part-1.md +++ b/docs/en/Tutorials/Part-1.md @@ -2,7 +2,7 @@ ````json //[doc-params] { - "UI": ["MVC","Blazor","NG"], + "UI": ["MVC","Blazor","BlazorServer","NG"], "DB": ["EF","Mongo"] } ```` diff --git a/docs/en/Tutorials/Part-10.md b/docs/en/Tutorials/Part-10.md index ec68dfe955..f0e24c4853 100644 --- a/docs/en/Tutorials/Part-10.md +++ b/docs/en/Tutorials/Part-10.md @@ -2,7 +2,7 @@ ````json //[doc-params] { - "UI": ["MVC","Blazor","NG"], + "UI": ["MVC","Blazor","BlazorServer","NG"], "DB": ["EF","Mongo"] } ```` @@ -326,6 +326,7 @@ Open the `BookAppService` interface in the `Books` folder of the `Acme.BookStore using System; using System.Collections.Generic; using System.Linq; +using System.Linq.Dynamic.Core; using System.Threading.Tasks; using Acme.BookStore.Authors; using Acme.BookStore.Permissions; @@ -387,23 +388,17 @@ namespace Acme.BookStore.Books public override async Task> GetListAsync(PagedAndSortedResultRequestDto input) { - //Set a default sorting, if not provided - if (input.Sorting.IsNullOrWhiteSpace()) - { - input.Sorting = nameof(Book.Name); - } - //Get the IQueryable from the repository var queryable = await Repository.GetQueryableAsync(); //Prepare a query to join books and authors var query = from book in queryable join author in _authorRepository on book.AuthorId equals author.Id - orderby input.Sorting //TODO: Can not sort like that! select new {book, author}; //Paging query = query + .OrderBy(NormalizeSorting(input.Sorting)) .Skip(input.SkipCount) .Take(input.MaxResultCount); @@ -435,6 +430,25 @@ namespace Acme.BookStore.Books ObjectMapper.Map, List>(authors) ); } + + private static string NormalizeSorting(string sorting) + { + if (sorting.IsNullOrEmpty()) + { + return $"book.{nameof(Book.Name)}"; + } + + if (sorting.Contains("authorName", StringComparison.OrdinalIgnoreCase)) + { + return sorting.Replace( + "authorName", + "author.Name", + StringComparison.OrdinalIgnoreCase + ); + } + + return $"book.{sorting}"; + } } } ``` @@ -1078,7 +1092,7 @@ That's all. Just run the application and try to create or edit an author. {{end}} -{{if UI == "Blazor"}} +{{if UI == "Blazor" || UI == "BlazorServer"}} ### The Book List diff --git a/docs/en/Tutorials/Part-2.md b/docs/en/Tutorials/Part-2.md index 627b55a476..5df5dae343 100644 --- a/docs/en/Tutorials/Part-2.md +++ b/docs/en/Tutorials/Part-2.md @@ -2,7 +2,7 @@ ````json //[doc-params] { - "UI": ["MVC","Blazor","NG"], + "UI": ["MVC","Blazor","BlazorServer","NG"], "DB": ["EF","Mongo"] } ```` @@ -447,7 +447,11 @@ For more information, see the [RoutesService document](../UI/Angular/Modifying-t [ABP CLI](../CLI.md) provides `generate-proxy` command that generates client proxies for your HTTP APIs to make easy to consume your HTTP APIs from the client side. Before running `generate-proxy` command, your host must be up and running. -Run the following command in the `angular` folder: +> **Warning**: There is a problem with IIS Express; it doesn't allow to connect to the application from another process. If you are using Visual Studio, select the `Acme.BookStore.HttpApi.Host` instead of IIS Express in the run button drop-down list, as shown in the figure below: + +![vs-run-without-iisexpress](images/vs-run-without-iisexpress.png) + +Once the host application is running, execute the following command in the `angular` folder: ```bash abp generate-proxy @@ -531,7 +535,7 @@ Now you can see the final result on your browser: ![Book list final result](images/bookstore-book-list.png) -{{else if UI == "Blazor"}} +{{else if UI == "Blazor" || UI == "BlazorServer"}} ## Create a Books Page diff --git a/docs/en/Tutorials/Part-3.md b/docs/en/Tutorials/Part-3.md index ec326ddb65..03daab1843 100644 --- a/docs/en/Tutorials/Part-3.md +++ b/docs/en/Tutorials/Part-3.md @@ -2,7 +2,7 @@ ````json //[doc-params] { - "UI": ["MVC","Blazor","NG"], + "UI": ["MVC","Blazor","BlazorServer","NG"], "DB": ["EF","Mongo"] } ```` @@ -709,7 +709,7 @@ Open `/src/app/book/book.component.html` and make the following changes: - @@ -844,7 +844,7 @@ Also replace ` ` with the following code p ````html - @@ -1158,7 +1158,7 @@ Clicking the "Delete" action calls the `delete` method which then shows a confir {{end}} -{{if UI == "Blazor"}} +{{if UI == "Blazor" || UI == "BlazorServer"}} ## Creating a New Book diff --git a/docs/en/Tutorials/Part-4.md b/docs/en/Tutorials/Part-4.md index 2262598544..85c6c6502e 100644 --- a/docs/en/Tutorials/Part-4.md +++ b/docs/en/Tutorials/Part-4.md @@ -2,7 +2,7 @@ ````json //[doc-params] { - "UI": ["MVC","Blazor","NG"], + "UI": ["MVC","Blazor","BlazorServer","NG"], "DB": ["EF","Mongo"] } ```` diff --git a/docs/en/Tutorials/Part-5.md b/docs/en/Tutorials/Part-5.md index 7ad9aed970..e8274116f4 100644 --- a/docs/en/Tutorials/Part-5.md +++ b/docs/en/Tutorials/Part-5.md @@ -2,7 +2,7 @@ ````json //[doc-params] { - "UI": ["MVC","Blazor","NG"], + "UI": ["MVC","Blazor","BlazorServer","NG"], "DB": ["EF","Mongo"] } ```` diff --git a/docs/en/Tutorials/Part-6.md b/docs/en/Tutorials/Part-6.md index d5df8133b7..f6601a9afd 100644 --- a/docs/en/Tutorials/Part-6.md +++ b/docs/en/Tutorials/Part-6.md @@ -2,7 +2,7 @@ ````json //[doc-params] { - "UI": ["MVC","Blazor","NG"], + "UI": ["MVC","Blazor","BlazorServer","NG"], "DB": ["EF","Mongo"] } ```` diff --git a/docs/en/Tutorials/Part-7.md b/docs/en/Tutorials/Part-7.md index e14237fd59..e359a3d22f 100644 --- a/docs/en/Tutorials/Part-7.md +++ b/docs/en/Tutorials/Part-7.md @@ -2,7 +2,7 @@ ````json //[doc-params] { - "UI": ["MVC","Blazor","NG"], + "UI": ["MVC","Blazor","BlazorServer","NG"], "DB": ["EF","Mongo"] } ```` diff --git a/docs/en/Tutorials/Part-8.md b/docs/en/Tutorials/Part-8.md index 6ab14c714c..fe8cbd2732 100644 --- a/docs/en/Tutorials/Part-8.md +++ b/docs/en/Tutorials/Part-8.md @@ -2,7 +2,7 @@ ````json //[doc-params] { - "UI": ["MVC","Blazor","NG"], + "UI": ["MVC","Blazor","BlazorServer","NG"], "DB": ["EF","Mongo"] } ```` @@ -267,7 +267,7 @@ public async Task CreateAsync(CreateAuthorDto input) ```` * `CreateAsync` requires the `BookStorePermissions.Authors.Create` permission (in addition to the `BookStorePermissions.Authors.Default` declared for the `AuthorAppService` class). -* Used the `AuthorManeger` (domain service) to create a new author. +* Used the `AuthorManager` (domain service) to create a new author. * Used the `IAuthorRepository.InsertAsync` to insert the new author to the database. * Used the `ObjectMapper` to return an `AuthorDto` representing the newly created author. @@ -566,4 +566,4 @@ Created some tests for the application service methods, which should be clear to ## The Next Part -See the [next part](Part-9.md) of this tutorial. \ No newline at end of file +See the [next part](Part-9.md) of this tutorial. diff --git a/docs/en/Tutorials/Part-9.md b/docs/en/Tutorials/Part-9.md index c7f5dc8beb..1fb4d0e703 100644 --- a/docs/en/Tutorials/Part-9.md +++ b/docs/en/Tutorials/Part-9.md @@ -2,7 +2,7 @@ ````json //[doc-params] { - "UI": ["MVC","Blazor","NG"], + "UI": ["MVC","Blazor","BlazorServer","NG"], "DB": ["EF","Mongo"] } ```` @@ -792,7 +792,7 @@ Open the `/src/app/author/author.component.html` and replace the content as belo - @@ -832,7 +832,7 @@ That's all! This is a fully working CRUD page, you can create, edit and delete a {{end}} -{{if UI == "Blazor"}} +{{if UI == "Blazor" || UI == "BlazorServer"}} ## The Author Management Page diff --git a/docs/en/Tutorials/Todo/Index.md b/docs/en/Tutorials/Todo/Index.md new file mode 100644 index 0000000000..5bbf4c8eaf --- /dev/null +++ b/docs/en/Tutorials/Todo/Index.md @@ -0,0 +1,824 @@ +# Quick Start + +````json +//[doc-params] +{ + "UI": ["MVC", "Blazor", "BlazorServer", "NG"], + "DB": ["EF", "Mongo"] +} +```` + +This is a single-part, quick-start tutorial to build a simple todo application with the ABP Framework. Here, a screenshot from the final application: + +![todo-list](todo-list.png) + +You can find source code of the completed application [here](https://github.com/abpframework/abp-samples/tree/master/TodoApp). + +## Pre-Requirements + +* An IDE (e.g. [Visual Studio](https://visualstudio.microsoft.com/vs/)) that supports [.NET 5.0+](https://dotnet.microsoft.com/download/dotnet) development. + +{{if DB=="Mongo"}} + +* [MongoDB Server 4.0+](https://docs.mongodb.com/manual/administration/install-community/) + +{{end}} + +{{if UI=="NG"}} + +* [Node v14.x](https://nodejs.org/) + +{{end}} + +## Creating a New Solution + +We will use the [ABP CLI](../../CLI.md) to create new solutions with the ABP Framework. You can run the following command in a command-line terminal to install it: + +````bash +dotnet tool install -g Volo.Abp.Cli +```` + +Then create an empty folder, open a command-line terminal and execute the following command in the terminal: + +````bash +abp new TodoApp{{if UI=="Blazor"}} -u blazor{{else if UI=="BlazorServer"}} -u blazor-server{{else if UI=="NG"}} -u angular{{end}}{{if DB=="Mongo"}} -d mongodb{{end}} +```` + +{{if UI=="NG"}} + +This will create a new solution, named *TodoApp* with `angular` and `aspnet-core` folders. Once the solution is ready, open the ASP.NET Core solution in your favorite IDE. + +{{else}} + +This will create a new solution, named *TodoApp*. Once the solution is ready, open it in your favorite IDE. + +{{end}} + +### Create the Database + +If you are using Visual Studio, right click to the `TodoApp.DbMigrator` project, select *Set as StartUp Project*, then hit *Ctrl+F5* to run it without debugging. It will create the initial database and seed the initial data. + +{{if DB=="EF"}} + +> Some IDEs (e.g. Rider) may have problems for the first run since *DbMigrator* adds the initial migration and re-compiles the project. In this case, open a command-line terminal in the folder of the `.DbMigrator` project and execute the `dotnet run` command. + +{{end}} + +### Run the Application + +{{if UI=="MVC" || UI=="BlazorServer"}} + +It is good to run the application before starting the development. Ensure the {{if UI=="BlazorServer"}}`TodoApp.Blazor`{{else}}`TodoApp.Web`{{end}} project is the startup project, then run the application (Ctrl+F5 in Visual Studio) to see the initial UI: + +{{else if UI=="Blazor"}} + +It is good to run the application before starting the development. The solution has two main applications; + +* `TodoApp.HttpApi.Host` host the server-side HTTP API. +* `TodoApp.Blazor` is the client-side Blazor WebAssembly application. + +Ensure the `TodoApp.HttpApi.Host` project is the startup project, then run the application (Ctrl+F5 in Visual Studio) to see the server-side HTTP API on the [Swagger UI](https://swagger.io/tools/swagger-ui/): + +![todo-swagger-ui-initial](todo-swagger-ui-initial.png) + +You can explore and test your HTTP API with this UI. Now, we can set the `TodoApp.Blazor` as the startup project and run it to open the actual Blazor application UI: + +{{else if UI=="NG"}} + +It is good to run the application before starting the development. The solution has two main applications; + +* `TodoApp.HttpApi.Host` (in the .NET solution) host the server-side HTTP API. +* `angular` folder contains the Angular application. + +Ensure the `TodoApp.HttpApi.Host` project is the startup project, then run the application (Ctrl+F5 in Visual Studio) to see the server-side HTTP API on the [Swagger UI](https://swagger.io/tools/swagger-ui/): + +![todo-swagger-ui-initial](todo-swagger-ui-initial.png) + +You can explore and test your HTTP API with this UI. If that works, we can run the Angular client application. + +First, run the following command to restore the NPM packages; + +````bash +npm install +```` + +It will take some time to install all the packages. Then you can run the application using the following command: + +````bash +npm start +```` + +This command takes time, but eventually runs and opens the application in your default browser: + +{{end}} + +![todo-ui-initial](todo-ui-initial.png) + +You can click to the *Login* button, use `admin` as the username and `1q2w3E*` as the password to login to the application. + +All ready. We can start the coding! + +## Domain Layer + +This application has a single [entity](../../Entities.md) and we are starting by creating it. Create a new `TodoItem` class inside the *TodoApp.Domain* project: + +````csharp +using System; +using Volo.Abp.Domain.Entities; + +namespace TodoApp +{ + public class TodoItem : BasicAggregateRoot + { + public string Text { get; set; } + } +} +```` + +`BasicAggregateRoot` is one the simplest base class to create root entities, and `Guid` is the primary key (`Id`) of the entity here. + +## Database Integration + +{{if DB=="EF"}} + +Next step is to setup the [Entity Framework Core](../../Entity-Framework-Core.md) configuration. + +### Mapping Configuration + +Open the `TodoAppDbContext` class in the `EntityFrameworkCore` folder of the *TodoApp.EntityFrameworkCore* project and add a new `DbSet` property to this class: + +````csharp +public DbSet TodoItems { get; set; } +```` + +Then open the `TodoAppDbContextModelCreatingExtensions` class in the same folder and add a mapping configuration for the `TodoItem` class as shown below: + +````csharp +public static void ConfigureTodoApp(this ModelBuilder builder) +{ + Check.NotNull(builder, nameof(builder)); + + builder.Entity(b => + { + b.ToTable("TodoItems"); + }); +} +```` + +We've mapped `TodoItem` entity to a `TodoItems` table in the database. + +### Code First Migrations + +The startup solution is configured to use Entity Framework Core [Code First Migrations](https://docs.microsoft.com/en-us/ef/core/managing-schemas/migrations). Since we've changed the database mapping configuration, we should create a new migration and apply changes to the database. + +Open a command-line terminal in the directory of the *TodoApp.EntityFrameworkCore.DbMigrations* project and type the following command: + +````bash +dotnet ef migrations add Added_TodoItem +```` + +This will add a new migration class to the project: + +![todo-efcore-migration](todo-efcore-migration.png) + +You can apply changes to the database using the following command, in the same command-line terminal: + +````bash +dotnet ef database update +```` + +> If you are using Visual Studio, you may want to use `Add-Migration Added_TodoItem` and `Update-Database` commands in the *Package Manager Console (PMC)*. In this case, ensure that {{if UI=="MVC"}}`TodoApp.Web`{{else if UI=="BlazorServer"}}`TodoApp.Blazor`{{else if UI=="Blazor" || UI=="NG"}}`TodoApp.HttpApi.Host`{{end}} is the startup project and `TodoApp.EntityFrameworkCore.DbMigrations` is the *Default Project* in PMC. + +{{else if DB=="Mongo"}} + +Next step is to setup the [MongoDB](../../MongoDB.md) configuration. Open the `TodoAppMongoDbContext` class in the `MongoDb` folder of the *TodoApp.MongoDB* project and make the following changes; + +1. Add a new property to the class: + +````csharp +public IMongoCollection TodoItems => Collection(); +```` + +2. Add the following code inside the `CreateModel` method: + +````csharp +modelBuilder.Entity(b => +{ + b.CollectionName = "TodoItems"; +}); +```` + +{{end}} + +Now, we can use ABP repositories to save and retrieve todo items, as we'll do in the next section. + +## Application Layer + +An [Application Service](../../Application-Services.md) is used to perform use cases of the application. We need to perform the following use cases; + +* Get the list of todo items +* Create a new todo item +* Delete an existing todo item + +### Application Service Interface + +We can start by defining an interface for the application service. Create a new `ITodoAppService` interface in the *TodoApp.Application.Contracts* project, as shown below: + +````csharp +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using Volo.Abp.Application.Services; + +namespace TodoApp +{ + public interface ITodoAppService : IApplicationService + { + Task> GetListAsync(); + Task CreateAsync(string text); + Task DeleteAsync(Guid id); + } +} +```` + +### Data Transfer Object + +`GetListAsync` and `CreateAsync` methods return `TodoItemDto`. Applications Services typically gets and returns DTOs ([Data Transfer Objects](../../Data-Transfer-Objects.md)) instead of entities. So, we should define the DTO class here. Create a new `TodoItemDto` class inside the *TodoApp.Application.Contracts* project: + +````csharp +using System; + +namespace TodoApp +{ + public class TodoItemDto + { + public Guid Id { get; set; } + public string Text { get; set; } + } +} +```` + +This is a very simple DTO class that matches to our `TodoItem` entity. We are ready to implement the `ITodoAppService`. + +### Application Service Implementation + +Create a `TodoAppService` class inside the *TodoApp.Application* project, as shown below: + +````csharp +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Volo.Abp.Application.Services; +using Volo.Abp.Domain.Repositories; + +namespace TodoApp +{ + public class TodoAppService : ApplicationService, ITodoAppService + { + private readonly IRepository _todoItemRepository; + + public TodoAppService(IRepository todoItemRepository) + { + _todoItemRepository = todoItemRepository; + } + + // TODO: Implement the methods here... + } +} +```` + +This class inherits from the `ApplicationService` class of the ABP Framework and implements the `ITodoAppService` that was defined before. ABP provides default generic [repositories](../../Repositories.md) for the entities. We can use them to perform the fundamental database operations. This class [injects](../../Dependency-Injection.md) `IRepository`, which is the default repository for the `TodoItem` entity. We will use it to implement the use cases described before. + +#### Getting Todo Items + +Let's start by implementing the `GetListAsync` method: + +````csharp +public async Task> GetListAsync() +{ + var items = await _todoItemRepository.GetListAsync(); + return items + .Select(item => new TodoItemDto + { + Id = item.Id, + Text = item.Text + }).ToList(); +} +```` + +We are simply getting the complete `TodoItem` list from database, mapping them to `TodoItemDto` objects and returning as the result. + +#### Creating a New Todo Item + +Next method is `CreateAsync` and we can implement it as shown below: + +````csharp +public async Task CreateAsync(string text) +{ + var todoItem = await _todoItemRepository.InsertAsync( + new TodoItem {Text = text} + ); + + return new TodoItemDto + { + Id = todoItem.Id, + Text = todoItem.Text + }; +} +```` + +Repository's `InsertAsync` method inserts the given `TodoItem` to database and returns the same `TodoItem` object. It also sets the `Id`, so we can use it on the returning object. We are simply returning a `TodoItemDto` by creating from the new `TodoItem` entity. + +#### Deleting a Todo Item + +Finally, we can implement the `DeleteAsync` as the following code block: + +````csharp +public async Task DeleteAsync(Guid id) +{ + await _todoItemRepository.DeleteAsync(id); +} +```` + +The application service is ready to be used from the UI layer. + +## User Interface Layer + +It is time to show the todo items on the UI! Before starting to write the code, it would be good to remember what we are trying to build. Here, a sample screenshot from the final UI: + +![todo-list](todo-list.png) + +> **We will keep the UI side minimal for this tutorial to make the tutorial simple and focused. See the [web application development tutorial](../Part-1.md) to build real-life pages with all aspects.** + +{{if UI=="MVC"}} + +### Index.cshtml.cs + +Open the `Index.cshtml.cs` file in the `Pages` folder of the *TodoApp.Web* project and replace the content with the following code block: + +````csharp +using System.Collections.Generic; +using System.Threading.Tasks; + +namespace TodoApp.Web.Pages +{ + public class IndexModel : TodoAppPageModel + { + public List TodoItems { get; set; } + + private readonly ITodoAppService _todoAppService; + + public IndexModel(ITodoAppService todoAppService) + { + _todoAppService = todoAppService; + } + + public async Task OnGetAsync() + { + TodoItems = await _todoAppService.GetListAsync(); + } + } +} +```` + +This class uses the `ITodoAppService` to get the list of todo items and assign the the `TodoItems` property. We will use it to render the todo items on the razor page. + +### Index.cshtml + +Open the `Index.cshtml` file in the `Pages` folder of the *TodoApp.Web* project and replace with the following content: + +````xml +@page +@model TodoApp.Web.Pages.IndexModel +@section styles { + +} +@section scripts { + +} +
+ + + + TODO LIST + + + + +
+ + +
+ + +
    + @foreach (var todoItem in Model.TodoItems) + { +
  • + @todoItem.Text +
    • + } +
+ + +
+```` + +We are using ABP's [card tag helper](../../UI/AspNetCore/Tag-Helpers/Cards.md) to create a simple card view. You could directly use the standard bootstrap HTML structure, however the ABP [tag helpers]() make it much easier and type safe. + +This page imports a CSS and a JavaScript file, so we should also create them. + +### Index.js + +Open the `Index.js` file in the `Pages` folder of the *TodoApp.Web* project and replace with the following content: + +````js +$(function () { + + // DELETING ITEMS ///////////////////////////////////////// + $('#TodoList').on('click', 'li i', function(){ + var $li = $(this).parent(); + var id = $li.attr('data-id'); + + todoApp.todo.delete(id).then(function(){ + $li.remove(); + abp.notify.info('Deleted the todo item.'); + }); + }); + + // CREATING NEW ITEMS ///////////////////////////////////// + $('#NewItemForm').submit(function(e){ + e.preventDefault(); + + var todoText = $('#NewItemText').val(); + todoApp.todo.create(todoText).then(function(result){ + $('
  • ') + .html(' ' + result.text) + .appendTo($('#TodoList')); + $('#NewItemText').val(''); + }); + }); +}); +```` + +In the first part, we are registering to click events of the trash icons near to the todo items, deleting the related item on the server and showing a notification on the UI. Also, we are removing the deleted item from DOM, so we don't need to refresh the page. + +In the second part, we are creating a new todo item on the server. If it succeed, we are then manipulating DOM to insert a new `
  • ` element to the todo list. In this way, no need to refresh the whole page after creating a new todo item. + +The interesting part here is how we communicate with the server. See the *Dynamic JavaScript Proxies & Auto API Controllers* section to understand how it works. But now, let's continue and complete the application. + +### Index.css + +As the final touch, open the `Index.css` file in the `Pages` folder of the *TodoApp.Web* project and replace with the following content: + +````css +#TodoList{ + list-style: none; + margin: 0; + padding: 0; +} + +#TodoList li { + padding: 5px; + margin: 5px 0px; + border: 1px solid #cccccc; + background-color: #f5f5f5; +} + +#TodoList li i +{ + opacity: 0.5; +} + +#TodoList li i:hover +{ + opacity: 1; + color: #ff0000; + cursor: pointer; +} +```` + +This is a simple styling for the todo page. We believe that you can do much better :) + +Now, you can run the application again to see the result. + +### Dynamic JavaScript Proxies & Auto API Controllers + +In the `Index.js` file, we've used `todoApp.todo.delete(...)` and `todoApp.todo.create(...)` functions to communicate with the server. These functions are dynamically created by the ABP Framework, thanks to the [Dynamic JavaScript Client Proxy](../../UI/AspNetCore/Dynamic-JavaScript-Proxies.md) system. They perform HTTP API calls to the server and return a promise, so you can register a callback to the `then` function as we've done above. + +However, you may ask that we haven't created any API Controller, so how server handles these requests? This question brings us the [Auto API Controller](../../API/Auto-API-Controllers.md) feature of the ABP Framework. It automatically converts the application services to API Controllers by conventions. + +If you open the [Swagger UI](https://swagger.io/tools/swagger-ui/) by entering the `/swagger` URL in your application, you can see the Todo API: + +![todo-api](todo-api.png) + +{{else if UI=="Blazor" || UI=="BlazorServer"}} + +### Index.razor.cs + +Open the `Index.razor.cs` file in the `Pages` folder of the *TodoApp.Blazor* project and replace the content with the following code block: + +````csharp +using Microsoft.AspNetCore.Components; +using System.Collections.Generic; +using System.Threading.Tasks; + +namespace TodoApp.Blazor.Pages +{ + public partial class Index + { + [Inject] + private ITodoAppService TodoAppService { get; set; } + + private List TodoItems { get; set; } = new List(); + private string NewTodoText { get; set; } + + protected async override Task OnInitializedAsync() + { + TodoItems = await TodoAppService.GetListAsync(); + } + + private async Task Create() + { + var result = await TodoAppService.CreateAsync(NewTodoText); + TodoItems.Add(result); + NewTodoText = null; + } + + private async Task Delete(TodoItemDto todoItem) + { + await TodoAppService.DeleteAsync(todoItem.Id); + await Notify.Info("Deleted the todo item."); + TodoItems.Remove(todoItem); + } + } +} +```` + +This class uses the `ITodoAppService` to perform operations for the todo items. It manipulates the `TodoItems` list after create and delete operations. In this way, we don't need to refresh the whole todo list from the server. + +{{if UI=="Blazor"}} + +See the *Dynamic C# Proxies & Auto API Controllers* section below to learn how we could inject and use the application service interface from the Blazor application which is running on the browser! But now, let's continue and complete the application. + +{{end # Blazor}} + +### Index.razor + +Open the `Index.razor` file in the `Pages` folder of the *TodoApp.Blazor* project and replace the content with the following code block: + +````xml +@page "/" +@inherits TodoAppComponentBase +
    + + + + TODO LIST + + + + +
    + + +
    + + +
      + @foreach (var todoItem in TodoItems) + { +
    • + @todoItem.Text +
      • + } +
    +     +     +
    +```` + +### Index.razor.css + +As the final touch, open the `Index.razor.css` file in the `Pages` folder of the *TodoApp.Web* project and replace with the following content: + +````css +#TodoList{ + list-style: none; + margin: 0; + padding: 0; +} + +#TodoList li { + padding: 5px; + margin: 5px 0px; + border: 1px solid #cccccc; + background-color: #f5f5f5; +} + +#TodoList li i +{ + opacity: 0.5; +} + +#TodoList li i:hover +{ + opacity: 1; + color: #ff0000; + cursor: pointer; +} +```` + +This is a simple styling for the todo page. We believe that you can do much better :) + +Now, you can run the application again to see the result. + +{{if UI=="Blazor"}} + +### Dynamic C# Proxies & Auto API Controllers + +In the `Index.razor.cs` file, we've injected (with the `[Inject]` attribute) and used the `ITodoAppService` just like using a local service. Remember that the Blazor application is running on the browser while the implementation of this application service is running on the server. + +The magic is done by the ABP Framework's [Dynamic C# Client Proxy](../../API/Dynamic-CSharp-API-Clients.md) system. It uses the standard `HttpClient` and performs HTTP API requests to the remote server. It also handles all the standard tasks for us, including authorization, JSON serialization and exception handling. + +However, you may ask that we haven't created any API Controller, so how server handles these requests? This question brings us the [Auto API Controller](../../API/Auto-API-Controllers.md) feature of the ABP Framework. It automatically converts the application services to API Controllers by conventions. + +If you run the `TodoApp.HttpApi.Host` application, you can see the Todo API: + +![todo-api](todo-api.png) + +{{end # Blazor}} + +{{else if UI=="NG"}} + +### Service Proxy Generation + +ABP provides a handy feature to automatically create client-side services to easily consume HTTP APIs provided by the server. + +You first need to run the `TodoApp.HttpApi.Host` project since the proxy generator reads API definitions from the server application. + +> **Warning**: There is a problem with IIS Express; it doesn't allow to connect to the application from another process. If you are using Visual Studio, select the `TodoApp.HttpApi.Host` instead of IIS Express in the run button drop-down list, as shown in the figure below: + +![run-without-iisexpress](run-without-iisexpress.png) + +Once you run the `TodoApp.HttpApi.Host` project, open a command-line terminal in the `angular` folder and type the following command: + +````bash +abp generate-proxy +```` + +If everything goes well, it should generate an output like shown below: + +````bash +CREATE src/app/proxy/generate-proxy.json (170978 bytes) +CREATE src/app/proxy/README.md (1000 bytes) +CREATE src/app/proxy/todo.service.ts (794 bytes) +CREATE src/app/proxy/models.ts (66 bytes) +CREATE src/app/proxy/index.ts (58 bytes) +```` + +We can then use the `todoService` to use the server-side HTTP APIs, as we'll do in the next section. + +### home.component.ts + +Open the `/angular/src/app/home/home.component.ts` file and replace its content with the following code block: + +````js +import { ToasterService } from '@abp/ng.theme.shared'; +import { Component, OnInit } from '@angular/core'; +import { TodoItemDto, TodoService } from '@proxy'; + +@Component({ + selector: 'app-home', + templateUrl: './home.component.html', + styleUrls: ['./home.component.scss'] +}) +export class HomeComponent implements OnInit { + + todoItems: TodoItemDto[]; + newTodoText: string; + + constructor( + private todoService: TodoService, + private toasterService: ToasterService) + { } + + ngOnInit(): void { + this.todoService.getList().subscribe(response => { + this.todoItems = response; + }); + } + + create(): void{ + this.todoService.create(this.newTodoText).subscribe((result) => { + this.todoItems = this.todoItems.concat(result); + this.newTodoText = null; + }); + } + + delete(id: string): void { + this.todoService.delete(id).subscribe(() => { + this.todoItems = this.todoItems.filter(item => item.id !== id); + this.toasterService.info('Deleted the todo item.'); + }); + } +} + +```` + +We've used the `todoService` to get the list of todo items and assigned the returning value to the `todoItems` array. We've also added `create` and `delete` methods. These methods will be used in the view side. + +### home.component.html + +Open the `/angular/src/app/home/home.component.html` file and replace its content with the following code block: + +````html +
    +
    +
    +
    TODO LIST
    +
    +
    + +
    + + +
    + + +
      +
    • + {%{{{ todoItem.text }}}%} +
      • +
    +
    +
    +
    +```` + +### home.component.scss + +As the final touch, open the `/angular/src/app/home/home.component.scss` file and replace its content with the following code block: + +````css +#TodoList{ + list-style: none; + margin: 0; + padding: 0; +} + +#TodoList li { + padding: 5px; + margin: 5px 0px; + border: 1px solid #cccccc; + background-color: #f5f5f5; +} + +#TodoList li i +{ + opacity: 0.5; +} + +#TodoList li i:hover +{ + opacity: 1; + color: #ff0000; + cursor: pointer; +} +```` + +This is a simple styling for the todo page. We believe that you can do much better :) + +Now, you can run the application again to see the result. + +{{end}} + +## Conclusion + +In this tutorial, we've build a very simple application to warm up to the ABP Framework. If you are looking to build a serious application, please check the [web application development tutorial](../Part-1.md) which covers all the aspects of a real-life web application development. + +## Source Code + +You can find source code of the completed application [here](https://github.com/abpframework/abp-samples/tree/master/TodoApp). + +## See Also + +* [Web Application Development Tutorial](../Part-1.md) \ No newline at end of file diff --git a/docs/en/Tutorials/Todo/run-without-iisexpress.png b/docs/en/Tutorials/Todo/run-without-iisexpress.png new file mode 100644 index 0000000000..41898e6c00 Binary files /dev/null and b/docs/en/Tutorials/Todo/run-without-iisexpress.png differ diff --git a/docs/en/Tutorials/Todo/todo-api.png b/docs/en/Tutorials/Todo/todo-api.png new file mode 100644 index 0000000000..f9a25f57b5 Binary files /dev/null and b/docs/en/Tutorials/Todo/todo-api.png differ diff --git a/docs/en/Tutorials/Todo/todo-efcore-migration.png b/docs/en/Tutorials/Todo/todo-efcore-migration.png new file mode 100644 index 0000000000..df370aebcf Binary files /dev/null and b/docs/en/Tutorials/Todo/todo-efcore-migration.png differ diff --git a/docs/en/Tutorials/Todo/todo-list.png b/docs/en/Tutorials/Todo/todo-list.png new file mode 100644 index 0000000000..e2eaf8bc46 Binary files /dev/null and b/docs/en/Tutorials/Todo/todo-list.png differ diff --git a/docs/en/Tutorials/Todo/todo-swagger-ui-initial.png b/docs/en/Tutorials/Todo/todo-swagger-ui-initial.png new file mode 100644 index 0000000000..1d3ed405c7 Binary files /dev/null and b/docs/en/Tutorials/Todo/todo-swagger-ui-initial.png differ diff --git a/docs/en/Tutorials/Todo/todo-ui-initial.png b/docs/en/Tutorials/Todo/todo-ui-initial.png new file mode 100644 index 0000000000..44be4ceaf6 Binary files /dev/null and b/docs/en/Tutorials/Todo/todo-ui-initial.png differ diff --git a/docs/en/Tutorials/images/vs-run-without-iisexpress.png b/docs/en/Tutorials/images/vs-run-without-iisexpress.png new file mode 100644 index 0000000000..03c30e2b48 Binary files /dev/null and b/docs/en/Tutorials/images/vs-run-without-iisexpress.png differ diff --git a/docs/en/UI/Angular/Entity-Action-Extensions.md b/docs/en/UI/Angular/Entity-Action-Extensions.md index fd22e293fd..1ee0a3b70a 100644 --- a/docs/en/UI/Angular/Entity-Action-Extensions.md +++ b/docs/en/UI/Angular/Entity-Action-Extensions.md @@ -180,7 +180,7 @@ Let's employ dependency injection to extend the functionality of `IdentityModule - diff --git a/docs/en/UI/Angular/How-Replaceable-Components-Work-with-Extensions.md b/docs/en/UI/Angular/How-Replaceable-Components-Work-with-Extensions.md index d942975646..147f8010a6 100644 --- a/docs/en/UI/Angular/How-Replaceable-Components-Work-with-Extensions.md +++ b/docs/en/UI/Angular/How-Replaceable-Components-Work-with-Extensions.md @@ -215,7 +215,7 @@ Open the generated `src/app/my-role/my-role.component.html` file and replace its - {%{{{ diff --git a/docs/en/UI/Angular/Modal.md b/docs/en/UI/Angular/Modal.md index f1583d4813..144f38e842 100644 --- a/docs/en/UI/Angular/Modal.md +++ b/docs/en/UI/Angular/Modal.md @@ -6,7 +6,7 @@ The `abp-modal` provides some additional benefits: - It is **flexible**. You can pass header, body, footer templates easily by adding the templates to the `abp-modal` content. It can also be implemented quickly. - Provides several inputs be able to customize the modal and several outputs be able to listen to some events. - - Automatically detects the close button which has a `#abpClose` template variable and closes the modal when pressed this button. + - Automatically detects the close button which has a `abpClose` directive attached to and closes the modal when pressed this button. - Automatically detects the `abp-button` and triggers its loading spinner when the `busy` input value of the modal component is true. - Automatically checks if the form inside the modal **has changed, but not saved**. It warns the user by displaying a [confirmation popup](Confirmation-Service) in this case when a user tries to close the modal or refresh/close the tab of the browser. @@ -47,7 +47,7 @@ You can add the `abp-modal` to your component very quickly. See an example: - + ``` @@ -116,7 +116,7 @@ See an example form inside a modal: - diff --git a/docs/en/UI/Angular/Page-Component.md b/docs/en/UI/Angular/Page-Component.md new file mode 100644 index 0000000000..a9e9857142 --- /dev/null +++ b/docs/en/UI/Angular/Page-Component.md @@ -0,0 +1,218 @@ +# Page Component + +ABP provides a component that wraps your content with some built-in components to reduce the amount of code you need to write. + +If the template of a component looks as follows, you can utilize the `abp-page` component. + +Let's look at the following example without `abp-page` component. + +`dashboard.component.ts` + +```html +
    +
    +

    {{ '::Dashboard' | abpLocalization }}

    +
    + +
    + +
    +
    + +
    + +
    +``` + +## Page Parts + +PageComponent divides the template shown above into three parts, `title`, `breadcrumb`, `toolbar`. Each can be configured separately. There, also, is an enum exported from the package that describes each part. + +```javascript +export enum PageParts { + title = 'PageTitleContainerComponent', + breadcrumb = 'PageBreadcrumbContainerComponent', + toolbar = 'PageToolbarContainerComponent', +} + +// You can import this enum from -> import { PageParts } from '@abp/ng.components/page'; +``` + +## Usage + +Firstly, you need to import `PageModule` from `@abp/ng.components/page` as follows: + +`dashboard.module.ts` + +```javascript +import { PageModule } from '@abp/ng.components/page'; +import { DashboardComponent } from './dashboard.component'; + +@NgModule({ + declarations: [DashboardComponent], + imports: [PageModule] +}) +export class DashboardModule {} +``` + +And change the template of `dashboard.component.ts` to the following: + +```html + +
    + +
    +     +``` + +## Inputs + +* title: `string`: Will be be rendered within `h1.content-header-title`. If not provided, the parent `div` will not be rendered +* breadcrumb: `boolean`: Determines whether to render `abp-breadcrumb`. Default is `true`. +* toolbar: `any`: Will be passed into `abp-page-toolbar` component through `record` input. If your page does not contain `abp-page-toolbar`, you can simply omit this field. + +## Overriding template + +If you need to replace the template of any part, you can use the following sub-components. + +```html + + +
    +

    Custom Title

    +
    +     + + +
    + +
    +     + + +
    + +
    +     +     +``` + +You do not have to provide them all. You can just use which one you need to replace. These components have priority over the inputs declared above. If you use these components, you can omit the inputs. + +## PagePartDirective + +`PageModule` provides a structural directive that is used internally within `PageComponent` and can also be used externally. + +`PageComponent` employs this directive internally as follows: + +```html +
    + +
    +``` + +It also can take a context input as follows: + +```html +
    + +
    +``` + +Its render strategy can be provided through Angular's Dependency Injection system. + +It expects a service through the `PAGE_RENDER_STRATEGY` injection token that implements the following interface. + +```javascript +interface PageRenderStrategy { + shouldRender(type?: string): boolean | Observable; + onInit?(type?: string, injector?: Injector, context?: any): void; + onDestroy?(type?: string, injector?: Injector, context?: any): void; + onContextUpdate?(change?: SimpleChange): void; +} +``` + +* `shouldRender` (required): It takes a string input named `type` and expects a `boolean` or `Observable` in return. +* `onInit` (optional): Will be called when the directive is initiated. Three inputs will be passed into this method. + * `type`: type of the page part + * `injector`: injector of the directive which could be used to retrieve anything from directive's DI tree. + * `context`: whatever context is available at the initialization phase. +* `onDestroy` (optional): Will be called when the directive is destroyed. The parameters are the same with `onInit` +* `onContextUpdate` (optional): Will be called when the context is updated. + * `change`: changes of the `context` will be passed through this method. + +Let's see everything in action. + +```javascript +import {  + PageModule, + PageRenderStrategy, + PageParts, + PAGE_RENDER_STRATEGY +} from '@abp/ng.components/page'; + +@Injectable() +export class MyPageRenderStrategy implements PageRenderStrategy { + shouldRender(type: string) { + // meaning everything but breadcrumb and custom-part will be rendered + return type !== PageParts.breadcrumb && type !== 'custom-part'; + } + + /** + * shouldRender can also return an Observable which means + * an async service can be used within. + + constructor(private service: SomeAsyncService) {} + + shouldRender(type: string) { + return this.service.checkTypeAsync(type).pipe(map(val => val.isTrue())); + } + */ + + onInit(type: string, injector: Injector, context: any) { + // this method will be called in ngOnInit of the directive + } + + onDestroy(type: string, injector: Injector, context: any) { + // this method will be called in ngOnDestroy of the directive + } + + onContextUpdate?(change?: SimpleChange) { + // this method will be called everytime context is updated within the directive + } +} + +@Component({ + selector: 'app-dashboard', + template: ` + + + + + +
    +

    Inner Title

    +
    +     + ` +}) +export class DashboardComponent {} + +@NgModule({ + imports: [PageModule], + declarations: [DashboardComponent], + providers: [ + { + provide: PAGE_RENDER_STRATEGY, + useClass: MyPageRenderStrategy, + } + ] +}) +export class DashboardModule {} +``` + +## See Also + +- [Page Toolbar Extensions for Angular UI](./Page-Page-Toolbar-Extensions.md) diff --git a/docs/en/UI/Angular/Permission-Management-Component-Replacement.md b/docs/en/UI/Angular/Permission-Management-Component-Replacement.md index 9ae712cedd..b6fcef3bb9 100644 --- a/docs/en/UI/Angular/Permission-Management-Component-Replacement.md +++ b/docs/en/UI/Angular/Permission-Management-Component-Replacement.md @@ -459,7 +459,7 @@ Open the generated `permission-management.component.html` in `src/app/permission     - {%{{{ diff --git a/docs/en/UI/Angular/Service-Proxies.md b/docs/en/UI/Angular/Service-Proxies.md index 3a10f1b6e8..18e5a3a0cc 100644 --- a/docs/en/UI/Angular/Service-Proxies.md +++ b/docs/en/UI/Angular/Service-Proxies.md @@ -10,6 +10,8 @@ To avoid manual effort, we might use a tool like [NSWAG](https://github.com/Rico ABP introduces an endpoint that exposes server-side method contracts. When the `generate-proxy` command is run, ABP CLI makes an HTTP request to this endpoint and generates better-aligned client proxies in TypeScript. It organizes folders according to namespaces, adds barrel exports, and reflects method signatures in Angular services. +> Before you start, please make sure you start the backend application with `dotnet run`. There is a [known limitation about Visual Studio](#known-limitations), so please do not run the project using its built-in web server. + Run the following command in the **root folder** of the angular application: ```bash diff --git a/docs/en/UI/AspNetCore/JavaScript-API/Ajax.md b/docs/en/UI/AspNetCore/JavaScript-API/Ajax.md index dca3105b5c..c100199d27 100644 --- a/docs/en/UI/AspNetCore/JavaScript-API/Ajax.md +++ b/docs/en/UI/AspNetCore/JavaScript-API/Ajax.md @@ -8,7 +8,7 @@ * Can **block** a UI part (or the full page) during the AJAX operation. * Allows to fully customize any AJAX call, by using the standard `$.ajax` **options**. -> While `abp.ajax` makes the AJAX call pretty easier, you typically will use the [Dynamic JavaScript Client Proxy](Dynamic-JavaScript-Client-Proxies.md) system to perform calls to your server side HTTP APIs. `abp.ajax` can be used when you need to perform low level AJAX operations. +> While `abp.ajax` makes the AJAX call pretty easier, you typically will use the [Dynamic JavaScript Client Proxy](../Dynamic-JavaScript-Proxies.md) system to perform calls to your server side HTTP APIs. `abp.ajax` can be used when you need to perform low level AJAX operations. ## Basic Usage diff --git a/docs/en/UI/AspNetCore/JavaScript-API/Dynamic-JavaScript-Client-Proxies.md b/docs/en/UI/AspNetCore/JavaScript-API/Dynamic-JavaScript-Client-Proxies.md deleted file mode 100644 index 5270852b60..0000000000 --- a/docs/en/UI/AspNetCore/JavaScript-API/Dynamic-JavaScript-Client-Proxies.md +++ /dev/null @@ -1,3 +0,0 @@ -# ASP.NET Core MVC / Razor Pages UI: Dynamic JavaScript Client Proxies - -TODO \ No newline at end of file diff --git a/docs/en/UI/Blazor/Data-Table-Column-Extensions.md b/docs/en/UI/Blazor/Data-Table-Column-Extensions.md new file mode 100644 index 0000000000..ebb2f27cbf --- /dev/null +++ b/docs/en/UI/Blazor/Data-Table-Column-Extensions.md @@ -0,0 +1,128 @@ +# Data Table Column Extensions for Blazor UI + +Data table column extension system allows you to add a **new table column** on the user interface. The example below adds a new column with the "Email Confirmed" title: + +![datatable-column-extension-](../../images/table-column-extension-example-blazor.png) + +You can use the standard column options to fine control the table column. + +> Note that this is a low level API to find control the table column. If you want to show an extension property on the table, see the [module entity extension](../../Module-Entity-Extensions.md) document. + +## How to Set Up + +### Create a C# File + +First, add a new C# file to your solution. We added inside the `/Pages/Identity/` folder of the `.Blazor` project: + +![user-action-extension-on-solution](../../images/user-action-extension-on-blazor-project.png) + +We will use the [component override system](Customization-Overriding-Components.md) in the Blazor. After creating a class inherits from the `UserManagement` component, we will override the `SetTableColumnsAsync` method and add the table column programmatically. + +Here, the content of the overridden `SetTableColumnsAsync` method. + +```csharp +protected override async ValueTask SetTableColumnsAsync() +{ + await base.SetTableColumnsAsync(); + var confirmedColumn = new TableColumn + { + Title = "Email Confirmed", + Data = nameof(IdentityUserDto.EmailConfirmed) + }; + TableColumns.Get().Add(confirmedColumn); +} +``` +Here, the entire content of the file. + +```csharp +using System.Threading.Tasks; +using Volo.Abp.AspNetCore.Components.Web.Extensibility.TableColumns; +using Volo.Abp.DependencyInjection; +using Volo.Abp.Identity; +using Volo.Abp.Identity.Blazor.Pages.Identity; + +namespace MyCompanyName.MyProjectName.Blazor.Pages.Identity +{ + [ExposeServices(typeof(UserManagement))] + [Dependency(ReplaceServices = true)] + public class CustomizedUserManagement : UserManagement + { + protected override async ValueTask SetTableColumnsAsync() + { + await base.SetTableColumnsAsync(); + var confirmedColumn = new TableColumn + { + Title = "Email Confirmed", + Data = nameof(IdentityUserDto.EmailConfirmed) + }; + TableColumns.Get().Add(confirmedColumn); + } + } +} +``` + +## Customizing Data Table Columns + +This section explains how to customize data table columns using the properties in the `TableColumn` type. + +* `Title`: Title of the column. +* `Data`: Name of the field in the supplied model. +* `Component`: Type of the component that you want to render. See the "Rendering Custom Components In The Data Table Columns" section for details. +* `Actions`: Action lists for the column. You can render additional action columns by adding actions to this collection. +* `ValueConverter`: Simple converter function that is being called before rendering the content. +* `Sortable`: A boolean field indicating whether the column is sortable or not. +* `DisplayFormat`: You can specify a custom format for the column. +* `DisplayFormatProvider` : You can provide a custom `IFormatProvider` for the column. Default value is `CultureInfo.CurrentCulture`. + +## Rendering Custom Components In The Data Table Columns + +This section explains how to render custom blazor components in data table columns. In this example, we're going to display custom icons instead of text representations of the property. + +First of all, create a blazor component. We will name it `CustomTableColumn`. + +![data-table-colum-extension-blazor-component-render-solution](../../images/data-table-colum-extension-blazor-component-render-solution.png) + +Add an object parameter named `Data`. + +```csharp +public class CustomTableColumn +{ + [Parameter] + public object Data { get; set; } +} +``` + +Navigate to the razor file and paste the following code. + +```csharp +@using System +@using Volo.Abp.Identity + +@if (Data.As().EmailConfirmed) +{ + +} +else +{ + +} +``` + +Navigate back to the `CustomizedUserManagement` class, and use `Component` property to specify the custom blazor component. + +```csharp +protected override async ValueTask SetTableColumnsAsync() +{ + await base.SetTableColumnsAsync(); + var confirmedColumn = new TableColumn + { + Title = "Email Confirmed", + Component = typeof(CustomTableColumn) + }; + TableColumns.Get().Add(confirmedColumn); +} +``` + +Run the project and you will see the icons instead of text fields. + +![data-table-colum-extension-blazor-component-render](../../images/data-table-colum-extension-blazor-component-render.png) \ No newline at end of file diff --git a/docs/en/UI/Blazor/Entity-Action-Extensions.md b/docs/en/UI/Blazor/Entity-Action-Extensions.md new file mode 100644 index 0000000000..a7a9d5ae36 --- /dev/null +++ b/docs/en/UI/Blazor/Entity-Action-Extensions.md @@ -0,0 +1,110 @@ +# Entity Action Extensions for Blazor UI + +Entity action extension system allows you to add a **new action** to the action menu for an entity. A **Click Me** action was added to the *User Management* page below: + +![user-action-extension-click-me](../../images/user-action-blazor-extension-click-me.png) + +You can take any action (open a modal, make an HTTP API call, redirect to another page... etc) by writing your custom code. You can access to the current entity in your code. + +## How to Set Up + +In this example, we will add a "Click Me!" action and execute a C# code for the user management page of the [Identity Module](../../Modules/Identity.md). + +### Create a C# File + +First, add a new C# file to your solution. We added inside the `/Pages/Identity/` folder of the `.Blazor` project: + +![user-action-extension-on-solution](../../images/user-action-extension-on-blazor-project.png) + +We will use the [component override system](Customization-Overriding-Components.md) in the Blazor. After creating a class inherits from the `UserManagement` component, we will override the `SetEntityActionsAsync` method and add the entity action programmatically. + +Here, the content of the overridden `SetEntityActionsAsync` method. + +```csharp +protected override async ValueTask SetEntityActionsAsync() +{ + await base.SetEntityActionsAsync(); + var clickMeAction = new EntityAction() + { + Text = "Click Me!", + Clicked = (data) => + { + //TODO: Write your custom code + + return Task.CompletedTask; + } + }; + + EntityActions.Get().Add(clickMeAction); +} +``` + +In the `Clicked` property, you can do anything you need. + +Here, the entire content of the file. + +```csharp +using System.Threading.Tasks; +using Volo.Abp.AspNetCore.Components.Web.Extensibility.EntityActions; +using Volo.Abp.DependencyInjection; +using Volo.Abp.Identity.Blazor.Pages.Identity; + +namespace MyCompanyName.MyProjectName.Blazor.Pages.Identity +{ + [ExposeServices(typeof(UserManagement))] + [Dependency(ReplaceServices = true)] + public class CustomizedUserManagement : UserManagement + { + protected override async ValueTask SetEntityActionsAsync() + { + await base.SetEntityActionsAsync(); + var clickMeAction = new EntityAction() + { + Text = "Click Me!", + Clicked = (data) => + { + //TODO: Write your custom code + + return Task.CompletedTask; + } + }; + EntityActions.Get().Add(clickMeAction); + } + } +} +``` + +## Customizing Entity Actions + +This section explains how to customize entity actions using the properties in the `EntityAction` type. + +Here, the list of the properties that you use in the `EntityAction`. +* `Text` : Entity action text. +* `Clicked` : Click event handler for the action. You can use the `data` parameter to access the selected item in the `DataGrid`. +* `Icon` : Icon for the action. +* `Color` : Color for the action. +* `Visible`: Visible function to determine the actions' visibility based on the data grid items individually. You can make the action invisible for some data grid items. You can also use the `data` parameter to access the selected item in the `DataGrid`. +* `Confirmation`: Confirmation message for the action. You can use the `data` parameter to access the selected item in the `DataGrid`. + +#### Example + +```csharp +var clickMeAction = new EntityAction() +{ + Text = "Click Me!", + Clicked = (data) => + { + //TODO: Write your custom code + + return Task.CompletedTask; + }, + Color = Blazorise.Color.Danger, + Icon = "fas fa-hand-point-right", + ConfirmationMessage = (data) => "Are you sure you want to click to the action?", + Visible = (data) => + { + //TODO: Write your custom visibility action + //var selectedUser = data.As(); + } +}; +``` diff --git a/docs/en/UI/Blazor/Page-Header.md b/docs/en/UI/Blazor/Page-Header.md index 2c7921bbd2..59748b717a 100644 --- a/docs/en/UI/Blazor/Page-Header.md +++ b/docs/en/UI/Blazor/Page-Header.md @@ -1,3 +1,90 @@ # Blazor UI: Page Header -TODO \ No newline at end of file +You can use the`PageHeader` component to set the page title, the breadcrumb items and the toolbar items for a page. Before using the `PageHeader` component, you need to add a using statement for the `Volo.Abp.AspNetCore.Components.Web.Theming.Layout` namespace. + +Once you add the `PageHeader` component to your page, you can control the related values using the parameters. + +## Page Title + + You can use the `Title` parameter to control the page header. + +```csharp + + +``` + +## Breadcrumb + +> **The [Basic Theme](Basic-Theme.md) currently doesn't implement the breadcrumbs.** + +Breadcrumbs can be added using the `BreadcrumbItems` property. + +**Example: Add Language Management to the breadcrumb items.** + +Create a collection of `Volo.Abp.BlazoriseUI.BreadcrumbItem` objects and set the collection to the `BreadcrumbItems` parameter. + +```csharp +public partial class Index +{ + protected List BreadcrumbItems { get; } = new(); + + protected override void OnInitialized() + { + BreadcrumbItems.Add(new BreadcrumbItem("Language Management")); + } +} +``` + +Navigate back to the razor page. + +```csharp + +``` + +The theme then renders the breadcrumb. An example render result can be: + +![breadcrumbs-example](../../images/breadcrumbs-example.png) + +* The Home icon is rendered by default. Set `BreadcrumbShowHome` to `false` to hide it. +* Breadcrumb items will be activated based on current navigation. Set `BreadcrumbShowCurrent` to `false` to disable it. + +You can add as many items as you need. `BreadcrumbItem` constructor gets three parameters: + +* `text`: The text to show for the breadcrumb item. +* `url` (optional): A URL to navigate to, if the user clicks to the breadcrumb item. +* `icon` (optional): An icon class (like `fas fa-user-tie` for Font-Awesome) to show with the `text`. + +## Page Toolbar + +Page toolbar can be set using the `Toolbar` property. + +**Example: Add a "New Item" toolbar item to the page toolbar.** + +Create a `PageToolbar` object and define toolbar items using the `AddButton` extension method. + +```csharp +public partial class Index +{ + protected PageToolbar Toolbar { get; } = new(); + + protected override void OnInitialized() + { + Toolbar.AddButton("New Item", () => + { + //Write your click action here + return Task.CompletedTask; + }, icon:IconName.Add); + } +} +``` + +Navigate back to the razor page and set the `Toolbar` parameter. + +```csharp + +``` + +An example render result can be: + +![breadcrumbs-example](../../images/page-header-toolbar-blazor.png) + diff --git a/docs/en/UI/Blazor/Page-Toolbar-Extensions.md b/docs/en/UI/Blazor/Page-Toolbar-Extensions.md new file mode 100644 index 0000000000..34e7c5b1b1 --- /dev/null +++ b/docs/en/UI/Blazor/Page-Toolbar-Extensions.md @@ -0,0 +1,126 @@ +# Page Toolbar Extensions for Blazor UI + +Page toolbar system allows you to add components to the toolbar of any page. The page toolbar is the area right to the header of a page. A button ("Import users from excel") was added to the user management page below: + +![page-toolbar-button](../../images/page-toolbar-button-blazor.png) + +You can add any type of view component item to the page toolbar or modify existing items. + +## How to Set Up + +In this example, we will add an "Import users from excel" button and execute a C# code for the user management page of the [Identity Module](../../Modules/Identity.md). + +### Create a C# File + +First, add a new C# file to your solution. We added inside the `/Pages/Identity/` folder of the `.Blazor` project: + +![user-action-extension-on-solution](../../images/user-action-extension-on-blazor-project.png) + +We will use the [component override system](Customization-Overriding-Components.md) in the Blazor. After creating a class inherits from the `UserManagement` component, we will override the `SetToolbarItemsAsync` method and add the toolbar item programmatically. + +Here, the content of the overridden `SetToolbarItemsAsync` method. + +```csharp +protected override async ValueTask SetToolbarItemsAsync() +{ + await base.SetToolbarItemsAsync(); + Toolbar.AddButton("Import users from excel", () => + { + //TODO: Write your custom code + return Task.CompletedTask; + }, "file-import", Blazorise.Color.Secondary); +} +``` +> In order to use the `AddButton` extension method, you need to add a using statement for the `Volo.Abp.AspNetCore.Components.Web.Theming.PageToolbars` namespace. + +Here, the entire content of the file. + +```csharp +using System.Threading.Tasks; +using Volo.Abp.AspNetCore.Components.Web.Theming.PageToolbars; +using Volo.Abp.DependencyInjection; +using Volo.Abp.Identity.Blazor.Pages.Identity; + +namespace MyCompanyName.MyProjectName.Blazor.Pages.Identity +{ + [ExposeServices(typeof(UserManagement))] + [Dependency(ReplaceServices = true)] + public class CustomizedUserManagement : UserManagement + { + protected override async ValueTask SetToolbarItemsAsync() + { + await base.SetToolbarItemsAsync(); + Toolbar.AddButton("Import users from excel", () => + { + //TODO: Write your custom code + return Task.CompletedTask; + }, "file-import", Blazorise.Color.Secondary); + } + } +} +``` + +When you run the application, you will see the button added next to the current button list. There are some other parameters of the `AddButton` method (for example, use `Order` to set the order of the button component relative to the other components). + +## Advanced Use Cases + +While you typically want to add a button action to the page toolbar, it is possible to add any type of blazor component. + +### Add A Blazor Component to a Page Toolbar + +First, create a new blazor component in your project: + +![page-toolbar-custom-component-blazor](../../images/page-toolbar-custom-component-blazor.png) + +For this example, we've created a `MyToolbarComponent` component under the `/Pages/Identity/` folder. + +`MyToolbarComponent.razor` content: + +````csharp + +```` +We will leave the `MyToolbarComponent.razor.cs` file empty. + +Then you can add the `MyToolbarComponent` to the user management page toolbar: + +````csharp +protected override async ValueTask SetToolbarItemsAsync() +{ + await base.SetToolbarItemsAsync(); + Toolbar.AddComponent(); +} +```` + +* If your component accepts parameters, you can pass them as key/value pairs using the `arguments` parameter. + +#### Permissions + +If your button/component should be available based on a [permission/policy](../../Authorization.md), you can pass the permission/policy name as the `RequiredPolicyName` parameter to the `AddButton` and `AddComponent` methods. + +### Add a Page Toolbar Contributor + +If you perform advanced custom logic while adding an item to a page toolbar, you can create a class that implements the `IPageToolbarContributor` interface or inherits from the `PageToolbarContributor` class: + +````csharp +public class MyToolbarContributor : PageToolbarContributor +{ + public override Task ContributeAsync(PageToolbarContributionContext context) + { + context.Items.Insert(0, new PageToolbarItem(typeof(MyToolbarComponent))); + return Task.CompletedTask; + } +} +```` + +* You can use `context.ServiceProvider` to resolve dependencies if you need. + +Then add your class to the `Contributors` list: + +````csharp +protected override async ValueTask SetToolbarItemsAsync() +{ + await base.SetToolbarItemsAsync(); + Toolbar.Contributors.Add(new PageContributor()); +} +```` + diff --git a/docs/en/docs-nav.json b/docs/en/docs-nav.json index efca73a484..4d2b2419c2 100644 --- a/docs/en/docs-nav.json +++ b/docs/en/docs-nav.json @@ -1,5 +1,9 @@ { "items": [ + { + "text": "Quick Start", + "path": "Tutorials/Todo/Index.md" + }, { "text": "Getting Started", "items": [ @@ -281,6 +285,10 @@ } ] }, + { + "text": "SMS Sending", + "path": "SMS-Sending.md" + }, { "text": "Event Bus", "items": [ @@ -335,6 +343,10 @@ { "text": "Virtual File System", "path": "Virtual-File-System.md" + }, + { + "text": "Cancellation Token Provider", + "path": "Cancellation-Token-Provider.md" } ] }, @@ -882,6 +894,15 @@ ] } ] + }, + { + "text": "Components", + "items": [ + { + "text": "Page", + "path": "UI/Angular/Page-Component.md" + } + ] } ] }, @@ -1004,14 +1025,6 @@ "text": "Background Jobs", "path": "Modules/Background-Jobs.md" }, - { - "text": "Blogging", - "path": "Modules/Blogging.md" - }, - { - "text": "Client Simulation", - "path": "Modules/Client-Simulation.md" - }, { "text": "CMS Kit", "path": "Modules/Cms-Kit.md" @@ -1044,10 +1057,6 @@ "text": "Tenant Management", "path": "Modules/Tenant-Management.md" }, - { - "text": "Users", - "path": "Modules/Users.md" - }, { "text": "Virtual File Explorer", "path": "Modules/Virtual-File-Explorer.md" diff --git a/docs/en/images/data-table-colum-extension-blazor-component-render-solution.png b/docs/en/images/data-table-colum-extension-blazor-component-render-solution.png new file mode 100644 index 0000000000..77612b5d34 Binary files /dev/null and b/docs/en/images/data-table-colum-extension-blazor-component-render-solution.png differ diff --git a/docs/en/images/data-table-colum-extension-blazor-component-render.png b/docs/en/images/data-table-colum-extension-blazor-component-render.png new file mode 100644 index 0000000000..9d018e2ab9 Binary files /dev/null and b/docs/en/images/data-table-colum-extension-blazor-component-render.png differ diff --git a/docs/en/images/email-settings.png b/docs/en/images/email-settings.png new file mode 100644 index 0000000000..6aa77da312 Binary files /dev/null and b/docs/en/images/email-settings.png differ diff --git a/docs/en/images/page-header-toolbar-blazor.png b/docs/en/images/page-header-toolbar-blazor.png new file mode 100644 index 0000000000..a4d0454893 Binary files /dev/null and b/docs/en/images/page-header-toolbar-blazor.png differ diff --git a/docs/en/images/page-toolbar-button-blazor.png b/docs/en/images/page-toolbar-button-blazor.png new file mode 100644 index 0000000000..fb907e797a Binary files /dev/null and b/docs/en/images/page-toolbar-button-blazor.png differ diff --git a/docs/en/images/page-toolbar-custom-component-blazor.png b/docs/en/images/page-toolbar-custom-component-blazor.png new file mode 100644 index 0000000000..fb0856fa03 Binary files /dev/null and b/docs/en/images/page-toolbar-custom-component-blazor.png differ diff --git a/docs/en/images/table-column-extension-example-blazor.png b/docs/en/images/table-column-extension-example-blazor.png new file mode 100644 index 0000000000..3079fa278c Binary files /dev/null and b/docs/en/images/table-column-extension-example-blazor.png differ diff --git a/docs/en/images/user-action-blazor-extension-click-me.png b/docs/en/images/user-action-blazor-extension-click-me.png new file mode 100644 index 0000000000..fb1ea80182 Binary files /dev/null and b/docs/en/images/user-action-blazor-extension-click-me.png differ diff --git a/docs/en/images/user-action-extension-on-blazor-project.png b/docs/en/images/user-action-extension-on-blazor-project.png new file mode 100644 index 0000000000..d11ea328b6 Binary files /dev/null and b/docs/en/images/user-action-extension-on-blazor-project.png differ diff --git a/docs/pt-BR/Tutorials/Angular/Part-II.md b/docs/pt-BR/Tutorials/Angular/Part-II.md index b75fa9e21c..b4b86350b0 100644 --- a/docs/pt-BR/Tutorials/Angular/Part-II.md +++ b/docs/pt-BR/Tutorials/Angular/Part-II.md @@ -90,7 +90,7 @@ Abra o `book-list.component.html`e adicione o `abp-modal`para mostrar / ocultar - @@ -276,7 +276,7 @@ Abra o `book-list.component.html`e adicione um `abp-button`para salvar o formul ```html - @@ -859,7 +859,7 @@ export class BookComponent implements OnInit { ````html - diff --git a/docs/zh-Hans/UI/Angular/Permission-Management-Component-Replacement.md b/docs/zh-Hans/UI/Angular/Permission-Management-Component-Replacement.md index 0b1f71035e..3ea2db6f51 100644 --- a/docs/zh-Hans/UI/Angular/Permission-Management-Component-Replacement.md +++ b/docs/zh-Hans/UI/Angular/Permission-Management-Component-Replacement.md @@ -459,7 +459,7 @@ function getPermissions(groups: PermissionManagement.Group[]): PermissionManagem - {%{{{ diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/Extensibility/TableColumns/TableColumn.cs b/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/Extensibility/TableColumns/TableColumn.cs index 0676c14399..2121b8a128 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/Extensibility/TableColumns/TableColumn.cs +++ b/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/Extensibility/TableColumns/TableColumn.cs @@ -1,6 +1,7 @@ using JetBrains.Annotations; using System; using System.Collections.Generic; +using System.Globalization; using Volo.Abp.AspNetCore.Components.Web.Extensibility.EntityActions; namespace Volo.Abp.AspNetCore.Components.Web.Extensibility.TableColumns @@ -11,11 +12,13 @@ namespace Volo.Abp.AspNetCore.Components.Web.Extensibility.TableColumns public string Data { get; set; } [CanBeNull] public string DisplayFormat { get; set; } + public IFormatProvider DisplayFormatProvider { get; set; } = CultureInfo.CurrentCulture; [CanBeNull] public Type Component { get; set; } public List Actions { get; set; } [CanBeNull] public Func ValueConverter { get; set; } + public bool Sortable { get; set; } public TableColumn() { diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/AbpAspNetCoreComponentsWebAssemblyModule.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/AbpAspNetCoreComponentsWebAssemblyModule.cs index 2a4abea950..170bd9c327 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/AbpAspNetCoreComponentsWebAssemblyModule.cs +++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/AbpAspNetCoreComponentsWebAssemblyModule.cs @@ -1,8 +1,5 @@ -using Microsoft.AspNetCore.Components; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.DependencyInjection.Extensions; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Volo.Abp.AspNetCore.Components.DependencyInjection; using Volo.Abp.AspNetCore.Components.Web; using Volo.Abp.AspNetCore.Components.Web.ExceptionHandling; using Volo.Abp.AspNetCore.Mvc.Client; @@ -32,8 +29,6 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly public override void ConfigureServices(ServiceConfigurationContext context) { - context.Services.Replace(ServiceDescriptor.Transient()); - context.Services .GetHostBuilder().Logging .AddProvider(new AbpExceptionHandlingLoggerProvider(context.Services)); diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ContentFormatters/AbpRemoteStreamContentModelBinder.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ContentFormatters/AbpRemoteStreamContentModelBinder.cs index 8b7264fef0..da58641d7e 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ContentFormatters/AbpRemoteStreamContentModelBinder.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ContentFormatters/AbpRemoteStreamContentModelBinder.cs @@ -115,13 +115,6 @@ namespace Volo.Abp.AspNetCore.Mvc.ContentFormatters } } } - else - { - postedFiles.Add(new RemoteStreamContent(request.Body) - { - ContentType = request.ContentType - }); - } } } } diff --git a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Auditing/AbpAuditingMiddleware.cs b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Auditing/AbpAuditingMiddleware.cs index 99c9ccb2d5..72e5d36b3f 100644 --- a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Auditing/AbpAuditingMiddleware.cs +++ b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Auditing/AbpAuditingMiddleware.cs @@ -45,19 +45,26 @@ namespace Volo.Abp.AspNetCore.Auditing var hasError = false; using (var saveHandle = _auditingManager.BeginScope()) { + Debug.Assert(_auditingManager.Current != null); + try { await next(context); - Debug.Assert(_auditingManager.Current != null); if (_auditingManager.Current.Log.Exceptions.Any()) { hasError = true; } } - catch (Exception) + catch (Exception ex) { hasError = true; + + if (!_auditingManager.Current.Log.Exceptions.Contains(ex)) + { + _auditingManager.Current.Log.Exceptions.Add(ex); + } + throw; } finally diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor b/framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor index f060450ffd..e0b867492e 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor +++ b/framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor @@ -25,11 +25,11 @@ if (action.ConfirmationMessage != null) { } @@ -37,9 +37,9 @@ { } @@ -62,7 +62,26 @@ { if (!ExtensionPropertiesRegex.IsMatch(column.Data)) { - + @if (column.ValueConverter == null) + { + + } + else + { + + + @(GetConvertedFieldValue(context, column)) + + + } } else { @@ -87,14 +106,7 @@ { if (column.ValueConverter != null) { - if (column.DisplayFormat == null) - { - @(column.ValueConverter(propertyValue)) - } - else - { - @(string.Format(column.DisplayFormat, column.ValueConverter(propertyValue))) - } + @(GetConvertedFieldValue(context, column)) } else { @@ -104,10 +116,9 @@ } else { - @(string.Format(column.DisplayFormat, propertyValue)) + @(string.Format(column.DisplayFormatProvider, column.DisplayFormat, propertyValue)) } } - } } diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor.cs b/framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor.cs index 72a58f94a5..71ff4b61ec 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor.cs +++ b/framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor.cs @@ -46,5 +46,17 @@ namespace Volo.Abp.BlazoriseUI.Components builder.CloseComponent(); }; } + + protected virtual string GetConvertedFieldValue(TItem item, TableColumn columnDefinition) + { + var convertedValue = columnDefinition.ValueConverter.Invoke(item); + if (!columnDefinition.DisplayFormat.IsNullOrEmpty()) + { + return string.Format(columnDefinition.DisplayFormatProvider, columnDefinition.DisplayFormat, + convertedValue); + } + + return convertedValue; + } } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/LookupExtensionProperty.razor b/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/LookupExtensionProperty.razor index a8257b9570..4a305d606d 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/LookupExtensionProperty.razor +++ b/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/LookupExtensionProperty.razor @@ -12,7 +12,8 @@ ValueField="item=>item.Value" SelectedValue="@SelectedValue" SelectedValueChanged="@SelectedValueChanged" - SearchChanged="@SearchFilterChangedAsync"> + SearchChanged="@SearchFilterChangedAsync" + MinLength="0"> \ No newline at end of file diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/LookupExtensionProperty.razor.cs b/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/LookupExtensionProperty.razor.cs index b4e74b16d9..bd8c1869cc 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/LookupExtensionProperty.razor.cs +++ b/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/LookupExtensionProperty.razor.cs @@ -96,14 +96,26 @@ namespace Volo.Abp.BlazoriseUI.Components.ObjectExtending return selectItems; } - protected virtual void SelectedValueChanged(object selectedItem) + protected virtual Task SelectedValueChanged(object selectedItem) { SelectedValue = selectedItem; + + return Task.CompletedTask; } protected async Task SearchFilterChangedAsync(string filter) { lookupItems = await GetLookupItemsAsync(filter); } + + protected override async Task OnAfterRenderAsync(bool firstRender) + { + await base.OnAfterRenderAsync(firstRender); + + if (firstRender) + { + await SearchFilterChangedAsync(string.Empty); + } + } } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj b/framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj index a80679cdca..e042047563 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj +++ b/framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj @@ -14,10 +14,10 @@ - - - - + + + + diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs index 0617ef26ff..83cce36fce 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs @@ -89,7 +89,7 @@ namespace Volo.Abp.Cli.Commands var preview = commandLineArgs.Options.ContainsKey(Options.Preview.Long); if (preview) { - Logger.LogInformation("Preview: yes if any exist for next version."); + Logger.LogInformation("Preview: yes"); } var databaseProvider = GetDatabaseProvider(commandLineArgs); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/MicroserviceServiceRandomPortStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/MicroserviceServiceRandomPortStep.cs index 88a19b43af..befc5414eb 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/MicroserviceServiceRandomPortStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/MicroserviceServiceRandomPortStep.cs @@ -59,9 +59,7 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps return _tyeFileContent; } - var solutionFolderPath = context.BuildArgs.ExtraProperties[NewCommand.Options.OutputFolder.Short] ?? - context.BuildArgs.ExtraProperties[NewCommand.Options.OutputFolder.Long] ?? - Directory.GetCurrentDirectory(); + var solutionFolderPath = GetSolutionFolderPath(context); var tyeFilePath = Path.Combine(solutionFolderPath, "tye.yaml"); @@ -74,5 +72,20 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps return _tyeFileContent; } + + private static string GetSolutionFolderPath(ProjectBuildContext context) + { + if (context.BuildArgs.ExtraProperties.ContainsKey(NewCommand.Options.OutputFolder.Short)) + { + return context.BuildArgs.ExtraProperties[NewCommand.Options.OutputFolder.Short]; + } + + if (context.BuildArgs.ExtraProperties.ContainsKey(NewCommand.Options.OutputFolder.Long)) + { + return context.BuildArgs.ExtraProperties[NewCommand.Options.OutputFolder.Long]; + } + + return Directory.GetCurrentDirectory(); + } } } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveDependencyFromPackageJsonFileStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveDependencyFromPackageJsonFileStep.cs new file mode 100644 index 0000000000..ab7cff8c56 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveDependencyFromPackageJsonFileStep.cs @@ -0,0 +1,35 @@ +using System.Linq; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; + +namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps +{ + public class RemoveDependencyFromPackageJsonFileStep : ProjectBuildPipelineStep + { + private readonly string _packageJsonFilePath; + private readonly string _packageName; + + public RemoveDependencyFromPackageJsonFileStep(string packageJsonFilePath, string packageName) + { + _packageJsonFilePath = packageJsonFilePath; + _packageName = packageName; + } + + public override void Execute(ProjectBuildContext context) + { + var packageJsonFile = context.Files.FirstOrDefault(f => f.Name == _packageJsonFilePath); + + if (packageJsonFile == null) + { + return; + } + + var packageJsonObject = JObject.Parse(packageJsonFile.Content); + var dependenciesObject = (JObject) packageJsonObject["dependencies"]; + + dependenciesObject?.Remove(_packageName); + + packageJsonFile.SetContent(packageJsonObject.ToString(Formatting.Indented)); + } + } +} diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs index 5e0436d91a..52a06f7117 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs @@ -169,10 +169,54 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.App steps.Add(new ChangePublicAuthPortStep()); } - if (!context.BuildArgs.ExtraProperties.ContainsKey("without-cms-kit")) + if (!context.BuildArgs.ExtraProperties.ContainsKey("without-cms-kit") && IsCmsKitSupportedForTargetVersion(context)) { context.Symbols.Add("CMS-KIT"); } + else + { + RemoveCmsKitDependenciesFromPackageJsonFiles(steps); + } + } + + private static void RemoveCmsKitDependenciesFromPackageJsonFiles(List steps) + { + var adminCmsPackageInstalledProjectsPackageJsonFiles = new List + { + "/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json", + "/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json", + "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json", + "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json" + }; + + var publicCmsPackageInstalledProjectsPackageJsonFiles = new List + { + "/aspnet-core/src/MyCompanyName.MyProjectName.Web.Public/package.json", + "/aspnet-core/src/MyCompanyName.MyProjectName.Web.Public.Host/package.json" + }; + + foreach (var packageJsonFile in adminCmsPackageInstalledProjectsPackageJsonFiles) + { + steps.Add(new RemoveDependencyFromPackageJsonFileStep(packageJsonFile, "@volo/cms-kit-pro.admin")); + } + + foreach (var packageJsonFile in publicCmsPackageInstalledProjectsPackageJsonFiles) + { + steps.Add(new RemoveDependencyFromPackageJsonFileStep(packageJsonFile, "@volo/cms-kit-pro.public")); + } + } + + private bool IsCmsKitSupportedForTargetVersion(ProjectBuildContext context) + { + if (string.IsNullOrWhiteSpace(context.BuildArgs.Version)) + { + // We'll return true after 4.3.0 stable release. see https://github.com/abpframework/abp/issues/8394 + // return true; + + return context.BuildArgs.ExtraProperties.ContainsKey(NewCommand.Options.Preview.Long); + } + + return SemanticVersion.Parse(context.BuildArgs.Version) > SemanticVersion.Parse("4.2.9"); } private static void ConfigureWithoutUi(ProjectBuildContext context, List steps) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateSwitchEntityFrameworkCoreToMongoDbStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateSwitchEntityFrameworkCoreToMongoDbStep.cs index b0a778c323..290da79157 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateSwitchEntityFrameworkCoreToMongoDbStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateSwitchEntityFrameworkCoreToMongoDbStep.cs @@ -76,6 +76,29 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.App "/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json" ); + //MyCompanyName.MyProjectName.Blazor.Server + + ChangeProjectReference( + context, + "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj", + "EntityFrameworkCore.DbMigrations", + "MongoDB" + ); + + ChangeNamespaceAndKeyword( + context, + "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorModule.cs", + "MyCompanyName.MyProjectName.EntityFrameworkCore", + "MyCompanyName.MyProjectName.MongoDB", + "MyProjectNameEntityFrameworkCoreDbMigrationsModule", + "MyProjectNameMongoDbModule" + ); + + ChangeConnectionStringToMongoDb( + context, + "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/appsettings.json" + ); + //MyCompanyName.MyProjectName.HttpApi.HostWithIds ChangeProjectReference( diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs index 76c2fe6bb5..7068cb9327 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs @@ -42,6 +42,9 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.Microservice steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor",null, "/apps/blazor/src/MyCompanyName.MyProjectName.Blazor")); + steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.ProductService.Blazor", + "/services/product/MyCompanyName.MyProjectName.ProductService.sln", + "/services/product/src/MyCompanyName.MyProjectName.ProductService.Blazor")); steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor.Server",null, "/apps/blazor/src/MyCompanyName.MyProjectName.Blazor.Server")); steps.Add(new RemoveFolderStep("/apps/blazor")); @@ -60,6 +63,9 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.Microservice steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor",null, "/apps/blazor/src/MyCompanyName.MyProjectName.Blazor")); + steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.ProductService.Blazor", + "/services/product/MyCompanyName.MyProjectName.ProductService.sln", + "/services/product/src/MyCompanyName.MyProjectName.ProductService.Blazor")); steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor.Server",null, "/apps/blazor/src/MyCompanyName.MyProjectName.Blazor.Server")); steps.Add(new RemoveFolderStep("/apps/blazor")); @@ -113,6 +119,9 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.Microservice "/apps/blazor/src/MyCompanyName.MyProjectName.Blazor")); steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor.Server",null, "/apps/blazor/src/MyCompanyName.MyProjectName.Blazor.Server")); + steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.ProductService.Blazor", + "/services/product/MyCompanyName.MyProjectName.ProductService.sln", + "/services/product/src/MyCompanyName.MyProjectName.ProductService.Blazor")); steps.Add(new RemoveFolderStep("/apps/blazor")); steps.Add(new RemoveProjectFromTyeStep("blazor")); steps.Add(new RemoveProjectFromTyeStep("blazor-server")); diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/AbpModuleHelper.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/AbpModuleHelper.cs index e8bccb8e18..286001345d 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/AbpModuleHelper.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/AbpModuleHelper.cs @@ -12,7 +12,7 @@ namespace Volo.Abp.Modularity { var moduleTypes = new List(); logger.Log(LogLevel.Information, "Loaded ABP modules:"); - AddModuleAndDependenciesResursively(moduleTypes, startupModuleType, logger); + AddModuleAndDependenciesRecursively(moduleTypes, startupModuleType, logger); return moduleTypes; } @@ -37,7 +37,7 @@ namespace Volo.Abp.Modularity return dependencies; } - private static void AddModuleAndDependenciesResursively( + private static void AddModuleAndDependenciesRecursively( List moduleTypes, Type moduleType, ILogger logger, @@ -55,7 +55,7 @@ namespace Volo.Abp.Modularity foreach (var dependedModuleType in FindDependedModuleTypes(moduleType)) { - AddModuleAndDependenciesResursively(moduleTypes, dependedModuleType, logger, depth + 1); + AddModuleAndDependenciesRecursively(moduleTypes, dependedModuleType, logger, depth + 1); } } } diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.csproj b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.csproj index 8c1f0cdec3..7fea04e7f5 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.csproj +++ b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.csproj @@ -19,7 +19,7 @@ - + diff --git a/framework/src/Volo.Abp.GlobalFeatures/Volo.Abp.GlobalFeatures.csproj b/framework/src/Volo.Abp.GlobalFeatures/Volo.Abp.GlobalFeatures.csproj index a082ba3c6f..0f118c1f08 100644 --- a/framework/src/Volo.Abp.GlobalFeatures/Volo.Abp.GlobalFeatures.csproj +++ b/framework/src/Volo.Abp.GlobalFeatures/Volo.Abp.GlobalFeatures.csproj @@ -20,7 +20,6 @@ - diff --git a/framework/src/Volo.Abp.GlobalFeatures/Volo/Abp/GlobalFeatures/GlobalFeatureDictionary.cs b/framework/src/Volo.Abp.GlobalFeatures/Volo/Abp/GlobalFeatures/GlobalFeatureDictionary.cs index a81632f8d5..c8f68a1ab0 100644 --- a/framework/src/Volo.Abp.GlobalFeatures/Volo/Abp/GlobalFeatures/GlobalFeatureDictionary.cs +++ b/framework/src/Volo.Abp.GlobalFeatures/Volo/Abp/GlobalFeatures/GlobalFeatureDictionary.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; namespace Volo.Abp.GlobalFeatures { diff --git a/framework/src/Volo.Abp.GlobalFeatures/Volo/Abp/GlobalFeatures/GlobalFeatureManager.cs b/framework/src/Volo.Abp.GlobalFeatures/Volo/Abp/GlobalFeatures/GlobalFeatureManager.cs index 19a48a9da3..e0662857e1 100644 --- a/framework/src/Volo.Abp.GlobalFeatures/Volo/Abp/GlobalFeatures/GlobalFeatureManager.cs +++ b/framework/src/Volo.Abp.GlobalFeatures/Volo/Abp/GlobalFeatures/GlobalFeatureManager.cs @@ -1,5 +1,5 @@ -using System; - using System.Collections.Generic; +using System; +using System.Collections.Generic; using JetBrains.Annotations; namespace Volo.Abp.GlobalFeatures @@ -26,7 +26,6 @@ namespace Volo.Abp.GlobalFeatures } public virtual bool IsEnabled() - where TFeature : GlobalFeature { return IsEnabled(GlobalFeatureNameAttribute.GetName()); } diff --git a/framework/src/Volo.Abp.GlobalFeatures/Volo/Abp/GlobalFeatures/GlobalFeatureNameAttribute.cs b/framework/src/Volo.Abp.GlobalFeatures/Volo/Abp/GlobalFeatures/GlobalFeatureNameAttribute.cs index 2b987f6cb1..96905b43bf 100644 --- a/framework/src/Volo.Abp.GlobalFeatures/Volo/Abp/GlobalFeatures/GlobalFeatureNameAttribute.cs +++ b/framework/src/Volo.Abp.GlobalFeatures/Volo/Abp/GlobalFeatures/GlobalFeatureNameAttribute.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Linq; using System.Reflection; using JetBrains.Annotations; @@ -17,7 +17,6 @@ namespace Volo.Abp.GlobalFeatures } public static string GetName() - where TFeature : GlobalFeature { return GetName(typeof(TFeature)); } diff --git a/framework/src/Volo.Abp.GlobalFeatures/Volo/Abp/GlobalFeatures/GlobalModuleFeatures.cs b/framework/src/Volo.Abp.GlobalFeatures/Volo/Abp/GlobalFeatures/GlobalModuleFeatures.cs index 7d1b844d45..9a8afd236d 100644 --- a/framework/src/Volo.Abp.GlobalFeatures/Volo/Abp/GlobalFeatures/GlobalModuleFeatures.cs +++ b/framework/src/Volo.Abp.GlobalFeatures/Volo/Abp/GlobalFeatures/GlobalModuleFeatures.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Collections.Immutable; using JetBrains.Annotations; diff --git a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/RequestPayloadBuilder.cs b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/RequestPayloadBuilder.cs index 8532f02c7c..1096fa971e 100644 --- a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/RequestPayloadBuilder.cs +++ b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/RequestPayloadBuilder.cs @@ -53,17 +53,7 @@ namespace Volo.Abp.Http.Client.DynamicProxying return null; } - if (value is IRemoteStreamContent remoteStreamContent) - { - var content = new StreamContent(remoteStreamContent.GetStream()); - content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue(remoteStreamContent.ContentType); - content.Headers.ContentLength = remoteStreamContent.ContentLength; - return content; - } - else - { - return new StringContent(jsonSerializer.Serialize(value), Encoding.UTF8, MimeTypes.Application.Json); - } + return new StringContent(jsonSerializer.Serialize(value), Encoding.UTF8, MimeTypes.Application.Json); } private static HttpContent GenerateFormPostData(ActionApiDescriptionModel action, IReadOnlyDictionary methodArguments) @@ -80,7 +70,7 @@ namespace Volo.Abp.Http.Client.DynamicProxying if (parameters.Any(x => x.BindingSourceId == ParameterBindingSources.FormFile)) { - var postDataBuilder = new MultipartFormDataContent(); + var formData = new MultipartFormDataContent(); foreach (var parameter in parameters) { var value = HttpActionParameterHelper.FindParameterValue(methodArguments, parameter); @@ -91,32 +81,42 @@ namespace Volo.Abp.Http.Client.DynamicProxying if (value is IRemoteStreamContent remoteStreamContent) { - var streamContent = new StreamContent(remoteStreamContent.GetStream()); + var stream = remoteStreamContent.GetStream(); + if (stream.CanSeek) + { + stream.Position = 0; + } + var streamContent = new StreamContent(stream); if (!remoteStreamContent.ContentType.IsNullOrWhiteSpace()) { streamContent.Headers.ContentType = new MediaTypeHeaderValue(remoteStreamContent.ContentType); } - postDataBuilder.Add(streamContent, parameter.Name, parameter.Name); + formData.Add(streamContent, parameter.Name, parameter.Name); } else if (value is IEnumerable remoteStreamContents) { foreach (var content in remoteStreamContents) { - var streamContent = new StreamContent(content.GetStream()); + var stream = content.GetStream(); + if (stream.CanSeek) + { + stream.Position = 0; + } + var streamContent = new StreamContent(stream); if (!content.ContentType.IsNullOrWhiteSpace()) { streamContent.Headers.ContentType = new MediaTypeHeaderValue(content.ContentType); } - postDataBuilder.Add(streamContent, parameter.Name, parameter.Name); + formData.Add(streamContent, parameter.Name, parameter.Name); } } else { - postDataBuilder.Add(new StringContent(value.ToString(), Encoding.UTF8), parameter.Name); + formData.Add(new StringContent(value.ToString(), Encoding.UTF8), parameter.Name); } } - return postDataBuilder; + return formData; } else { diff --git a/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/AbpLdapModule.cs b/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/AbpLdapModule.cs index 3366f3d70f..a1749e4466 100644 --- a/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/AbpLdapModule.cs +++ b/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/AbpLdapModule.cs @@ -21,11 +21,7 @@ namespace Volo.Abp.Ldap context.Services.AddAbpDynamicOptions(); var configuration = context.Services.GetConfiguration(); - var ldapConfiguration = configuration["Ldap"]; - if (!ldapConfiguration.IsNullOrEmpty()) - { - Configure(configuration.GetSection("Ldap")); - } + Configure(configuration.GetSection("Ldap")); Configure(options => { diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Auditing/AuditTestController.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Auditing/AuditTestController.cs index 94e57403f5..e67bbcb1ae 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Auditing/AuditTestController.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Auditing/AuditTestController.cs @@ -31,10 +31,18 @@ namespace Volo.Abp.AspNetCore.Mvc.Auditing { throw new UserFriendlyException("Exception occurred!"); } + [Route("audit-fail-object")] public object AuditFailForGetRequestsReturningObject() { throw new UserFriendlyException("Exception occurred!"); } + + [HttpGet] + [Route("audit-activate-failed")] + public IActionResult AuditActivateFailed([FromServices] AbpAuditingOptions options) + { + return Ok(); + } } } diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Auditing/AuditTestController_Tests.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Auditing/AuditTestController_Tests.cs index 9d3da08095..b76e71de52 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Auditing/AuditTestController_Tests.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Auditing/AuditTestController_Tests.cs @@ -74,5 +74,20 @@ namespace Volo.Abp.AspNetCore.Mvc.Auditing await _auditingStore.Received().SaveAsync(Arg.Any()); } + + [Fact] + public async Task Should_Trigger_Middleware_And_AuditLog_Exception_When_Activate_Controller_Failed() + { + _options.IsEnabledForGetRequests = true; + _options.AlwaysLogOnException = true; + + try + { + await GetResponseAsync("api/audit-test/audit-activate-failed", System.Net.HttpStatusCode.InternalServerError); + } + catch { } + + await _auditingStore.Received().SaveAsync(Arg.Is(x => x.Exceptions.Any())); + } } } diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Auditing/AuditTestPage.cshtml.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Auditing/AuditTestPage.cshtml.cs index 7dc1967a2e..10e28a4bb1 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Auditing/AuditTestPage.cshtml.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Auditing/AuditTestPage.cshtml.cs @@ -34,5 +34,10 @@ namespace Volo.Abp.AspNetCore.Mvc.Auditing { throw new UserFriendlyException("Exception occurred!"); } + + public IActionResult OnGetAuditActivateFailed([FromServices] AbpAuditingOptions options) + { + return new OkResult(); + } } } diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Auditing/AuditTestPage_Tests.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Auditing/AuditTestPage_Tests.cs index 311abe5aa5..24d7a58dd3 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Auditing/AuditTestPage_Tests.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Auditing/AuditTestPage_Tests.cs @@ -73,5 +73,20 @@ namespace Volo.Abp.AspNetCore.Mvc.Auditing await _auditingStore.Received().SaveAsync(Arg.Any()); } + + [Fact] + public async Task Should_Trigger_Middleware_And_AuditLog_Exception_When_Activate_Page_Failed() + { + _options.IsEnabledForGetRequests = true; + _options.AlwaysLogOnException = true; + + try + { + await GetResponseAsync("/Auditing/AuditTestPage?handler=AuditActivateFailed", System.Net.HttpStatusCode.InternalServerError); + } + catch { } + + await _auditingStore.Received().SaveAsync(Arg.Is(x => x.Exceptions.Any())); + } } } diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ContentFormatters/RemoteStreamContentTestController.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ContentFormatters/RemoteStreamContentTestController.cs index 15491f9b21..e74c9d52e8 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ContentFormatters/RemoteStreamContentTestController.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ContentFormatters/RemoteStreamContentTestController.cs @@ -25,11 +25,11 @@ namespace Volo.Abp.AspNetCore.Mvc.ContentFormatters [HttpPost] [Route("Upload")] - public async Task UploadAsync([FromBody]IRemoteStreamContent streamContent) + public async Task UploadAsync(IRemoteStreamContent file) { - using (var reader = new StreamReader(streamContent.GetStream())) + using (var reader = new StreamReader(file.GetStream())) { - return await reader.ReadToEndAsync() + ":" + streamContent.ContentType; + return await reader.ReadToEndAsync() + ":" + file.ContentType; } } } diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ContentFormatters/RemoteStreamContentTestController_Tests.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ContentFormatters/RemoteStreamContentTestController_Tests.cs index 3d49a5b3ff..12745da732 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ContentFormatters/RemoteStreamContentTestController_Tests.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ContentFormatters/RemoteStreamContentTestController_Tests.cs @@ -1,5 +1,6 @@ using System.IO; using System.Net.Http; +using System.Net.Http.Headers; using System.Text; using System.Threading.Tasks; using Shouldly; @@ -25,8 +26,11 @@ namespace Volo.Abp.AspNetCore.Mvc.ContentFormatters var memoryStream = new MemoryStream(); await memoryStream.WriteAsync(Encoding.UTF8.GetBytes("UploadAsync")); memoryStream.Position = 0; - requestMessage.Content = new StreamContent(memoryStream); - requestMessage.Content.Headers.Add("Content-Type", "application/rtf"); + + var streamContent = new StreamContent(memoryStream); + streamContent.Headers.ContentType = new MediaTypeHeaderValue("application/rtf"); + + requestMessage.Content = new MultipartFormDataContent {{streamContent, "file", "file"}}; var response = await Client.SendAsync(requestMessage); diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json index b9c5e49f2b..a4704ecfd3 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json +++ b/framework/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": "^4.3.0-rc.1", + "@abp/aspnetcore.mvc.ui.theme.shared": "^4.3.0-rc.2", "highlight.js": "^9.13.1" }, "devDependencies": {} diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock index aecdad579a..d529fabaca 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock @@ -2,30 +2,30 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.shared@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.3.0-rc.1.tgz#9d4447f068b490367a20772eb9c2b38480088edb" - integrity sha512-untEVm6cKT375ZVEQFO01/VKIqtdFGIyJd5ZxtoQEV8ueVFRQefCOcvvqaJ8Gfj86T1nacXvJRfBfGihYHY+JQ== - dependencies: - "@abp/aspnetcore.mvc.ui" "~4.3.0-rc.1" - "@abp/bootstrap" "~4.3.0-rc.1" - "@abp/bootstrap-datepicker" "~4.3.0-rc.1" - "@abp/datatables.net-bs4" "~4.3.0-rc.1" - "@abp/font-awesome" "~4.3.0-rc.1" - "@abp/jquery-form" "~4.3.0-rc.1" - "@abp/jquery-validation-unobtrusive" "~4.3.0-rc.1" - "@abp/lodash" "~4.3.0-rc.1" - "@abp/luxon" "~4.3.0-rc.1" - "@abp/malihu-custom-scrollbar-plugin" "~4.3.0-rc.1" - "@abp/select2" "~4.3.0-rc.1" - "@abp/sweetalert" "~4.3.0-rc.1" - "@abp/timeago" "~4.3.0-rc.1" - "@abp/toastr" "~4.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.3.0-rc.1.tgz#1e54da2a668939941ab955f11db69798d04d9e7e" - integrity sha512-969etEb4H/fR9Twz6pcl766M/1AriCh6+B8r4haPB5g7QkOWhyU99mT11BHxQwf+uNV4duGZwvPvrMomrdLj2w== +"@abp/aspnetcore.mvc.ui.theme.shared@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.3.0-rc.2.tgz#d3bf79929c55c5380d7ca7b913a23031d7a6bd12" + integrity sha512-pz86bIV4wNeG7/UPYzNCXlJ/MdOdIygc+Com7C9Ld7gzsyER7VD9h5U/hkytvL4FBFLJn4DU+xuZNECjv0HS0A== + dependencies: + "@abp/aspnetcore.mvc.ui" "~4.3.0-rc.2" + "@abp/bootstrap" "~4.3.0-rc.2" + "@abp/bootstrap-datepicker" "~4.3.0-rc.2" + "@abp/datatables.net-bs4" "~4.3.0-rc.2" + "@abp/font-awesome" "~4.3.0-rc.2" + "@abp/jquery-form" "~4.3.0-rc.2" + "@abp/jquery-validation-unobtrusive" "~4.3.0-rc.2" + "@abp/lodash" "~4.3.0-rc.2" + "@abp/luxon" "~4.3.0-rc.2" + "@abp/malihu-custom-scrollbar-plugin" "~4.3.0-rc.2" + "@abp/select2" "~4.3.0-rc.2" + "@abp/sweetalert" "~4.3.0-rc.2" + "@abp/timeago" "~4.3.0-rc.2" + "@abp/toastr" "~4.3.0-rc.2" + +"@abp/aspnetcore.mvc.ui@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.3.0-rc.2.tgz#6ff41be179c8d1089778a51ffa54a1f3d7614278" + integrity sha512-2L5zvuqUwPwNPcMauiiJZD1ft0QycqINz+bXEQ8t0EwbB+dzcsukL/rpOQfpeRHWWYy4nIN4C2bTvXhNgQbPqQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -36,145 +36,145 @@ micromatch "^4.0.2" path "^0.12.7" -"@abp/bootstrap-datepicker@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.3.0-rc.1.tgz#879a8ce32a3dbdb0cd80401360d24f25f318670b" - integrity sha512-W2T+rrC3oxuWj2xQUz2virbBK6x7ershWZB9d6FjXTSH89nin9DyBK20dEfskVvhK/IMrmZaW4PWyTTcx9r7dA== +"@abp/bootstrap-datepicker@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.3.0-rc.2.tgz#29a686c3d2bce356967f646d7334cd83c4257b4c" + integrity sha512-3+B7SJRi7DQJe0aNgv0H0zu1BfvMZcwgt06N3ALR9+o3TSJcOqcYrEMed3aG+ASH++CltnohTYnLkVXaxshioA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.3.0-rc.1.tgz#3260de03f29e210e44a55efa3af2ab6d34362227" - integrity sha512-flB18MUnRWpEnS0t/WEjsdhfB5w+zHjsa69Pj733+GHGSsZ1Vppu+rgvSWp38yNHO5uRwGECrwUIGwvd5uD9+A== +"@abp/bootstrap@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.3.0-rc.2.tgz#1416fe639c88b7d958435e45fe19692268a7f932" + integrity sha512-E6svmDhNQlT5nd65VgshexyedRWhbvi9o1oYo/dLTUpJDzR7M9ptDqxFLVB9vVDva3HgxUoEvgRJgb9fXvq4zw== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" bootstrap "^4.6.0" bootstrap-v4-rtl "4.6.0-1" -"@abp/core@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.3.0-rc.1.tgz#201c3be8b5697fe8e1b08b23f87f50e950036a14" - integrity sha512-ET8NGugNmdub+8qGeFf9qGPbloP5gcoBnB7U6ieFz1Eai9S3pSpbM+sdyifucEpzMThUiLS772EP4pJTMXhfEg== +"@abp/core@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.3.0-rc.2.tgz#3c9ea339624ae3b6cbee13e048268d48269ea6a9" + integrity sha512-/89xH+IVSmTOLWeUO4yVB7Hg64uHTbR7bHjgl+b94cFdtITH9Nvr2EGdXUJbHGUK7L6lSDziqiMcG/ic0061+Q== dependencies: - "@abp/utils" "^4.3.0-rc.1" + "@abp/utils" "^4.3.0-rc.2" -"@abp/datatables.net-bs4@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.3.0-rc.1.tgz#f7dad14d13b468949fd161b679f4a70271e0d466" - integrity sha512-812cLTfSZZMvjAFAq5h7R5AeJHigBxbPc+kMReQIcFLH82o6BjA2NqFBqYOvQuh4kqiQ85dqFTW9MTKeY8or6Q== +"@abp/datatables.net-bs4@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.3.0-rc.2.tgz#bbfc0d9d0ed86cdb14b38849fb78b2b1911c4a35" + integrity sha512-PRKYi2NU41KpckJ/d0buHoFbyKVuW5NCQNpUdYzDsPS2riyeXccCsLFJM1bT01TdR4Idla3vx9Fkb+HoJOiDeQ== dependencies: - "@abp/datatables.net" "~4.3.0-rc.1" + "@abp/datatables.net" "~4.3.0-rc.2" datatables.net-bs4 "^1.10.21" -"@abp/datatables.net@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.3.0-rc.1.tgz#aa1640903fe67d20e1fc57ffe0519b2764e4c7df" - integrity sha512-qfdQa43sbXsIEBc3WpxSC7cXyKSFxLiFdCKnLIkQNsC3Wo+WX/Cute2xNbT0+xIQdGznfEBdPxcwQkNE6JQgcA== +"@abp/datatables.net@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.3.0-rc.2.tgz#1923e60db261366a7d2f284b0274d13e253567ca" + integrity sha512-rp53+5Xj1jhjpCj7UBA9+nSNbaTQ4Vc1NWCg1e5aI5tWiyZprUS44dRszIQIDV86XKorfFhog5ihOZyzl1HDyg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" datatables.net "^1.10.21" -"@abp/font-awesome@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.3.0-rc.1.tgz#5d336ead8b8c67b2c0aaff9365c2c856b033196e" - integrity sha512-BU4ycN/gOxX2x8S/Eszi3bJAz6bZRhxa0uPWxEWKul9PNvKSwMJRoVaEVehnIlfTi2raHsLQHk+F7079gt3dlQ== +"@abp/font-awesome@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.3.0-rc.2.tgz#437d3d6bbd8f52e5091251932d6a494d0164694b" + integrity sha512-FeHHtEQwrJBwD5PkFYqjKouCLwNjjRqTNseaN+s/r7gNjv0PgKytfRoqEb+O/BkZg/DwEuMz9jFX/RXCCNa2xA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" "@fortawesome/fontawesome-free" "^5.13.0" -"@abp/jquery-form@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.3.0-rc.1.tgz#4543e3d751519ba12d2c563aa7cbc56e51dfe093" - integrity sha512-ONQeImarHEe4VRSv13da+rHnCv+2Ycyd7YF+Dr77gtBmTKpC5nAFGY4wO7+u0U0px/YsR2dntpyBj2fEw3wjXA== +"@abp/jquery-form@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.3.0-rc.2.tgz#999910deaf46330477b6ed487a771a2123d69f92" + integrity sha512-+fdEIOTlxDOdYXMtc/ujhYeuP2qiI4bmL3TQQWQxSTlW8q5jB6dHLBnHiXXltO8HxX9+7ZsjN3tsV7+Div5joA== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.3.0-rc.1.tgz#15a06257fba8ef8d2cba2ac9da3f6f7185e6c8dd" - integrity sha512-8Tshu/QsqulwNfRnvoX1mViY12OTvCqpHdRldqr7k6MQd+boo6ahybQ4SCoZ9vsDTmqxd5dkV/A8VijMw66WTQ== +"@abp/jquery-validation-unobtrusive@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.3.0-rc.2.tgz#0635e0c77da269e8367c3d7c388613249ce9221d" + integrity sha512-ubmPjVJatAW3AJWjWtT+ZbNLhu+HHNgcxYkFGVNusNuboTGsoBs5G45Cjzp/q5FnggWoPvkllpf8CGuaYUbpUQ== dependencies: - "@abp/jquery-validation" "~4.3.0-rc.1" + "@abp/jquery-validation" "~4.3.0-rc.2" jquery-validation-unobtrusive "^3.2.11" -"@abp/jquery-validation@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.3.0-rc.1.tgz#6a0d771c88e961cb43144cd6ef916d1ab22aceaf" - integrity sha512-kjVF6757xP8wZ9qw8ysI5ve3AD8PoJtxqkkUV4QF4xcrdP8EPk2heX3Imu7MJiYGyMlwLU++FTm8J68UNsWRmQ== +"@abp/jquery-validation@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.3.0-rc.2.tgz#ee145f8c4a633218ccfa50cca0bed503a0ca8dc6" + integrity sha512-SLWzN6jxVqKaHYs/d6Mku8CfhB1vWgfMbFma14upiJ+/VDkTF4Rh27iMCWKYVOS3bukh2ltBp6kPFplrjCAGSg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" jquery-validation "^1.19.2" -"@abp/jquery@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.3.0-rc.1.tgz#06030baf44983175707409eff16a05db72c93bf5" - integrity sha512-Xgptjea/RzgBvwK+paydXWMgenobuvqKsr9LbrIDiYAJuLMMCyGvwJnA7jeszz+OqZShP8ppoeB0ifa5K2Yc2A== +"@abp/jquery@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.3.0-rc.2.tgz#f620628ea0739888cbcb360c058d09bff10d553b" + integrity sha512-+rfyLVJn7E8wJ1oQ9GiCR63Yk6wah1Hqnj4XpsRDMkIaOXKaqrnVHAZd4W2DUunQSe95wqHfkNH/wkvTyNEwUg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" jquery "~3.5.1" -"@abp/lodash@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.3.0-rc.1.tgz#cd9bf0693379ea54f789299ba67483d345da5abf" - integrity sha512-BtsQs6wpJJvdwPDx7sOIIzkVHJnzw4Twrv0q3XNqmsiv5eGIwluFsorm5N6qOk7nC5csor6mpk6YuJuFii8GbQ== +"@abp/lodash@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.3.0-rc.2.tgz#9b5429d3976b34022aaf8cab4afef57479b66821" + integrity sha512-sE2dyofYbiIy4xhL85diZWkfqBcQl1q61T0DbYDOHgaejZAJxk4bVyFpEuMiC2HwWAZ656IN1bzyQIyE1RKzQA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" lodash "^4.17.15" -"@abp/luxon@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.3.0-rc.1.tgz#dd855417224bbf124cdc9f395bb5cf5f0c6a7a03" - integrity sha512-OtxmjCgPiH1JWsdUvQpkvum3k43H6v8Z5okv4lDpcBOah/HZYUP8qOsSS3Tcyw2I66TK15tq13XJeHabmh2lAQ== +"@abp/luxon@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.3.0-rc.2.tgz#6fdbf1624462615dcb1f5ce85c07fc3bc4065e3f" + integrity sha512-C4aT0aN3/TVtTE3m0AZyhFSeeg+RxXpUO+nffAZoM/cH5NL8tir+O1hd+dhtCb7AELaqQNx5+qgXoJLYdWMYVg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" luxon "^1.24.1" -"@abp/malihu-custom-scrollbar-plugin@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.3.0-rc.1.tgz#e07a9a1895ded98150c1ff4470638ab71e6a0561" - integrity sha512-OiCVlh8iHPHFchSZdFzUl/w+MqPbnlZ4jlohbEuqBTV6rbaAnJXA0Tqylv4RKjho7fybGvhxjDbBrZS4kxUFLg== +"@abp/malihu-custom-scrollbar-plugin@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.3.0-rc.2.tgz#28fc1f216c1d84b20acaf8c8c5cf5c3b33e1aeb1" + integrity sha512-LYMXKkPVyBLWV4Qnom2MW8JJ/rZmVg1CyOFxM6JiL+dpsN1Ogw0hRG33CCHQveqUmf2cr3vf96qk5Et5DyDDIg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.3.0-rc.1.tgz#f3d60b42cb82abc6a0ce6a640b82eb53501f9893" - integrity sha512-z+6Dhu6kqgCfTdZReI08N2ONKakQSmdDsNiZDB5/OOP26k2pOefe/j//sRfjTWiI5gCxO5y98ZZ0ccanBF8oTw== +"@abp/select2@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.3.0-rc.2.tgz#42d62daff9e50b1fe211a1560794625ba3f52107" + integrity sha512-okiIXmFaqx0uy/UMcpMKWKjrwop1JINyzN4FS5tafUpWhx6KcYYHudLWJvnPbsdsOeBQx91kw8jjERRJIqfEOA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" select2 "^4.0.13" -"@abp/sweetalert@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.3.0-rc.1.tgz#d54a8628f004c2d22ebcc4bd60f2b6c1cbd3bc8f" - integrity sha512-OpgDbM9vOfCLpjCRFXavPAdoKlZnpxP+DkUH8owHTrtEuxmrSjpLlIa6VOzAKr70GiLtuMCz9QoH3AyMepx9vA== +"@abp/sweetalert@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.3.0-rc.2.tgz#dfb20dfca8449ed3c3f6599d99b51746019eb664" + integrity sha512-NRKOgT80JVQrwI1FRqpbCzALvnLAFKdPwKKNDgm0L7r/5DL0+JbkKCI1AIPl/yiM8MBrCaQqNms+9JES5mjiUQ== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" sweetalert "^2.1.2" -"@abp/timeago@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.3.0-rc.1.tgz#247f3b3a8e54f6732efa3600ba649a81fee6ec82" - integrity sha512-cplxM3jYhhakET1DyERQoWJQxx0mhTKoI7gW93wNeEMyL4FWaF4lgUNEoubJUSBCDs4v/0ni0pKG8c8nldbiew== +"@abp/timeago@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.3.0-rc.2.tgz#22943e219facd7fa0efddb63017198474b5cef89" + integrity sha512-TjKyuli+SpVjTgVJmraBpqJK112I+1DYHPJfso7QAH48Ra4gceGj9EVS0i/420YyLZyJSMtZOruxzYkyJeR/6w== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" timeago "^1.6.7" -"@abp/toastr@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.3.0-rc.1.tgz#7bc5bb071839fbb971f56c41c8bf220b0a6d67e9" - integrity sha512-OQgmdmWPKlpn/Lks6fUL4enEJgnvUeEcoGTuQOKfkh9ybadYd8kcELWw5ttsQ4o35yvDH3Lsh1jLwPDrCheTBg== +"@abp/toastr@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.3.0-rc.2.tgz#143a344b00bbfaa858fe267fb6d627952bf7b3c0" + integrity sha512-cQV9UFWb9zarkb/CbrqkF9RXqn1Fc/TFKKM5mxpUEcYjx52NuM0d+KawdEMoN2y3y2U4ciY44kbTP2W1y+NlBg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" toastr "^2.1.4" -"@abp/utils@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.3.0-rc.1.tgz#82ef26e01e0cb38417bf4fa9459fde85cbc2b424" - integrity sha512-C/sk6jZQDENI7FbylBoPnTb1rC5eVPnsL8B++vAH4jS//OAj2iNvE6tCewK21GYI/JmfmQzzauQBzOiOJR9a6A== +"@abp/utils@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.3.0-rc.2.tgz#6d051f98772e5642c2e3bc2f68e73d6f24f4694c" + integrity sha512-9qYo8OMTxIUG+qQBWXEpkURS6FUrx+J5s3SwC/eerp46hYr72GQ8L38Wq566a+xiLCn7Duxt6oJ/BxhTfQQxdw== dependencies: just-compare "^1.3.0" diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json index b9db49b418..438f9df375 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json +++ b/framework/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": "^4.3.0-rc.1", - "@abp/prismjs": "^4.3.0-rc.1" + "@abp/aspnetcore.mvc.ui.theme.basic": "^4.3.0-rc.2", + "@abp/prismjs": "^4.3.0-rc.2" }, "devDependencies": {} } diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock index ab0f00749a..910082d2cc 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.3.0-rc.1.tgz#5dc06d82ee213bc33527b5af72ac94ae06bb7c25" - integrity sha512-Xkwj3NPnqWDgqvaP2eda3gviV7aBtyNOMCdZSvpxWmlaPlvJYN+SnKNnlmX02XVArTlOjaeTapFkE3auJeR6jA== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~4.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui.theme.shared@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.3.0-rc.1.tgz#9d4447f068b490367a20772eb9c2b38480088edb" - integrity sha512-untEVm6cKT375ZVEQFO01/VKIqtdFGIyJd5ZxtoQEV8ueVFRQefCOcvvqaJ8Gfj86T1nacXvJRfBfGihYHY+JQ== - dependencies: - "@abp/aspnetcore.mvc.ui" "~4.3.0-rc.1" - "@abp/bootstrap" "~4.3.0-rc.1" - "@abp/bootstrap-datepicker" "~4.3.0-rc.1" - "@abp/datatables.net-bs4" "~4.3.0-rc.1" - "@abp/font-awesome" "~4.3.0-rc.1" - "@abp/jquery-form" "~4.3.0-rc.1" - "@abp/jquery-validation-unobtrusive" "~4.3.0-rc.1" - "@abp/lodash" "~4.3.0-rc.1" - "@abp/luxon" "~4.3.0-rc.1" - "@abp/malihu-custom-scrollbar-plugin" "~4.3.0-rc.1" - "@abp/select2" "~4.3.0-rc.1" - "@abp/sweetalert" "~4.3.0-rc.1" - "@abp/timeago" "~4.3.0-rc.1" - "@abp/toastr" "~4.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.3.0-rc.1.tgz#1e54da2a668939941ab955f11db69798d04d9e7e" - integrity sha512-969etEb4H/fR9Twz6pcl766M/1AriCh6+B8r4haPB5g7QkOWhyU99mT11BHxQwf+uNV4duGZwvPvrMomrdLj2w== +"@abp/aspnetcore.mvc.ui.theme.basic@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.3.0-rc.2.tgz#4ebafbaade6610e3d405877a148d72d57569c3e3" + integrity sha512-Q3QqxKDFC04gaaj30Rk+9zGNfNxC8FX0jciARATceFV6pdA3F3PgT5EMDSlo6NoGniFVjHPRgay9N09zT6Htyw== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~4.3.0-rc.2" + +"@abp/aspnetcore.mvc.ui.theme.shared@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.3.0-rc.2.tgz#d3bf79929c55c5380d7ca7b913a23031d7a6bd12" + integrity sha512-pz86bIV4wNeG7/UPYzNCXlJ/MdOdIygc+Com7C9Ld7gzsyER7VD9h5U/hkytvL4FBFLJn4DU+xuZNECjv0HS0A== + dependencies: + "@abp/aspnetcore.mvc.ui" "~4.3.0-rc.2" + "@abp/bootstrap" "~4.3.0-rc.2" + "@abp/bootstrap-datepicker" "~4.3.0-rc.2" + "@abp/datatables.net-bs4" "~4.3.0-rc.2" + "@abp/font-awesome" "~4.3.0-rc.2" + "@abp/jquery-form" "~4.3.0-rc.2" + "@abp/jquery-validation-unobtrusive" "~4.3.0-rc.2" + "@abp/lodash" "~4.3.0-rc.2" + "@abp/luxon" "~4.3.0-rc.2" + "@abp/malihu-custom-scrollbar-plugin" "~4.3.0-rc.2" + "@abp/select2" "~4.3.0-rc.2" + "@abp/sweetalert" "~4.3.0-rc.2" + "@abp/timeago" "~4.3.0-rc.2" + "@abp/toastr" "~4.3.0-rc.2" + +"@abp/aspnetcore.mvc.ui@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.3.0-rc.2.tgz#6ff41be179c8d1089778a51ffa54a1f3d7614278" + integrity sha512-2L5zvuqUwPwNPcMauiiJZD1ft0QycqINz+bXEQ8t0EwbB+dzcsukL/rpOQfpeRHWWYy4nIN4C2bTvXhNgQbPqQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -43,162 +43,162 @@ micromatch "^4.0.2" path "^0.12.7" -"@abp/bootstrap-datepicker@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.3.0-rc.1.tgz#879a8ce32a3dbdb0cd80401360d24f25f318670b" - integrity sha512-W2T+rrC3oxuWj2xQUz2virbBK6x7ershWZB9d6FjXTSH89nin9DyBK20dEfskVvhK/IMrmZaW4PWyTTcx9r7dA== +"@abp/bootstrap-datepicker@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.3.0-rc.2.tgz#29a686c3d2bce356967f646d7334cd83c4257b4c" + integrity sha512-3+B7SJRi7DQJe0aNgv0H0zu1BfvMZcwgt06N3ALR9+o3TSJcOqcYrEMed3aG+ASH++CltnohTYnLkVXaxshioA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.3.0-rc.1.tgz#3260de03f29e210e44a55efa3af2ab6d34362227" - integrity sha512-flB18MUnRWpEnS0t/WEjsdhfB5w+zHjsa69Pj733+GHGSsZ1Vppu+rgvSWp38yNHO5uRwGECrwUIGwvd5uD9+A== +"@abp/bootstrap@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.3.0-rc.2.tgz#1416fe639c88b7d958435e45fe19692268a7f932" + integrity sha512-E6svmDhNQlT5nd65VgshexyedRWhbvi9o1oYo/dLTUpJDzR7M9ptDqxFLVB9vVDva3HgxUoEvgRJgb9fXvq4zw== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" bootstrap "^4.6.0" bootstrap-v4-rtl "4.6.0-1" -"@abp/clipboard@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-4.3.0-rc.1.tgz#014ac354e8d2aa93266f5415fcb9cef344df48e8" - integrity sha512-+Kp4f5ib81AkufOPMyG4BTKiwcnAW6ZbWOGnsR2sBEz63wW6/ZPJ0GMngLfTkxPUJCH1QMwlk5wZoj9QAKqOAw== +"@abp/clipboard@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-4.3.0-rc.2.tgz#63670e869b09f9e10ec9a2e7f8ffcc097ce1efc7" + integrity sha512-jTHzum4h5TQqAKJKEHwJ88NLFmby92hJ8byOBl/HAjOHb8LhWuw/ktTwl2knd0/63KpiCKYZGQPV3kk5JXVQ6w== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" clipboard "^2.0.6" -"@abp/core@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.3.0-rc.1.tgz#201c3be8b5697fe8e1b08b23f87f50e950036a14" - integrity sha512-ET8NGugNmdub+8qGeFf9qGPbloP5gcoBnB7U6ieFz1Eai9S3pSpbM+sdyifucEpzMThUiLS772EP4pJTMXhfEg== +"@abp/core@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.3.0-rc.2.tgz#3c9ea339624ae3b6cbee13e048268d48269ea6a9" + integrity sha512-/89xH+IVSmTOLWeUO4yVB7Hg64uHTbR7bHjgl+b94cFdtITH9Nvr2EGdXUJbHGUK7L6lSDziqiMcG/ic0061+Q== dependencies: - "@abp/utils" "^4.3.0-rc.1" + "@abp/utils" "^4.3.0-rc.2" -"@abp/datatables.net-bs4@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.3.0-rc.1.tgz#f7dad14d13b468949fd161b679f4a70271e0d466" - integrity sha512-812cLTfSZZMvjAFAq5h7R5AeJHigBxbPc+kMReQIcFLH82o6BjA2NqFBqYOvQuh4kqiQ85dqFTW9MTKeY8or6Q== +"@abp/datatables.net-bs4@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.3.0-rc.2.tgz#bbfc0d9d0ed86cdb14b38849fb78b2b1911c4a35" + integrity sha512-PRKYi2NU41KpckJ/d0buHoFbyKVuW5NCQNpUdYzDsPS2riyeXccCsLFJM1bT01TdR4Idla3vx9Fkb+HoJOiDeQ== dependencies: - "@abp/datatables.net" "~4.3.0-rc.1" + "@abp/datatables.net" "~4.3.0-rc.2" datatables.net-bs4 "^1.10.21" -"@abp/datatables.net@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.3.0-rc.1.tgz#aa1640903fe67d20e1fc57ffe0519b2764e4c7df" - integrity sha512-qfdQa43sbXsIEBc3WpxSC7cXyKSFxLiFdCKnLIkQNsC3Wo+WX/Cute2xNbT0+xIQdGznfEBdPxcwQkNE6JQgcA== +"@abp/datatables.net@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.3.0-rc.2.tgz#1923e60db261366a7d2f284b0274d13e253567ca" + integrity sha512-rp53+5Xj1jhjpCj7UBA9+nSNbaTQ4Vc1NWCg1e5aI5tWiyZprUS44dRszIQIDV86XKorfFhog5ihOZyzl1HDyg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" datatables.net "^1.10.21" -"@abp/font-awesome@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.3.0-rc.1.tgz#5d336ead8b8c67b2c0aaff9365c2c856b033196e" - integrity sha512-BU4ycN/gOxX2x8S/Eszi3bJAz6bZRhxa0uPWxEWKul9PNvKSwMJRoVaEVehnIlfTi2raHsLQHk+F7079gt3dlQ== +"@abp/font-awesome@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.3.0-rc.2.tgz#437d3d6bbd8f52e5091251932d6a494d0164694b" + integrity sha512-FeHHtEQwrJBwD5PkFYqjKouCLwNjjRqTNseaN+s/r7gNjv0PgKytfRoqEb+O/BkZg/DwEuMz9jFX/RXCCNa2xA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" "@fortawesome/fontawesome-free" "^5.13.0" -"@abp/jquery-form@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.3.0-rc.1.tgz#4543e3d751519ba12d2c563aa7cbc56e51dfe093" - integrity sha512-ONQeImarHEe4VRSv13da+rHnCv+2Ycyd7YF+Dr77gtBmTKpC5nAFGY4wO7+u0U0px/YsR2dntpyBj2fEw3wjXA== +"@abp/jquery-form@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.3.0-rc.2.tgz#999910deaf46330477b6ed487a771a2123d69f92" + integrity sha512-+fdEIOTlxDOdYXMtc/ujhYeuP2qiI4bmL3TQQWQxSTlW8q5jB6dHLBnHiXXltO8HxX9+7ZsjN3tsV7+Div5joA== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.3.0-rc.1.tgz#15a06257fba8ef8d2cba2ac9da3f6f7185e6c8dd" - integrity sha512-8Tshu/QsqulwNfRnvoX1mViY12OTvCqpHdRldqr7k6MQd+boo6ahybQ4SCoZ9vsDTmqxd5dkV/A8VijMw66WTQ== +"@abp/jquery-validation-unobtrusive@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.3.0-rc.2.tgz#0635e0c77da269e8367c3d7c388613249ce9221d" + integrity sha512-ubmPjVJatAW3AJWjWtT+ZbNLhu+HHNgcxYkFGVNusNuboTGsoBs5G45Cjzp/q5FnggWoPvkllpf8CGuaYUbpUQ== dependencies: - "@abp/jquery-validation" "~4.3.0-rc.1" + "@abp/jquery-validation" "~4.3.0-rc.2" jquery-validation-unobtrusive "^3.2.11" -"@abp/jquery-validation@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.3.0-rc.1.tgz#6a0d771c88e961cb43144cd6ef916d1ab22aceaf" - integrity sha512-kjVF6757xP8wZ9qw8ysI5ve3AD8PoJtxqkkUV4QF4xcrdP8EPk2heX3Imu7MJiYGyMlwLU++FTm8J68UNsWRmQ== +"@abp/jquery-validation@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.3.0-rc.2.tgz#ee145f8c4a633218ccfa50cca0bed503a0ca8dc6" + integrity sha512-SLWzN6jxVqKaHYs/d6Mku8CfhB1vWgfMbFma14upiJ+/VDkTF4Rh27iMCWKYVOS3bukh2ltBp6kPFplrjCAGSg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" jquery-validation "^1.19.2" -"@abp/jquery@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.3.0-rc.1.tgz#06030baf44983175707409eff16a05db72c93bf5" - integrity sha512-Xgptjea/RzgBvwK+paydXWMgenobuvqKsr9LbrIDiYAJuLMMCyGvwJnA7jeszz+OqZShP8ppoeB0ifa5K2Yc2A== +"@abp/jquery@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.3.0-rc.2.tgz#f620628ea0739888cbcb360c058d09bff10d553b" + integrity sha512-+rfyLVJn7E8wJ1oQ9GiCR63Yk6wah1Hqnj4XpsRDMkIaOXKaqrnVHAZd4W2DUunQSe95wqHfkNH/wkvTyNEwUg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" jquery "~3.5.1" -"@abp/lodash@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.3.0-rc.1.tgz#cd9bf0693379ea54f789299ba67483d345da5abf" - integrity sha512-BtsQs6wpJJvdwPDx7sOIIzkVHJnzw4Twrv0q3XNqmsiv5eGIwluFsorm5N6qOk7nC5csor6mpk6YuJuFii8GbQ== +"@abp/lodash@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.3.0-rc.2.tgz#9b5429d3976b34022aaf8cab4afef57479b66821" + integrity sha512-sE2dyofYbiIy4xhL85diZWkfqBcQl1q61T0DbYDOHgaejZAJxk4bVyFpEuMiC2HwWAZ656IN1bzyQIyE1RKzQA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" lodash "^4.17.15" -"@abp/luxon@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.3.0-rc.1.tgz#dd855417224bbf124cdc9f395bb5cf5f0c6a7a03" - integrity sha512-OtxmjCgPiH1JWsdUvQpkvum3k43H6v8Z5okv4lDpcBOah/HZYUP8qOsSS3Tcyw2I66TK15tq13XJeHabmh2lAQ== +"@abp/luxon@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.3.0-rc.2.tgz#6fdbf1624462615dcb1f5ce85c07fc3bc4065e3f" + integrity sha512-C4aT0aN3/TVtTE3m0AZyhFSeeg+RxXpUO+nffAZoM/cH5NL8tir+O1hd+dhtCb7AELaqQNx5+qgXoJLYdWMYVg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" luxon "^1.24.1" -"@abp/malihu-custom-scrollbar-plugin@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.3.0-rc.1.tgz#e07a9a1895ded98150c1ff4470638ab71e6a0561" - integrity sha512-OiCVlh8iHPHFchSZdFzUl/w+MqPbnlZ4jlohbEuqBTV6rbaAnJXA0Tqylv4RKjho7fybGvhxjDbBrZS4kxUFLg== +"@abp/malihu-custom-scrollbar-plugin@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.3.0-rc.2.tgz#28fc1f216c1d84b20acaf8c8c5cf5c3b33e1aeb1" + integrity sha512-LYMXKkPVyBLWV4Qnom2MW8JJ/rZmVg1CyOFxM6JiL+dpsN1Ogw0hRG33CCHQveqUmf2cr3vf96qk5Et5DyDDIg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/prismjs@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-4.3.0-rc.1.tgz#1a43222861e094de7be69cadc6caab91b8da69cd" - integrity sha512-nd23YXLIWFr1JbUpGahfxgAIyolQgfujSphIpQsiuKm/HfXD5IWWjKRO6NGd6gUJfdpQzlzxUv+5cZXQlQ+0OA== +"@abp/prismjs@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-4.3.0-rc.2.tgz#ecb98291898ba0c2fd4317be022d1a3e281c8bea" + integrity sha512-LA2pmTDhB3NwM4hEkZSW1xBXsixIXY2FVnEHS7ATkyRr36W/Gqb5fchv0ILBD7Gce40pAiPO2dMs4SUWT8qk0Q== dependencies: - "@abp/clipboard" "~4.3.0-rc.1" - "@abp/core" "~4.3.0-rc.1" + "@abp/clipboard" "~4.3.0-rc.2" + "@abp/core" "~4.3.0-rc.2" prismjs "^1.20.0" -"@abp/select2@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.3.0-rc.1.tgz#f3d60b42cb82abc6a0ce6a640b82eb53501f9893" - integrity sha512-z+6Dhu6kqgCfTdZReI08N2ONKakQSmdDsNiZDB5/OOP26k2pOefe/j//sRfjTWiI5gCxO5y98ZZ0ccanBF8oTw== +"@abp/select2@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.3.0-rc.2.tgz#42d62daff9e50b1fe211a1560794625ba3f52107" + integrity sha512-okiIXmFaqx0uy/UMcpMKWKjrwop1JINyzN4FS5tafUpWhx6KcYYHudLWJvnPbsdsOeBQx91kw8jjERRJIqfEOA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" select2 "^4.0.13" -"@abp/sweetalert@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.3.0-rc.1.tgz#d54a8628f004c2d22ebcc4bd60f2b6c1cbd3bc8f" - integrity sha512-OpgDbM9vOfCLpjCRFXavPAdoKlZnpxP+DkUH8owHTrtEuxmrSjpLlIa6VOzAKr70GiLtuMCz9QoH3AyMepx9vA== +"@abp/sweetalert@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.3.0-rc.2.tgz#dfb20dfca8449ed3c3f6599d99b51746019eb664" + integrity sha512-NRKOgT80JVQrwI1FRqpbCzALvnLAFKdPwKKNDgm0L7r/5DL0+JbkKCI1AIPl/yiM8MBrCaQqNms+9JES5mjiUQ== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" sweetalert "^2.1.2" -"@abp/timeago@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.3.0-rc.1.tgz#247f3b3a8e54f6732efa3600ba649a81fee6ec82" - integrity sha512-cplxM3jYhhakET1DyERQoWJQxx0mhTKoI7gW93wNeEMyL4FWaF4lgUNEoubJUSBCDs4v/0ni0pKG8c8nldbiew== +"@abp/timeago@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.3.0-rc.2.tgz#22943e219facd7fa0efddb63017198474b5cef89" + integrity sha512-TjKyuli+SpVjTgVJmraBpqJK112I+1DYHPJfso7QAH48Ra4gceGj9EVS0i/420YyLZyJSMtZOruxzYkyJeR/6w== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" timeago "^1.6.7" -"@abp/toastr@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.3.0-rc.1.tgz#7bc5bb071839fbb971f56c41c8bf220b0a6d67e9" - integrity sha512-OQgmdmWPKlpn/Lks6fUL4enEJgnvUeEcoGTuQOKfkh9ybadYd8kcELWw5ttsQ4o35yvDH3Lsh1jLwPDrCheTBg== +"@abp/toastr@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.3.0-rc.2.tgz#143a344b00bbfaa858fe267fb6d627952bf7b3c0" + integrity sha512-cQV9UFWb9zarkb/CbrqkF9RXqn1Fc/TFKKM5mxpUEcYjx52NuM0d+KawdEMoN2y3y2U4ciY44kbTP2W1y+NlBg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" toastr "^2.1.4" -"@abp/utils@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.3.0-rc.1.tgz#82ef26e01e0cb38417bf4fa9459fde85cbc2b424" - integrity sha512-C/sk6jZQDENI7FbylBoPnTb1rC5eVPnsL8B++vAH4jS//OAj2iNvE6tCewK21GYI/JmfmQzzauQBzOiOJR9a6A== +"@abp/utils@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.3.0-rc.2.tgz#6d051f98772e5642c2e3bc2f68e73d6f24f4694c" + integrity sha512-9qYo8OMTxIUG+qQBWXEpkURS6FUrx+J5s3SwC/eerp46hYr72GQ8L38Wq566a+xiLCn7Duxt6oJ/BxhTfQQxdw== 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 e5fc2f6ba4..9570a265db 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": "^4.3.0-rc.1", - "@abp/blogging": "^4.3.0-rc.1" + "@abp/aspnetcore.mvc.ui.theme.basic": "^4.3.0-rc.2", + "@abp/blogging": "^4.3.0-rc.2" } } \ No newline at end of file diff --git a/modules/blogging/app/Volo.BloggingTestApp/yarn.lock b/modules/blogging/app/Volo.BloggingTestApp/yarn.lock index 7ddfc323d5..ea7d837a0b 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@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.3.0-rc.1.tgz#5dc06d82ee213bc33527b5af72ac94ae06bb7c25" - integrity sha512-Xkwj3NPnqWDgqvaP2eda3gviV7aBtyNOMCdZSvpxWmlaPlvJYN+SnKNnlmX02XVArTlOjaeTapFkE3auJeR6jA== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~4.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui.theme.shared@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.3.0-rc.1.tgz#9d4447f068b490367a20772eb9c2b38480088edb" - integrity sha512-untEVm6cKT375ZVEQFO01/VKIqtdFGIyJd5ZxtoQEV8ueVFRQefCOcvvqaJ8Gfj86T1nacXvJRfBfGihYHY+JQ== - dependencies: - "@abp/aspnetcore.mvc.ui" "~4.3.0-rc.1" - "@abp/bootstrap" "~4.3.0-rc.1" - "@abp/bootstrap-datepicker" "~4.3.0-rc.1" - "@abp/datatables.net-bs4" "~4.3.0-rc.1" - "@abp/font-awesome" "~4.3.0-rc.1" - "@abp/jquery-form" "~4.3.0-rc.1" - "@abp/jquery-validation-unobtrusive" "~4.3.0-rc.1" - "@abp/lodash" "~4.3.0-rc.1" - "@abp/luxon" "~4.3.0-rc.1" - "@abp/malihu-custom-scrollbar-plugin" "~4.3.0-rc.1" - "@abp/select2" "~4.3.0-rc.1" - "@abp/sweetalert" "~4.3.0-rc.1" - "@abp/timeago" "~4.3.0-rc.1" - "@abp/toastr" "~4.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.3.0-rc.1.tgz#1e54da2a668939941ab955f11db69798d04d9e7e" - integrity sha512-969etEb4H/fR9Twz6pcl766M/1AriCh6+B8r4haPB5g7QkOWhyU99mT11BHxQwf+uNV4duGZwvPvrMomrdLj2w== +"@abp/aspnetcore.mvc.ui.theme.basic@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.3.0-rc.2.tgz#4ebafbaade6610e3d405877a148d72d57569c3e3" + integrity sha512-Q3QqxKDFC04gaaj30Rk+9zGNfNxC8FX0jciARATceFV6pdA3F3PgT5EMDSlo6NoGniFVjHPRgay9N09zT6Htyw== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~4.3.0-rc.2" + +"@abp/aspnetcore.mvc.ui.theme.shared@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.3.0-rc.2.tgz#d3bf79929c55c5380d7ca7b913a23031d7a6bd12" + integrity sha512-pz86bIV4wNeG7/UPYzNCXlJ/MdOdIygc+Com7C9Ld7gzsyER7VD9h5U/hkytvL4FBFLJn4DU+xuZNECjv0HS0A== + dependencies: + "@abp/aspnetcore.mvc.ui" "~4.3.0-rc.2" + "@abp/bootstrap" "~4.3.0-rc.2" + "@abp/bootstrap-datepicker" "~4.3.0-rc.2" + "@abp/datatables.net-bs4" "~4.3.0-rc.2" + "@abp/font-awesome" "~4.3.0-rc.2" + "@abp/jquery-form" "~4.3.0-rc.2" + "@abp/jquery-validation-unobtrusive" "~4.3.0-rc.2" + "@abp/lodash" "~4.3.0-rc.2" + "@abp/luxon" "~4.3.0-rc.2" + "@abp/malihu-custom-scrollbar-plugin" "~4.3.0-rc.2" + "@abp/select2" "~4.3.0-rc.2" + "@abp/sweetalert" "~4.3.0-rc.2" + "@abp/timeago" "~4.3.0-rc.2" + "@abp/toastr" "~4.3.0-rc.2" + +"@abp/aspnetcore.mvc.ui@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.3.0-rc.2.tgz#6ff41be179c8d1089778a51ffa54a1f3d7614278" + integrity sha512-2L5zvuqUwPwNPcMauiiJZD1ft0QycqINz+bXEQ8t0EwbB+dzcsukL/rpOQfpeRHWWYy4nIN4C2bTvXhNgQbPqQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -43,215 +43,215 @@ micromatch "^4.0.2" path "^0.12.7" -"@abp/blogging@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/blogging/-/blogging-4.3.0-rc.1.tgz#86cb002ddee3ce7ae93c7e740d9399108720ef60" - integrity sha512-JVwlNuIMo7jp3x8iC7KyLJFUy4pcYA1JthunUOJMwDCb1mFGkQIfK9t+S1wyWcOHug3KwCEsavzC685TZoD1eg== +"@abp/blogging@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/blogging/-/blogging-4.3.0-rc.2.tgz#4123557055737297c83970bfa4d5ddeb7d8ab8e7" + integrity sha512-yMaMYet5Y7Rfpm84zzhTNL3b8pU3CHoxRuWFGYveMz03v4lqzmHxi39GLa8Tciimth2r/6SROVpPClcLGuuNLw== dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~4.3.0-rc.1" - "@abp/owl.carousel" "~4.3.0-rc.1" - "@abp/prismjs" "~4.3.0-rc.1" - "@abp/tui-editor" "~4.3.0-rc.1" + "@abp/aspnetcore.mvc.ui.theme.shared" "~4.3.0-rc.2" + "@abp/owl.carousel" "~4.3.0-rc.2" + "@abp/prismjs" "~4.3.0-rc.2" + "@abp/tui-editor" "~4.3.0-rc.2" -"@abp/bootstrap-datepicker@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.3.0-rc.1.tgz#879a8ce32a3dbdb0cd80401360d24f25f318670b" - integrity sha512-W2T+rrC3oxuWj2xQUz2virbBK6x7ershWZB9d6FjXTSH89nin9DyBK20dEfskVvhK/IMrmZaW4PWyTTcx9r7dA== +"@abp/bootstrap-datepicker@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.3.0-rc.2.tgz#29a686c3d2bce356967f646d7334cd83c4257b4c" + integrity sha512-3+B7SJRi7DQJe0aNgv0H0zu1BfvMZcwgt06N3ALR9+o3TSJcOqcYrEMed3aG+ASH++CltnohTYnLkVXaxshioA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.3.0-rc.1.tgz#3260de03f29e210e44a55efa3af2ab6d34362227" - integrity sha512-flB18MUnRWpEnS0t/WEjsdhfB5w+zHjsa69Pj733+GHGSsZ1Vppu+rgvSWp38yNHO5uRwGECrwUIGwvd5uD9+A== +"@abp/bootstrap@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.3.0-rc.2.tgz#1416fe639c88b7d958435e45fe19692268a7f932" + integrity sha512-E6svmDhNQlT5nd65VgshexyedRWhbvi9o1oYo/dLTUpJDzR7M9ptDqxFLVB9vVDva3HgxUoEvgRJgb9fXvq4zw== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" bootstrap "^4.6.0" bootstrap-v4-rtl "4.6.0-1" -"@abp/clipboard@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-4.3.0-rc.1.tgz#014ac354e8d2aa93266f5415fcb9cef344df48e8" - integrity sha512-+Kp4f5ib81AkufOPMyG4BTKiwcnAW6ZbWOGnsR2sBEz63wW6/ZPJ0GMngLfTkxPUJCH1QMwlk5wZoj9QAKqOAw== +"@abp/clipboard@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-4.3.0-rc.2.tgz#63670e869b09f9e10ec9a2e7f8ffcc097ce1efc7" + integrity sha512-jTHzum4h5TQqAKJKEHwJ88NLFmby92hJ8byOBl/HAjOHb8LhWuw/ktTwl2knd0/63KpiCKYZGQPV3kk5JXVQ6w== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" clipboard "^2.0.6" -"@abp/codemirror@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-4.3.0-rc.1.tgz#f31d54113142c6d6a9dc70de111486ba54fb01e9" - integrity sha512-XXCD8FqP7y29GwNoIjLr73FVy9WIxUzpVt2uyVVyzSTndKec2FzxoCBM/O3wEj33GUK7Z99bNIxReAcDOlf9Pw== +"@abp/codemirror@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-4.3.0-rc.2.tgz#672d43fe99b74ed5b4e85a0ba79ba70e261a8e31" + integrity sha512-ZGGg8wkxRF9ZypEfmXFHTAg+dNn7uklfsBH4PJBB7CRpI5m3qth5ZQeIoUFbdoJHFWXl/UevmM9yzI1P05jZFA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" codemirror "^5.54.0" -"@abp/core@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.3.0-rc.1.tgz#201c3be8b5697fe8e1b08b23f87f50e950036a14" - integrity sha512-ET8NGugNmdub+8qGeFf9qGPbloP5gcoBnB7U6ieFz1Eai9S3pSpbM+sdyifucEpzMThUiLS772EP4pJTMXhfEg== +"@abp/core@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.3.0-rc.2.tgz#3c9ea339624ae3b6cbee13e048268d48269ea6a9" + integrity sha512-/89xH+IVSmTOLWeUO4yVB7Hg64uHTbR7bHjgl+b94cFdtITH9Nvr2EGdXUJbHGUK7L6lSDziqiMcG/ic0061+Q== dependencies: - "@abp/utils" "^4.3.0-rc.1" + "@abp/utils" "^4.3.0-rc.2" -"@abp/datatables.net-bs4@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.3.0-rc.1.tgz#f7dad14d13b468949fd161b679f4a70271e0d466" - integrity sha512-812cLTfSZZMvjAFAq5h7R5AeJHigBxbPc+kMReQIcFLH82o6BjA2NqFBqYOvQuh4kqiQ85dqFTW9MTKeY8or6Q== +"@abp/datatables.net-bs4@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.3.0-rc.2.tgz#bbfc0d9d0ed86cdb14b38849fb78b2b1911c4a35" + integrity sha512-PRKYi2NU41KpckJ/d0buHoFbyKVuW5NCQNpUdYzDsPS2riyeXccCsLFJM1bT01TdR4Idla3vx9Fkb+HoJOiDeQ== dependencies: - "@abp/datatables.net" "~4.3.0-rc.1" + "@abp/datatables.net" "~4.3.0-rc.2" datatables.net-bs4 "^1.10.21" -"@abp/datatables.net@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.3.0-rc.1.tgz#aa1640903fe67d20e1fc57ffe0519b2764e4c7df" - integrity sha512-qfdQa43sbXsIEBc3WpxSC7cXyKSFxLiFdCKnLIkQNsC3Wo+WX/Cute2xNbT0+xIQdGznfEBdPxcwQkNE6JQgcA== +"@abp/datatables.net@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.3.0-rc.2.tgz#1923e60db261366a7d2f284b0274d13e253567ca" + integrity sha512-rp53+5Xj1jhjpCj7UBA9+nSNbaTQ4Vc1NWCg1e5aI5tWiyZprUS44dRszIQIDV86XKorfFhog5ihOZyzl1HDyg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" datatables.net "^1.10.21" -"@abp/font-awesome@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.3.0-rc.1.tgz#5d336ead8b8c67b2c0aaff9365c2c856b033196e" - integrity sha512-BU4ycN/gOxX2x8S/Eszi3bJAz6bZRhxa0uPWxEWKul9PNvKSwMJRoVaEVehnIlfTi2raHsLQHk+F7079gt3dlQ== +"@abp/font-awesome@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.3.0-rc.2.tgz#437d3d6bbd8f52e5091251932d6a494d0164694b" + integrity sha512-FeHHtEQwrJBwD5PkFYqjKouCLwNjjRqTNseaN+s/r7gNjv0PgKytfRoqEb+O/BkZg/DwEuMz9jFX/RXCCNa2xA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" "@fortawesome/fontawesome-free" "^5.13.0" -"@abp/highlight.js@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-4.3.0-rc.1.tgz#10438fb6728fe7ff63f2f7271e0db1627320041c" - integrity sha512-MYcQyaokZrzlKX4FbwWISodfwQFOrbtzLF2x28qjWlSFNO13xka8Wn0EmZMjY84oFqYybNzoEMNAsDDgF+STBA== +"@abp/highlight.js@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-4.3.0-rc.2.tgz#a7c51e826b2a7e25c84af7ecbb38c5abe1d35dfb" + integrity sha512-oIGSsyAxdYm3ow/LbUwyYqtRvIOLQbsLQgP2+8FatnUdgFTKJRqG1RJXyPINDb3ldJlyQMFlgGlxlUV8cyqNzw== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" -"@abp/jquery-form@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.3.0-rc.1.tgz#4543e3d751519ba12d2c563aa7cbc56e51dfe093" - integrity sha512-ONQeImarHEe4VRSv13da+rHnCv+2Ycyd7YF+Dr77gtBmTKpC5nAFGY4wO7+u0U0px/YsR2dntpyBj2fEw3wjXA== +"@abp/jquery-form@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.3.0-rc.2.tgz#999910deaf46330477b6ed487a771a2123d69f92" + integrity sha512-+fdEIOTlxDOdYXMtc/ujhYeuP2qiI4bmL3TQQWQxSTlW8q5jB6dHLBnHiXXltO8HxX9+7ZsjN3tsV7+Div5joA== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.3.0-rc.1.tgz#15a06257fba8ef8d2cba2ac9da3f6f7185e6c8dd" - integrity sha512-8Tshu/QsqulwNfRnvoX1mViY12OTvCqpHdRldqr7k6MQd+boo6ahybQ4SCoZ9vsDTmqxd5dkV/A8VijMw66WTQ== +"@abp/jquery-validation-unobtrusive@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.3.0-rc.2.tgz#0635e0c77da269e8367c3d7c388613249ce9221d" + integrity sha512-ubmPjVJatAW3AJWjWtT+ZbNLhu+HHNgcxYkFGVNusNuboTGsoBs5G45Cjzp/q5FnggWoPvkllpf8CGuaYUbpUQ== dependencies: - "@abp/jquery-validation" "~4.3.0-rc.1" + "@abp/jquery-validation" "~4.3.0-rc.2" jquery-validation-unobtrusive "^3.2.11" -"@abp/jquery-validation@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.3.0-rc.1.tgz#6a0d771c88e961cb43144cd6ef916d1ab22aceaf" - integrity sha512-kjVF6757xP8wZ9qw8ysI5ve3AD8PoJtxqkkUV4QF4xcrdP8EPk2heX3Imu7MJiYGyMlwLU++FTm8J68UNsWRmQ== +"@abp/jquery-validation@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.3.0-rc.2.tgz#ee145f8c4a633218ccfa50cca0bed503a0ca8dc6" + integrity sha512-SLWzN6jxVqKaHYs/d6Mku8CfhB1vWgfMbFma14upiJ+/VDkTF4Rh27iMCWKYVOS3bukh2ltBp6kPFplrjCAGSg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" jquery-validation "^1.19.2" -"@abp/jquery@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.3.0-rc.1.tgz#06030baf44983175707409eff16a05db72c93bf5" - integrity sha512-Xgptjea/RzgBvwK+paydXWMgenobuvqKsr9LbrIDiYAJuLMMCyGvwJnA7jeszz+OqZShP8ppoeB0ifa5K2Yc2A== +"@abp/jquery@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.3.0-rc.2.tgz#f620628ea0739888cbcb360c058d09bff10d553b" + integrity sha512-+rfyLVJn7E8wJ1oQ9GiCR63Yk6wah1Hqnj4XpsRDMkIaOXKaqrnVHAZd4W2DUunQSe95wqHfkNH/wkvTyNEwUg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" jquery "~3.5.1" -"@abp/lodash@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.3.0-rc.1.tgz#cd9bf0693379ea54f789299ba67483d345da5abf" - integrity sha512-BtsQs6wpJJvdwPDx7sOIIzkVHJnzw4Twrv0q3XNqmsiv5eGIwluFsorm5N6qOk7nC5csor6mpk6YuJuFii8GbQ== +"@abp/lodash@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.3.0-rc.2.tgz#9b5429d3976b34022aaf8cab4afef57479b66821" + integrity sha512-sE2dyofYbiIy4xhL85diZWkfqBcQl1q61T0DbYDOHgaejZAJxk4bVyFpEuMiC2HwWAZ656IN1bzyQIyE1RKzQA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" lodash "^4.17.15" -"@abp/luxon@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.3.0-rc.1.tgz#dd855417224bbf124cdc9f395bb5cf5f0c6a7a03" - integrity sha512-OtxmjCgPiH1JWsdUvQpkvum3k43H6v8Z5okv4lDpcBOah/HZYUP8qOsSS3Tcyw2I66TK15tq13XJeHabmh2lAQ== +"@abp/luxon@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.3.0-rc.2.tgz#6fdbf1624462615dcb1f5ce85c07fc3bc4065e3f" + integrity sha512-C4aT0aN3/TVtTE3m0AZyhFSeeg+RxXpUO+nffAZoM/cH5NL8tir+O1hd+dhtCb7AELaqQNx5+qgXoJLYdWMYVg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" luxon "^1.24.1" -"@abp/malihu-custom-scrollbar-plugin@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.3.0-rc.1.tgz#e07a9a1895ded98150c1ff4470638ab71e6a0561" - integrity sha512-OiCVlh8iHPHFchSZdFzUl/w+MqPbnlZ4jlohbEuqBTV6rbaAnJXA0Tqylv4RKjho7fybGvhxjDbBrZS4kxUFLg== +"@abp/malihu-custom-scrollbar-plugin@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.3.0-rc.2.tgz#28fc1f216c1d84b20acaf8c8c5cf5c3b33e1aeb1" + integrity sha512-LYMXKkPVyBLWV4Qnom2MW8JJ/rZmVg1CyOFxM6JiL+dpsN1Ogw0hRG33CCHQveqUmf2cr3vf96qk5Et5DyDDIg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/markdown-it@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/markdown-it/-/markdown-it-4.3.0-rc.1.tgz#d545c789c493836d052f77441fcb23b847cd12d9" - integrity sha512-uJA0V6eyOJdjadHg4X3GOQ0ifXSU38lJVblS8yYB/8yt9GezvwS9JukX+SguuR18YlFwwjTv1cU9CCYdY8htnA== +"@abp/markdown-it@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/markdown-it/-/markdown-it-4.3.0-rc.2.tgz#4f1d039812e7efc8032b8542cd9d48dad136bf0d" + integrity sha512-fTMj0FFjMZcBevFWWrfnyxV5XZZYrD5Guq+cICMBYtKVqfbsy/ILpnznApXMuLxNukqIvGa8I3SdWaWO6CVhgQ== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" markdown-it "^11.0.0" -"@abp/owl.carousel@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/owl.carousel/-/owl.carousel-4.3.0-rc.1.tgz#b78cff4f2d5494fe124230a217215e8721c5f1e8" - integrity sha512-TE0rcGmH2l/pTY7/OuA/1s/IfxUjxXhTQslwlp5YHMk+z26+m4YcnWDzYU2kjA+mQ/q4wFkmNu7DVhld+YpS/A== +"@abp/owl.carousel@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/owl.carousel/-/owl.carousel-4.3.0-rc.2.tgz#e13a568575a3d1c0b1f9c03c215792dd5320fb2a" + integrity sha512-pu87oxJjU0wA7bcxeTd0XUPYBqXV/0/9br79nhqeK4Qz8tsI1mC4mF4LW1GmTgNDKNrNydAEAenErFzG0GOwvA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" owl.carousel "^2.3.4" -"@abp/prismjs@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-4.3.0-rc.1.tgz#1a43222861e094de7be69cadc6caab91b8da69cd" - integrity sha512-nd23YXLIWFr1JbUpGahfxgAIyolQgfujSphIpQsiuKm/HfXD5IWWjKRO6NGd6gUJfdpQzlzxUv+5cZXQlQ+0OA== +"@abp/prismjs@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-4.3.0-rc.2.tgz#ecb98291898ba0c2fd4317be022d1a3e281c8bea" + integrity sha512-LA2pmTDhB3NwM4hEkZSW1xBXsixIXY2FVnEHS7ATkyRr36W/Gqb5fchv0ILBD7Gce40pAiPO2dMs4SUWT8qk0Q== dependencies: - "@abp/clipboard" "~4.3.0-rc.1" - "@abp/core" "~4.3.0-rc.1" + "@abp/clipboard" "~4.3.0-rc.2" + "@abp/core" "~4.3.0-rc.2" prismjs "^1.20.0" -"@abp/select2@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.3.0-rc.1.tgz#f3d60b42cb82abc6a0ce6a640b82eb53501f9893" - integrity sha512-z+6Dhu6kqgCfTdZReI08N2ONKakQSmdDsNiZDB5/OOP26k2pOefe/j//sRfjTWiI5gCxO5y98ZZ0ccanBF8oTw== +"@abp/select2@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.3.0-rc.2.tgz#42d62daff9e50b1fe211a1560794625ba3f52107" + integrity sha512-okiIXmFaqx0uy/UMcpMKWKjrwop1JINyzN4FS5tafUpWhx6KcYYHudLWJvnPbsdsOeBQx91kw8jjERRJIqfEOA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" select2 "^4.0.13" -"@abp/sweetalert@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.3.0-rc.1.tgz#d54a8628f004c2d22ebcc4bd60f2b6c1cbd3bc8f" - integrity sha512-OpgDbM9vOfCLpjCRFXavPAdoKlZnpxP+DkUH8owHTrtEuxmrSjpLlIa6VOzAKr70GiLtuMCz9QoH3AyMepx9vA== +"@abp/sweetalert@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.3.0-rc.2.tgz#dfb20dfca8449ed3c3f6599d99b51746019eb664" + integrity sha512-NRKOgT80JVQrwI1FRqpbCzALvnLAFKdPwKKNDgm0L7r/5DL0+JbkKCI1AIPl/yiM8MBrCaQqNms+9JES5mjiUQ== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" sweetalert "^2.1.2" -"@abp/timeago@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.3.0-rc.1.tgz#247f3b3a8e54f6732efa3600ba649a81fee6ec82" - integrity sha512-cplxM3jYhhakET1DyERQoWJQxx0mhTKoI7gW93wNeEMyL4FWaF4lgUNEoubJUSBCDs4v/0ni0pKG8c8nldbiew== +"@abp/timeago@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.3.0-rc.2.tgz#22943e219facd7fa0efddb63017198474b5cef89" + integrity sha512-TjKyuli+SpVjTgVJmraBpqJK112I+1DYHPJfso7QAH48Ra4gceGj9EVS0i/420YyLZyJSMtZOruxzYkyJeR/6w== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" timeago "^1.6.7" -"@abp/toastr@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.3.0-rc.1.tgz#7bc5bb071839fbb971f56c41c8bf220b0a6d67e9" - integrity sha512-OQgmdmWPKlpn/Lks6fUL4enEJgnvUeEcoGTuQOKfkh9ybadYd8kcELWw5ttsQ4o35yvDH3Lsh1jLwPDrCheTBg== +"@abp/toastr@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.3.0-rc.2.tgz#143a344b00bbfaa858fe267fb6d627952bf7b3c0" + integrity sha512-cQV9UFWb9zarkb/CbrqkF9RXqn1Fc/TFKKM5mxpUEcYjx52NuM0d+KawdEMoN2y3y2U4ciY44kbTP2W1y+NlBg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" toastr "^2.1.4" -"@abp/tui-editor@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-4.3.0-rc.1.tgz#f72b82f2b9afb97562db29897261b02f0eb4ab34" - integrity sha512-MEAv6Y6rDxhhB2/CKvhhW4iCHWEYSlZpiKDnAu9eD7xyyLyWDkn/x9oC+srVoTalfZOwMQ7B6kYSUuXMvX+2Uw== +"@abp/tui-editor@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-4.3.0-rc.2.tgz#4d4de602faa2f1093752aa148df3fa3f5523d918" + integrity sha512-NuuQTiqYue+gJosVNzVTdx1HvuyfjoTzk1ih1uo8hkUWxcDuaK7LK/p4ZId8q10ZPeek5rhi2W9LgEj3EHkMBw== dependencies: - "@abp/codemirror" "~4.3.0-rc.1" - "@abp/highlight.js" "~4.3.0-rc.1" - "@abp/jquery" "~4.3.0-rc.1" - "@abp/markdown-it" "~4.3.0-rc.1" + "@abp/codemirror" "~4.3.0-rc.2" + "@abp/highlight.js" "~4.3.0-rc.2" + "@abp/jquery" "~4.3.0-rc.2" + "@abp/markdown-it" "~4.3.0-rc.2" tui-code-snippet "1.5.2" tui-editor "^1.4.10" -"@abp/utils@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.3.0-rc.1.tgz#82ef26e01e0cb38417bf4fa9459fde85cbc2b424" - integrity sha512-C/sk6jZQDENI7FbylBoPnTb1rC5eVPnsL8B++vAH4jS//OAj2iNvE6tCewK21GYI/JmfmQzzauQBzOiOJR9a6A== +"@abp/utils@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.3.0-rc.2.tgz#6d051f98772e5642c2e3bc2f68e73d6f24f4694c" + integrity sha512-9qYo8OMTxIUG+qQBWXEpkURS6FUrx+J5s3SwC/eerp46hYr72GQ8L38Wq566a+xiLCn7Duxt6oJ/BxhTfQQxdw== dependencies: just-compare "^1.3.0" diff --git a/modules/blogging/src/Volo.Blogging.Admin.Application.Contracts/Volo/Blogging/Admin/Blogs/IBlogManagementAppService.cs b/modules/blogging/src/Volo.Blogging.Admin.Application.Contracts/Volo/Blogging/Admin/Blogs/IBlogManagementAppService.cs index 35d6d1c97e..1e363c8578 100644 --- a/modules/blogging/src/Volo.Blogging.Admin.Application.Contracts/Volo/Blogging/Admin/Blogs/IBlogManagementAppService.cs +++ b/modules/blogging/src/Volo.Blogging.Admin.Application.Contracts/Volo/Blogging/Admin/Blogs/IBlogManagementAppService.cs @@ -18,5 +18,7 @@ namespace Volo.Blogging.Admin.Blogs Task UpdateAsync(Guid id, UpdateBlogDto input); Task DeleteAsync(Guid id); + + Task ClearCacheAsync(Guid id); } } diff --git a/modules/blogging/src/Volo.Blogging.Admin.Application/Volo/Blogging/Admin/Blogs/BlogManagementAppService.cs b/modules/blogging/src/Volo.Blogging.Admin.Application/Volo/Blogging/Admin/Blogs/BlogManagementAppService.cs index b11bd481fe..1c5f282d7c 100644 --- a/modules/blogging/src/Volo.Blogging.Admin.Application/Volo/Blogging/Admin/Blogs/BlogManagementAppService.cs +++ b/modules/blogging/src/Volo.Blogging.Admin.Application/Volo/Blogging/Admin/Blogs/BlogManagementAppService.cs @@ -3,18 +3,22 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; using Volo.Abp.Application.Dtos; +using Volo.Abp.Caching; using Volo.Blogging.Blogs; using Volo.Blogging.Blogs.Dtos; +using Volo.Blogging.Posts; namespace Volo.Blogging.Admin.Blogs { public class BlogManagementAppService : BloggingAdminAppServiceBase, IBlogManagementAppService { private readonly IBlogRepository _blogRepository; - - public BlogManagementAppService(IBlogRepository blogRepository) + private readonly IDistributedCache> _postsCache; + + public BlogManagementAppService(IBlogRepository blogRepository, IDistributedCache> postsCache) { _blogRepository = blogRepository; + _postsCache = postsCache; } public async Task> GetListAsync() @@ -63,5 +67,11 @@ namespace Volo.Blogging.Admin.Blogs { await _blogRepository.DeleteAsync(id); } + + [Authorize(BloggingPermissions.Blogs.ClearCache)] + public async Task ClearCacheAsync(Guid id) + { + await _postsCache.RemoveAsync(id.ToString()); + } } } diff --git a/modules/blogging/src/Volo.Blogging.Admin.HttpApi/Volo/Blogging/Admin/BlogManagementController.cs b/modules/blogging/src/Volo.Blogging.Admin.HttpApi/Volo/Blogging/Admin/BlogManagementController.cs index 815604e871..ce6457dcc7 100644 --- a/modules/blogging/src/Volo.Blogging.Admin.HttpApi/Volo/Blogging/Admin/BlogManagementController.cs +++ b/modules/blogging/src/Volo.Blogging.Admin.HttpApi/Volo/Blogging/Admin/BlogManagementController.cs @@ -54,5 +54,12 @@ namespace Volo.Blogging.Admin { await _blogManagementAppService.DeleteAsync(id); } + + [HttpGet] + [Route("clear-cache/{id}")] + public async Task ClearCacheAsync(Guid id) + { + await _blogManagementAppService.ClearCacheAsync(id); + } } } diff --git a/modules/blogging/src/Volo.Blogging.Admin.Web/Pages/Blogging/Admin/Blogs/index.js b/modules/blogging/src/Volo.Blogging.Admin.Web/Pages/Blogging/Admin/Blogs/index.js index a2b618b89f..aaa378cabd 100644 --- a/modules/blogging/src/Volo.Blogging.Admin.Web/Pages/Blogging/Admin/Blogs/index.js +++ b/modules/blogging/src/Volo.Blogging.Admin.Web/Pages/Blogging/Admin/Blogs/index.js @@ -52,6 +52,22 @@ }); }, }, + { + text: l("ClearCache"), + visible: abp.auth.isGranted( + 'Blogging.Blog.ClearCache' + ), + confirmMessage: function (data) { + return l("ClearCacheConfirmationMessage"); + }, + action: function (data) { + volo.blogging.admin.blogManagement + .clearCache(data.record.id) + .then(function () { + _dataTable.ajax.reload(); + }) + } + } ], }, }, diff --git a/modules/blogging/src/Volo.Blogging.Application.Contracts.Shared/Volo/Blogging/BloggingPermissionDefinitionProvider.cs b/modules/blogging/src/Volo.Blogging.Application.Contracts.Shared/Volo/Blogging/BloggingPermissionDefinitionProvider.cs index 65a6ab1ab7..595e32199c 100644 --- a/modules/blogging/src/Volo.Blogging.Application.Contracts.Shared/Volo/Blogging/BloggingPermissionDefinitionProvider.cs +++ b/modules/blogging/src/Volo.Blogging.Application.Contracts.Shared/Volo/Blogging/BloggingPermissionDefinitionProvider.cs @@ -15,6 +15,7 @@ namespace Volo.Blogging blogs.AddChild(BloggingPermissions.Blogs.Update, L("Permission:Edit")); blogs.AddChild(BloggingPermissions.Blogs.Delete, L("Permission:Delete")); blogs.AddChild(BloggingPermissions.Blogs.Create, L("Permission:Create")); + blogs.AddChild(BloggingPermissions.Blogs.ClearCache, L("Permission:ClearCache")); var posts = bloggingGroup.AddPermission(BloggingPermissions.Posts.Default, L("Permission:Posts")); posts.AddChild(BloggingPermissions.Posts.Update, L("Permission:Edit")); diff --git a/modules/blogging/src/Volo.Blogging.Application.Contracts.Shared/Volo/Blogging/BloggingPermissions.cs b/modules/blogging/src/Volo.Blogging.Application.Contracts.Shared/Volo/Blogging/BloggingPermissions.cs index fae85acf88..617b4d06f1 100644 --- a/modules/blogging/src/Volo.Blogging.Application.Contracts.Shared/Volo/Blogging/BloggingPermissions.cs +++ b/modules/blogging/src/Volo.Blogging.Application.Contracts.Shared/Volo/Blogging/BloggingPermissions.cs @@ -13,6 +13,7 @@ namespace Volo.Blogging public const string Delete = Default + ".Delete"; public const string Update = Default + ".Update"; public const string Create = Default + ".Create"; + public const string ClearCache = Default + ".ClearCache"; } public static class Posts diff --git a/modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/BloggingApplicationAutoMapperProfile.cs b/modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/BloggingApplicationAutoMapperProfile.cs index b9e3cf0dea..3572e00113 100644 --- a/modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/BloggingApplicationAutoMapperProfile.cs +++ b/modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/BloggingApplicationAutoMapperProfile.cs @@ -20,6 +20,13 @@ namespace Volo.Blogging CreateMap().Ignore(x=>x.Writer).Ignore(x=>x.CommentCount).Ignore(x=>x.Tags); CreateMap().Ignore(x => x.Writer); CreateMap(); + CreateMap().Ignore(x=>x.CommentCount).Ignore(x=>x.Tags); + CreateMap() + .IgnoreModificationAuditedObjectProperties() + .IgnoreDeletionAuditedObjectProperties() + .Ignore(x=>x.Writer) + .Ignore(x => x.CommentCount) + .Ignore(x => x.Tags); } } } diff --git a/modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/Posts/PostAppService.cs b/modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/Posts/PostAppService.cs index 07d22d3385..7b42d25f84 100644 --- a/modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/Posts/PostAppService.cs +++ b/modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/Posts/PostAppService.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Caching.Distributed; using Volo.Abp.Caching; +using Volo.Abp.EventBus.Local; using Volo.Blogging.Comments; using Volo.Blogging.Tagging; using Volo.Blogging.Tagging.Dtos; @@ -20,41 +21,92 @@ namespace Volo.Blogging.Posts private readonly IPostRepository _postRepository; private readonly ITagRepository _tagRepository; private readonly ICommentRepository _commentRepository; - private readonly IDistributedCache> _postsCache; - - public PostAppService(IPostRepository postRepository, ITagRepository tagRepository, ICommentRepository commentRepository, IBlogUserLookupService userLookupService, IDistributedCache> postsCache) + private readonly IDistributedCache> _postsCache; + private readonly ILocalEventBus _localEventBus; + + public PostAppService( + IPostRepository postRepository, + ITagRepository tagRepository, + ICommentRepository commentRepository, + IBlogUserLookupService userLookupService, + IDistributedCache> postsCache, + ILocalEventBus localEventBus + ) { UserLookupService = userLookupService; _postRepository = postRepository; _tagRepository = tagRepository; _commentRepository = commentRepository; _postsCache = postsCache; + _localEventBus = localEventBus; } public async Task> GetListByBlogIdAndTagName(Guid id, string tagName) { - var cacheKey = id.ToString() + "-" + tagName; + var posts = await _postRepository.GetPostsByBlogId(id); + var tag = tagName.IsNullOrWhiteSpace() ? null : await _tagRepository.FindByNameAsync(id, tagName); + var userDictionary = new Dictionary(); + var postDtos = new List(ObjectMapper.Map, List>(posts)); - return await _postsCache.GetOrAddAsync( - cacheKey, - async () => await GetPostsByBlogIdAndTagName(id, tagName), - () => new DistributedCacheEntryOptions + foreach (var postDto in postDtos) + { + postDto.Tags = await GetTagsOfPost(postDto.Id); + } + + if (tag != null) + { + postDtos = await FilterPostsByTag(postDtos, tag); + } + + foreach (var postDto in postDtos) + { + if (postDto.CreatorId.HasValue) { - AbsoluteExpiration = DateTimeOffset.Now.AddHours(6) + if (!userDictionary.ContainsKey(postDto.CreatorId.Value)) + { + var creatorUser = await UserLookupService.FindByIdAsync(postDto.CreatorId.Value); + if (creatorUser != null) + { + userDictionary[creatorUser.Id] = ObjectMapper.Map(creatorUser); + } + } + + if (userDictionary.ContainsKey(postDto.CreatorId.Value)) + { + postDto.Writer = userDictionary[(Guid)postDto.CreatorId]; + } } - ); + } + + return new ListResultDto(postDtos); } public async Task> GetTimeOrderedListAsync(Guid blogId) { - return await _postsCache.GetOrAddAsync( + var postCacheItems = await _postsCache.GetOrAddAsync( blogId.ToString(), async () => await GetTimeOrderedPostsAsync(blogId), () => new DistributedCacheEntryOptions { - AbsoluteExpiration = DateTimeOffset.Now.AddHours(6) + AbsoluteExpiration = DateTimeOffset.Now.AddHours(1) } ); + + var postsWithDetails = ObjectMapper.Map, List>(postCacheItems); + + foreach (var post in postsWithDetails) + { + if (post.CreatorId.HasValue) + { + var creatorUser = await UserLookupService.FindByIdAsync(post.CreatorId.Value); + if (creatorUser != null) + { + post.Writer = ObjectMapper.Map(creatorUser); + } + } + } + + return new ListResultDto(postsWithDetails); } public async Task GetForReadingAsync(GetPostInput input) @@ -107,6 +159,7 @@ namespace Volo.Blogging.Posts await _commentRepository.DeleteOfPost(id); await _postRepository.DeleteAsync(id); + await PublishPostChangedEventAsync(post.BlogId); } [Authorize(BloggingPermissions.Posts.Update)] @@ -128,6 +181,7 @@ namespace Volo.Blogging.Posts var tagList = SplitTags(input.Tags); await SaveTags(tagList, post); + await PublishPostChangedEventAsync(post.BlogId); return ObjectMapper.Map(post); } @@ -153,66 +207,16 @@ namespace Volo.Blogging.Posts var tagList = SplitTags(input.Tags); await SaveTags(tagList, post); + await PublishPostChangedEventAsync(post.BlogId); return ObjectMapper.Map(post); } - private async Task> GetPostsByBlogIdAndTagName(Guid id, string tagName) - { - var posts = await _postRepository.GetPostsByBlogId(id); - var tag = tagName.IsNullOrWhiteSpace() ? null : await _tagRepository.FindByNameAsync(id, tagName); - var userDictionary = new Dictionary(); - var postDtos = new List(ObjectMapper.Map, List>(posts)); - - foreach (var postDto in postDtos) - { - postDto.Tags = await GetTagsOfPost(postDto.Id); - } - - if (tag != null) - { - postDtos = await FilterPostsByTag(postDtos, tag); - } - - foreach (var postDto in postDtos) - { - if (postDto.CreatorId.HasValue) - { - if (!userDictionary.ContainsKey(postDto.CreatorId.Value)) - { - var creatorUser = await UserLookupService.FindByIdAsync(postDto.CreatorId.Value); - if (creatorUser != null) - { - userDictionary[creatorUser.Id] = ObjectMapper.Map(creatorUser); - } - } - - if (userDictionary.ContainsKey(postDto.CreatorId.Value)) - { - postDto.Writer = userDictionary[(Guid)postDto.CreatorId]; - } - } - } - - return new ListResultDto(postDtos); - } - - private async Task> GetTimeOrderedPostsAsync(Guid blogId) + private async Task> GetTimeOrderedPostsAsync(Guid blogId) { var posts = await _postRepository.GetOrderedList(blogId); - var postDtos = new List(ObjectMapper.Map, List>(posts)); - - foreach (var postDto in postDtos) - { - var creatorUser = await UserLookupService.FindByIdAsync(postDto.CreatorId.Value); - if (creatorUser != null) - { - postDto.Writer = ObjectMapper.Map(creatorUser); - } - } - - return new ListResultDto(postDtos); + return ObjectMapper.Map, List>(posts); } private async Task RenameUrlIfItAlreadyExistAsync(Guid blogId, string url, Post existingPost = null) @@ -300,5 +304,14 @@ namespace Volo.Blogging.Posts return Task.FromResult(filteredPostDtos); } + + private async Task PublishPostChangedEventAsync(Guid blogId) + { + await _localEventBus.PublishAsync( + new PostChangedEvent + { + BlogId = blogId + }); + } } } diff --git a/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/Localization/Resources/en.json b/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/Localization/Resources/en.json index 5ebdf25d9f..2219aa9fcd 100644 --- a/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/Localization/Resources/en.json +++ b/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/Localization/Resources/en.json @@ -12,6 +12,7 @@ "Permission:Posts": "Posts", "Permission:Tags": "Tags", "Permission:Comments": "Comments", + "Permission:ClearCache": "Clear cache", "Title": "Title", "Delete": "Delete", "Reply": "Reply", @@ -53,6 +54,8 @@ "Blogs": "Blogs", "Tags": "Tags", "ShareOn": "Share on", - "TitleLengthWarning": "Keep your title size under 60 characters to be SEO friendly!" + "TitleLengthWarning": "Keep your title size under 60 characters to be SEO friendly!", + "ClearCache": "Clear cache", + "ClearCacheConfirmationMessage": "Are you sure you want to clear the cache?" } } diff --git a/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/Localization/Resources/tr.json b/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/Localization/Resources/tr.json index 4a9a38b040..915e8b233e 100644 --- a/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/Localization/Resources/tr.json +++ b/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/Localization/Resources/tr.json @@ -12,6 +12,7 @@ "Permission:Posts": "Yazılar", "Permission:Tags": "Etiketler", "Permission:Comments": "Yorumlar", + "Permission:ClearCache": "Önbelleği temizle", "Title": "Başlık", "Delete": "Sil", "Reply": "Yanıtla", @@ -53,6 +54,8 @@ "Blogs": "Bloglar", "Tags": "Etiketler", "ShareOn": "Paylaş", - "TitleLengthWarning": "Başlığınınz SEO dostu olabilmesi için 60 karakterden az olmasını sağlayın!" + "TitleLengthWarning": "Başlığınınz SEO dostu olabilmesi için 60 karakterden az olmasını sağlayın!", + "ClearCache": "Önbelleği temizle", + "ClearCacheConfirmationMessage": "Önbelleği temizlemek istediğinizden emin misiniz?" } } diff --git a/modules/blogging/src/Volo.Blogging.Domain/Volo.Blogging.Domain.csproj b/modules/blogging/src/Volo.Blogging.Domain/Volo.Blogging.Domain.csproj index 73cf0498c5..c6c096105b 100644 --- a/modules/blogging/src/Volo.Blogging.Domain/Volo.Blogging.Domain.csproj +++ b/modules/blogging/src/Volo.Blogging.Domain/Volo.Blogging.Domain.csproj @@ -15,6 +15,7 @@ + diff --git a/modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/BloggingDomainModule.cs b/modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/BloggingDomainModule.cs index 3179303215..2e5e9a68e0 100644 --- a/modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/BloggingDomainModule.cs +++ b/modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/BloggingDomainModule.cs @@ -1,5 +1,6 @@ using Microsoft.Extensions.DependencyInjection; using Volo.Abp.AutoMapper; +using Volo.Abp.Caching; using Volo.Abp.Domain; using Volo.Abp.Domain.Entities.Events.Distributed; using Volo.Abp.Modularity; @@ -13,7 +14,9 @@ namespace Volo.Blogging [DependsOn( typeof(BloggingDomainSharedModule), typeof(AbpDddDomainModule), - typeof(AbpAutoMapperModule))] + typeof(AbpAutoMapperModule), + typeof(AbpCachingModule) + )] public class BloggingDomainModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) diff --git a/modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/Posts/PostCacheInvalidator.cs b/modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/Posts/PostCacheInvalidator.cs new file mode 100644 index 0000000000..e18e6de23b --- /dev/null +++ b/modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/Posts/PostCacheInvalidator.cs @@ -0,0 +1,23 @@ +using System.Collections.Generic; +using System.Threading.Tasks; +using Volo.Abp.Caching; +using Volo.Abp.DependencyInjection; +using Volo.Abp.EventBus; + +namespace Volo.Blogging.Posts +{ + public class PostCacheInvalidator : ILocalEventHandler, ITransientDependency + { + protected IDistributedCache> Cache { get; } + + public PostCacheInvalidator(IDistributedCache> cache) + { + Cache = cache; + } + + public virtual async Task HandleEventAsync(PostChangedEvent post) + { + await Cache.RemoveAsync(post.BlogId.ToString()); + } + } +} \ No newline at end of file diff --git a/modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/Posts/PostCacheItem.cs b/modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/Posts/PostCacheItem.cs new file mode 100644 index 0000000000..d65b64ba43 --- /dev/null +++ b/modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/Posts/PostCacheItem.cs @@ -0,0 +1,38 @@ +using System; +using System.Collections.Generic; +using JetBrains.Annotations; +using Volo.Abp.Auditing; +using Volo.Abp.Domain.Entities; +using Volo.Blogging.Tagging; +using Volo.Blogging.Users; + +namespace Volo.Blogging.Posts +{ + [Serializable] + public class PostCacheItem : ICreationAuditedObject + { + public Guid Id { get; set; } + + public Guid BlogId { get; set; } + + public string Title { get; set; } + + public string CoverImage { get; set; } + + public string Url { get; set; } + + public string Content { get; set; } + + public string Description { get; set; } + + public int ReadCount { get; set; } + + public int CommentCount { get; set; } + + public List Tags { get; set; } + + public Guid? CreatorId { get; set; } + + public DateTime CreationTime { get; set; } + } +} \ No newline at end of file diff --git a/modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/Posts/PostChangedEvent.cs b/modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/Posts/PostChangedEvent.cs new file mode 100644 index 0000000000..c32ed92224 --- /dev/null +++ b/modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/Posts/PostChangedEvent.cs @@ -0,0 +1,9 @@ +using System; + +namespace Volo.Blogging.Posts +{ + public class PostChangedEvent + { + public Guid BlogId { get; set; } + } +} \ No newline at end of file diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json index 85f08a8046..391b299fdc 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": "^4.3.0-rc.1" + "@abp/aspnetcore.mvc.ui.theme.basic": "^4.3.0-rc.2" } } \ No newline at end of file diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock index b6d4a05f93..25d1eb8717 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@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.3.0-rc.1.tgz#5dc06d82ee213bc33527b5af72ac94ae06bb7c25" - integrity sha512-Xkwj3NPnqWDgqvaP2eda3gviV7aBtyNOMCdZSvpxWmlaPlvJYN+SnKNnlmX02XVArTlOjaeTapFkE3auJeR6jA== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~4.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui.theme.shared@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.3.0-rc.1.tgz#9d4447f068b490367a20772eb9c2b38480088edb" - integrity sha512-untEVm6cKT375ZVEQFO01/VKIqtdFGIyJd5ZxtoQEV8ueVFRQefCOcvvqaJ8Gfj86T1nacXvJRfBfGihYHY+JQ== - dependencies: - "@abp/aspnetcore.mvc.ui" "~4.3.0-rc.1" - "@abp/bootstrap" "~4.3.0-rc.1" - "@abp/bootstrap-datepicker" "~4.3.0-rc.1" - "@abp/datatables.net-bs4" "~4.3.0-rc.1" - "@abp/font-awesome" "~4.3.0-rc.1" - "@abp/jquery-form" "~4.3.0-rc.1" - "@abp/jquery-validation-unobtrusive" "~4.3.0-rc.1" - "@abp/lodash" "~4.3.0-rc.1" - "@abp/luxon" "~4.3.0-rc.1" - "@abp/malihu-custom-scrollbar-plugin" "~4.3.0-rc.1" - "@abp/select2" "~4.3.0-rc.1" - "@abp/sweetalert" "~4.3.0-rc.1" - "@abp/timeago" "~4.3.0-rc.1" - "@abp/toastr" "~4.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.3.0-rc.1.tgz#1e54da2a668939941ab955f11db69798d04d9e7e" - integrity sha512-969etEb4H/fR9Twz6pcl766M/1AriCh6+B8r4haPB5g7QkOWhyU99mT11BHxQwf+uNV4duGZwvPvrMomrdLj2w== +"@abp/aspnetcore.mvc.ui.theme.basic@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.3.0-rc.2.tgz#4ebafbaade6610e3d405877a148d72d57569c3e3" + integrity sha512-Q3QqxKDFC04gaaj30Rk+9zGNfNxC8FX0jciARATceFV6pdA3F3PgT5EMDSlo6NoGniFVjHPRgay9N09zT6Htyw== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~4.3.0-rc.2" + +"@abp/aspnetcore.mvc.ui.theme.shared@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.3.0-rc.2.tgz#d3bf79929c55c5380d7ca7b913a23031d7a6bd12" + integrity sha512-pz86bIV4wNeG7/UPYzNCXlJ/MdOdIygc+Com7C9Ld7gzsyER7VD9h5U/hkytvL4FBFLJn4DU+xuZNECjv0HS0A== + dependencies: + "@abp/aspnetcore.mvc.ui" "~4.3.0-rc.2" + "@abp/bootstrap" "~4.3.0-rc.2" + "@abp/bootstrap-datepicker" "~4.3.0-rc.2" + "@abp/datatables.net-bs4" "~4.3.0-rc.2" + "@abp/font-awesome" "~4.3.0-rc.2" + "@abp/jquery-form" "~4.3.0-rc.2" + "@abp/jquery-validation-unobtrusive" "~4.3.0-rc.2" + "@abp/lodash" "~4.3.0-rc.2" + "@abp/luxon" "~4.3.0-rc.2" + "@abp/malihu-custom-scrollbar-plugin" "~4.3.0-rc.2" + "@abp/select2" "~4.3.0-rc.2" + "@abp/sweetalert" "~4.3.0-rc.2" + "@abp/timeago" "~4.3.0-rc.2" + "@abp/toastr" "~4.3.0-rc.2" + +"@abp/aspnetcore.mvc.ui@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.3.0-rc.2.tgz#6ff41be179c8d1089778a51ffa54a1f3d7614278" + integrity sha512-2L5zvuqUwPwNPcMauiiJZD1ft0QycqINz+bXEQ8t0EwbB+dzcsukL/rpOQfpeRHWWYy4nIN4C2bTvXhNgQbPqQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -43,145 +43,145 @@ micromatch "^4.0.2" path "^0.12.7" -"@abp/bootstrap-datepicker@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.3.0-rc.1.tgz#879a8ce32a3dbdb0cd80401360d24f25f318670b" - integrity sha512-W2T+rrC3oxuWj2xQUz2virbBK6x7ershWZB9d6FjXTSH89nin9DyBK20dEfskVvhK/IMrmZaW4PWyTTcx9r7dA== +"@abp/bootstrap-datepicker@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.3.0-rc.2.tgz#29a686c3d2bce356967f646d7334cd83c4257b4c" + integrity sha512-3+B7SJRi7DQJe0aNgv0H0zu1BfvMZcwgt06N3ALR9+o3TSJcOqcYrEMed3aG+ASH++CltnohTYnLkVXaxshioA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.3.0-rc.1.tgz#3260de03f29e210e44a55efa3af2ab6d34362227" - integrity sha512-flB18MUnRWpEnS0t/WEjsdhfB5w+zHjsa69Pj733+GHGSsZ1Vppu+rgvSWp38yNHO5uRwGECrwUIGwvd5uD9+A== +"@abp/bootstrap@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.3.0-rc.2.tgz#1416fe639c88b7d958435e45fe19692268a7f932" + integrity sha512-E6svmDhNQlT5nd65VgshexyedRWhbvi9o1oYo/dLTUpJDzR7M9ptDqxFLVB9vVDva3HgxUoEvgRJgb9fXvq4zw== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" bootstrap "^4.6.0" bootstrap-v4-rtl "4.6.0-1" -"@abp/core@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.3.0-rc.1.tgz#201c3be8b5697fe8e1b08b23f87f50e950036a14" - integrity sha512-ET8NGugNmdub+8qGeFf9qGPbloP5gcoBnB7U6ieFz1Eai9S3pSpbM+sdyifucEpzMThUiLS772EP4pJTMXhfEg== +"@abp/core@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.3.0-rc.2.tgz#3c9ea339624ae3b6cbee13e048268d48269ea6a9" + integrity sha512-/89xH+IVSmTOLWeUO4yVB7Hg64uHTbR7bHjgl+b94cFdtITH9Nvr2EGdXUJbHGUK7L6lSDziqiMcG/ic0061+Q== dependencies: - "@abp/utils" "^4.3.0-rc.1" + "@abp/utils" "^4.3.0-rc.2" -"@abp/datatables.net-bs4@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.3.0-rc.1.tgz#f7dad14d13b468949fd161b679f4a70271e0d466" - integrity sha512-812cLTfSZZMvjAFAq5h7R5AeJHigBxbPc+kMReQIcFLH82o6BjA2NqFBqYOvQuh4kqiQ85dqFTW9MTKeY8or6Q== +"@abp/datatables.net-bs4@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.3.0-rc.2.tgz#bbfc0d9d0ed86cdb14b38849fb78b2b1911c4a35" + integrity sha512-PRKYi2NU41KpckJ/d0buHoFbyKVuW5NCQNpUdYzDsPS2riyeXccCsLFJM1bT01TdR4Idla3vx9Fkb+HoJOiDeQ== dependencies: - "@abp/datatables.net" "~4.3.0-rc.1" + "@abp/datatables.net" "~4.3.0-rc.2" datatables.net-bs4 "^1.10.21" -"@abp/datatables.net@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.3.0-rc.1.tgz#aa1640903fe67d20e1fc57ffe0519b2764e4c7df" - integrity sha512-qfdQa43sbXsIEBc3WpxSC7cXyKSFxLiFdCKnLIkQNsC3Wo+WX/Cute2xNbT0+xIQdGznfEBdPxcwQkNE6JQgcA== +"@abp/datatables.net@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.3.0-rc.2.tgz#1923e60db261366a7d2f284b0274d13e253567ca" + integrity sha512-rp53+5Xj1jhjpCj7UBA9+nSNbaTQ4Vc1NWCg1e5aI5tWiyZprUS44dRszIQIDV86XKorfFhog5ihOZyzl1HDyg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" datatables.net "^1.10.21" -"@abp/font-awesome@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.3.0-rc.1.tgz#5d336ead8b8c67b2c0aaff9365c2c856b033196e" - integrity sha512-BU4ycN/gOxX2x8S/Eszi3bJAz6bZRhxa0uPWxEWKul9PNvKSwMJRoVaEVehnIlfTi2raHsLQHk+F7079gt3dlQ== +"@abp/font-awesome@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.3.0-rc.2.tgz#437d3d6bbd8f52e5091251932d6a494d0164694b" + integrity sha512-FeHHtEQwrJBwD5PkFYqjKouCLwNjjRqTNseaN+s/r7gNjv0PgKytfRoqEb+O/BkZg/DwEuMz9jFX/RXCCNa2xA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" "@fortawesome/fontawesome-free" "^5.13.0" -"@abp/jquery-form@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.3.0-rc.1.tgz#4543e3d751519ba12d2c563aa7cbc56e51dfe093" - integrity sha512-ONQeImarHEe4VRSv13da+rHnCv+2Ycyd7YF+Dr77gtBmTKpC5nAFGY4wO7+u0U0px/YsR2dntpyBj2fEw3wjXA== +"@abp/jquery-form@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.3.0-rc.2.tgz#999910deaf46330477b6ed487a771a2123d69f92" + integrity sha512-+fdEIOTlxDOdYXMtc/ujhYeuP2qiI4bmL3TQQWQxSTlW8q5jB6dHLBnHiXXltO8HxX9+7ZsjN3tsV7+Div5joA== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.3.0-rc.1.tgz#15a06257fba8ef8d2cba2ac9da3f6f7185e6c8dd" - integrity sha512-8Tshu/QsqulwNfRnvoX1mViY12OTvCqpHdRldqr7k6MQd+boo6ahybQ4SCoZ9vsDTmqxd5dkV/A8VijMw66WTQ== +"@abp/jquery-validation-unobtrusive@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.3.0-rc.2.tgz#0635e0c77da269e8367c3d7c388613249ce9221d" + integrity sha512-ubmPjVJatAW3AJWjWtT+ZbNLhu+HHNgcxYkFGVNusNuboTGsoBs5G45Cjzp/q5FnggWoPvkllpf8CGuaYUbpUQ== dependencies: - "@abp/jquery-validation" "~4.3.0-rc.1" + "@abp/jquery-validation" "~4.3.0-rc.2" jquery-validation-unobtrusive "^3.2.11" -"@abp/jquery-validation@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.3.0-rc.1.tgz#6a0d771c88e961cb43144cd6ef916d1ab22aceaf" - integrity sha512-kjVF6757xP8wZ9qw8ysI5ve3AD8PoJtxqkkUV4QF4xcrdP8EPk2heX3Imu7MJiYGyMlwLU++FTm8J68UNsWRmQ== +"@abp/jquery-validation@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.3.0-rc.2.tgz#ee145f8c4a633218ccfa50cca0bed503a0ca8dc6" + integrity sha512-SLWzN6jxVqKaHYs/d6Mku8CfhB1vWgfMbFma14upiJ+/VDkTF4Rh27iMCWKYVOS3bukh2ltBp6kPFplrjCAGSg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" jquery-validation "^1.19.2" -"@abp/jquery@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.3.0-rc.1.tgz#06030baf44983175707409eff16a05db72c93bf5" - integrity sha512-Xgptjea/RzgBvwK+paydXWMgenobuvqKsr9LbrIDiYAJuLMMCyGvwJnA7jeszz+OqZShP8ppoeB0ifa5K2Yc2A== +"@abp/jquery@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.3.0-rc.2.tgz#f620628ea0739888cbcb360c058d09bff10d553b" + integrity sha512-+rfyLVJn7E8wJ1oQ9GiCR63Yk6wah1Hqnj4XpsRDMkIaOXKaqrnVHAZd4W2DUunQSe95wqHfkNH/wkvTyNEwUg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" jquery "~3.5.1" -"@abp/lodash@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.3.0-rc.1.tgz#cd9bf0693379ea54f789299ba67483d345da5abf" - integrity sha512-BtsQs6wpJJvdwPDx7sOIIzkVHJnzw4Twrv0q3XNqmsiv5eGIwluFsorm5N6qOk7nC5csor6mpk6YuJuFii8GbQ== +"@abp/lodash@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.3.0-rc.2.tgz#9b5429d3976b34022aaf8cab4afef57479b66821" + integrity sha512-sE2dyofYbiIy4xhL85diZWkfqBcQl1q61T0DbYDOHgaejZAJxk4bVyFpEuMiC2HwWAZ656IN1bzyQIyE1RKzQA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" lodash "^4.17.15" -"@abp/luxon@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.3.0-rc.1.tgz#dd855417224bbf124cdc9f395bb5cf5f0c6a7a03" - integrity sha512-OtxmjCgPiH1JWsdUvQpkvum3k43H6v8Z5okv4lDpcBOah/HZYUP8qOsSS3Tcyw2I66TK15tq13XJeHabmh2lAQ== +"@abp/luxon@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.3.0-rc.2.tgz#6fdbf1624462615dcb1f5ce85c07fc3bc4065e3f" + integrity sha512-C4aT0aN3/TVtTE3m0AZyhFSeeg+RxXpUO+nffAZoM/cH5NL8tir+O1hd+dhtCb7AELaqQNx5+qgXoJLYdWMYVg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" luxon "^1.24.1" -"@abp/malihu-custom-scrollbar-plugin@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.3.0-rc.1.tgz#e07a9a1895ded98150c1ff4470638ab71e6a0561" - integrity sha512-OiCVlh8iHPHFchSZdFzUl/w+MqPbnlZ4jlohbEuqBTV6rbaAnJXA0Tqylv4RKjho7fybGvhxjDbBrZS4kxUFLg== +"@abp/malihu-custom-scrollbar-plugin@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.3.0-rc.2.tgz#28fc1f216c1d84b20acaf8c8c5cf5c3b33e1aeb1" + integrity sha512-LYMXKkPVyBLWV4Qnom2MW8JJ/rZmVg1CyOFxM6JiL+dpsN1Ogw0hRG33CCHQveqUmf2cr3vf96qk5Et5DyDDIg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.3.0-rc.1.tgz#f3d60b42cb82abc6a0ce6a640b82eb53501f9893" - integrity sha512-z+6Dhu6kqgCfTdZReI08N2ONKakQSmdDsNiZDB5/OOP26k2pOefe/j//sRfjTWiI5gCxO5y98ZZ0ccanBF8oTw== +"@abp/select2@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.3.0-rc.2.tgz#42d62daff9e50b1fe211a1560794625ba3f52107" + integrity sha512-okiIXmFaqx0uy/UMcpMKWKjrwop1JINyzN4FS5tafUpWhx6KcYYHudLWJvnPbsdsOeBQx91kw8jjERRJIqfEOA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" select2 "^4.0.13" -"@abp/sweetalert@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.3.0-rc.1.tgz#d54a8628f004c2d22ebcc4bd60f2b6c1cbd3bc8f" - integrity sha512-OpgDbM9vOfCLpjCRFXavPAdoKlZnpxP+DkUH8owHTrtEuxmrSjpLlIa6VOzAKr70GiLtuMCz9QoH3AyMepx9vA== +"@abp/sweetalert@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.3.0-rc.2.tgz#dfb20dfca8449ed3c3f6599d99b51746019eb664" + integrity sha512-NRKOgT80JVQrwI1FRqpbCzALvnLAFKdPwKKNDgm0L7r/5DL0+JbkKCI1AIPl/yiM8MBrCaQqNms+9JES5mjiUQ== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" sweetalert "^2.1.2" -"@abp/timeago@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.3.0-rc.1.tgz#247f3b3a8e54f6732efa3600ba649a81fee6ec82" - integrity sha512-cplxM3jYhhakET1DyERQoWJQxx0mhTKoI7gW93wNeEMyL4FWaF4lgUNEoubJUSBCDs4v/0ni0pKG8c8nldbiew== +"@abp/timeago@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.3.0-rc.2.tgz#22943e219facd7fa0efddb63017198474b5cef89" + integrity sha512-TjKyuli+SpVjTgVJmraBpqJK112I+1DYHPJfso7QAH48Ra4gceGj9EVS0i/420YyLZyJSMtZOruxzYkyJeR/6w== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" timeago "^1.6.7" -"@abp/toastr@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.3.0-rc.1.tgz#7bc5bb071839fbb971f56c41c8bf220b0a6d67e9" - integrity sha512-OQgmdmWPKlpn/Lks6fUL4enEJgnvUeEcoGTuQOKfkh9ybadYd8kcELWw5ttsQ4o35yvDH3Lsh1jLwPDrCheTBg== +"@abp/toastr@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.3.0-rc.2.tgz#143a344b00bbfaa858fe267fb6d627952bf7b3c0" + integrity sha512-cQV9UFWb9zarkb/CbrqkF9RXqn1Fc/TFKKM5mxpUEcYjx52NuM0d+KawdEMoN2y3y2U4ciY44kbTP2W1y+NlBg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" toastr "^2.1.4" -"@abp/utils@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.3.0-rc.1.tgz#82ef26e01e0cb38417bf4fa9459fde85cbc2b424" - integrity sha512-C/sk6jZQDENI7FbylBoPnTb1rC5eVPnsL8B++vAH4jS//OAj2iNvE6tCewK21GYI/JmfmQzzauQBzOiOJR9a6A== +"@abp/utils@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.3.0-rc.2.tgz#6d051f98772e5642c2e3bc2f68e73d6f24f4694c" + integrity sha512-9qYo8OMTxIUG+qQBWXEpkURS6FUrx+J5s3SwC/eerp46hYr72GQ8L38Wq566a+xiLCn7Duxt6oJ/BxhTfQQxdw== dependencies: just-compare "^1.3.0" diff --git a/modules/cms-kit/angular/package.json b/modules/cms-kit/angular/package.json index ce7e5e91ee..2dff40a63e 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": "~4.3.0-rc.1", - "@abp/ng.identity": "~4.3.0-rc.1", - "@abp/ng.setting-management": "~4.3.0-rc.1", - "@abp/ng.tenant-management": "~4.3.0-rc.1", - "@abp/ng.theme.basic": "~4.3.0-rc.1", + "@abp/ng.account": "~4.3.0-rc.2", + "@abp/ng.identity": "~4.3.0-rc.2", + "@abp/ng.setting-management": "~4.3.0-rc.2", + "@abp/ng.tenant-management": "~4.3.0-rc.2", + "@abp/ng.theme.basic": "~4.3.0-rc.2", "@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 292510cb02..f6d7c9fa47 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": ">=4.3.0-rc.1", - "@abp/ng.theme.shared": ">=4.3.0-rc.1" + "@abp/ng.core": ">=4.3.0-rc.2", + "@abp/ng.theme.shared": ">=4.3.0-rc.2" }, "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 b9e8623fe2..00e47b60e7 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": "^4.3.0-rc.1" + "@abp/aspnetcore.mvc.ui.theme.basic": "^4.3.0-rc.2" } } \ No newline at end of file diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock index e068e01f38..429ce75f04 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@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.3.0-rc.1.tgz#5dc06d82ee213bc33527b5af72ac94ae06bb7c25" - integrity sha512-Xkwj3NPnqWDgqvaP2eda3gviV7aBtyNOMCdZSvpxWmlaPlvJYN+SnKNnlmX02XVArTlOjaeTapFkE3auJeR6jA== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~4.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui.theme.shared@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.3.0-rc.1.tgz#9d4447f068b490367a20772eb9c2b38480088edb" - integrity sha512-untEVm6cKT375ZVEQFO01/VKIqtdFGIyJd5ZxtoQEV8ueVFRQefCOcvvqaJ8Gfj86T1nacXvJRfBfGihYHY+JQ== - dependencies: - "@abp/aspnetcore.mvc.ui" "~4.3.0-rc.1" - "@abp/bootstrap" "~4.3.0-rc.1" - "@abp/bootstrap-datepicker" "~4.3.0-rc.1" - "@abp/datatables.net-bs4" "~4.3.0-rc.1" - "@abp/font-awesome" "~4.3.0-rc.1" - "@abp/jquery-form" "~4.3.0-rc.1" - "@abp/jquery-validation-unobtrusive" "~4.3.0-rc.1" - "@abp/lodash" "~4.3.0-rc.1" - "@abp/luxon" "~4.3.0-rc.1" - "@abp/malihu-custom-scrollbar-plugin" "~4.3.0-rc.1" - "@abp/select2" "~4.3.0-rc.1" - "@abp/sweetalert" "~4.3.0-rc.1" - "@abp/timeago" "~4.3.0-rc.1" - "@abp/toastr" "~4.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.3.0-rc.1.tgz#1e54da2a668939941ab955f11db69798d04d9e7e" - integrity sha512-969etEb4H/fR9Twz6pcl766M/1AriCh6+B8r4haPB5g7QkOWhyU99mT11BHxQwf+uNV4duGZwvPvrMomrdLj2w== +"@abp/aspnetcore.mvc.ui.theme.basic@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.3.0-rc.2.tgz#4ebafbaade6610e3d405877a148d72d57569c3e3" + integrity sha512-Q3QqxKDFC04gaaj30Rk+9zGNfNxC8FX0jciARATceFV6pdA3F3PgT5EMDSlo6NoGniFVjHPRgay9N09zT6Htyw== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~4.3.0-rc.2" + +"@abp/aspnetcore.mvc.ui.theme.shared@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.3.0-rc.2.tgz#d3bf79929c55c5380d7ca7b913a23031d7a6bd12" + integrity sha512-pz86bIV4wNeG7/UPYzNCXlJ/MdOdIygc+Com7C9Ld7gzsyER7VD9h5U/hkytvL4FBFLJn4DU+xuZNECjv0HS0A== + dependencies: + "@abp/aspnetcore.mvc.ui" "~4.3.0-rc.2" + "@abp/bootstrap" "~4.3.0-rc.2" + "@abp/bootstrap-datepicker" "~4.3.0-rc.2" + "@abp/datatables.net-bs4" "~4.3.0-rc.2" + "@abp/font-awesome" "~4.3.0-rc.2" + "@abp/jquery-form" "~4.3.0-rc.2" + "@abp/jquery-validation-unobtrusive" "~4.3.0-rc.2" + "@abp/lodash" "~4.3.0-rc.2" + "@abp/luxon" "~4.3.0-rc.2" + "@abp/malihu-custom-scrollbar-plugin" "~4.3.0-rc.2" + "@abp/select2" "~4.3.0-rc.2" + "@abp/sweetalert" "~4.3.0-rc.2" + "@abp/timeago" "~4.3.0-rc.2" + "@abp/toastr" "~4.3.0-rc.2" + +"@abp/aspnetcore.mvc.ui@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.3.0-rc.2.tgz#6ff41be179c8d1089778a51ffa54a1f3d7614278" + integrity sha512-2L5zvuqUwPwNPcMauiiJZD1ft0QycqINz+bXEQ8t0EwbB+dzcsukL/rpOQfpeRHWWYy4nIN4C2bTvXhNgQbPqQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -43,145 +43,145 @@ micromatch "^4.0.2" path "^0.12.7" -"@abp/bootstrap-datepicker@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.3.0-rc.1.tgz#879a8ce32a3dbdb0cd80401360d24f25f318670b" - integrity sha512-W2T+rrC3oxuWj2xQUz2virbBK6x7ershWZB9d6FjXTSH89nin9DyBK20dEfskVvhK/IMrmZaW4PWyTTcx9r7dA== +"@abp/bootstrap-datepicker@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.3.0-rc.2.tgz#29a686c3d2bce356967f646d7334cd83c4257b4c" + integrity sha512-3+B7SJRi7DQJe0aNgv0H0zu1BfvMZcwgt06N3ALR9+o3TSJcOqcYrEMed3aG+ASH++CltnohTYnLkVXaxshioA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.3.0-rc.1.tgz#3260de03f29e210e44a55efa3af2ab6d34362227" - integrity sha512-flB18MUnRWpEnS0t/WEjsdhfB5w+zHjsa69Pj733+GHGSsZ1Vppu+rgvSWp38yNHO5uRwGECrwUIGwvd5uD9+A== +"@abp/bootstrap@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.3.0-rc.2.tgz#1416fe639c88b7d958435e45fe19692268a7f932" + integrity sha512-E6svmDhNQlT5nd65VgshexyedRWhbvi9o1oYo/dLTUpJDzR7M9ptDqxFLVB9vVDva3HgxUoEvgRJgb9fXvq4zw== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" bootstrap "^4.6.0" bootstrap-v4-rtl "4.6.0-1" -"@abp/core@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.3.0-rc.1.tgz#201c3be8b5697fe8e1b08b23f87f50e950036a14" - integrity sha512-ET8NGugNmdub+8qGeFf9qGPbloP5gcoBnB7U6ieFz1Eai9S3pSpbM+sdyifucEpzMThUiLS772EP4pJTMXhfEg== +"@abp/core@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.3.0-rc.2.tgz#3c9ea339624ae3b6cbee13e048268d48269ea6a9" + integrity sha512-/89xH+IVSmTOLWeUO4yVB7Hg64uHTbR7bHjgl+b94cFdtITH9Nvr2EGdXUJbHGUK7L6lSDziqiMcG/ic0061+Q== dependencies: - "@abp/utils" "^4.3.0-rc.1" + "@abp/utils" "^4.3.0-rc.2" -"@abp/datatables.net-bs4@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.3.0-rc.1.tgz#f7dad14d13b468949fd161b679f4a70271e0d466" - integrity sha512-812cLTfSZZMvjAFAq5h7R5AeJHigBxbPc+kMReQIcFLH82o6BjA2NqFBqYOvQuh4kqiQ85dqFTW9MTKeY8or6Q== +"@abp/datatables.net-bs4@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.3.0-rc.2.tgz#bbfc0d9d0ed86cdb14b38849fb78b2b1911c4a35" + integrity sha512-PRKYi2NU41KpckJ/d0buHoFbyKVuW5NCQNpUdYzDsPS2riyeXccCsLFJM1bT01TdR4Idla3vx9Fkb+HoJOiDeQ== dependencies: - "@abp/datatables.net" "~4.3.0-rc.1" + "@abp/datatables.net" "~4.3.0-rc.2" datatables.net-bs4 "^1.10.21" -"@abp/datatables.net@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.3.0-rc.1.tgz#aa1640903fe67d20e1fc57ffe0519b2764e4c7df" - integrity sha512-qfdQa43sbXsIEBc3WpxSC7cXyKSFxLiFdCKnLIkQNsC3Wo+WX/Cute2xNbT0+xIQdGznfEBdPxcwQkNE6JQgcA== +"@abp/datatables.net@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.3.0-rc.2.tgz#1923e60db261366a7d2f284b0274d13e253567ca" + integrity sha512-rp53+5Xj1jhjpCj7UBA9+nSNbaTQ4Vc1NWCg1e5aI5tWiyZprUS44dRszIQIDV86XKorfFhog5ihOZyzl1HDyg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" datatables.net "^1.10.21" -"@abp/font-awesome@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.3.0-rc.1.tgz#5d336ead8b8c67b2c0aaff9365c2c856b033196e" - integrity sha512-BU4ycN/gOxX2x8S/Eszi3bJAz6bZRhxa0uPWxEWKul9PNvKSwMJRoVaEVehnIlfTi2raHsLQHk+F7079gt3dlQ== +"@abp/font-awesome@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.3.0-rc.2.tgz#437d3d6bbd8f52e5091251932d6a494d0164694b" + integrity sha512-FeHHtEQwrJBwD5PkFYqjKouCLwNjjRqTNseaN+s/r7gNjv0PgKytfRoqEb+O/BkZg/DwEuMz9jFX/RXCCNa2xA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" "@fortawesome/fontawesome-free" "^5.13.0" -"@abp/jquery-form@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.3.0-rc.1.tgz#4543e3d751519ba12d2c563aa7cbc56e51dfe093" - integrity sha512-ONQeImarHEe4VRSv13da+rHnCv+2Ycyd7YF+Dr77gtBmTKpC5nAFGY4wO7+u0U0px/YsR2dntpyBj2fEw3wjXA== +"@abp/jquery-form@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.3.0-rc.2.tgz#999910deaf46330477b6ed487a771a2123d69f92" + integrity sha512-+fdEIOTlxDOdYXMtc/ujhYeuP2qiI4bmL3TQQWQxSTlW8q5jB6dHLBnHiXXltO8HxX9+7ZsjN3tsV7+Div5joA== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.3.0-rc.1.tgz#15a06257fba8ef8d2cba2ac9da3f6f7185e6c8dd" - integrity sha512-8Tshu/QsqulwNfRnvoX1mViY12OTvCqpHdRldqr7k6MQd+boo6ahybQ4SCoZ9vsDTmqxd5dkV/A8VijMw66WTQ== +"@abp/jquery-validation-unobtrusive@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.3.0-rc.2.tgz#0635e0c77da269e8367c3d7c388613249ce9221d" + integrity sha512-ubmPjVJatAW3AJWjWtT+ZbNLhu+HHNgcxYkFGVNusNuboTGsoBs5G45Cjzp/q5FnggWoPvkllpf8CGuaYUbpUQ== dependencies: - "@abp/jquery-validation" "~4.3.0-rc.1" + "@abp/jquery-validation" "~4.3.0-rc.2" jquery-validation-unobtrusive "^3.2.11" -"@abp/jquery-validation@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.3.0-rc.1.tgz#6a0d771c88e961cb43144cd6ef916d1ab22aceaf" - integrity sha512-kjVF6757xP8wZ9qw8ysI5ve3AD8PoJtxqkkUV4QF4xcrdP8EPk2heX3Imu7MJiYGyMlwLU++FTm8J68UNsWRmQ== +"@abp/jquery-validation@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.3.0-rc.2.tgz#ee145f8c4a633218ccfa50cca0bed503a0ca8dc6" + integrity sha512-SLWzN6jxVqKaHYs/d6Mku8CfhB1vWgfMbFma14upiJ+/VDkTF4Rh27iMCWKYVOS3bukh2ltBp6kPFplrjCAGSg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" jquery-validation "^1.19.2" -"@abp/jquery@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.3.0-rc.1.tgz#06030baf44983175707409eff16a05db72c93bf5" - integrity sha512-Xgptjea/RzgBvwK+paydXWMgenobuvqKsr9LbrIDiYAJuLMMCyGvwJnA7jeszz+OqZShP8ppoeB0ifa5K2Yc2A== +"@abp/jquery@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.3.0-rc.2.tgz#f620628ea0739888cbcb360c058d09bff10d553b" + integrity sha512-+rfyLVJn7E8wJ1oQ9GiCR63Yk6wah1Hqnj4XpsRDMkIaOXKaqrnVHAZd4W2DUunQSe95wqHfkNH/wkvTyNEwUg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" jquery "~3.5.1" -"@abp/lodash@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.3.0-rc.1.tgz#cd9bf0693379ea54f789299ba67483d345da5abf" - integrity sha512-BtsQs6wpJJvdwPDx7sOIIzkVHJnzw4Twrv0q3XNqmsiv5eGIwluFsorm5N6qOk7nC5csor6mpk6YuJuFii8GbQ== +"@abp/lodash@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.3.0-rc.2.tgz#9b5429d3976b34022aaf8cab4afef57479b66821" + integrity sha512-sE2dyofYbiIy4xhL85diZWkfqBcQl1q61T0DbYDOHgaejZAJxk4bVyFpEuMiC2HwWAZ656IN1bzyQIyE1RKzQA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" lodash "^4.17.15" -"@abp/luxon@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.3.0-rc.1.tgz#dd855417224bbf124cdc9f395bb5cf5f0c6a7a03" - integrity sha512-OtxmjCgPiH1JWsdUvQpkvum3k43H6v8Z5okv4lDpcBOah/HZYUP8qOsSS3Tcyw2I66TK15tq13XJeHabmh2lAQ== +"@abp/luxon@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.3.0-rc.2.tgz#6fdbf1624462615dcb1f5ce85c07fc3bc4065e3f" + integrity sha512-C4aT0aN3/TVtTE3m0AZyhFSeeg+RxXpUO+nffAZoM/cH5NL8tir+O1hd+dhtCb7AELaqQNx5+qgXoJLYdWMYVg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" luxon "^1.24.1" -"@abp/malihu-custom-scrollbar-plugin@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.3.0-rc.1.tgz#e07a9a1895ded98150c1ff4470638ab71e6a0561" - integrity sha512-OiCVlh8iHPHFchSZdFzUl/w+MqPbnlZ4jlohbEuqBTV6rbaAnJXA0Tqylv4RKjho7fybGvhxjDbBrZS4kxUFLg== +"@abp/malihu-custom-scrollbar-plugin@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.3.0-rc.2.tgz#28fc1f216c1d84b20acaf8c8c5cf5c3b33e1aeb1" + integrity sha512-LYMXKkPVyBLWV4Qnom2MW8JJ/rZmVg1CyOFxM6JiL+dpsN1Ogw0hRG33CCHQveqUmf2cr3vf96qk5Et5DyDDIg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.3.0-rc.1.tgz#f3d60b42cb82abc6a0ce6a640b82eb53501f9893" - integrity sha512-z+6Dhu6kqgCfTdZReI08N2ONKakQSmdDsNiZDB5/OOP26k2pOefe/j//sRfjTWiI5gCxO5y98ZZ0ccanBF8oTw== +"@abp/select2@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.3.0-rc.2.tgz#42d62daff9e50b1fe211a1560794625ba3f52107" + integrity sha512-okiIXmFaqx0uy/UMcpMKWKjrwop1JINyzN4FS5tafUpWhx6KcYYHudLWJvnPbsdsOeBQx91kw8jjERRJIqfEOA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" select2 "^4.0.13" -"@abp/sweetalert@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.3.0-rc.1.tgz#d54a8628f004c2d22ebcc4bd60f2b6c1cbd3bc8f" - integrity sha512-OpgDbM9vOfCLpjCRFXavPAdoKlZnpxP+DkUH8owHTrtEuxmrSjpLlIa6VOzAKr70GiLtuMCz9QoH3AyMepx9vA== +"@abp/sweetalert@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.3.0-rc.2.tgz#dfb20dfca8449ed3c3f6599d99b51746019eb664" + integrity sha512-NRKOgT80JVQrwI1FRqpbCzALvnLAFKdPwKKNDgm0L7r/5DL0+JbkKCI1AIPl/yiM8MBrCaQqNms+9JES5mjiUQ== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" sweetalert "^2.1.2" -"@abp/timeago@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.3.0-rc.1.tgz#247f3b3a8e54f6732efa3600ba649a81fee6ec82" - integrity sha512-cplxM3jYhhakET1DyERQoWJQxx0mhTKoI7gW93wNeEMyL4FWaF4lgUNEoubJUSBCDs4v/0ni0pKG8c8nldbiew== +"@abp/timeago@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.3.0-rc.2.tgz#22943e219facd7fa0efddb63017198474b5cef89" + integrity sha512-TjKyuli+SpVjTgVJmraBpqJK112I+1DYHPJfso7QAH48Ra4gceGj9EVS0i/420YyLZyJSMtZOruxzYkyJeR/6w== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" timeago "^1.6.7" -"@abp/toastr@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.3.0-rc.1.tgz#7bc5bb071839fbb971f56c41c8bf220b0a6d67e9" - integrity sha512-OQgmdmWPKlpn/Lks6fUL4enEJgnvUeEcoGTuQOKfkh9ybadYd8kcELWw5ttsQ4o35yvDH3Lsh1jLwPDrCheTBg== +"@abp/toastr@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.3.0-rc.2.tgz#143a344b00bbfaa858fe267fb6d627952bf7b3c0" + integrity sha512-cQV9UFWb9zarkb/CbrqkF9RXqn1Fc/TFKKM5mxpUEcYjx52NuM0d+KawdEMoN2y3y2U4ciY44kbTP2W1y+NlBg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" toastr "^2.1.4" -"@abp/utils@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.3.0-rc.1.tgz#82ef26e01e0cb38417bf4fa9459fde85cbc2b424" - integrity sha512-C/sk6jZQDENI7FbylBoPnTb1rC5eVPnsL8B++vAH4jS//OAj2iNvE6tCewK21GYI/JmfmQzzauQBzOiOJR9a6A== +"@abp/utils@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.3.0-rc.2.tgz#6d051f98772e5642c2e3bc2f68e73d6f24f4694c" + integrity sha512-9qYo8OMTxIUG+qQBWXEpkURS6FUrx+J5s3SwC/eerp46hYr72GQ8L38Wq566a+xiLCn7Duxt6oJ/BxhTfQQxdw== 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 321ad21fba..4bc77c8984 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": "^4.3.0-rc.1" + "@abp/aspnetcore.mvc.ui.theme.basic": "^4.3.0-rc.2" } } \ No newline at end of file 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 1c1cf1f9ab..75cec285e5 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@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.3.0-rc.1.tgz#5dc06d82ee213bc33527b5af72ac94ae06bb7c25" - integrity sha512-Xkwj3NPnqWDgqvaP2eda3gviV7aBtyNOMCdZSvpxWmlaPlvJYN+SnKNnlmX02XVArTlOjaeTapFkE3auJeR6jA== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~4.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui.theme.shared@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.3.0-rc.1.tgz#9d4447f068b490367a20772eb9c2b38480088edb" - integrity sha512-untEVm6cKT375ZVEQFO01/VKIqtdFGIyJd5ZxtoQEV8ueVFRQefCOcvvqaJ8Gfj86T1nacXvJRfBfGihYHY+JQ== - dependencies: - "@abp/aspnetcore.mvc.ui" "~4.3.0-rc.1" - "@abp/bootstrap" "~4.3.0-rc.1" - "@abp/bootstrap-datepicker" "~4.3.0-rc.1" - "@abp/datatables.net-bs4" "~4.3.0-rc.1" - "@abp/font-awesome" "~4.3.0-rc.1" - "@abp/jquery-form" "~4.3.0-rc.1" - "@abp/jquery-validation-unobtrusive" "~4.3.0-rc.1" - "@abp/lodash" "~4.3.0-rc.1" - "@abp/luxon" "~4.3.0-rc.1" - "@abp/malihu-custom-scrollbar-plugin" "~4.3.0-rc.1" - "@abp/select2" "~4.3.0-rc.1" - "@abp/sweetalert" "~4.3.0-rc.1" - "@abp/timeago" "~4.3.0-rc.1" - "@abp/toastr" "~4.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.3.0-rc.1.tgz#1e54da2a668939941ab955f11db69798d04d9e7e" - integrity sha512-969etEb4H/fR9Twz6pcl766M/1AriCh6+B8r4haPB5g7QkOWhyU99mT11BHxQwf+uNV4duGZwvPvrMomrdLj2w== +"@abp/aspnetcore.mvc.ui.theme.basic@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.3.0-rc.2.tgz#4ebafbaade6610e3d405877a148d72d57569c3e3" + integrity sha512-Q3QqxKDFC04gaaj30Rk+9zGNfNxC8FX0jciARATceFV6pdA3F3PgT5EMDSlo6NoGniFVjHPRgay9N09zT6Htyw== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~4.3.0-rc.2" + +"@abp/aspnetcore.mvc.ui.theme.shared@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.3.0-rc.2.tgz#d3bf79929c55c5380d7ca7b913a23031d7a6bd12" + integrity sha512-pz86bIV4wNeG7/UPYzNCXlJ/MdOdIygc+Com7C9Ld7gzsyER7VD9h5U/hkytvL4FBFLJn4DU+xuZNECjv0HS0A== + dependencies: + "@abp/aspnetcore.mvc.ui" "~4.3.0-rc.2" + "@abp/bootstrap" "~4.3.0-rc.2" + "@abp/bootstrap-datepicker" "~4.3.0-rc.2" + "@abp/datatables.net-bs4" "~4.3.0-rc.2" + "@abp/font-awesome" "~4.3.0-rc.2" + "@abp/jquery-form" "~4.3.0-rc.2" + "@abp/jquery-validation-unobtrusive" "~4.3.0-rc.2" + "@abp/lodash" "~4.3.0-rc.2" + "@abp/luxon" "~4.3.0-rc.2" + "@abp/malihu-custom-scrollbar-plugin" "~4.3.0-rc.2" + "@abp/select2" "~4.3.0-rc.2" + "@abp/sweetalert" "~4.3.0-rc.2" + "@abp/timeago" "~4.3.0-rc.2" + "@abp/toastr" "~4.3.0-rc.2" + +"@abp/aspnetcore.mvc.ui@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.3.0-rc.2.tgz#6ff41be179c8d1089778a51ffa54a1f3d7614278" + integrity sha512-2L5zvuqUwPwNPcMauiiJZD1ft0QycqINz+bXEQ8t0EwbB+dzcsukL/rpOQfpeRHWWYy4nIN4C2bTvXhNgQbPqQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -43,145 +43,145 @@ micromatch "^4.0.2" path "^0.12.7" -"@abp/bootstrap-datepicker@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.3.0-rc.1.tgz#879a8ce32a3dbdb0cd80401360d24f25f318670b" - integrity sha512-W2T+rrC3oxuWj2xQUz2virbBK6x7ershWZB9d6FjXTSH89nin9DyBK20dEfskVvhK/IMrmZaW4PWyTTcx9r7dA== +"@abp/bootstrap-datepicker@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.3.0-rc.2.tgz#29a686c3d2bce356967f646d7334cd83c4257b4c" + integrity sha512-3+B7SJRi7DQJe0aNgv0H0zu1BfvMZcwgt06N3ALR9+o3TSJcOqcYrEMed3aG+ASH++CltnohTYnLkVXaxshioA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.3.0-rc.1.tgz#3260de03f29e210e44a55efa3af2ab6d34362227" - integrity sha512-flB18MUnRWpEnS0t/WEjsdhfB5w+zHjsa69Pj733+GHGSsZ1Vppu+rgvSWp38yNHO5uRwGECrwUIGwvd5uD9+A== +"@abp/bootstrap@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.3.0-rc.2.tgz#1416fe639c88b7d958435e45fe19692268a7f932" + integrity sha512-E6svmDhNQlT5nd65VgshexyedRWhbvi9o1oYo/dLTUpJDzR7M9ptDqxFLVB9vVDva3HgxUoEvgRJgb9fXvq4zw== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" bootstrap "^4.6.0" bootstrap-v4-rtl "4.6.0-1" -"@abp/core@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.3.0-rc.1.tgz#201c3be8b5697fe8e1b08b23f87f50e950036a14" - integrity sha512-ET8NGugNmdub+8qGeFf9qGPbloP5gcoBnB7U6ieFz1Eai9S3pSpbM+sdyifucEpzMThUiLS772EP4pJTMXhfEg== +"@abp/core@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.3.0-rc.2.tgz#3c9ea339624ae3b6cbee13e048268d48269ea6a9" + integrity sha512-/89xH+IVSmTOLWeUO4yVB7Hg64uHTbR7bHjgl+b94cFdtITH9Nvr2EGdXUJbHGUK7L6lSDziqiMcG/ic0061+Q== dependencies: - "@abp/utils" "^4.3.0-rc.1" + "@abp/utils" "^4.3.0-rc.2" -"@abp/datatables.net-bs4@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.3.0-rc.1.tgz#f7dad14d13b468949fd161b679f4a70271e0d466" - integrity sha512-812cLTfSZZMvjAFAq5h7R5AeJHigBxbPc+kMReQIcFLH82o6BjA2NqFBqYOvQuh4kqiQ85dqFTW9MTKeY8or6Q== +"@abp/datatables.net-bs4@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.3.0-rc.2.tgz#bbfc0d9d0ed86cdb14b38849fb78b2b1911c4a35" + integrity sha512-PRKYi2NU41KpckJ/d0buHoFbyKVuW5NCQNpUdYzDsPS2riyeXccCsLFJM1bT01TdR4Idla3vx9Fkb+HoJOiDeQ== dependencies: - "@abp/datatables.net" "~4.3.0-rc.1" + "@abp/datatables.net" "~4.3.0-rc.2" datatables.net-bs4 "^1.10.21" -"@abp/datatables.net@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.3.0-rc.1.tgz#aa1640903fe67d20e1fc57ffe0519b2764e4c7df" - integrity sha512-qfdQa43sbXsIEBc3WpxSC7cXyKSFxLiFdCKnLIkQNsC3Wo+WX/Cute2xNbT0+xIQdGznfEBdPxcwQkNE6JQgcA== +"@abp/datatables.net@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.3.0-rc.2.tgz#1923e60db261366a7d2f284b0274d13e253567ca" + integrity sha512-rp53+5Xj1jhjpCj7UBA9+nSNbaTQ4Vc1NWCg1e5aI5tWiyZprUS44dRszIQIDV86XKorfFhog5ihOZyzl1HDyg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" datatables.net "^1.10.21" -"@abp/font-awesome@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.3.0-rc.1.tgz#5d336ead8b8c67b2c0aaff9365c2c856b033196e" - integrity sha512-BU4ycN/gOxX2x8S/Eszi3bJAz6bZRhxa0uPWxEWKul9PNvKSwMJRoVaEVehnIlfTi2raHsLQHk+F7079gt3dlQ== +"@abp/font-awesome@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.3.0-rc.2.tgz#437d3d6bbd8f52e5091251932d6a494d0164694b" + integrity sha512-FeHHtEQwrJBwD5PkFYqjKouCLwNjjRqTNseaN+s/r7gNjv0PgKytfRoqEb+O/BkZg/DwEuMz9jFX/RXCCNa2xA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" "@fortawesome/fontawesome-free" "^5.13.0" -"@abp/jquery-form@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.3.0-rc.1.tgz#4543e3d751519ba12d2c563aa7cbc56e51dfe093" - integrity sha512-ONQeImarHEe4VRSv13da+rHnCv+2Ycyd7YF+Dr77gtBmTKpC5nAFGY4wO7+u0U0px/YsR2dntpyBj2fEw3wjXA== +"@abp/jquery-form@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.3.0-rc.2.tgz#999910deaf46330477b6ed487a771a2123d69f92" + integrity sha512-+fdEIOTlxDOdYXMtc/ujhYeuP2qiI4bmL3TQQWQxSTlW8q5jB6dHLBnHiXXltO8HxX9+7ZsjN3tsV7+Div5joA== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.3.0-rc.1.tgz#15a06257fba8ef8d2cba2ac9da3f6f7185e6c8dd" - integrity sha512-8Tshu/QsqulwNfRnvoX1mViY12OTvCqpHdRldqr7k6MQd+boo6ahybQ4SCoZ9vsDTmqxd5dkV/A8VijMw66WTQ== +"@abp/jquery-validation-unobtrusive@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.3.0-rc.2.tgz#0635e0c77da269e8367c3d7c388613249ce9221d" + integrity sha512-ubmPjVJatAW3AJWjWtT+ZbNLhu+HHNgcxYkFGVNusNuboTGsoBs5G45Cjzp/q5FnggWoPvkllpf8CGuaYUbpUQ== dependencies: - "@abp/jquery-validation" "~4.3.0-rc.1" + "@abp/jquery-validation" "~4.3.0-rc.2" jquery-validation-unobtrusive "^3.2.11" -"@abp/jquery-validation@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.3.0-rc.1.tgz#6a0d771c88e961cb43144cd6ef916d1ab22aceaf" - integrity sha512-kjVF6757xP8wZ9qw8ysI5ve3AD8PoJtxqkkUV4QF4xcrdP8EPk2heX3Imu7MJiYGyMlwLU++FTm8J68UNsWRmQ== +"@abp/jquery-validation@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.3.0-rc.2.tgz#ee145f8c4a633218ccfa50cca0bed503a0ca8dc6" + integrity sha512-SLWzN6jxVqKaHYs/d6Mku8CfhB1vWgfMbFma14upiJ+/VDkTF4Rh27iMCWKYVOS3bukh2ltBp6kPFplrjCAGSg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" jquery-validation "^1.19.2" -"@abp/jquery@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.3.0-rc.1.tgz#06030baf44983175707409eff16a05db72c93bf5" - integrity sha512-Xgptjea/RzgBvwK+paydXWMgenobuvqKsr9LbrIDiYAJuLMMCyGvwJnA7jeszz+OqZShP8ppoeB0ifa5K2Yc2A== +"@abp/jquery@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.3.0-rc.2.tgz#f620628ea0739888cbcb360c058d09bff10d553b" + integrity sha512-+rfyLVJn7E8wJ1oQ9GiCR63Yk6wah1Hqnj4XpsRDMkIaOXKaqrnVHAZd4W2DUunQSe95wqHfkNH/wkvTyNEwUg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" jquery "~3.5.1" -"@abp/lodash@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.3.0-rc.1.tgz#cd9bf0693379ea54f789299ba67483d345da5abf" - integrity sha512-BtsQs6wpJJvdwPDx7sOIIzkVHJnzw4Twrv0q3XNqmsiv5eGIwluFsorm5N6qOk7nC5csor6mpk6YuJuFii8GbQ== +"@abp/lodash@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.3.0-rc.2.tgz#9b5429d3976b34022aaf8cab4afef57479b66821" + integrity sha512-sE2dyofYbiIy4xhL85diZWkfqBcQl1q61T0DbYDOHgaejZAJxk4bVyFpEuMiC2HwWAZ656IN1bzyQIyE1RKzQA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" lodash "^4.17.15" -"@abp/luxon@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.3.0-rc.1.tgz#dd855417224bbf124cdc9f395bb5cf5f0c6a7a03" - integrity sha512-OtxmjCgPiH1JWsdUvQpkvum3k43H6v8Z5okv4lDpcBOah/HZYUP8qOsSS3Tcyw2I66TK15tq13XJeHabmh2lAQ== +"@abp/luxon@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.3.0-rc.2.tgz#6fdbf1624462615dcb1f5ce85c07fc3bc4065e3f" + integrity sha512-C4aT0aN3/TVtTE3m0AZyhFSeeg+RxXpUO+nffAZoM/cH5NL8tir+O1hd+dhtCb7AELaqQNx5+qgXoJLYdWMYVg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" luxon "^1.24.1" -"@abp/malihu-custom-scrollbar-plugin@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.3.0-rc.1.tgz#e07a9a1895ded98150c1ff4470638ab71e6a0561" - integrity sha512-OiCVlh8iHPHFchSZdFzUl/w+MqPbnlZ4jlohbEuqBTV6rbaAnJXA0Tqylv4RKjho7fybGvhxjDbBrZS4kxUFLg== +"@abp/malihu-custom-scrollbar-plugin@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.3.0-rc.2.tgz#28fc1f216c1d84b20acaf8c8c5cf5c3b33e1aeb1" + integrity sha512-LYMXKkPVyBLWV4Qnom2MW8JJ/rZmVg1CyOFxM6JiL+dpsN1Ogw0hRG33CCHQveqUmf2cr3vf96qk5Et5DyDDIg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.3.0-rc.1.tgz#f3d60b42cb82abc6a0ce6a640b82eb53501f9893" - integrity sha512-z+6Dhu6kqgCfTdZReI08N2ONKakQSmdDsNiZDB5/OOP26k2pOefe/j//sRfjTWiI5gCxO5y98ZZ0ccanBF8oTw== +"@abp/select2@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.3.0-rc.2.tgz#42d62daff9e50b1fe211a1560794625ba3f52107" + integrity sha512-okiIXmFaqx0uy/UMcpMKWKjrwop1JINyzN4FS5tafUpWhx6KcYYHudLWJvnPbsdsOeBQx91kw8jjERRJIqfEOA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" select2 "^4.0.13" -"@abp/sweetalert@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.3.0-rc.1.tgz#d54a8628f004c2d22ebcc4bd60f2b6c1cbd3bc8f" - integrity sha512-OpgDbM9vOfCLpjCRFXavPAdoKlZnpxP+DkUH8owHTrtEuxmrSjpLlIa6VOzAKr70GiLtuMCz9QoH3AyMepx9vA== +"@abp/sweetalert@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.3.0-rc.2.tgz#dfb20dfca8449ed3c3f6599d99b51746019eb664" + integrity sha512-NRKOgT80JVQrwI1FRqpbCzALvnLAFKdPwKKNDgm0L7r/5DL0+JbkKCI1AIPl/yiM8MBrCaQqNms+9JES5mjiUQ== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" sweetalert "^2.1.2" -"@abp/timeago@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.3.0-rc.1.tgz#247f3b3a8e54f6732efa3600ba649a81fee6ec82" - integrity sha512-cplxM3jYhhakET1DyERQoWJQxx0mhTKoI7gW93wNeEMyL4FWaF4lgUNEoubJUSBCDs4v/0ni0pKG8c8nldbiew== +"@abp/timeago@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.3.0-rc.2.tgz#22943e219facd7fa0efddb63017198474b5cef89" + integrity sha512-TjKyuli+SpVjTgVJmraBpqJK112I+1DYHPJfso7QAH48Ra4gceGj9EVS0i/420YyLZyJSMtZOruxzYkyJeR/6w== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" timeago "^1.6.7" -"@abp/toastr@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.3.0-rc.1.tgz#7bc5bb071839fbb971f56c41c8bf220b0a6d67e9" - integrity sha512-OQgmdmWPKlpn/Lks6fUL4enEJgnvUeEcoGTuQOKfkh9ybadYd8kcELWw5ttsQ4o35yvDH3Lsh1jLwPDrCheTBg== +"@abp/toastr@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.3.0-rc.2.tgz#143a344b00bbfaa858fe267fb6d627952bf7b3c0" + integrity sha512-cQV9UFWb9zarkb/CbrqkF9RXqn1Fc/TFKKM5mxpUEcYjx52NuM0d+KawdEMoN2y3y2U4ciY44kbTP2W1y+NlBg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" toastr "^2.1.4" -"@abp/utils@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.3.0-rc.1.tgz#82ef26e01e0cb38417bf4fa9459fde85cbc2b424" - integrity sha512-C/sk6jZQDENI7FbylBoPnTb1rC5eVPnsL8B++vAH4jS//OAj2iNvE6tCewK21GYI/JmfmQzzauQBzOiOJR9a6A== +"@abp/utils@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.3.0-rc.2.tgz#6d051f98772e5642c2e3bc2f68e73d6f24f4694c" + integrity sha512-9qYo8OMTxIUG+qQBWXEpkURS6FUrx+J5s3SwC/eerp46hYr72GQ8L38Wq566a+xiLCn7Duxt6oJ/BxhTfQQxdw== 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 85474c6835..4499332946 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json @@ -3,11 +3,11 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^4.3.0-rc.1", - "@abp/cms-kit": "4.3.0-rc.1", - "@abp/tui-editor": "^4.3.0-rc.1", + "@abp/aspnetcore.mvc.ui.theme.basic": "^4.3.0-rc.2", + "@abp/cms-kit": "4.3.0-rc.2", + "@abp/tui-editor": "^4.3.0-rc.2", "tui-code-snippet": "1.5.2", - "@abp/uppy": "^4.3.0-rc.1", + "@abp/uppy": "^4.3.0-rc.2", "slugify": "1.4.6" } } \ No newline at end of file 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 2ea6a4e794..6fa480a3ca 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@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.3.0-rc.1.tgz#5dc06d82ee213bc33527b5af72ac94ae06bb7c25" - integrity sha512-Xkwj3NPnqWDgqvaP2eda3gviV7aBtyNOMCdZSvpxWmlaPlvJYN+SnKNnlmX02XVArTlOjaeTapFkE3auJeR6jA== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~4.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui.theme.shared@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.3.0-rc.1.tgz#9d4447f068b490367a20772eb9c2b38480088edb" - integrity sha512-untEVm6cKT375ZVEQFO01/VKIqtdFGIyJd5ZxtoQEV8ueVFRQefCOcvvqaJ8Gfj86T1nacXvJRfBfGihYHY+JQ== - dependencies: - "@abp/aspnetcore.mvc.ui" "~4.3.0-rc.1" - "@abp/bootstrap" "~4.3.0-rc.1" - "@abp/bootstrap-datepicker" "~4.3.0-rc.1" - "@abp/datatables.net-bs4" "~4.3.0-rc.1" - "@abp/font-awesome" "~4.3.0-rc.1" - "@abp/jquery-form" "~4.3.0-rc.1" - "@abp/jquery-validation-unobtrusive" "~4.3.0-rc.1" - "@abp/lodash" "~4.3.0-rc.1" - "@abp/luxon" "~4.3.0-rc.1" - "@abp/malihu-custom-scrollbar-plugin" "~4.3.0-rc.1" - "@abp/select2" "~4.3.0-rc.1" - "@abp/sweetalert" "~4.3.0-rc.1" - "@abp/timeago" "~4.3.0-rc.1" - "@abp/toastr" "~4.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.3.0-rc.1.tgz#1e54da2a668939941ab955f11db69798d04d9e7e" - integrity sha512-969etEb4H/fR9Twz6pcl766M/1AriCh6+B8r4haPB5g7QkOWhyU99mT11BHxQwf+uNV4duGZwvPvrMomrdLj2w== +"@abp/aspnetcore.mvc.ui.theme.basic@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.3.0-rc.2.tgz#4ebafbaade6610e3d405877a148d72d57569c3e3" + integrity sha512-Q3QqxKDFC04gaaj30Rk+9zGNfNxC8FX0jciARATceFV6pdA3F3PgT5EMDSlo6NoGniFVjHPRgay9N09zT6Htyw== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~4.3.0-rc.2" + +"@abp/aspnetcore.mvc.ui.theme.shared@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.3.0-rc.2.tgz#d3bf79929c55c5380d7ca7b913a23031d7a6bd12" + integrity sha512-pz86bIV4wNeG7/UPYzNCXlJ/MdOdIygc+Com7C9Ld7gzsyER7VD9h5U/hkytvL4FBFLJn4DU+xuZNECjv0HS0A== + dependencies: + "@abp/aspnetcore.mvc.ui" "~4.3.0-rc.2" + "@abp/bootstrap" "~4.3.0-rc.2" + "@abp/bootstrap-datepicker" "~4.3.0-rc.2" + "@abp/datatables.net-bs4" "~4.3.0-rc.2" + "@abp/font-awesome" "~4.3.0-rc.2" + "@abp/jquery-form" "~4.3.0-rc.2" + "@abp/jquery-validation-unobtrusive" "~4.3.0-rc.2" + "@abp/lodash" "~4.3.0-rc.2" + "@abp/luxon" "~4.3.0-rc.2" + "@abp/malihu-custom-scrollbar-plugin" "~4.3.0-rc.2" + "@abp/select2" "~4.3.0-rc.2" + "@abp/sweetalert" "~4.3.0-rc.2" + "@abp/timeago" "~4.3.0-rc.2" + "@abp/toastr" "~4.3.0-rc.2" + +"@abp/aspnetcore.mvc.ui@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.3.0-rc.2.tgz#6ff41be179c8d1089778a51ffa54a1f3d7614278" + integrity sha512-2L5zvuqUwPwNPcMauiiJZD1ft0QycqINz+bXEQ8t0EwbB+dzcsukL/rpOQfpeRHWWYy4nIN4C2bTvXhNgQbPqQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -43,228 +43,228 @@ micromatch "^4.0.2" path "^0.12.7" -"@abp/bootstrap-datepicker@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.3.0-rc.1.tgz#879a8ce32a3dbdb0cd80401360d24f25f318670b" - integrity sha512-W2T+rrC3oxuWj2xQUz2virbBK6x7ershWZB9d6FjXTSH89nin9DyBK20dEfskVvhK/IMrmZaW4PWyTTcx9r7dA== +"@abp/bootstrap-datepicker@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.3.0-rc.2.tgz#29a686c3d2bce356967f646d7334cd83c4257b4c" + integrity sha512-3+B7SJRi7DQJe0aNgv0H0zu1BfvMZcwgt06N3ALR9+o3TSJcOqcYrEMed3aG+ASH++CltnohTYnLkVXaxshioA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.3.0-rc.1.tgz#3260de03f29e210e44a55efa3af2ab6d34362227" - integrity sha512-flB18MUnRWpEnS0t/WEjsdhfB5w+zHjsa69Pj733+GHGSsZ1Vppu+rgvSWp38yNHO5uRwGECrwUIGwvd5uD9+A== +"@abp/bootstrap@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.3.0-rc.2.tgz#1416fe639c88b7d958435e45fe19692268a7f932" + integrity sha512-E6svmDhNQlT5nd65VgshexyedRWhbvi9o1oYo/dLTUpJDzR7M9ptDqxFLVB9vVDva3HgxUoEvgRJgb9fXvq4zw== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" bootstrap "^4.6.0" bootstrap-v4-rtl "4.6.0-1" -"@abp/cms-kit.admin@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/cms-kit.admin/-/cms-kit.admin-4.3.0-rc.1.tgz#6381dbf35d51e7ce677a4cc292cbb9b875f9a222" - integrity sha512-DQ3Ll9CtJMaPJOuLvAlqQSRjZo5xD92rVjBR3O8kMZgZWK6gJsv+34cAL2yQ8/tXYZch769RUcqd3ZenPTL7sg== +"@abp/cms-kit.admin@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/cms-kit.admin/-/cms-kit.admin-4.3.0-rc.2.tgz#353310b5d6f2b812567ef396e61817b7cfee294e" + integrity sha512-NP8Z/GWk2loYEXCMj3k7YrjXy2Ijao4Sd96Rg5O1XKh/J8IrwoYeixJYCibsedOv7ewy+kf5xiISEokfTdaCfw== dependencies: - "@abp/slugify" "~4.3.0-rc.1" - "@abp/tui-editor" "~4.3.0-rc.1" - "@abp/uppy" "~4.3.0-rc.1" + "@abp/slugify" "~4.3.0-rc.2" + "@abp/tui-editor" "~4.3.0-rc.2" + "@abp/uppy" "~4.3.0-rc.2" -"@abp/cms-kit.public@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/cms-kit.public/-/cms-kit.public-4.3.0-rc.1.tgz#90476afe653c63f94d52d5ff831695cafd2b13ca" - integrity sha512-6q13aGrStH7Ia9ESE2nd4DOZDClnZW2OIXtBX6g33iYtqCsnXEA+ljfOTgyuIICrWhkEGsVIMiFNtbzxsWx64g== +"@abp/cms-kit.public@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/cms-kit.public/-/cms-kit.public-4.3.0-rc.2.tgz#41ce3c619ab525031aca11f8c42d55a31e3ccf95" + integrity sha512-3Z+6DFHkurX1ewfMKc/i6iHT24fjV/Dh+u3I4LKJcM3BDEtN8tj3xYpP9kQTcFqKMCEGtjHQpYYDxpJDuYcrJw== dependencies: - "@abp/highlight.js" "~4.3.0-rc.1" - "@abp/star-rating-svg" "~4.3.0-rc.1" + "@abp/highlight.js" "~4.3.0-rc.2" + "@abp/star-rating-svg" "~4.3.0-rc.2" -"@abp/cms-kit@4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/cms-kit/-/cms-kit-4.3.0-rc.1.tgz#c6d9fd61009d49992abd889a9fd721daf5cf37c1" - integrity sha512-3rAHFNshyEjc/7l3WasuJzbz5kE/TMlUpPBYh71AjcJ2FNz1pOp4V/hIFadG/t8YywQ04coMFiMGNkHZt0a5fw== +"@abp/cms-kit@4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/cms-kit/-/cms-kit-4.3.0-rc.2.tgz#f81345bddafbaff68f0b464b13858fb6dfc2dcae" + integrity sha512-k8jux/6EcWP3MYBkJqeexZ/gAqAXZ1+upNDZ5X81+khSRT/v5s6ZigO+UgZX0uHZtB/clH45iJyCxEPdyRUYaw== dependencies: - "@abp/cms-kit.admin" "~4.3.0-rc.1" - "@abp/cms-kit.public" "~4.3.0-rc.1" + "@abp/cms-kit.admin" "~4.3.0-rc.2" + "@abp/cms-kit.public" "~4.3.0-rc.2" -"@abp/codemirror@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-4.3.0-rc.1.tgz#f31d54113142c6d6a9dc70de111486ba54fb01e9" - integrity sha512-XXCD8FqP7y29GwNoIjLr73FVy9WIxUzpVt2uyVVyzSTndKec2FzxoCBM/O3wEj33GUK7Z99bNIxReAcDOlf9Pw== +"@abp/codemirror@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-4.3.0-rc.2.tgz#672d43fe99b74ed5b4e85a0ba79ba70e261a8e31" + integrity sha512-ZGGg8wkxRF9ZypEfmXFHTAg+dNn7uklfsBH4PJBB7CRpI5m3qth5ZQeIoUFbdoJHFWXl/UevmM9yzI1P05jZFA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" codemirror "^5.54.0" -"@abp/core@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.3.0-rc.1.tgz#201c3be8b5697fe8e1b08b23f87f50e950036a14" - integrity sha512-ET8NGugNmdub+8qGeFf9qGPbloP5gcoBnB7U6ieFz1Eai9S3pSpbM+sdyifucEpzMThUiLS772EP4pJTMXhfEg== +"@abp/core@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.3.0-rc.2.tgz#3c9ea339624ae3b6cbee13e048268d48269ea6a9" + integrity sha512-/89xH+IVSmTOLWeUO4yVB7Hg64uHTbR7bHjgl+b94cFdtITH9Nvr2EGdXUJbHGUK7L6lSDziqiMcG/ic0061+Q== dependencies: - "@abp/utils" "^4.3.0-rc.1" + "@abp/utils" "^4.3.0-rc.2" -"@abp/datatables.net-bs4@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.3.0-rc.1.tgz#f7dad14d13b468949fd161b679f4a70271e0d466" - integrity sha512-812cLTfSZZMvjAFAq5h7R5AeJHigBxbPc+kMReQIcFLH82o6BjA2NqFBqYOvQuh4kqiQ85dqFTW9MTKeY8or6Q== +"@abp/datatables.net-bs4@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.3.0-rc.2.tgz#bbfc0d9d0ed86cdb14b38849fb78b2b1911c4a35" + integrity sha512-PRKYi2NU41KpckJ/d0buHoFbyKVuW5NCQNpUdYzDsPS2riyeXccCsLFJM1bT01TdR4Idla3vx9Fkb+HoJOiDeQ== dependencies: - "@abp/datatables.net" "~4.3.0-rc.1" + "@abp/datatables.net" "~4.3.0-rc.2" datatables.net-bs4 "^1.10.21" -"@abp/datatables.net@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.3.0-rc.1.tgz#aa1640903fe67d20e1fc57ffe0519b2764e4c7df" - integrity sha512-qfdQa43sbXsIEBc3WpxSC7cXyKSFxLiFdCKnLIkQNsC3Wo+WX/Cute2xNbT0+xIQdGznfEBdPxcwQkNE6JQgcA== +"@abp/datatables.net@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.3.0-rc.2.tgz#1923e60db261366a7d2f284b0274d13e253567ca" + integrity sha512-rp53+5Xj1jhjpCj7UBA9+nSNbaTQ4Vc1NWCg1e5aI5tWiyZprUS44dRszIQIDV86XKorfFhog5ihOZyzl1HDyg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" datatables.net "^1.10.21" -"@abp/font-awesome@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.3.0-rc.1.tgz#5d336ead8b8c67b2c0aaff9365c2c856b033196e" - integrity sha512-BU4ycN/gOxX2x8S/Eszi3bJAz6bZRhxa0uPWxEWKul9PNvKSwMJRoVaEVehnIlfTi2raHsLQHk+F7079gt3dlQ== +"@abp/font-awesome@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.3.0-rc.2.tgz#437d3d6bbd8f52e5091251932d6a494d0164694b" + integrity sha512-FeHHtEQwrJBwD5PkFYqjKouCLwNjjRqTNseaN+s/r7gNjv0PgKytfRoqEb+O/BkZg/DwEuMz9jFX/RXCCNa2xA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" "@fortawesome/fontawesome-free" "^5.13.0" -"@abp/highlight.js@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-4.3.0-rc.1.tgz#10438fb6728fe7ff63f2f7271e0db1627320041c" - integrity sha512-MYcQyaokZrzlKX4FbwWISodfwQFOrbtzLF2x28qjWlSFNO13xka8Wn0EmZMjY84oFqYybNzoEMNAsDDgF+STBA== +"@abp/highlight.js@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-4.3.0-rc.2.tgz#a7c51e826b2a7e25c84af7ecbb38c5abe1d35dfb" + integrity sha512-oIGSsyAxdYm3ow/LbUwyYqtRvIOLQbsLQgP2+8FatnUdgFTKJRqG1RJXyPINDb3ldJlyQMFlgGlxlUV8cyqNzw== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" -"@abp/jquery-form@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.3.0-rc.1.tgz#4543e3d751519ba12d2c563aa7cbc56e51dfe093" - integrity sha512-ONQeImarHEe4VRSv13da+rHnCv+2Ycyd7YF+Dr77gtBmTKpC5nAFGY4wO7+u0U0px/YsR2dntpyBj2fEw3wjXA== +"@abp/jquery-form@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.3.0-rc.2.tgz#999910deaf46330477b6ed487a771a2123d69f92" + integrity sha512-+fdEIOTlxDOdYXMtc/ujhYeuP2qiI4bmL3TQQWQxSTlW8q5jB6dHLBnHiXXltO8HxX9+7ZsjN3tsV7+Div5joA== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.3.0-rc.1.tgz#15a06257fba8ef8d2cba2ac9da3f6f7185e6c8dd" - integrity sha512-8Tshu/QsqulwNfRnvoX1mViY12OTvCqpHdRldqr7k6MQd+boo6ahybQ4SCoZ9vsDTmqxd5dkV/A8VijMw66WTQ== +"@abp/jquery-validation-unobtrusive@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.3.0-rc.2.tgz#0635e0c77da269e8367c3d7c388613249ce9221d" + integrity sha512-ubmPjVJatAW3AJWjWtT+ZbNLhu+HHNgcxYkFGVNusNuboTGsoBs5G45Cjzp/q5FnggWoPvkllpf8CGuaYUbpUQ== dependencies: - "@abp/jquery-validation" "~4.3.0-rc.1" + "@abp/jquery-validation" "~4.3.0-rc.2" jquery-validation-unobtrusive "^3.2.11" -"@abp/jquery-validation@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.3.0-rc.1.tgz#6a0d771c88e961cb43144cd6ef916d1ab22aceaf" - integrity sha512-kjVF6757xP8wZ9qw8ysI5ve3AD8PoJtxqkkUV4QF4xcrdP8EPk2heX3Imu7MJiYGyMlwLU++FTm8J68UNsWRmQ== +"@abp/jquery-validation@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.3.0-rc.2.tgz#ee145f8c4a633218ccfa50cca0bed503a0ca8dc6" + integrity sha512-SLWzN6jxVqKaHYs/d6Mku8CfhB1vWgfMbFma14upiJ+/VDkTF4Rh27iMCWKYVOS3bukh2ltBp6kPFplrjCAGSg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" jquery-validation "^1.19.2" -"@abp/jquery@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.3.0-rc.1.tgz#06030baf44983175707409eff16a05db72c93bf5" - integrity sha512-Xgptjea/RzgBvwK+paydXWMgenobuvqKsr9LbrIDiYAJuLMMCyGvwJnA7jeszz+OqZShP8ppoeB0ifa5K2Yc2A== +"@abp/jquery@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.3.0-rc.2.tgz#f620628ea0739888cbcb360c058d09bff10d553b" + integrity sha512-+rfyLVJn7E8wJ1oQ9GiCR63Yk6wah1Hqnj4XpsRDMkIaOXKaqrnVHAZd4W2DUunQSe95wqHfkNH/wkvTyNEwUg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" jquery "~3.5.1" -"@abp/lodash@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.3.0-rc.1.tgz#cd9bf0693379ea54f789299ba67483d345da5abf" - integrity sha512-BtsQs6wpJJvdwPDx7sOIIzkVHJnzw4Twrv0q3XNqmsiv5eGIwluFsorm5N6qOk7nC5csor6mpk6YuJuFii8GbQ== +"@abp/lodash@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.3.0-rc.2.tgz#9b5429d3976b34022aaf8cab4afef57479b66821" + integrity sha512-sE2dyofYbiIy4xhL85diZWkfqBcQl1q61T0DbYDOHgaejZAJxk4bVyFpEuMiC2HwWAZ656IN1bzyQIyE1RKzQA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" lodash "^4.17.15" -"@abp/luxon@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.3.0-rc.1.tgz#dd855417224bbf124cdc9f395bb5cf5f0c6a7a03" - integrity sha512-OtxmjCgPiH1JWsdUvQpkvum3k43H6v8Z5okv4lDpcBOah/HZYUP8qOsSS3Tcyw2I66TK15tq13XJeHabmh2lAQ== +"@abp/luxon@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.3.0-rc.2.tgz#6fdbf1624462615dcb1f5ce85c07fc3bc4065e3f" + integrity sha512-C4aT0aN3/TVtTE3m0AZyhFSeeg+RxXpUO+nffAZoM/cH5NL8tir+O1hd+dhtCb7AELaqQNx5+qgXoJLYdWMYVg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" luxon "^1.24.1" -"@abp/malihu-custom-scrollbar-plugin@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.3.0-rc.1.tgz#e07a9a1895ded98150c1ff4470638ab71e6a0561" - integrity sha512-OiCVlh8iHPHFchSZdFzUl/w+MqPbnlZ4jlohbEuqBTV6rbaAnJXA0Tqylv4RKjho7fybGvhxjDbBrZS4kxUFLg== +"@abp/malihu-custom-scrollbar-plugin@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.3.0-rc.2.tgz#28fc1f216c1d84b20acaf8c8c5cf5c3b33e1aeb1" + integrity sha512-LYMXKkPVyBLWV4Qnom2MW8JJ/rZmVg1CyOFxM6JiL+dpsN1Ogw0hRG33CCHQveqUmf2cr3vf96qk5Et5DyDDIg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/markdown-it@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/markdown-it/-/markdown-it-4.3.0-rc.1.tgz#d545c789c493836d052f77441fcb23b847cd12d9" - integrity sha512-uJA0V6eyOJdjadHg4X3GOQ0ifXSU38lJVblS8yYB/8yt9GezvwS9JukX+SguuR18YlFwwjTv1cU9CCYdY8htnA== +"@abp/markdown-it@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/markdown-it/-/markdown-it-4.3.0-rc.2.tgz#4f1d039812e7efc8032b8542cd9d48dad136bf0d" + integrity sha512-fTMj0FFjMZcBevFWWrfnyxV5XZZYrD5Guq+cICMBYtKVqfbsy/ILpnznApXMuLxNukqIvGa8I3SdWaWO6CVhgQ== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" markdown-it "^11.0.0" -"@abp/select2@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.3.0-rc.1.tgz#f3d60b42cb82abc6a0ce6a640b82eb53501f9893" - integrity sha512-z+6Dhu6kqgCfTdZReI08N2ONKakQSmdDsNiZDB5/OOP26k2pOefe/j//sRfjTWiI5gCxO5y98ZZ0ccanBF8oTw== +"@abp/select2@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.3.0-rc.2.tgz#42d62daff9e50b1fe211a1560794625ba3f52107" + integrity sha512-okiIXmFaqx0uy/UMcpMKWKjrwop1JINyzN4FS5tafUpWhx6KcYYHudLWJvnPbsdsOeBQx91kw8jjERRJIqfEOA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" select2 "^4.0.13" -"@abp/slugify@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/slugify/-/slugify-4.3.0-rc.1.tgz#9ce4b82445f5ef76f99d8d9533d99c38b1ea3d8b" - integrity sha512-duWFcJLZAvCoqNaT5ZBAIX+BVTmFlTWe8YJkg11Z9kMGImb0Z8HkiTcqMSx0VNwQEGAhqpOc8v9vEw8S9xCBwQ== +"@abp/slugify@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/slugify/-/slugify-4.3.0-rc.2.tgz#2e35f973d878f13ca1ff71f090d1bdd88b89fd38" + integrity sha512-9okL+PEZhAeF3Vs/vLMnXn1O6qp6U7RQW1HI7j41i+7fHAJ4UZozym6sbYsFAEWT/ph4dcdzPRsxTxpBFiJYVQ== dependencies: slugify "^1.4.7" -"@abp/star-rating-svg@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/star-rating-svg/-/star-rating-svg-4.3.0-rc.1.tgz#b09e65ba0b05a41460f71b517a1b74a3e2949821" - integrity sha512-UmuavGqYn4pJe0LX8vaXNxwOhCXpVkU0PuuBx285JHcZ+hpBDCAoSjvE9Ve+c08vLhGErTTApGJ1QMEjNvM7rw== +"@abp/star-rating-svg@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/star-rating-svg/-/star-rating-svg-4.3.0-rc.2.tgz#aeabae6df07d621574b6a4057032e3a2a0cb1e13" + integrity sha512-xDcwIVjP8wkGNuJQn8H9PetHD/YgZ33jrOpPhw+EZAYCMW++e9LkKFSeEfiNT8MW5qyjC2hOISE6n2bz+hHU5w== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" star-rating-svg "^3.5.0" -"@abp/sweetalert@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.3.0-rc.1.tgz#d54a8628f004c2d22ebcc4bd60f2b6c1cbd3bc8f" - integrity sha512-OpgDbM9vOfCLpjCRFXavPAdoKlZnpxP+DkUH8owHTrtEuxmrSjpLlIa6VOzAKr70GiLtuMCz9QoH3AyMepx9vA== +"@abp/sweetalert@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.3.0-rc.2.tgz#dfb20dfca8449ed3c3f6599d99b51746019eb664" + integrity sha512-NRKOgT80JVQrwI1FRqpbCzALvnLAFKdPwKKNDgm0L7r/5DL0+JbkKCI1AIPl/yiM8MBrCaQqNms+9JES5mjiUQ== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" sweetalert "^2.1.2" -"@abp/timeago@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.3.0-rc.1.tgz#247f3b3a8e54f6732efa3600ba649a81fee6ec82" - integrity sha512-cplxM3jYhhakET1DyERQoWJQxx0mhTKoI7gW93wNeEMyL4FWaF4lgUNEoubJUSBCDs4v/0ni0pKG8c8nldbiew== +"@abp/timeago@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.3.0-rc.2.tgz#22943e219facd7fa0efddb63017198474b5cef89" + integrity sha512-TjKyuli+SpVjTgVJmraBpqJK112I+1DYHPJfso7QAH48Ra4gceGj9EVS0i/420YyLZyJSMtZOruxzYkyJeR/6w== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" timeago "^1.6.7" -"@abp/toastr@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.3.0-rc.1.tgz#7bc5bb071839fbb971f56c41c8bf220b0a6d67e9" - integrity sha512-OQgmdmWPKlpn/Lks6fUL4enEJgnvUeEcoGTuQOKfkh9ybadYd8kcELWw5ttsQ4o35yvDH3Lsh1jLwPDrCheTBg== +"@abp/toastr@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.3.0-rc.2.tgz#143a344b00bbfaa858fe267fb6d627952bf7b3c0" + integrity sha512-cQV9UFWb9zarkb/CbrqkF9RXqn1Fc/TFKKM5mxpUEcYjx52NuM0d+KawdEMoN2y3y2U4ciY44kbTP2W1y+NlBg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" toastr "^2.1.4" -"@abp/tui-editor@^4.3.0-rc.1", "@abp/tui-editor@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-4.3.0-rc.1.tgz#f72b82f2b9afb97562db29897261b02f0eb4ab34" - integrity sha512-MEAv6Y6rDxhhB2/CKvhhW4iCHWEYSlZpiKDnAu9eD7xyyLyWDkn/x9oC+srVoTalfZOwMQ7B6kYSUuXMvX+2Uw== +"@abp/tui-editor@^4.3.0-rc.2", "@abp/tui-editor@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-4.3.0-rc.2.tgz#4d4de602faa2f1093752aa148df3fa3f5523d918" + integrity sha512-NuuQTiqYue+gJosVNzVTdx1HvuyfjoTzk1ih1uo8hkUWxcDuaK7LK/p4ZId8q10ZPeek5rhi2W9LgEj3EHkMBw== dependencies: - "@abp/codemirror" "~4.3.0-rc.1" - "@abp/highlight.js" "~4.3.0-rc.1" - "@abp/jquery" "~4.3.0-rc.1" - "@abp/markdown-it" "~4.3.0-rc.1" + "@abp/codemirror" "~4.3.0-rc.2" + "@abp/highlight.js" "~4.3.0-rc.2" + "@abp/jquery" "~4.3.0-rc.2" + "@abp/markdown-it" "~4.3.0-rc.2" tui-code-snippet "1.5.2" tui-editor "^1.4.10" -"@abp/uppy@^4.3.0-rc.1", "@abp/uppy@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/uppy/-/uppy-4.3.0-rc.1.tgz#85cb56d7b82434a61d6a271b2f11678301e68ee3" - integrity sha512-/6FLrIzHjPGo0xO9U76nt/iDVNjL/OnA8wOCcIEDMcZtEQtbT9YXj7kyKFCf8MNBq4D2so3yKpLAMOch2a5Jsg== +"@abp/uppy@^4.3.0-rc.2", "@abp/uppy@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/uppy/-/uppy-4.3.0-rc.2.tgz#abb39dacf2f5c88dbec124e449ebcfaf66a1aead" + integrity sha512-C+bZ7GnSUFGIEZVeLfh5ruPkh6PvlsYLsTJaykzcMSDS5FQugVWRAw4OaCnELtDePmHUa+m3ppQw+e1TzuSAUQ== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" uppy "^1.16.1" -"@abp/utils@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.3.0-rc.1.tgz#82ef26e01e0cb38417bf4fa9459fde85cbc2b424" - integrity sha512-C/sk6jZQDENI7FbylBoPnTb1rC5eVPnsL8B++vAH4jS//OAj2iNvE6tCewK21GYI/JmfmQzzauQBzOiOJR9a6A== +"@abp/utils@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.3.0-rc.2.tgz#6d051f98772e5642c2e3bc2f68e73d6f24f4694c" + integrity sha512-9qYo8OMTxIUG+qQBWXEpkURS6FUrx+J5s3SwC/eerp46hYr72GQ8L38Wq566a+xiLCn7Duxt6oJ/BxhTfQQxdw== dependencies: just-compare "^1.3.0" diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/MediaDescriptors/CreateMediaInputWithStream.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/MediaDescriptors/CreateMediaInputWithStream.cs new file mode 100644 index 0000000000..a8a13b2ed2 --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/MediaDescriptors/CreateMediaInputWithStream.cs @@ -0,0 +1,16 @@ +using System.ComponentModel.DataAnnotations; +using Volo.Abp.Content; +using Volo.Abp.Validation; +using Volo.CmsKit.MediaDescriptors; + +namespace Volo.CmsKit.Admin.MediaDescriptors +{ + public class CreateMediaInputWithStream + { + [Required] + [DynamicStringLength(typeof(MediaDescriptorConsts), nameof(MediaDescriptorConsts.MaxNameLength))] + public string Name { get; set; } + + public IRemoteStreamContent File { get; set; } + } +} \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/MediaDescriptors/IMediaDescriptorAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/MediaDescriptors/IMediaDescriptorAdminAppService.cs index eb4819dd06..83cd14e90c 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/MediaDescriptors/IMediaDescriptorAdminAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/MediaDescriptors/IMediaDescriptorAdminAppService.cs @@ -6,7 +6,7 @@ namespace Volo.CmsKit.Admin.MediaDescriptors { public interface IMediaDescriptorAdminAppService : IApplicationService { - Task CreateAsync(CreateMediaInputStream inputStream); + Task CreateAsync(string entityType, CreateMediaInputWithStream inputStream); Task DeleteAsync(Guid id); } diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/MediaDescriptors/MediaDescriptorAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/MediaDescriptors/MediaDescriptorAdminAppService.cs index b359d55244..fa799cb65b 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/MediaDescriptors/MediaDescriptorAdminAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/MediaDescriptors/MediaDescriptorAdminAppService.cs @@ -1,11 +1,9 @@ using System; using System.Threading.Tasks; -using Microsoft.AspNetCore.Authorization; using Volo.Abp.BlobStoring; using Volo.Abp.GlobalFeatures; using Volo.CmsKit.GlobalFeatures; using Volo.CmsKit.MediaDescriptors; -using Volo.CmsKit.Permissions; namespace Volo.CmsKit.Admin.MediaDescriptors { @@ -29,16 +27,16 @@ namespace Volo.CmsKit.Admin.MediaDescriptors MediaDescriptorDefinitionStore = mediaDescriptorDefinitionStore; } - public virtual async Task CreateAsync(CreateMediaInputStream inputStream) + public virtual async Task CreateAsync(string entityType, CreateMediaInputWithStream inputStream) { - var definition = await MediaDescriptorDefinitionStore.GetAsync(inputStream.EntityType); + var definition = await MediaDescriptorDefinitionStore.GetAsync(entityType); /* TODO: Shouldn't CreatePolicies be a dictionary and we check for inputStream.EntityType? */ await CheckAnyOfPoliciesAsync(definition.CreatePolicies); - using (var stream = inputStream.GetStream()) + using (var stream = inputStream.File.GetStream()) { - var newEntity = await MediaDescriptorManager.CreateAsync(inputStream.EntityType, inputStream.Name, inputStream.ContentType, inputStream.ContentLength ?? 0); + var newEntity = await MediaDescriptorManager.CreateAsync(entityType, inputStream.Name, inputStream.File.ContentType, inputStream.File.ContentLength ?? 0); await MediaContainer.SaveAsync(newEntity.Id.ToString(), stream); await MediaDescriptorRepository.InsertAsync(newEntity); diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/CmsKitAdminHttpApiModule.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/CmsKitAdminHttpApiModule.cs index 5d84242bcd..bb573d55e6 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/CmsKitAdminHttpApiModule.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/CmsKitAdminHttpApiModule.cs @@ -1,5 +1,7 @@ using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.Modularity; +using Volo.CmsKit.Admin.MediaDescriptors; namespace Volo.CmsKit.Admin { @@ -16,5 +18,13 @@ namespace Volo.CmsKit.Admin mvcBuilder.AddApplicationPartIfNotExists(typeof(CmsKitAdminHttpApiModule).Assembly); }); } + + public override void ConfigureServices(ServiceConfigurationContext context) + { + Configure(options => + { + options.ConventionalControllers.FormBodyBindingIgnoredTypes.Add(typeof(CreateMediaInputWithStream)); + }); + } } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/MediaDescriptors/MediaDescriptorAdminController.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/MediaDescriptors/MediaDescriptorAdminController.cs index da84dc8a3d..07c1315eed 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/MediaDescriptors/MediaDescriptorAdminController.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/MediaDescriptors/MediaDescriptorAdminController.cs @@ -25,10 +25,10 @@ namespace Volo.CmsKit.Admin.MediaDescriptors } [HttpPost] - [NonAction] - public virtual Task CreateAsync(CreateMediaInputStream inputStream) + [Route("{entityType}")] + public virtual Task CreateAsync(string entityType, CreateMediaInputWithStream inputStream) { - return MediaDescriptorAdminAppService.CreateAsync(inputStream); + return MediaDescriptorAdminAppService.CreateAsync(entityType, inputStream); } [HttpDelete] @@ -37,26 +37,5 @@ namespace Volo.CmsKit.Admin.MediaDescriptors { return MediaDescriptorAdminAppService.DeleteAsync(id); } - - [HttpPost] - [Route("{entityType}")] - public virtual async Task UploadAsync(string entityType, IFormFile file) - { - if (file == null) - { - return BadRequest(); - } - - var inputStream = new CreateMediaInputStream(file.OpenReadStream()) - { - EntityType = entityType, - ContentType = file.ContentType, - Name = file.FileName - }; - - var mediaDescriptorDto = await MediaDescriptorAdminAppService.CreateAsync(inputStream); - - return StatusCode((int)HttpStatusCode.Created, mediaDescriptorDto); - } } } \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs index ed162cc360..c7f7dbf524 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs @@ -92,7 +92,7 @@ namespace Volo.CmsKit.Admin.Web toolbar => { toolbar.AddButton( - LocalizableString.Create("New"), + LocalizableString.Create("NewTag"), icon: "plus", name: "NewButton", requiredPolicyName: CmsKitAdminPermissions.Tags.Create @@ -104,7 +104,7 @@ namespace Volo.CmsKit.Admin.Web toolbar => { toolbar.AddButton( - LocalizableString.Create("New"), + LocalizableString.Create("NewPage"), icon: "plus", name: "CreatePage", requiredPolicyName: CmsKitAdminPermissions.Pages.Create @@ -115,7 +115,7 @@ namespace Volo.CmsKit.Admin.Web toolbar => { toolbar.AddButton( - LocalizableString.Create("New"), + LocalizableString.Create("NewBlog"), icon: "plus", name: "CreateBlog", id: "CreateBlog", @@ -127,7 +127,7 @@ namespace Volo.CmsKit.Admin.Web toolbar => { toolbar.AddButton( - LocalizableString.Create("New"), + LocalizableString.Create("NewBlogPost"), icon: "plus", name: "CreateBlogPost", id: "CreateBlogPost", diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Create.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Create.cshtml index 6bce551aee..e730d549d3 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Create.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Create.cshtml @@ -33,6 +33,7 @@ @section styles { + } @@ -61,7 +62,7 @@ -
    diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Update.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Update.cshtml index 6102eeb9d7..626c435370 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Update.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Update.cshtml @@ -33,6 +33,7 @@ @section styles { + } @@ -41,7 +42,7 @@ } - +
    @@ -59,7 +60,7 @@ -
    diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.css b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.css new file mode 100644 index 0000000000..1493b95338 --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.css @@ -0,0 +1,3 @@ +.cms-kit-editor { + height: 65vh !important; +} diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js index b8ba58a844..fba54928f1 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js @@ -231,7 +231,7 @@ useCommandShortcut: true, initialValue: initialValue, previewStyle: 'tab', - height: "95vh", + height: "100%", minHeight: "25em", initialEditType: 'markdown', language: $editorContainer.data("language"), diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/index.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/index.js index 0218d360f0..715c159013 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/index.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/index.js @@ -44,7 +44,6 @@ $(function () { blogsService .delete(data.record.id) .then(function () { - abp.notify.info(l("SuccessfullyDeleted")); dataTable.ajax.reload(); }); } diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.css b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.css new file mode 100644 index 0000000000..1493b95338 --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.css @@ -0,0 +1,3 @@ +.cms-kit-editor { + height: 65vh !important; +} diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js index e2adb4e3e0..e4661a7b88 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js @@ -178,7 +178,7 @@ useCommandShortcut: true, initialValue: initialValue, previewStyle: 'tab', - height: "95vh", + height: "100%", minHeight: "25em", initialEditType: 'markdown', language: $editorContainer.data("language"), diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Blogs/UpdateModal.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Blogs/UpdateModal.cshtml index 5a23933a0a..c458c80cbf 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Blogs/UpdateModal.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Blogs/UpdateModal.cshtml @@ -13,7 +13,7 @@ - + diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Blogs/index.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Blogs/index.js index ac1a7ce484..e9bd665abd 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Blogs/index.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Blogs/index.js @@ -49,7 +49,6 @@ $(function () { blogsService .delete(data.record.id) .then(function () { - abp.notify.info(l("SuccessfullyDeleted")); dataTable.ajax.reload(); }); } diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/details.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/details.js index 31e32d37e3..9c6a346921 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/details.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/details.js @@ -73,7 +73,6 @@ commentsService .delete(data.record.id) .then(function () { - abp.notify.info(l("SuccessfullyDeleted")); _dataTable.ajax.reload(); }); } diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js index c2a9c7d364..069a3983ec 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js @@ -73,7 +73,6 @@ commentsService .delete(data.record.id) .then(function () { - abp.notify.info(l("SuccessfullyDeleted")); _dataTable.ajax.reload(); }); } 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 8f06d1d32a..b154b13261 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 @@ @section styles { + } @@ -45,7 +46,7 @@ -
    @@ -53,11 +54,11 @@ - + - + diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Update.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Update.cshtml index 608b4c089a..d8868cf5a1 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Update.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Update.cshtml @@ -30,6 +30,7 @@ @section styles { + } @@ -49,7 +50,7 @@ -
    @@ -57,11 +58,11 @@ - + - + diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.css b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.css new file mode 100644 index 0000000000..1493b95338 --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.css @@ -0,0 +1,3 @@ +.cms-kit-editor { + height: 65vh !important; +} 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 1a5e86c207..e64ca27237 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 @@ -90,7 +90,7 @@ useCommandShortcut: true, initialValue: initialValue, previewStyle: 'tab', - height: "95vh", + height: "100%", minHeight: "25em", initialEditType: 'markdown', language: $editorContainer.data("language"), diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/index.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/index.js index 828da9c55c..c63e2cda2c 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/index.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/index.js @@ -43,7 +43,6 @@ pagesService .delete(data.record.id) .then(function () { - abp.notify.info(l("SuccessfullyDeleted")); _dataTable.ajax.reload(); }); } diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/update.css b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/update.css new file mode 100644 index 0000000000..1493b95338 --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/update.css @@ -0,0 +1,3 @@ +.cms-kit-editor { + height: 65vh !important; +} diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/update.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/update.js index 69b1960f87..f56539b47e 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/update.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/update.js @@ -61,7 +61,7 @@ useCommandShortcut: true, initialValue: initialValue, previewStyle: 'tab', - height: "95vh", + height: "100%", minHeight: "25em", initialEditType: 'markdown', language: $editorContainer.data("language"), diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Tags/EditModal.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Tags/EditModal.cshtml index 3146915cef..41a77ccbc6 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Tags/EditModal.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Tags/EditModal.cshtml @@ -14,7 +14,7 @@ - + diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Tags/Index.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Tags/Index.js index 85e91908d6..87960c5aed 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Tags/Index.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Tags/Index.js @@ -44,7 +44,6 @@ service .delete(data.record.id) .then(function () { - abp.notify.info(l("SuccessfullyDeleted")); dataTable.ajax.reload(null, false); }); } 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 11927d6537..a51193582d 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 @@ -52,8 +52,10 @@ "Menu:CMS": "CMS", "Message": "Message", "MessageDeletionConfirmationMessage": "This comment will be deleted completely.", - "Name": "Name", - "New": "New", + "NewPage": "New Page", + "NewBlog": "New Blog", + "NewBlogPost": "New Blog Post", + "NewTag": "New Tag", "OK": "OK", "PageDeletionConfirmationMessage": "Are you sure to delete this page?", "Pages": "Pages", @@ -110,7 +112,6 @@ "SubjectPlaceholder": "Please type a subject", "Submit": "Submit", "Subscribe": "Subscribe", - "SuccessfullyDeleted": "Successfully deleted!", "SuccessfullySaved": "Successfully saved!", "TagDeletionConfirmationMessage": "Are you sure to delete '{0}' tag?", "Tags": "Tags", 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 a45104b597..5169045a92 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 @@ -54,7 +54,10 @@ "Message": "Mesaj", "MessageDeletionConfirmationMessage": "Bu yorum tamamen silinecektir", "Name": "Ad", - "New": "Yeni", + "NewPage": "Yeni Sayfa", + "NewBlog": "Yeni Blog", + "NewBlogPost": "Yeni Blog Yazısı", + "NewTag": "Yeni Etiket", "OK": "Tamam", "PageDeletionConfirmationMessage": "Bu sayfayı silmek istediğinize emin misiniz?", "PageSlugInformation": "Etiket URL'de kullanılır. Url şöyle görünür: '/pages/{{slug}}'.", @@ -99,7 +102,6 @@ "SubjectPlaceholder": "Lütfen bir konu yazınız", "Submit": "Kaydet", "Subscribe": "Abone ol", - "SuccessfullyDeleted": "Başarıyla silindi!", "SuccessfullySaved": "Başarıyla kaydedildi!", "TagDeletionConfirmationMessage": "'{0}' etiketini silmek istediğinize emin misiniz?", "Tags": "Etiketler", diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/zh-Hans.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/zh-Hans.json index 64ed439d50..411af82bd0 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/zh-Hans.json +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/zh-Hans.json @@ -101,7 +101,6 @@ "SubjectPlaceholder": "请输入主题", "Submit": "提交", "Subscribe": "订阅", - "SuccessfullyDeleted": "删除成功!", "SuccessfullySaved": "保存成功!", "TagDeletionConfirmationMessage": "你确定删除 '{0}' 标签吗?", "Tags": "标签", diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/zh-Hant.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/zh-Hant.json index bf3ff196f0..b2d45d25ce 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/zh-Hant.json +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/zh-Hant.json @@ -102,7 +102,6 @@ "SubjectPlaceholder": "請輸入主題", "Submit": "提交", "Subscribe": "訂閱", - "SuccessfullyDeleted": "刪除成功!", "SuccessfullySaved": "保存成功!", "TagDeletionConfirmationMessage": "你確定刪除 '{0}' 標籤嗎?", "Tags": "標籤", diff --git a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/MediaDescriptors/MediaDescriptorAdminAppService_Tests.cs b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/MediaDescriptors/MediaDescriptorAdminAppService_Tests.cs index 52169eddbe..38a8b472bd 100644 --- a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/MediaDescriptors/MediaDescriptorAdminAppService_Tests.cs +++ b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/MediaDescriptors/MediaDescriptorAdminAppService_Tests.cs @@ -3,6 +3,7 @@ using System.IO; using System.Text; using System.Threading.Tasks; using Shouldly; +using Volo.Abp.Content; using Volo.CmsKit.Admin.MediaDescriptors; using Xunit; @@ -31,14 +32,14 @@ namespace Volo.CmsKit.MediaDescriptors using var stream = new MemoryStream(Encoding.UTF8.GetBytes(mediaContent)); - var inputStream = new CreateMediaInputStream(stream) + var media = await _mediaDescriptorAdminAppService.CreateAsync(_cmsKitTestData.Media_1_EntityType, new CreateMediaInputWithStream { - ContentType = mediaType, Name = mediaName, - EntityType = _cmsKitTestData.Media_1_EntityType - }; - - var media = await _mediaDescriptorAdminAppService.CreateAsync(inputStream); + File = new RemoteStreamContent(stream) + { + ContentType = mediaType + } + }); media.ShouldNotBeNull(); } diff --git a/modules/docs/app/VoloDocs.Web/package.json b/modules/docs/app/VoloDocs.Web/package.json index 5205dd0b97..8282c15b5f 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": "^4.3.0-rc.1", - "@abp/docs": "^4.3.0-rc.1" + "@abp/aspnetcore.mvc.ui.theme.basic": "^4.3.0-rc.2", + "@abp/docs": "^4.3.0-rc.2" } } diff --git a/modules/docs/app/VoloDocs.Web/yarn.lock b/modules/docs/app/VoloDocs.Web/yarn.lock index fcd2124137..a6a44b5e52 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@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/anchor-js/-/anchor-js-4.3.0-rc.1.tgz#ef27d81477e15afa40929b0fbbf96d5ab56388bd" - integrity sha512-6SBvt4nIHqC//pmm/zx/2+P0f7lFfRmKuOI2MwhuGPpC6jU0ZP5yB+Ez+wNp/lHoCet8/UcpN2i1JRGIAtDFqQ== +"@abp/anchor-js@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/anchor-js/-/anchor-js-4.3.0-rc.2.tgz#bb25b4b80a8f3c9b4fd281b8d2a8670fd582a59a" + integrity sha512-Rokwf2vSnqfY9Sf4DQzC5b4vMUINXk3mWb9fCTqZfjdiqjnLWJ+JyfsOeXV4qGvLF5NOU0wCbYSLvUdPn/LZwg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" anchor-js "^4.2.2" -"@abp/aspnetcore.mvc.ui.theme.basic@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.3.0-rc.1.tgz#5dc06d82ee213bc33527b5af72ac94ae06bb7c25" - integrity sha512-Xkwj3NPnqWDgqvaP2eda3gviV7aBtyNOMCdZSvpxWmlaPlvJYN+SnKNnlmX02XVArTlOjaeTapFkE3auJeR6jA== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~4.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui.theme.shared@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.3.0-rc.1.tgz#9d4447f068b490367a20772eb9c2b38480088edb" - integrity sha512-untEVm6cKT375ZVEQFO01/VKIqtdFGIyJd5ZxtoQEV8ueVFRQefCOcvvqaJ8Gfj86T1nacXvJRfBfGihYHY+JQ== - dependencies: - "@abp/aspnetcore.mvc.ui" "~4.3.0-rc.1" - "@abp/bootstrap" "~4.3.0-rc.1" - "@abp/bootstrap-datepicker" "~4.3.0-rc.1" - "@abp/datatables.net-bs4" "~4.3.0-rc.1" - "@abp/font-awesome" "~4.3.0-rc.1" - "@abp/jquery-form" "~4.3.0-rc.1" - "@abp/jquery-validation-unobtrusive" "~4.3.0-rc.1" - "@abp/lodash" "~4.3.0-rc.1" - "@abp/luxon" "~4.3.0-rc.1" - "@abp/malihu-custom-scrollbar-plugin" "~4.3.0-rc.1" - "@abp/select2" "~4.3.0-rc.1" - "@abp/sweetalert" "~4.3.0-rc.1" - "@abp/timeago" "~4.3.0-rc.1" - "@abp/toastr" "~4.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.3.0-rc.1.tgz#1e54da2a668939941ab955f11db69798d04d9e7e" - integrity sha512-969etEb4H/fR9Twz6pcl766M/1AriCh6+B8r4haPB5g7QkOWhyU99mT11BHxQwf+uNV4duGZwvPvrMomrdLj2w== +"@abp/aspnetcore.mvc.ui.theme.basic@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.3.0-rc.2.tgz#4ebafbaade6610e3d405877a148d72d57569c3e3" + integrity sha512-Q3QqxKDFC04gaaj30Rk+9zGNfNxC8FX0jciARATceFV6pdA3F3PgT5EMDSlo6NoGniFVjHPRgay9N09zT6Htyw== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~4.3.0-rc.2" + +"@abp/aspnetcore.mvc.ui.theme.shared@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.3.0-rc.2.tgz#d3bf79929c55c5380d7ca7b913a23031d7a6bd12" + integrity sha512-pz86bIV4wNeG7/UPYzNCXlJ/MdOdIygc+Com7C9Ld7gzsyER7VD9h5U/hkytvL4FBFLJn4DU+xuZNECjv0HS0A== + dependencies: + "@abp/aspnetcore.mvc.ui" "~4.3.0-rc.2" + "@abp/bootstrap" "~4.3.0-rc.2" + "@abp/bootstrap-datepicker" "~4.3.0-rc.2" + "@abp/datatables.net-bs4" "~4.3.0-rc.2" + "@abp/font-awesome" "~4.3.0-rc.2" + "@abp/jquery-form" "~4.3.0-rc.2" + "@abp/jquery-validation-unobtrusive" "~4.3.0-rc.2" + "@abp/lodash" "~4.3.0-rc.2" + "@abp/luxon" "~4.3.0-rc.2" + "@abp/malihu-custom-scrollbar-plugin" "~4.3.0-rc.2" + "@abp/select2" "~4.3.0-rc.2" + "@abp/sweetalert" "~4.3.0-rc.2" + "@abp/timeago" "~4.3.0-rc.2" + "@abp/toastr" "~4.3.0-rc.2" + +"@abp/aspnetcore.mvc.ui@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.3.0-rc.2.tgz#6ff41be179c8d1089778a51ffa54a1f3d7614278" + integrity sha512-2L5zvuqUwPwNPcMauiiJZD1ft0QycqINz+bXEQ8t0EwbB+dzcsukL/rpOQfpeRHWWYy4nIN4C2bTvXhNgQbPqQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -51,181 +51,181 @@ micromatch "^4.0.2" path "^0.12.7" -"@abp/bootstrap-datepicker@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.3.0-rc.1.tgz#879a8ce32a3dbdb0cd80401360d24f25f318670b" - integrity sha512-W2T+rrC3oxuWj2xQUz2virbBK6x7ershWZB9d6FjXTSH89nin9DyBK20dEfskVvhK/IMrmZaW4PWyTTcx9r7dA== +"@abp/bootstrap-datepicker@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.3.0-rc.2.tgz#29a686c3d2bce356967f646d7334cd83c4257b4c" + integrity sha512-3+B7SJRi7DQJe0aNgv0H0zu1BfvMZcwgt06N3ALR9+o3TSJcOqcYrEMed3aG+ASH++CltnohTYnLkVXaxshioA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.3.0-rc.1.tgz#3260de03f29e210e44a55efa3af2ab6d34362227" - integrity sha512-flB18MUnRWpEnS0t/WEjsdhfB5w+zHjsa69Pj733+GHGSsZ1Vppu+rgvSWp38yNHO5uRwGECrwUIGwvd5uD9+A== +"@abp/bootstrap@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.3.0-rc.2.tgz#1416fe639c88b7d958435e45fe19692268a7f932" + integrity sha512-E6svmDhNQlT5nd65VgshexyedRWhbvi9o1oYo/dLTUpJDzR7M9ptDqxFLVB9vVDva3HgxUoEvgRJgb9fXvq4zw== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" bootstrap "^4.6.0" bootstrap-v4-rtl "4.6.0-1" -"@abp/clipboard@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-4.3.0-rc.1.tgz#014ac354e8d2aa93266f5415fcb9cef344df48e8" - integrity sha512-+Kp4f5ib81AkufOPMyG4BTKiwcnAW6ZbWOGnsR2sBEz63wW6/ZPJ0GMngLfTkxPUJCH1QMwlk5wZoj9QAKqOAw== +"@abp/clipboard@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-4.3.0-rc.2.tgz#63670e869b09f9e10ec9a2e7f8ffcc097ce1efc7" + integrity sha512-jTHzum4h5TQqAKJKEHwJ88NLFmby92hJ8byOBl/HAjOHb8LhWuw/ktTwl2knd0/63KpiCKYZGQPV3kk5JXVQ6w== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" clipboard "^2.0.6" -"@abp/core@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.3.0-rc.1.tgz#201c3be8b5697fe8e1b08b23f87f50e950036a14" - integrity sha512-ET8NGugNmdub+8qGeFf9qGPbloP5gcoBnB7U6ieFz1Eai9S3pSpbM+sdyifucEpzMThUiLS772EP4pJTMXhfEg== +"@abp/core@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.3.0-rc.2.tgz#3c9ea339624ae3b6cbee13e048268d48269ea6a9" + integrity sha512-/89xH+IVSmTOLWeUO4yVB7Hg64uHTbR7bHjgl+b94cFdtITH9Nvr2EGdXUJbHGUK7L6lSDziqiMcG/ic0061+Q== dependencies: - "@abp/utils" "^4.3.0-rc.1" + "@abp/utils" "^4.3.0-rc.2" -"@abp/datatables.net-bs4@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.3.0-rc.1.tgz#f7dad14d13b468949fd161b679f4a70271e0d466" - integrity sha512-812cLTfSZZMvjAFAq5h7R5AeJHigBxbPc+kMReQIcFLH82o6BjA2NqFBqYOvQuh4kqiQ85dqFTW9MTKeY8or6Q== +"@abp/datatables.net-bs4@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.3.0-rc.2.tgz#bbfc0d9d0ed86cdb14b38849fb78b2b1911c4a35" + integrity sha512-PRKYi2NU41KpckJ/d0buHoFbyKVuW5NCQNpUdYzDsPS2riyeXccCsLFJM1bT01TdR4Idla3vx9Fkb+HoJOiDeQ== dependencies: - "@abp/datatables.net" "~4.3.0-rc.1" + "@abp/datatables.net" "~4.3.0-rc.2" datatables.net-bs4 "^1.10.21" -"@abp/datatables.net@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.3.0-rc.1.tgz#aa1640903fe67d20e1fc57ffe0519b2764e4c7df" - integrity sha512-qfdQa43sbXsIEBc3WpxSC7cXyKSFxLiFdCKnLIkQNsC3Wo+WX/Cute2xNbT0+xIQdGznfEBdPxcwQkNE6JQgcA== +"@abp/datatables.net@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.3.0-rc.2.tgz#1923e60db261366a7d2f284b0274d13e253567ca" + integrity sha512-rp53+5Xj1jhjpCj7UBA9+nSNbaTQ4Vc1NWCg1e5aI5tWiyZprUS44dRszIQIDV86XKorfFhog5ihOZyzl1HDyg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" datatables.net "^1.10.21" -"@abp/docs@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/docs/-/docs-4.3.0-rc.1.tgz#0a107705c66aed1586e06fd99fd27cb84ef23d56" - integrity sha512-MRZrXpJHszIUMCGAMGPuK+NPW+E8KI8LsTWESEBkY0461eAYW48rvP4Vbt2b+/vpy6enzopNmuhzq8kXH6MFzQ== +"@abp/docs@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/docs/-/docs-4.3.0-rc.2.tgz#a0871a860a57542de601657b4d41c5ca724adfe2" + integrity sha512-vJW6wTa9la7dwAv909QMIvOwtRlHdZGXRAS4gbyDbuGL2/OrqyIsGOdSfIcRakRNsTs5tuzRNIMCkdIvlJVzmw== dependencies: - "@abp/anchor-js" "~4.3.0-rc.1" - "@abp/clipboard" "~4.3.0-rc.1" - "@abp/malihu-custom-scrollbar-plugin" "~4.3.0-rc.1" - "@abp/popper.js" "~4.3.0-rc.1" - "@abp/prismjs" "~4.3.0-rc.1" + "@abp/anchor-js" "~4.3.0-rc.2" + "@abp/clipboard" "~4.3.0-rc.2" + "@abp/malihu-custom-scrollbar-plugin" "~4.3.0-rc.2" + "@abp/popper.js" "~4.3.0-rc.2" + "@abp/prismjs" "~4.3.0-rc.2" -"@abp/font-awesome@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.3.0-rc.1.tgz#5d336ead8b8c67b2c0aaff9365c2c856b033196e" - integrity sha512-BU4ycN/gOxX2x8S/Eszi3bJAz6bZRhxa0uPWxEWKul9PNvKSwMJRoVaEVehnIlfTi2raHsLQHk+F7079gt3dlQ== +"@abp/font-awesome@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.3.0-rc.2.tgz#437d3d6bbd8f52e5091251932d6a494d0164694b" + integrity sha512-FeHHtEQwrJBwD5PkFYqjKouCLwNjjRqTNseaN+s/r7gNjv0PgKytfRoqEb+O/BkZg/DwEuMz9jFX/RXCCNa2xA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" "@fortawesome/fontawesome-free" "^5.13.0" -"@abp/jquery-form@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.3.0-rc.1.tgz#4543e3d751519ba12d2c563aa7cbc56e51dfe093" - integrity sha512-ONQeImarHEe4VRSv13da+rHnCv+2Ycyd7YF+Dr77gtBmTKpC5nAFGY4wO7+u0U0px/YsR2dntpyBj2fEw3wjXA== +"@abp/jquery-form@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.3.0-rc.2.tgz#999910deaf46330477b6ed487a771a2123d69f92" + integrity sha512-+fdEIOTlxDOdYXMtc/ujhYeuP2qiI4bmL3TQQWQxSTlW8q5jB6dHLBnHiXXltO8HxX9+7ZsjN3tsV7+Div5joA== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.3.0-rc.1.tgz#15a06257fba8ef8d2cba2ac9da3f6f7185e6c8dd" - integrity sha512-8Tshu/QsqulwNfRnvoX1mViY12OTvCqpHdRldqr7k6MQd+boo6ahybQ4SCoZ9vsDTmqxd5dkV/A8VijMw66WTQ== +"@abp/jquery-validation-unobtrusive@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.3.0-rc.2.tgz#0635e0c77da269e8367c3d7c388613249ce9221d" + integrity sha512-ubmPjVJatAW3AJWjWtT+ZbNLhu+HHNgcxYkFGVNusNuboTGsoBs5G45Cjzp/q5FnggWoPvkllpf8CGuaYUbpUQ== dependencies: - "@abp/jquery-validation" "~4.3.0-rc.1" + "@abp/jquery-validation" "~4.3.0-rc.2" jquery-validation-unobtrusive "^3.2.11" -"@abp/jquery-validation@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.3.0-rc.1.tgz#6a0d771c88e961cb43144cd6ef916d1ab22aceaf" - integrity sha512-kjVF6757xP8wZ9qw8ysI5ve3AD8PoJtxqkkUV4QF4xcrdP8EPk2heX3Imu7MJiYGyMlwLU++FTm8J68UNsWRmQ== +"@abp/jquery-validation@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.3.0-rc.2.tgz#ee145f8c4a633218ccfa50cca0bed503a0ca8dc6" + integrity sha512-SLWzN6jxVqKaHYs/d6Mku8CfhB1vWgfMbFma14upiJ+/VDkTF4Rh27iMCWKYVOS3bukh2ltBp6kPFplrjCAGSg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" jquery-validation "^1.19.2" -"@abp/jquery@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.3.0-rc.1.tgz#06030baf44983175707409eff16a05db72c93bf5" - integrity sha512-Xgptjea/RzgBvwK+paydXWMgenobuvqKsr9LbrIDiYAJuLMMCyGvwJnA7jeszz+OqZShP8ppoeB0ifa5K2Yc2A== +"@abp/jquery@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.3.0-rc.2.tgz#f620628ea0739888cbcb360c058d09bff10d553b" + integrity sha512-+rfyLVJn7E8wJ1oQ9GiCR63Yk6wah1Hqnj4XpsRDMkIaOXKaqrnVHAZd4W2DUunQSe95wqHfkNH/wkvTyNEwUg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" jquery "~3.5.1" -"@abp/lodash@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.3.0-rc.1.tgz#cd9bf0693379ea54f789299ba67483d345da5abf" - integrity sha512-BtsQs6wpJJvdwPDx7sOIIzkVHJnzw4Twrv0q3XNqmsiv5eGIwluFsorm5N6qOk7nC5csor6mpk6YuJuFii8GbQ== +"@abp/lodash@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.3.0-rc.2.tgz#9b5429d3976b34022aaf8cab4afef57479b66821" + integrity sha512-sE2dyofYbiIy4xhL85diZWkfqBcQl1q61T0DbYDOHgaejZAJxk4bVyFpEuMiC2HwWAZ656IN1bzyQIyE1RKzQA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" lodash "^4.17.15" -"@abp/luxon@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.3.0-rc.1.tgz#dd855417224bbf124cdc9f395bb5cf5f0c6a7a03" - integrity sha512-OtxmjCgPiH1JWsdUvQpkvum3k43H6v8Z5okv4lDpcBOah/HZYUP8qOsSS3Tcyw2I66TK15tq13XJeHabmh2lAQ== +"@abp/luxon@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.3.0-rc.2.tgz#6fdbf1624462615dcb1f5ce85c07fc3bc4065e3f" + integrity sha512-C4aT0aN3/TVtTE3m0AZyhFSeeg+RxXpUO+nffAZoM/cH5NL8tir+O1hd+dhtCb7AELaqQNx5+qgXoJLYdWMYVg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" luxon "^1.24.1" -"@abp/malihu-custom-scrollbar-plugin@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.3.0-rc.1.tgz#e07a9a1895ded98150c1ff4470638ab71e6a0561" - integrity sha512-OiCVlh8iHPHFchSZdFzUl/w+MqPbnlZ4jlohbEuqBTV6rbaAnJXA0Tqylv4RKjho7fybGvhxjDbBrZS4kxUFLg== +"@abp/malihu-custom-scrollbar-plugin@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.3.0-rc.2.tgz#28fc1f216c1d84b20acaf8c8c5cf5c3b33e1aeb1" + integrity sha512-LYMXKkPVyBLWV4Qnom2MW8JJ/rZmVg1CyOFxM6JiL+dpsN1Ogw0hRG33CCHQveqUmf2cr3vf96qk5Et5DyDDIg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/popper.js@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/popper.js/-/popper.js-4.3.0-rc.1.tgz#42aaf3074485a06cba9b7851f649acda75dab5be" - integrity sha512-SNwSooa74WoClvx/OccK59Gqqm3/TDAp9HQ8hrowVT0kkYDxX9cXQLgVz3Nk2RuAtzz2hUJ/J9Z2A0la6f2WTQ== +"@abp/popper.js@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/popper.js/-/popper.js-4.3.0-rc.2.tgz#9945cb762beb625117c48124bd01fe9356199164" + integrity sha512-Mrf4Y4vy2OB/W+Ce61Lt6CzRFmfCvpGvr8QM8t2mlxtVawQ1AR2J586et5iO6kou0Ku7LX+CFcWP/leDNZYF2Q== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" popper.js "^1.16.0" -"@abp/prismjs@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-4.3.0-rc.1.tgz#1a43222861e094de7be69cadc6caab91b8da69cd" - integrity sha512-nd23YXLIWFr1JbUpGahfxgAIyolQgfujSphIpQsiuKm/HfXD5IWWjKRO6NGd6gUJfdpQzlzxUv+5cZXQlQ+0OA== +"@abp/prismjs@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-4.3.0-rc.2.tgz#ecb98291898ba0c2fd4317be022d1a3e281c8bea" + integrity sha512-LA2pmTDhB3NwM4hEkZSW1xBXsixIXY2FVnEHS7ATkyRr36W/Gqb5fchv0ILBD7Gce40pAiPO2dMs4SUWT8qk0Q== dependencies: - "@abp/clipboard" "~4.3.0-rc.1" - "@abp/core" "~4.3.0-rc.1" + "@abp/clipboard" "~4.3.0-rc.2" + "@abp/core" "~4.3.0-rc.2" prismjs "^1.20.0" -"@abp/select2@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.3.0-rc.1.tgz#f3d60b42cb82abc6a0ce6a640b82eb53501f9893" - integrity sha512-z+6Dhu6kqgCfTdZReI08N2ONKakQSmdDsNiZDB5/OOP26k2pOefe/j//sRfjTWiI5gCxO5y98ZZ0ccanBF8oTw== +"@abp/select2@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.3.0-rc.2.tgz#42d62daff9e50b1fe211a1560794625ba3f52107" + integrity sha512-okiIXmFaqx0uy/UMcpMKWKjrwop1JINyzN4FS5tafUpWhx6KcYYHudLWJvnPbsdsOeBQx91kw8jjERRJIqfEOA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" select2 "^4.0.13" -"@abp/sweetalert@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.3.0-rc.1.tgz#d54a8628f004c2d22ebcc4bd60f2b6c1cbd3bc8f" - integrity sha512-OpgDbM9vOfCLpjCRFXavPAdoKlZnpxP+DkUH8owHTrtEuxmrSjpLlIa6VOzAKr70GiLtuMCz9QoH3AyMepx9vA== +"@abp/sweetalert@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.3.0-rc.2.tgz#dfb20dfca8449ed3c3f6599d99b51746019eb664" + integrity sha512-NRKOgT80JVQrwI1FRqpbCzALvnLAFKdPwKKNDgm0L7r/5DL0+JbkKCI1AIPl/yiM8MBrCaQqNms+9JES5mjiUQ== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" sweetalert "^2.1.2" -"@abp/timeago@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.3.0-rc.1.tgz#247f3b3a8e54f6732efa3600ba649a81fee6ec82" - integrity sha512-cplxM3jYhhakET1DyERQoWJQxx0mhTKoI7gW93wNeEMyL4FWaF4lgUNEoubJUSBCDs4v/0ni0pKG8c8nldbiew== +"@abp/timeago@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.3.0-rc.2.tgz#22943e219facd7fa0efddb63017198474b5cef89" + integrity sha512-TjKyuli+SpVjTgVJmraBpqJK112I+1DYHPJfso7QAH48Ra4gceGj9EVS0i/420YyLZyJSMtZOruxzYkyJeR/6w== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" timeago "^1.6.7" -"@abp/toastr@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.3.0-rc.1.tgz#7bc5bb071839fbb971f56c41c8bf220b0a6d67e9" - integrity sha512-OQgmdmWPKlpn/Lks6fUL4enEJgnvUeEcoGTuQOKfkh9ybadYd8kcELWw5ttsQ4o35yvDH3Lsh1jLwPDrCheTBg== +"@abp/toastr@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.3.0-rc.2.tgz#143a344b00bbfaa858fe267fb6d627952bf7b3c0" + integrity sha512-cQV9UFWb9zarkb/CbrqkF9RXqn1Fc/TFKKM5mxpUEcYjx52NuM0d+KawdEMoN2y3y2U4ciY44kbTP2W1y+NlBg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" toastr "^2.1.4" -"@abp/utils@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.3.0-rc.1.tgz#82ef26e01e0cb38417bf4fa9459fde85cbc2b424" - integrity sha512-C/sk6jZQDENI7FbylBoPnTb1rC5eVPnsL8B++vAH4jS//OAj2iNvE6tCewK21GYI/JmfmQzzauQBzOiOJR9a6A== +"@abp/utils@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.3.0-rc.2.tgz#6d051f98772e5642c2e3bc2f68e73d6f24f4694c" + integrity sha512-9qYo8OMTxIUG+qQBWXEpkURS6FUrx+J5s3SwC/eerp46hYr72GQ8L38Wq566a+xiLCn7Duxt6oJ/BxhTfQQxdw== dependencies: just-compare "^1.3.0" diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/FullSearch/Elastic/DefaultElasticClientProvider.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/FullSearch/Elastic/DefaultElasticClientProvider.cs index 5db064fd5f..8b4d82e5cd 100644 --- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/FullSearch/Elastic/DefaultElasticClientProvider.cs +++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/FullSearch/Elastic/DefaultElasticClientProvider.cs @@ -21,7 +21,7 @@ namespace Volo.Docs.Documents.FullSearch.Elastic { var node = new Uri(Configuration["ElasticSearch:Url"]); var settings = new ConnectionSettings(node).DefaultIndex(Options.IndexName); - return new ElasticClient(settings); + return new ElasticClient(Options.Authenticate(settings)); } } -} \ No newline at end of file +} diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/FullSearch/Elastic/DocsElasticSearchOptions.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/FullSearch/Elastic/DocsElasticSearchOptions.cs index 40bbf66b08..6a17a034c4 100644 --- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/FullSearch/Elastic/DocsElasticSearchOptions.cs +++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/FullSearch/Elastic/DocsElasticSearchOptions.cs @@ -1,15 +1,53 @@ -namespace Volo.Docs.Documents.FullSearch.Elastic +using System; +using Nest; +using Volo.Abp; + +namespace Volo.Docs.Documents.FullSearch.Elastic { public class DocsElasticSearchOptions { + public bool Enable { get; set; } + + public string IndexName { get; set; } + + protected Action AuthenticationAction { get; set; } + public DocsElasticSearchOptions() { Enable = false; IndexName = "abp_documents"; } - public bool Enable { get; set; } + public DocsElasticSearchOptions UseBasicAuthentication(string username, string password) + { + Check.NotNullOrEmpty(username, nameof(username)); + Check.NotNullOrEmpty(password, nameof(password)); - public string IndexName { get; set; } + AuthenticationAction = settings => + { + settings.BasicAuthentication(username, password); + }; + + return this; + } + + public DocsElasticSearchOptions UseApiKeyAuthentication(string id, string apiKey) + { + Check.NotNullOrEmpty(id, nameof(id)); + Check.NotNullOrEmpty(apiKey, nameof(apiKey)); + + AuthenticationAction = settings => + { + settings.ApiKeyAuthentication(id, apiKey); + }; + + return this; + } + + public ConnectionSettings Authenticate(ConnectionSettings connectionSettings) + { + AuthenticationAction?.Invoke(connectionSettings); + return connectionSettings; + } } } diff --git a/modules/docs/src/Volo.Docs.Web/Models/VersionInfoViewModel.cs b/modules/docs/src/Volo.Docs.Web/Models/VersionInfoViewModel.cs index 7def41b3f3..86f3a4d821 100644 --- a/modules/docs/src/Volo.Docs.Web/Models/VersionInfoViewModel.cs +++ b/modules/docs/src/Volo.Docs.Web/Models/VersionInfoViewModel.cs @@ -8,6 +8,8 @@ namespace Volo.Docs.Models public bool IsSelected { get; set; } + public bool IsPreview { get; set; } + public VersionInfoViewModel(string displayText, string version, bool isSelected = false) { DisplayText = displayText; @@ -15,4 +17,4 @@ namespace Volo.Docs.Models IsSelected = isSelected; } } -} \ No newline at end of file +} diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs index a52027bb11..6a23afba29 100644 --- a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs +++ b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs @@ -66,6 +66,8 @@ namespace Volo.Docs.Pages.Documents.Project public bool ShowProjectsCombobox { get; set; } + public bool IsVersionPreview { get; set; } + public string DocumentLanguageCode { get; set; } public DocumentParametersDto DocumentPreferences { get; set; } @@ -283,6 +285,7 @@ namespace Volo.Docs.Pages.Documents.Project if (versionFromUrl != null) { versionFromUrl.IsSelected = true; + IsVersionPreview = versionFromUrl.IsPreview; Version = versionFromUrl.Version; } else @@ -321,8 +324,9 @@ namespace Volo.Docs.Pages.Documents.Project { return version; } - + version.DisplayText = $"{version.DisplayText} ({L["Preview"].Value})"; + version.IsPreview = true; } } @@ -530,6 +534,7 @@ namespace Volo.Docs.Pages.Documents.Project { UserPreferences.Add("Document_Language_Code", DocumentLanguageCode); UserPreferences.Add("Document_Version", Version); + UserPreferences.Add("Release_Status", IsVersionPreview ? "preview" : "stable"); var cookie = Request.Cookies["AbpDocsPreferences"]; @@ -563,10 +568,24 @@ namespace Volo.Docs.Pages.Documents.Project UserPreferences.Remove(key + "_Value"); } + var values = DocumentPreferences?.Parameters?.FirstOrDefault(p => p.Name == key)?.Values; + + if (values == null) + { + continue; + } + + if (!values.Any(v => v.Key == value)) + { + var defaultValue = values.FirstOrDefault(); + UserPreferences.Add(key, defaultValue.Key); + UserPreferences.Add(key + "_Value", defaultValue.Value); + + continue; + } + UserPreferences.Add(key, value); - UserPreferences.Add(key + "_Value", - DocumentPreferences?.Parameters?.FirstOrDefault(p => p.Name == key)?.Values - .FirstOrDefault(v => v.Key == value).Value); + UserPreferences.Add(key + "_Value", values.FirstOrDefault(v => v.Key == value).Value); } if (DocumentPreferences?.Parameters == null) diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpCorsPolicyService.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpCorsPolicyService.cs index 57158db720..c1932d0435 100644 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpCorsPolicyService.cs +++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpCorsPolicyService.cs @@ -40,7 +40,7 @@ namespace Volo.Abp.IdentityServer AbsoluteExpirationRelativeToNow = Options.Caching.CorsExpiration }); - var isAllowed = cacheItem.AllowedOrigins.Contains(origin, StringComparer.OrdinalIgnoreCase); + var isAllowed = await IsOriginAllowedAsync(cacheItem.AllowedOrigins, origin); if (!isAllowed) { @@ -63,5 +63,10 @@ namespace Volo.Abp.IdentityServer }; } } + + protected virtual Task IsOriginAllowedAsync(string[] allowedOrigins, string origin) + { + return Task.FromResult(allowedOrigins.Contains(origin, StringComparer.OrdinalIgnoreCase)); + } } } diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerServiceCollectionExtensions.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerServiceCollectionExtensions.cs index 4bb5b2ca6a..baa04a6e5f 100644 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerServiceCollectionExtensions.cs +++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerServiceCollectionExtensions.cs @@ -1,4 +1,5 @@ -using IdentityServer4.Validation; +using IdentityServer4.Services; +using IdentityServer4.Validation; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; @@ -15,5 +16,10 @@ namespace Volo.Abp.IdentityServer { services.Replace(ServiceDescriptor.Transient()); } + + public static void AddAbpWildcardSubdomainCorsPolicyService(this IServiceCollection services) + { + services.Replace(ServiceDescriptor.Transient()); + } } } diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpWildcardSubdomainCorsPolicyService.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpWildcardSubdomainCorsPolicyService.cs new file mode 100644 index 0000000000..1a9d146ca9 --- /dev/null +++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpWildcardSubdomainCorsPolicyService.cs @@ -0,0 +1,47 @@ +using System; +using System.Threading.Tasks; +using IdentityServer4.Configuration; +using Microsoft.Extensions.Options; +using Volo.Abp.Caching; +using Volo.Abp.DependencyInjection; +using Volo.Abp.Text.Formatting; + +namespace Volo.Abp.IdentityServer +{ + public class AbpWildcardSubdomainCorsPolicyService : AbpCorsPolicyService + { + public AbpWildcardSubdomainCorsPolicyService( + IDistributedCache cache, + IHybridServiceScopeFactory hybridServiceScopeFactory, + IOptions options) + : base(cache, hybridServiceScopeFactory, options) + { + + } + + protected override async Task IsOriginAllowedAsync(string[] allowedOrigins, string origin) + { + var isAllowed = await base.IsOriginAllowedAsync(allowedOrigins, origin); + if (isAllowed) + { + return true; + } + + foreach (var url in allowedOrigins) + { + var extractResult = FormattedStringValueExtracter.Extract(origin, url, ignoreCase: true); + if (extractResult.IsMatch) + { + return true; + } + + if (url.Replace("{0}.", "").Contains(origin, StringComparison.OrdinalIgnoreCase)) + { + return true; + } + } + + return false; + } + } +} diff --git a/modules/identityserver/test/Volo.Abp.IdentityServer.Domain.Tests/Volo/Abp/IdentityServer/AbpWildcardSubdomainCorsPolicyService_Tests.cs b/modules/identityserver/test/Volo.Abp.IdentityServer.Domain.Tests/Volo/Abp/IdentityServer/AbpWildcardSubdomainCorsPolicyService_Tests.cs new file mode 100644 index 0000000000..fcb8e756e0 --- /dev/null +++ b/modules/identityserver/test/Volo.Abp.IdentityServer.Domain.Tests/Volo/Abp/IdentityServer/AbpWildcardSubdomainCorsPolicyService_Tests.cs @@ -0,0 +1,40 @@ +using System.Threading.Tasks; +using IdentityServer4.Services; +using Microsoft.Extensions.DependencyInjection; +using Shouldly; +using Xunit; + +namespace Volo.Abp.IdentityServer +{ + public class AbpWildcardSubdomainCorsPolicyService_Tests : AbpIdentityServerTestBase + { + private readonly ICorsPolicyService _corsPolicyService; + + public AbpWildcardSubdomainCorsPolicyService_Tests() + { + _corsPolicyService = GetRequiredService(); + } + + protected override void AfterAddApplication(IServiceCollection services) + { + services.AddAbpWildcardSubdomainCorsPolicyService(); + } + + [Fact] + public void Should_Register_AbpWildcardSubdomainCorsPolicyService() + { + _corsPolicyService.GetType().ShouldBe(typeof(AbpWildcardSubdomainCorsPolicyService)); + } + + [Fact] + public async Task IsOriginAllowedAsync() + { + (await _corsPolicyService.IsOriginAllowedAsync("https://client1-origin.com")).ShouldBeTrue(); + (await _corsPolicyService.IsOriginAllowedAsync("https://client2-origin.com")).ShouldBeFalse(); + + (await _corsPolicyService.IsOriginAllowedAsync("https://abp.io")).ShouldBeTrue(); + (await _corsPolicyService.IsOriginAllowedAsync("https://t1.abp.io")).ShouldBeTrue(); + (await _corsPolicyService.IsOriginAllowedAsync("https://t1.ng.abp.io")).ShouldBeTrue(); + } + } +} diff --git a/modules/identityserver/test/Volo.Abp.IdentityServer.TestBase/Volo/Abp/IdentityServer/AbpIdentityServerTestDataBuilder.cs b/modules/identityserver/test/Volo.Abp.IdentityServer.TestBase/Volo/Abp/IdentityServer/AbpIdentityServerTestDataBuilder.cs index a2d9490404..e2bd202ec1 100644 --- a/modules/identityserver/test/Volo.Abp.IdentityServer.TestBase/Volo/Abp/IdentityServer/AbpIdentityServerTestDataBuilder.cs +++ b/modules/identityserver/test/Volo.Abp.IdentityServer.TestBase/Volo/Abp/IdentityServer/AbpIdentityServerTestDataBuilder.cs @@ -148,6 +148,7 @@ namespace Volo.Abp.IdentityServer }; client.AddCorsOrigin("https://client1-origin.com"); + client.AddCorsOrigin("https://{0}.abp.io"); client.AddClaim(nameof(ClientClaim.Value), nameof(ClientClaim.Type)); client.AddGrantType(nameof(ClientGrantType.GrantType)); client.AddIdentityProviderRestriction(nameof(ClientIdPRestriction.Provider)); 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 9360b67730..02b66f579e 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": "^4.3.0-rc.1" + "@abp/aspnetcore.mvc.ui.theme.basic": "^4.3.0-rc.2" } } 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 6e90958c27..bf9e01967e 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@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.3.0-rc.1.tgz#5dc06d82ee213bc33527b5af72ac94ae06bb7c25" - integrity sha512-Xkwj3NPnqWDgqvaP2eda3gviV7aBtyNOMCdZSvpxWmlaPlvJYN+SnKNnlmX02XVArTlOjaeTapFkE3auJeR6jA== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~4.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui.theme.shared@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.3.0-rc.1.tgz#9d4447f068b490367a20772eb9c2b38480088edb" - integrity sha512-untEVm6cKT375ZVEQFO01/VKIqtdFGIyJd5ZxtoQEV8ueVFRQefCOcvvqaJ8Gfj86T1nacXvJRfBfGihYHY+JQ== - dependencies: - "@abp/aspnetcore.mvc.ui" "~4.3.0-rc.1" - "@abp/bootstrap" "~4.3.0-rc.1" - "@abp/bootstrap-datepicker" "~4.3.0-rc.1" - "@abp/datatables.net-bs4" "~4.3.0-rc.1" - "@abp/font-awesome" "~4.3.0-rc.1" - "@abp/jquery-form" "~4.3.0-rc.1" - "@abp/jquery-validation-unobtrusive" "~4.3.0-rc.1" - "@abp/lodash" "~4.3.0-rc.1" - "@abp/luxon" "~4.3.0-rc.1" - "@abp/malihu-custom-scrollbar-plugin" "~4.3.0-rc.1" - "@abp/select2" "~4.3.0-rc.1" - "@abp/sweetalert" "~4.3.0-rc.1" - "@abp/timeago" "~4.3.0-rc.1" - "@abp/toastr" "~4.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.3.0-rc.1.tgz#1e54da2a668939941ab955f11db69798d04d9e7e" - integrity sha512-969etEb4H/fR9Twz6pcl766M/1AriCh6+B8r4haPB5g7QkOWhyU99mT11BHxQwf+uNV4duGZwvPvrMomrdLj2w== +"@abp/aspnetcore.mvc.ui.theme.basic@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.3.0-rc.2.tgz#4ebafbaade6610e3d405877a148d72d57569c3e3" + integrity sha512-Q3QqxKDFC04gaaj30Rk+9zGNfNxC8FX0jciARATceFV6pdA3F3PgT5EMDSlo6NoGniFVjHPRgay9N09zT6Htyw== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~4.3.0-rc.2" + +"@abp/aspnetcore.mvc.ui.theme.shared@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.3.0-rc.2.tgz#d3bf79929c55c5380d7ca7b913a23031d7a6bd12" + integrity sha512-pz86bIV4wNeG7/UPYzNCXlJ/MdOdIygc+Com7C9Ld7gzsyER7VD9h5U/hkytvL4FBFLJn4DU+xuZNECjv0HS0A== + dependencies: + "@abp/aspnetcore.mvc.ui" "~4.3.0-rc.2" + "@abp/bootstrap" "~4.3.0-rc.2" + "@abp/bootstrap-datepicker" "~4.3.0-rc.2" + "@abp/datatables.net-bs4" "~4.3.0-rc.2" + "@abp/font-awesome" "~4.3.0-rc.2" + "@abp/jquery-form" "~4.3.0-rc.2" + "@abp/jquery-validation-unobtrusive" "~4.3.0-rc.2" + "@abp/lodash" "~4.3.0-rc.2" + "@abp/luxon" "~4.3.0-rc.2" + "@abp/malihu-custom-scrollbar-plugin" "~4.3.0-rc.2" + "@abp/select2" "~4.3.0-rc.2" + "@abp/sweetalert" "~4.3.0-rc.2" + "@abp/timeago" "~4.3.0-rc.2" + "@abp/toastr" "~4.3.0-rc.2" + +"@abp/aspnetcore.mvc.ui@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.3.0-rc.2.tgz#6ff41be179c8d1089778a51ffa54a1f3d7614278" + integrity sha512-2L5zvuqUwPwNPcMauiiJZD1ft0QycqINz+bXEQ8t0EwbB+dzcsukL/rpOQfpeRHWWYy4nIN4C2bTvXhNgQbPqQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -43,145 +43,145 @@ micromatch "^4.0.2" path "^0.12.7" -"@abp/bootstrap-datepicker@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.3.0-rc.1.tgz#879a8ce32a3dbdb0cd80401360d24f25f318670b" - integrity sha512-W2T+rrC3oxuWj2xQUz2virbBK6x7ershWZB9d6FjXTSH89nin9DyBK20dEfskVvhK/IMrmZaW4PWyTTcx9r7dA== +"@abp/bootstrap-datepicker@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.3.0-rc.2.tgz#29a686c3d2bce356967f646d7334cd83c4257b4c" + integrity sha512-3+B7SJRi7DQJe0aNgv0H0zu1BfvMZcwgt06N3ALR9+o3TSJcOqcYrEMed3aG+ASH++CltnohTYnLkVXaxshioA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.3.0-rc.1.tgz#3260de03f29e210e44a55efa3af2ab6d34362227" - integrity sha512-flB18MUnRWpEnS0t/WEjsdhfB5w+zHjsa69Pj733+GHGSsZ1Vppu+rgvSWp38yNHO5uRwGECrwUIGwvd5uD9+A== +"@abp/bootstrap@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.3.0-rc.2.tgz#1416fe639c88b7d958435e45fe19692268a7f932" + integrity sha512-E6svmDhNQlT5nd65VgshexyedRWhbvi9o1oYo/dLTUpJDzR7M9ptDqxFLVB9vVDva3HgxUoEvgRJgb9fXvq4zw== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" bootstrap "^4.6.0" bootstrap-v4-rtl "4.6.0-1" -"@abp/core@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.3.0-rc.1.tgz#201c3be8b5697fe8e1b08b23f87f50e950036a14" - integrity sha512-ET8NGugNmdub+8qGeFf9qGPbloP5gcoBnB7U6ieFz1Eai9S3pSpbM+sdyifucEpzMThUiLS772EP4pJTMXhfEg== +"@abp/core@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.3.0-rc.2.tgz#3c9ea339624ae3b6cbee13e048268d48269ea6a9" + integrity sha512-/89xH+IVSmTOLWeUO4yVB7Hg64uHTbR7bHjgl+b94cFdtITH9Nvr2EGdXUJbHGUK7L6lSDziqiMcG/ic0061+Q== dependencies: - "@abp/utils" "^4.3.0-rc.1" + "@abp/utils" "^4.3.0-rc.2" -"@abp/datatables.net-bs4@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.3.0-rc.1.tgz#f7dad14d13b468949fd161b679f4a70271e0d466" - integrity sha512-812cLTfSZZMvjAFAq5h7R5AeJHigBxbPc+kMReQIcFLH82o6BjA2NqFBqYOvQuh4kqiQ85dqFTW9MTKeY8or6Q== +"@abp/datatables.net-bs4@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.3.0-rc.2.tgz#bbfc0d9d0ed86cdb14b38849fb78b2b1911c4a35" + integrity sha512-PRKYi2NU41KpckJ/d0buHoFbyKVuW5NCQNpUdYzDsPS2riyeXccCsLFJM1bT01TdR4Idla3vx9Fkb+HoJOiDeQ== dependencies: - "@abp/datatables.net" "~4.3.0-rc.1" + "@abp/datatables.net" "~4.3.0-rc.2" datatables.net-bs4 "^1.10.21" -"@abp/datatables.net@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.3.0-rc.1.tgz#aa1640903fe67d20e1fc57ffe0519b2764e4c7df" - integrity sha512-qfdQa43sbXsIEBc3WpxSC7cXyKSFxLiFdCKnLIkQNsC3Wo+WX/Cute2xNbT0+xIQdGznfEBdPxcwQkNE6JQgcA== +"@abp/datatables.net@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.3.0-rc.2.tgz#1923e60db261366a7d2f284b0274d13e253567ca" + integrity sha512-rp53+5Xj1jhjpCj7UBA9+nSNbaTQ4Vc1NWCg1e5aI5tWiyZprUS44dRszIQIDV86XKorfFhog5ihOZyzl1HDyg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" datatables.net "^1.10.21" -"@abp/font-awesome@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.3.0-rc.1.tgz#5d336ead8b8c67b2c0aaff9365c2c856b033196e" - integrity sha512-BU4ycN/gOxX2x8S/Eszi3bJAz6bZRhxa0uPWxEWKul9PNvKSwMJRoVaEVehnIlfTi2raHsLQHk+F7079gt3dlQ== +"@abp/font-awesome@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.3.0-rc.2.tgz#437d3d6bbd8f52e5091251932d6a494d0164694b" + integrity sha512-FeHHtEQwrJBwD5PkFYqjKouCLwNjjRqTNseaN+s/r7gNjv0PgKytfRoqEb+O/BkZg/DwEuMz9jFX/RXCCNa2xA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" "@fortawesome/fontawesome-free" "^5.13.0" -"@abp/jquery-form@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.3.0-rc.1.tgz#4543e3d751519ba12d2c563aa7cbc56e51dfe093" - integrity sha512-ONQeImarHEe4VRSv13da+rHnCv+2Ycyd7YF+Dr77gtBmTKpC5nAFGY4wO7+u0U0px/YsR2dntpyBj2fEw3wjXA== +"@abp/jquery-form@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.3.0-rc.2.tgz#999910deaf46330477b6ed487a771a2123d69f92" + integrity sha512-+fdEIOTlxDOdYXMtc/ujhYeuP2qiI4bmL3TQQWQxSTlW8q5jB6dHLBnHiXXltO8HxX9+7ZsjN3tsV7+Div5joA== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.3.0-rc.1.tgz#15a06257fba8ef8d2cba2ac9da3f6f7185e6c8dd" - integrity sha512-8Tshu/QsqulwNfRnvoX1mViY12OTvCqpHdRldqr7k6MQd+boo6ahybQ4SCoZ9vsDTmqxd5dkV/A8VijMw66WTQ== +"@abp/jquery-validation-unobtrusive@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.3.0-rc.2.tgz#0635e0c77da269e8367c3d7c388613249ce9221d" + integrity sha512-ubmPjVJatAW3AJWjWtT+ZbNLhu+HHNgcxYkFGVNusNuboTGsoBs5G45Cjzp/q5FnggWoPvkllpf8CGuaYUbpUQ== dependencies: - "@abp/jquery-validation" "~4.3.0-rc.1" + "@abp/jquery-validation" "~4.3.0-rc.2" jquery-validation-unobtrusive "^3.2.11" -"@abp/jquery-validation@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.3.0-rc.1.tgz#6a0d771c88e961cb43144cd6ef916d1ab22aceaf" - integrity sha512-kjVF6757xP8wZ9qw8ysI5ve3AD8PoJtxqkkUV4QF4xcrdP8EPk2heX3Imu7MJiYGyMlwLU++FTm8J68UNsWRmQ== +"@abp/jquery-validation@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.3.0-rc.2.tgz#ee145f8c4a633218ccfa50cca0bed503a0ca8dc6" + integrity sha512-SLWzN6jxVqKaHYs/d6Mku8CfhB1vWgfMbFma14upiJ+/VDkTF4Rh27iMCWKYVOS3bukh2ltBp6kPFplrjCAGSg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" jquery-validation "^1.19.2" -"@abp/jquery@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.3.0-rc.1.tgz#06030baf44983175707409eff16a05db72c93bf5" - integrity sha512-Xgptjea/RzgBvwK+paydXWMgenobuvqKsr9LbrIDiYAJuLMMCyGvwJnA7jeszz+OqZShP8ppoeB0ifa5K2Yc2A== +"@abp/jquery@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.3.0-rc.2.tgz#f620628ea0739888cbcb360c058d09bff10d553b" + integrity sha512-+rfyLVJn7E8wJ1oQ9GiCR63Yk6wah1Hqnj4XpsRDMkIaOXKaqrnVHAZd4W2DUunQSe95wqHfkNH/wkvTyNEwUg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" jquery "~3.5.1" -"@abp/lodash@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.3.0-rc.1.tgz#cd9bf0693379ea54f789299ba67483d345da5abf" - integrity sha512-BtsQs6wpJJvdwPDx7sOIIzkVHJnzw4Twrv0q3XNqmsiv5eGIwluFsorm5N6qOk7nC5csor6mpk6YuJuFii8GbQ== +"@abp/lodash@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.3.0-rc.2.tgz#9b5429d3976b34022aaf8cab4afef57479b66821" + integrity sha512-sE2dyofYbiIy4xhL85diZWkfqBcQl1q61T0DbYDOHgaejZAJxk4bVyFpEuMiC2HwWAZ656IN1bzyQIyE1RKzQA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" lodash "^4.17.15" -"@abp/luxon@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.3.0-rc.1.tgz#dd855417224bbf124cdc9f395bb5cf5f0c6a7a03" - integrity sha512-OtxmjCgPiH1JWsdUvQpkvum3k43H6v8Z5okv4lDpcBOah/HZYUP8qOsSS3Tcyw2I66TK15tq13XJeHabmh2lAQ== +"@abp/luxon@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.3.0-rc.2.tgz#6fdbf1624462615dcb1f5ce85c07fc3bc4065e3f" + integrity sha512-C4aT0aN3/TVtTE3m0AZyhFSeeg+RxXpUO+nffAZoM/cH5NL8tir+O1hd+dhtCb7AELaqQNx5+qgXoJLYdWMYVg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" luxon "^1.24.1" -"@abp/malihu-custom-scrollbar-plugin@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.3.0-rc.1.tgz#e07a9a1895ded98150c1ff4470638ab71e6a0561" - integrity sha512-OiCVlh8iHPHFchSZdFzUl/w+MqPbnlZ4jlohbEuqBTV6rbaAnJXA0Tqylv4RKjho7fybGvhxjDbBrZS4kxUFLg== +"@abp/malihu-custom-scrollbar-plugin@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.3.0-rc.2.tgz#28fc1f216c1d84b20acaf8c8c5cf5c3b33e1aeb1" + integrity sha512-LYMXKkPVyBLWV4Qnom2MW8JJ/rZmVg1CyOFxM6JiL+dpsN1Ogw0hRG33CCHQveqUmf2cr3vf96qk5Et5DyDDIg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.3.0-rc.1.tgz#f3d60b42cb82abc6a0ce6a640b82eb53501f9893" - integrity sha512-z+6Dhu6kqgCfTdZReI08N2ONKakQSmdDsNiZDB5/OOP26k2pOefe/j//sRfjTWiI5gCxO5y98ZZ0ccanBF8oTw== +"@abp/select2@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.3.0-rc.2.tgz#42d62daff9e50b1fe211a1560794625ba3f52107" + integrity sha512-okiIXmFaqx0uy/UMcpMKWKjrwop1JINyzN4FS5tafUpWhx6KcYYHudLWJvnPbsdsOeBQx91kw8jjERRJIqfEOA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" select2 "^4.0.13" -"@abp/sweetalert@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.3.0-rc.1.tgz#d54a8628f004c2d22ebcc4bd60f2b6c1cbd3bc8f" - integrity sha512-OpgDbM9vOfCLpjCRFXavPAdoKlZnpxP+DkUH8owHTrtEuxmrSjpLlIa6VOzAKr70GiLtuMCz9QoH3AyMepx9vA== +"@abp/sweetalert@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.3.0-rc.2.tgz#dfb20dfca8449ed3c3f6599d99b51746019eb664" + integrity sha512-NRKOgT80JVQrwI1FRqpbCzALvnLAFKdPwKKNDgm0L7r/5DL0+JbkKCI1AIPl/yiM8MBrCaQqNms+9JES5mjiUQ== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" sweetalert "^2.1.2" -"@abp/timeago@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.3.0-rc.1.tgz#247f3b3a8e54f6732efa3600ba649a81fee6ec82" - integrity sha512-cplxM3jYhhakET1DyERQoWJQxx0mhTKoI7gW93wNeEMyL4FWaF4lgUNEoubJUSBCDs4v/0ni0pKG8c8nldbiew== +"@abp/timeago@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.3.0-rc.2.tgz#22943e219facd7fa0efddb63017198474b5cef89" + integrity sha512-TjKyuli+SpVjTgVJmraBpqJK112I+1DYHPJfso7QAH48Ra4gceGj9EVS0i/420YyLZyJSMtZOruxzYkyJeR/6w== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" timeago "^1.6.7" -"@abp/toastr@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.3.0-rc.1.tgz#7bc5bb071839fbb971f56c41c8bf220b0a6d67e9" - integrity sha512-OQgmdmWPKlpn/Lks6fUL4enEJgnvUeEcoGTuQOKfkh9ybadYd8kcELWw5ttsQ4o35yvDH3Lsh1jLwPDrCheTBg== +"@abp/toastr@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.3.0-rc.2.tgz#143a344b00bbfaa858fe267fb6d627952bf7b3c0" + integrity sha512-cQV9UFWb9zarkb/CbrqkF9RXqn1Fc/TFKKM5mxpUEcYjx52NuM0d+KawdEMoN2y3y2U4ciY44kbTP2W1y+NlBg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" toastr "^2.1.4" -"@abp/utils@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.3.0-rc.1.tgz#82ef26e01e0cb38417bf4fa9459fde85cbc2b424" - integrity sha512-C/sk6jZQDENI7FbylBoPnTb1rC5eVPnsL8B++vAH4jS//OAj2iNvE6tCewK21GYI/JmfmQzzauQBzOiOJR9a6A== +"@abp/utils@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.3.0-rc.2.tgz#6d051f98772e5642c2e3bc2f68e73d6f24f4694c" + integrity sha512-9qYo8OMTxIUG+qQBWXEpkURS6FUrx+J5s3SwC/eerp46hYr72GQ8L38Wq566a+xiLCn7Duxt6oJ/BxhTfQQxdw== dependencies: just-compare "^1.3.0" diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo/Abp/SettingManagement/SettingManagementApplicationModule.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo/Abp/SettingManagement/SettingManagementApplicationModule.cs index 9ed44d59c0..9b7b809b47 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo/Abp/SettingManagement/SettingManagementApplicationModule.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo/Abp/SettingManagement/SettingManagementApplicationModule.cs @@ -6,7 +6,6 @@ namespace Volo.Abp.SettingManagement [DependsOn( typeof(AbpSettingManagementDomainModule), typeof(AbpSettingManagementApplicationContractsModule), - typeof(AbpSettingManagementDomainModule), typeof(AbpEmailingModule) )] public class AbpSettingManagementApplicationModule : AbpModule diff --git a/npm/lerna.json b/npm/lerna.json index 078ef2de79..147991d344 100644 --- a/npm/lerna.json +++ b/npm/lerna.json @@ -1,5 +1,5 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "packages": [ "packs/*" ], diff --git a/npm/ng-packs/lerna.version.json b/npm/ng-packs/lerna.version.json index c7f0b71c03..1800a690ad 100644 --- a/npm/ng-packs/lerna.version.json +++ b/npm/ng-packs/lerna.version.json @@ -1,5 +1,5 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "packages": [ "packages/*" ], diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index aa10210d90..1b673c3255 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -27,17 +27,17 @@ "postinstall": "npm run compile:ivy" }, "devDependencies": { - "@abp/ng.core": "~4.3.0-rc.1", - "@abp/ng.feature-management": "~4.3.0-rc.1", - "@abp/ng.account": "~4.3.0-rc.1", - "@abp/ng.identity": "~4.3.0-rc.1", - "@abp/ng.permission-management": "~4.3.0-rc.1", - "@abp/ng.schematics": "~4.3.0-rc.1", - "@abp/ng.setting-management": "~4.3.0-rc.1", - "@abp/ng.tenant-management": "~4.3.0-rc.1", - "@abp/ng.theme.basic": "~4.3.0-rc.1", - "@abp/ng.theme.shared": "~4.3.0-rc.1", - "@abp/utils": "^4.3.0-rc.1", + "@abp/ng.core": "~4.3.0-rc.2", + "@abp/ng.feature-management": "~4.3.0-rc.2", + "@abp/ng.account": "~4.3.0-rc.2", + "@abp/ng.identity": "~4.3.0-rc.2", + "@abp/ng.permission-management": "~4.3.0-rc.2", + "@abp/ng.schematics": "~4.3.0-rc.2", + "@abp/ng.setting-management": "~4.3.0-rc.2", + "@abp/ng.tenant-management": "~4.3.0-rc.2", + "@abp/ng.theme.basic": "~4.3.0-rc.2", + "@abp/ng.theme.shared": "~4.3.0-rc.2", + "@abp/utils": "^4.3.0-rc.2", "@angular-builders/jest": "^10.0.0", "@angular-devkit/build-angular": "~0.1101.0", "@angular-devkit/build-ng-packagr": "~0.1001.2", diff --git a/npm/ng-packs/packages/account/package.json b/npm/ng-packs/packages/account/package.json index 7192056af4..678a2126a1 100644 --- a/npm/ng-packs/packages/account/package.json +++ b/npm/ng-packs/packages/account/package.json @@ -1,13 +1,13 @@ { "name": "@abp/ng.account", - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.theme.shared": "~4.3.0-rc.1", + "@abp/ng.theme.shared": "~4.3.0-rc.2", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/account/src/lib/components/tenant-box/tenant-box.component.html b/npm/ng-packs/packages/account/src/lib/components/tenant-box/tenant-box.component.html index e8b2df61e1..91e68d9a0a 100644 --- a/npm/ng-packs/packages/account/src/lib/components/tenant-box/tenant-box.component.html +++ b/npm/ng-packs/packages/account/src/lib/components/tenant-box/tenant-box.component.html @@ -3,7 +3,7 @@
    - {{ + {{ 'AbpUiMultiTenancy::Tenant' | abpLocalization }}
    @@ -47,7 +47,7 @@ - =4.3.0-rc.1", - "@abp/ng.theme.shared": ">=4.3.0-rc.1", + "@abp/ng.core": ">=4.3.0-rc.2", + "@abp/ng.theme.shared": ">=4.3.0-rc.2", "@ng-bootstrap/ng-bootstrap": ">=6.0.0" }, "dependencies": { diff --git a/npm/ng-packs/packages/components/page/src/page.component.html b/npm/ng-packs/packages/components/page/src/page.component.html index 71715fd82e..fe5aff2e58 100644 --- a/npm/ng-packs/packages/components/page/src/page.component.html +++ b/npm/ng-packs/packages/components/page/src/page.component.html @@ -1,4 +1,4 @@ -
    +
    diff --git a/npm/ng-packs/packages/components/page/src/page.component.ts b/npm/ng-packs/packages/components/page/src/page.component.ts index 49e884fb2c..24b6d18ccf 100644 --- a/npm/ng-packs/packages/components/page/src/page.component.ts +++ b/npm/ng-packs/packages/components/page/src/page.component.ts @@ -37,4 +37,15 @@ export class PageComponent { @ContentChild(PageBreadcrumbContainerComponent) customBreadcrumb: PageBreadcrumbContainerComponent; @ContentChild(PageToolbarContainerComponent) customToolbar: PageToolbarContainerComponent; + + get shouldRenderRow() { + return !!( + this.title || + this.toolbarVisible || + this.breadcrumbVisible || + this.customTitle || + this.customBreadcrumb || + this.customToolbar + ); + } } diff --git a/npm/ng-packs/packages/core/package.json b/npm/ng-packs/packages/core/package.json index 9f6f1a7772..b8a57f7416 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": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/utils": "^4.3.0-rc.1", + "@abp/utils": "^4.3.0-rc.2", "@angular/localize": "~10.0.10", "@ngxs/store": "^3.7.0", "angular-oauth2-oidc": "^10.0.0", diff --git a/npm/ng-packs/packages/feature-management/package.json b/npm/ng-packs/packages/feature-management/package.json index 66db42a63b..146533099f 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": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.theme.shared": "~4.3.0-rc.1", + "@abp/ng.theme.shared": "~4.3.0-rc.2", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html index 314da224d4..126fb9638c 100644 --- a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html +++ b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html @@ -82,8 +82,8 @@ {{ item.displayText?.resourceName + '::' + item.displayText?.name | abpLocalization - }} + }} + - - {{ diff --git a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html index 97d0616eb3..aa6dac1e93 100644 --- a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html +++ b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html @@ -74,7 +74,7 @@ - {{ diff --git a/npm/ng-packs/packages/permission-management/package.json b/npm/ng-packs/packages/permission-management/package.json index b756bcff8c..34d80173b7 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": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.theme.shared": "~4.3.0-rc.1", + "@abp/ng.theme.shared": "~4.3.0-rc.2", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html index 148b4ab1b5..06ab7ff9f1 100644 --- a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html +++ b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html @@ -94,7 +94,7 @@
    - {{ diff --git a/npm/ng-packs/packages/schematics/package.json b/npm/ng-packs/packages/schematics/package.json index 4e1fc2a0b9..93e5cde0c2 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": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "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 1f2585bd6a..fe25f6cec5 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": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.components": "~4.3.0-rc.1", - "@abp/ng.theme.shared": "~4.3.0-rc.1", + "@abp/ng.components": "~4.3.0-rc.2", + "@abp/ng.theme.shared": "~4.3.0-rc.2", "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 e85b8a4c4e..e82efcaa34 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": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.feature-management": "~4.3.0-rc.1", - "@abp/ng.theme.shared": "~4.3.0-rc.1", + "@abp/ng.feature-management": "~4.3.0-rc.2", + "@abp/ng.theme.shared": "~4.3.0-rc.2", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html b/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html index a418e9ff1d..c296589afd 100644 --- a/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html +++ b/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html @@ -40,7 +40,7 @@ - {{ diff --git a/npm/ng-packs/packages/theme-basic/package.json b/npm/ng-packs/packages/theme-basic/package.json index cb8b1a4f15..61b078b126 100644 --- a/npm/ng-packs/packages/theme-basic/package.json +++ b/npm/ng-packs/packages/theme-basic/package.json @@ -1,13 +1,13 @@ { "name": "@abp/ng.theme.basic", - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.theme.shared": "~4.3.0-rc.1", + "@abp/ng.theme.shared": "~4.3.0-rc.2", "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 69e6613bf9..a6170cd2de 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": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.core": "~4.3.0-rc.1", + "@abp/ng.core": "~4.3.0-rc.2", "@fortawesome/fontawesome-free": "^5.14.0", "@ng-bootstrap/ng-bootstrap": "^7.0.0", "@ngx-validate/core": "^0.0.13", diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/index.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/index.ts index 608dbb8ba8..a80a7cb574 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/index.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/index.ts @@ -6,6 +6,7 @@ export * from './http-error-wrapper/http-error-wrapper.component'; export * from './loader-bar/loader-bar.component'; export * from './loading/loading.component'; export * from './modal/modal.component'; +export * from './modal/modal-close.directive'; export * from './sort-order-icon/sort-order-icon.component'; export * from './table-empty-message/table-empty-message.component'; export * from './table/table.component'; diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal-close.directive.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal-close.directive.ts new file mode 100644 index 0000000000..a20c8d8a34 --- /dev/null +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal-close.directive.ts @@ -0,0 +1,16 @@ +import { Directive, HostListener, Optional } from '@angular/core'; +import { ModalComponent } from './modal.component'; + +@Directive({ selector: '[abpClose]' }) +export class ModalCloseDirective { + constructor(@Optional() private modal: ModalComponent) { + if (!modal) { + console.error('Please use abpClose within an abp-modal'); + } + } + + @HostListener('click') + onClick() { + this.modal?.close(); + } +} diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts index d1414d0272..4195e84d9b 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts @@ -11,6 +11,7 @@ import { Output, TemplateRef, ViewChild, + isDevMode, } from '@angular/core'; import { NgbModal, NgbModalOptions, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { fromEvent, Subject } from 'rxjs'; @@ -78,6 +79,9 @@ export class ModalComponent implements OnDestroy { @ContentChild(ButtonComponent, { static: false, read: ButtonComponent }) abpSubmit: ButtonComponent; + /** + * @deprecated will be removed in v5.0 + */ @ContentChild('abpClose', { static: false, read: ElementRef }) abpClose: ElementRef; @@ -203,6 +207,7 @@ export class ModalComponent implements OnDestroy { setTimeout(() => { if (!this.abpClose) return; + this.warnForDeprecatedClose(); fromEvent(this.abpClose.nativeElement, 'click') .pipe(takeUntil(this.destroy$)) .subscribe(() => this.close()); @@ -210,4 +215,12 @@ export class ModalComponent implements OnDestroy { this.init.emit(); } + + private warnForDeprecatedClose() { + if (isDevMode()) { + console.warn( + 'Please use abpClose directive instead of #abpClose template variable. #abpClose will be removed in v5.0', + ); + } + } } diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/modal.component.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/modal.component.spec.ts index 7c693211f1..60c71b8e16 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/tests/modal.component.spec.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/modal.component.spec.ts @@ -51,7 +51,7 @@ describe('ModalComponent', () => {
    - + Submit
    diff --git a/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts b/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts index 8d8f08ea6b..ddf1d6a5a3 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts @@ -37,6 +37,7 @@ import { THEME_SHARED_ROUTE_PROVIDERS } from './providers/route.provider'; import { THEME_SHARED_APPEND_CONTENT } from './tokens/append-content.token'; import { HTTP_ERROR_CONFIG, httpErrorConfigFactory } from './tokens/http-error.token'; import { DateParserFormatter } from './utils/date-parser-formatter'; +import { ModalCloseDirective } from './components/modal/modal-close.directive'; const declarationsWithExports = [ BreadcrumbComponent, @@ -55,6 +56,7 @@ const declarationsWithExports = [ NgxDatatableListDirective, LoadingDirective, TableSortDirective, + ModalCloseDirective, ]; @NgModule({ diff --git a/npm/ng-packs/yarn.lock b/npm/ng-packs/yarn.lock index a432442306..07222948a2 100644 --- a/npm/ng-packs/yarn.lock +++ b/npm/ng-packs/yarn.lock @@ -2,37 +2,14 @@ # yarn lockfile v1 -"@abp/ng.account@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/ng.account/-/ng.account-4.3.0-rc.1.tgz#e9d9e3807b0f4f3d9729adb14b62142b8a95dbd3" - integrity sha512-CPPSVoB937oF9vIMjqiXFQoHQAqqn4O4CYb+70gIkh3I182c40SpJD4kA+kRlmtAggBgXMQyodTfJ15qvrRKmg== - dependencies: - "@abp/ng.theme.shared" "~3.3.2" - tslib "^2.0.0" - "@abp/ng.components@~4.3.0-rc.1": version "4.3.0-rc.1" resolved "https://registry.yarnpkg.com/@abp/ng.components/-/ng.components-4.3.0-rc.1.tgz#7142e476577fe74429b0eb0f0f9af5955a3aea3f" integrity sha512-JjRRbE9RHh8X82PKLO1VKsEMui+mCNzGgkmBVL1qwTrlLcfUW6IYjCVXUxQX67e6waHVT+cIFFWWk00zfVEMJw== dependencies: ng-zorro-antd "^11.0.0" - tslib "^2.0.0" - -"@abp/ng.core@~3.3.2": - version "3.3.2" - resolved "https://registry.yarnpkg.com/@abp/ng.core/-/ng.core-3.3.2.tgz#53d6d8721d2432ee98688e678fc43ecba1f2de26" - integrity sha512-JOp16y4Uvfa4QIiBcb4LIPLoV5qBE5NhPvmu4/xzz/oSHChLmhHGdOqWVwRil4EMkL4A8QsSoAb06Rs2OckSJw== - dependencies: - "@abp/utils" "^3.3.1" - "@angular/localize" "~10.0.10" - "@ngxs/router-plugin" "^3.7.0" - "@ngxs/storage-plugin" "^3.7.0" - "@ngxs/store" "^3.7.0" - angular-oauth2-oidc "^10.0.0" - just-clone "^3.1.0" - just-compare "^1.3.0" - snq "^1.0.3" - ts-toolbelt "6.15.4" + + tslib "^2.0.0" "@abp/ng.core@~4.3.0-rc.1": @@ -42,6 +19,8 @@ dependencies: "@abp/utils" "^4.2.2" "@angular/localize" "~10.0.10" + "@ngxs/router-plugin" "^3.7.0" + "@ngxs/storage-plugin" "^3.7.0" "@ngxs/store" "^3.7.0" angular-oauth2-oidc "^10.0.0" just-clone "^3.1.0" @@ -76,14 +55,15 @@ tslib "^2.0.0" "@abp/ng.schematics@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/ng.schematics/-/ng.schematics-4.3.0-rc.1.tgz#1a71b35df7ecb1b92520b0fda8654b81eb48ee15" - integrity sha512-7QHDFo4WHRhTeA5Hyh7Ni/7bnCJHz9vRKvxp/b1Vhw+s0aWu3nyBmWZB66atA+LLl6SeqDmO1WDJ3vTMgHGh1g== + version "4.3.0-rc.1-1" + resolved "https://registry.yarnpkg.com/@abp/ng.schematics/-/ng.schematics-4.3.0-rc.1-1.tgz#70897e5be3ea308b1a535241ddbf08ad730be1cf" + integrity sha512-YKnsx4q4OrUBJl8VbzHORlnPT1iEv6y72soe/xWqasL8i1UIEAUQjLx7ZDZCMWq+Dm+v7EgMU/yOjcNpdL3Eng== dependencies: "@angular-devkit/core" "~11.0.2" "@angular-devkit/schematics" "~11.0.2" got "^11.5.2" jsonc-parser "^2.3.0" + should-quote "^1.0.0" typescript "~3.9.2" "@abp/ng.setting-management@~4.3.0-rc.1": @@ -112,20 +92,6 @@ "@abp/ng.theme.shared" "~4.3.0-rc.1" tslib "^2.0.0" -"@abp/ng.theme.shared@~3.3.2": - version "3.3.2" - resolved "https://registry.yarnpkg.com/@abp/ng.theme.shared/-/ng.theme.shared-3.3.2.tgz#fd15b8690d9b5da950c8d4cb22fa0292b020ead1" - integrity sha512-EFDnfAiAx+ISDLPAffnunxKb4K/TVO/m/9O1fLiGtGVj1R14oq0gv3gdB1Oq0IxFS6V6M+ehocowIrXlO2HcrA== - dependencies: - "@abp/ng.core" "~3.3.2" - "@fortawesome/fontawesome-free" "^5.14.0" - "@ng-bootstrap/ng-bootstrap" "^7.0.0" - "@ngx-validate/core" "^0.0.12" - "@swimlane/ngx-datatable" "^17.1.0" - bootstrap "^4.5.0" - chart.js "^2.9.3" - tslib "^2.0.0" - "@abp/ng.theme.shared@~4.3.0-rc.1": version "4.3.0-rc.1" resolved "https://registry.yarnpkg.com/@abp/ng.theme.shared/-/ng.theme.shared-4.3.0-rc.1.tgz#1442443baf2a70832f0bd0f04a2103a731b7b521" @@ -134,19 +100,12 @@ "@abp/ng.core" "~4.3.0-rc.1" "@fortawesome/fontawesome-free" "^5.14.0" "@ng-bootstrap/ng-bootstrap" "^7.0.0" - "@ngx-validate/core" "^0.0.13" + "@ngx-validate/core" "^0.0.12" "@swimlane/ngx-datatable" "^17.1.0" bootstrap "~4.6.0" chart.js "^2.9.3" tslib "^2.0.0" -"@abp/utils@^3.3.1": - version "3.3.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.3.2.tgz#c68e78c7f90284b03a2f4ae3bcf25bf77b2edc31" - integrity sha512-IRXPgPMYOzMelz+tbThdZvTQmHTG76OJvr+5bI4UTr2ROUPMDnJzLJV6Xjk1eN/esM0yZhYu7eyXoNQbgI4OZg== - dependencies: - just-compare "^1.3.0" - "@abp/utils@^4.2.2": version "4.2.2" resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.2.2.tgz#7afdbbd14246ce06c074109c51d01588596805a9" diff --git a/npm/packs/anchor-js/package.json b/npm/packs/anchor-js/package.json index 6fac8b4e0e..8a6adf77e2 100644 --- a/npm/packs/anchor-js/package.json +++ b/npm/packs/anchor-js/package.json @@ -1,11 +1,11 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/anchor-js", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~4.3.0-rc.1", + "@abp/core": "~4.3.0-rc.2", "anchor-js": "^4.2.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/aspnetcore.components.server.basictheme/package.json b/npm/packs/aspnetcore.components.server.basictheme/package.json index 37076ad5a2..ed065cc728 100644 --- a/npm/packs/aspnetcore.components.server.basictheme/package.json +++ b/npm/packs/aspnetcore.components.server.basictheme/package.json @@ -1,11 +1,11 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/aspnetcore.components.server.basictheme", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/aspnetcore.components.server.theming": "~4.3.0-rc.1" + "@abp/aspnetcore.components.server.theming": "~4.3.0-rc.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/aspnetcore.components.server.theming/package.json b/npm/packs/aspnetcore.components.server.theming/package.json index 9d029aef5e..e9649026aa 100644 --- a/npm/packs/aspnetcore.components.server.theming/package.json +++ b/npm/packs/aspnetcore.components.server.theming/package.json @@ -1,12 +1,12 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/aspnetcore.components.server.theming", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/bootstrap": "~4.3.0-rc.1", - "@abp/font-awesome": "~4.3.0-rc.1" + "@abp/bootstrap": "~4.3.0-rc.2", + "@abp/font-awesome": "~4.3.0-rc.2" }, "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 a3b2ef89fd..5050cba502 100644 --- a/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json +++ b/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json @@ -1,11 +1,11 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/aspnetcore.mvc.ui.theme.basic", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.shared": "~4.3.0-rc.1" + "@abp/aspnetcore.mvc.ui.theme.shared": "~4.3.0-rc.2" }, "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 30a5d2fe11..52bf76b86e 100644 --- a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json +++ b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json @@ -1,24 +1,24 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/aspnetcore.mvc.ui.theme.shared", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui": "~4.3.0-rc.1", - "@abp/bootstrap": "~4.3.0-rc.1", - "@abp/bootstrap-datepicker": "~4.3.0-rc.1", - "@abp/datatables.net-bs4": "~4.3.0-rc.1", - "@abp/font-awesome": "~4.3.0-rc.1", - "@abp/jquery-form": "~4.3.0-rc.1", - "@abp/jquery-validation-unobtrusive": "~4.3.0-rc.1", - "@abp/lodash": "~4.3.0-rc.1", - "@abp/luxon": "~4.3.0-rc.1", - "@abp/malihu-custom-scrollbar-plugin": "~4.3.0-rc.1", - "@abp/select2": "~4.3.0-rc.1", - "@abp/sweetalert": "~4.3.0-rc.1", - "@abp/timeago": "~4.3.0-rc.1", - "@abp/toastr": "~4.3.0-rc.1" + "@abp/aspnetcore.mvc.ui": "~4.3.0-rc.2", + "@abp/bootstrap": "~4.3.0-rc.2", + "@abp/bootstrap-datepicker": "~4.3.0-rc.2", + "@abp/datatables.net-bs4": "~4.3.0-rc.2", + "@abp/font-awesome": "~4.3.0-rc.2", + "@abp/jquery-form": "~4.3.0-rc.2", + "@abp/jquery-validation-unobtrusive": "~4.3.0-rc.2", + "@abp/lodash": "~4.3.0-rc.2", + "@abp/luxon": "~4.3.0-rc.2", + "@abp/malihu-custom-scrollbar-plugin": "~4.3.0-rc.2", + "@abp/select2": "~4.3.0-rc.2", + "@abp/sweetalert": "~4.3.0-rc.2", + "@abp/timeago": "~4.3.0-rc.2", + "@abp/toastr": "~4.3.0-rc.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/aspnetcore.mvc.ui/package-lock.json b/npm/packs/aspnetcore.mvc.ui/package-lock.json index 6a7a6e9773..366b2c1407 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": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/npm/packs/aspnetcore.mvc.ui/package.json b/npm/packs/aspnetcore.mvc.ui/package.json index d86fdda46e..5a2360c3bc 100644 --- a/npm/packs/aspnetcore.mvc.ui/package.json +++ b/npm/packs/aspnetcore.mvc.ui/package.json @@ -1,5 +1,5 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/aspnetcore.mvc.ui", "publishConfig": { "access": "public" diff --git a/npm/packs/blogging/package.json b/npm/packs/blogging/package.json index 1340e8d745..088b69bdee 100644 --- a/npm/packs/blogging/package.json +++ b/npm/packs/blogging/package.json @@ -1,14 +1,14 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/blogging", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.shared": "~4.3.0-rc.1", - "@abp/owl.carousel": "~4.3.0-rc.1", - "@abp/prismjs": "~4.3.0-rc.1", - "@abp/tui-editor": "~4.3.0-rc.1" + "@abp/aspnetcore.mvc.ui.theme.shared": "~4.3.0-rc.2", + "@abp/owl.carousel": "~4.3.0-rc.2", + "@abp/prismjs": "~4.3.0-rc.2", + "@abp/tui-editor": "~4.3.0-rc.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/bootstrap-datepicker/package.json b/npm/packs/bootstrap-datepicker/package.json index 7577f36aae..1cd41161dd 100644 --- a/npm/packs/bootstrap-datepicker/package.json +++ b/npm/packs/bootstrap-datepicker/package.json @@ -1,5 +1,5 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/bootstrap-datepicker", "publishConfig": { "access": "public" diff --git a/npm/packs/bootstrap/package.json b/npm/packs/bootstrap/package.json index 6b0ddab2f4..efc6f1da78 100644 --- a/npm/packs/bootstrap/package.json +++ b/npm/packs/bootstrap/package.json @@ -1,11 +1,11 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/bootstrap", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~4.3.0-rc.1", + "@abp/core": "~4.3.0-rc.2", "bootstrap": "^4.6.0", "bootstrap-v4-rtl": "4.6.0-1" }, diff --git a/npm/packs/chart.js/package.json b/npm/packs/chart.js/package.json index e214f5889e..ed64ebeda0 100644 --- a/npm/packs/chart.js/package.json +++ b/npm/packs/chart.js/package.json @@ -1,5 +1,5 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/chart.js", "publishConfig": { "access": "public" diff --git a/npm/packs/clipboard/package.json b/npm/packs/clipboard/package.json index 97bc25b557..b908408495 100644 --- a/npm/packs/clipboard/package.json +++ b/npm/packs/clipboard/package.json @@ -1,11 +1,11 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/clipboard", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~4.3.0-rc.1", + "@abp/core": "~4.3.0-rc.2", "clipboard": "^2.0.6" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/cms-kit.admin/package.json b/npm/packs/cms-kit.admin/package.json index d91c4c44b4..5da858798e 100644 --- a/npm/packs/cms-kit.admin/package.json +++ b/npm/packs/cms-kit.admin/package.json @@ -1,13 +1,13 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/cms-kit.admin", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/slugify": "~4.3.0-rc.1", - "@abp/tui-editor": "~4.3.0-rc.1", - "@abp/uppy": "~4.3.0-rc.1" + "@abp/slugify": "~4.3.0-rc.2", + "@abp/tui-editor": "~4.3.0-rc.2", + "@abp/uppy": "~4.3.0-rc.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/cms-kit.public/package.json b/npm/packs/cms-kit.public/package.json index a8f064ccca..084609b37a 100644 --- a/npm/packs/cms-kit.public/package.json +++ b/npm/packs/cms-kit.public/package.json @@ -1,12 +1,12 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/cms-kit.public", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/highlight.js": "~4.3.0-rc.1", - "@abp/star-rating-svg": "~4.3.0-rc.1" + "@abp/highlight.js": "~4.3.0-rc.2", + "@abp/star-rating-svg": "~4.3.0-rc.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/cms-kit/package.json b/npm/packs/cms-kit/package.json index dcdac25a7a..8b763c0045 100644 --- a/npm/packs/cms-kit/package.json +++ b/npm/packs/cms-kit/package.json @@ -1,12 +1,12 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/cms-kit", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/cms-kit.admin": "~4.3.0-rc.1", - "@abp/cms-kit.public": "~4.3.0-rc.1" + "@abp/cms-kit.admin": "~4.3.0-rc.2", + "@abp/cms-kit.public": "~4.3.0-rc.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/codemirror/package.json b/npm/packs/codemirror/package.json index f35f1daf66..78fdb7c6ea 100644 --- a/npm/packs/codemirror/package.json +++ b/npm/packs/codemirror/package.json @@ -1,11 +1,11 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/codemirror", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~4.3.0-rc.1", + "@abp/core": "~4.3.0-rc.2", "codemirror": "^5.54.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/core/package.json b/npm/packs/core/package.json index c29c0c5903..34f914469e 100644 --- a/npm/packs/core/package.json +++ b/npm/packs/core/package.json @@ -1,11 +1,11 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/core", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/utils": "^4.3.0-rc.1" + "@abp/utils": "^4.3.0-rc.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/cropperjs/package.json b/npm/packs/cropperjs/package.json index 035c74f10f..bd1d55bb7b 100644 --- a/npm/packs/cropperjs/package.json +++ b/npm/packs/cropperjs/package.json @@ -1,11 +1,11 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/cropperjs", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~4.3.0-rc.1", + "@abp/core": "~4.3.0-rc.2", "cropperjs": "^1.5.7" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/datatables.net-bs4/package.json b/npm/packs/datatables.net-bs4/package.json index 4b23490244..207bd1225f 100644 --- a/npm/packs/datatables.net-bs4/package.json +++ b/npm/packs/datatables.net-bs4/package.json @@ -1,11 +1,11 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/datatables.net-bs4", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/datatables.net": "~4.3.0-rc.1", + "@abp/datatables.net": "~4.3.0-rc.2", "datatables.net-bs4": "^1.10.21" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/datatables.net/package.json b/npm/packs/datatables.net/package.json index 0f697a1949..d9b2d226b7 100644 --- a/npm/packs/datatables.net/package.json +++ b/npm/packs/datatables.net/package.json @@ -1,11 +1,11 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/datatables.net", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "~4.3.0-rc.1", + "@abp/jquery": "~4.3.0-rc.2", "datatables.net": "^1.10.21" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/docs/package.json b/npm/packs/docs/package.json index a9da550070..4ade4f66e3 100644 --- a/npm/packs/docs/package.json +++ b/npm/packs/docs/package.json @@ -1,15 +1,15 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/docs", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/anchor-js": "~4.3.0-rc.1", - "@abp/clipboard": "~4.3.0-rc.1", - "@abp/malihu-custom-scrollbar-plugin": "~4.3.0-rc.1", - "@abp/popper.js": "~4.3.0-rc.1", - "@abp/prismjs": "~4.3.0-rc.1" + "@abp/anchor-js": "~4.3.0-rc.2", + "@abp/clipboard": "~4.3.0-rc.2", + "@abp/malihu-custom-scrollbar-plugin": "~4.3.0-rc.2", + "@abp/popper.js": "~4.3.0-rc.2", + "@abp/prismjs": "~4.3.0-rc.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/flag-icon-css/package.json b/npm/packs/flag-icon-css/package.json index f85617fe9c..bfd184434e 100644 --- a/npm/packs/flag-icon-css/package.json +++ b/npm/packs/flag-icon-css/package.json @@ -1,5 +1,5 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "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 16fda01e5c..796c66dffa 100644 --- a/npm/packs/font-awesome/package.json +++ b/npm/packs/font-awesome/package.json @@ -1,11 +1,11 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/font-awesome", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~4.3.0-rc.1", + "@abp/core": "~4.3.0-rc.2", "@fortawesome/fontawesome-free": "^5.13.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/highlight.js/package.json b/npm/packs/highlight.js/package.json index db3cd41992..04b514cec0 100644 --- a/npm/packs/highlight.js/package.json +++ b/npm/packs/highlight.js/package.json @@ -1,11 +1,11 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/highlight.js", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~4.3.0-rc.1" + "@abp/core": "~4.3.0-rc.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/jquery-form/package.json b/npm/packs/jquery-form/package.json index 4f058ac6a6..9beb324ed0 100644 --- a/npm/packs/jquery-form/package.json +++ b/npm/packs/jquery-form/package.json @@ -1,11 +1,11 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/jquery-form", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "~4.3.0-rc.1", + "@abp/jquery": "~4.3.0-rc.2", "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 580a45aaad..c8fc2a7d55 100644 --- a/npm/packs/jquery-validation-unobtrusive/package.json +++ b/npm/packs/jquery-validation-unobtrusive/package.json @@ -1,11 +1,11 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/jquery-validation-unobtrusive", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery-validation": "~4.3.0-rc.1", + "@abp/jquery-validation": "~4.3.0-rc.2", "jquery-validation-unobtrusive": "^3.2.11" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/jquery-validation/package.json b/npm/packs/jquery-validation/package.json index 202871533b..ebb5e30cab 100644 --- a/npm/packs/jquery-validation/package.json +++ b/npm/packs/jquery-validation/package.json @@ -1,11 +1,11 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/jquery-validation", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "~4.3.0-rc.1", + "@abp/jquery": "~4.3.0-rc.2", "jquery-validation": "^1.19.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/jquery/package.json b/npm/packs/jquery/package.json index 9190437f5e..6fa5e418cd 100644 --- a/npm/packs/jquery/package.json +++ b/npm/packs/jquery/package.json @@ -1,5 +1,5 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/jquery", "publishConfig": { "access": "public" diff --git a/npm/packs/jstree/package.json b/npm/packs/jstree/package.json index 7ebeb1a8f5..cc748dda59 100644 --- a/npm/packs/jstree/package.json +++ b/npm/packs/jstree/package.json @@ -1,11 +1,11 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/jstree", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "~4.3.0-rc.1", + "@abp/jquery": "~4.3.0-rc.2", "jstree": "^3.3.9" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/lodash/package.json b/npm/packs/lodash/package.json index 18a6cc4573..1db7f7acf8 100644 --- a/npm/packs/lodash/package.json +++ b/npm/packs/lodash/package.json @@ -1,11 +1,11 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/lodash", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~4.3.0-rc.1", + "@abp/core": "~4.3.0-rc.2", "lodash": "^4.17.15" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/luxon/package.json b/npm/packs/luxon/package.json index 680d9a425c..d12a545d5f 100644 --- a/npm/packs/luxon/package.json +++ b/npm/packs/luxon/package.json @@ -1,11 +1,11 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/luxon", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~4.3.0-rc.1", + "@abp/core": "~4.3.0-rc.2", "luxon": "^1.24.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/malihu-custom-scrollbar-plugin/package.json b/npm/packs/malihu-custom-scrollbar-plugin/package.json index 6a492b31a2..168ee9430e 100644 --- a/npm/packs/malihu-custom-scrollbar-plugin/package.json +++ b/npm/packs/malihu-custom-scrollbar-plugin/package.json @@ -1,11 +1,11 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/malihu-custom-scrollbar-plugin", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~4.3.0-rc.1", + "@abp/core": "~4.3.0-rc.2", "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 095a8c6a8b..60e19e63d6 100644 --- a/npm/packs/markdown-it/package.json +++ b/npm/packs/markdown-it/package.json @@ -1,11 +1,11 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/markdown-it", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~4.3.0-rc.1", + "@abp/core": "~4.3.0-rc.2", "markdown-it": "^11.0.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/owl.carousel/package.json b/npm/packs/owl.carousel/package.json index f216e45075..a87571ade5 100644 --- a/npm/packs/owl.carousel/package.json +++ b/npm/packs/owl.carousel/package.json @@ -1,11 +1,11 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/owl.carousel", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~4.3.0-rc.1", + "@abp/core": "~4.3.0-rc.2", "owl.carousel": "^2.3.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/popper.js/package.json b/npm/packs/popper.js/package.json index 95fb824a7d..4877a95f4c 100644 --- a/npm/packs/popper.js/package.json +++ b/npm/packs/popper.js/package.json @@ -1,11 +1,11 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/popper.js", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~4.3.0-rc.1", + "@abp/core": "~4.3.0-rc.2", "popper.js": "^1.16.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/prismjs/package.json b/npm/packs/prismjs/package.json index 6a4f4fea76..3201f41d37 100644 --- a/npm/packs/prismjs/package.json +++ b/npm/packs/prismjs/package.json @@ -1,12 +1,12 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/prismjs", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/clipboard": "~4.3.0-rc.1", - "@abp/core": "~4.3.0-rc.1", + "@abp/clipboard": "~4.3.0-rc.2", + "@abp/core": "~4.3.0-rc.2", "prismjs": "^1.20.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/select2/package.json b/npm/packs/select2/package.json index e32c767bed..1afd783357 100644 --- a/npm/packs/select2/package.json +++ b/npm/packs/select2/package.json @@ -1,11 +1,11 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/select2", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~4.3.0-rc.1", + "@abp/core": "~4.3.0-rc.2", "select2": "^4.0.13" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/signalr/package.json b/npm/packs/signalr/package.json index 0256b8a6f4..4367062c7c 100644 --- a/npm/packs/signalr/package.json +++ b/npm/packs/signalr/package.json @@ -1,11 +1,11 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/signalr", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~4.3.0-rc.1", + "@abp/core": "~4.3.0-rc.2", "@microsoft/signalr": "~3.1.5" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/slugify/package.json b/npm/packs/slugify/package.json index b79dbe01a1..73bf9c41bb 100644 --- a/npm/packs/slugify/package.json +++ b/npm/packs/slugify/package.json @@ -1,5 +1,5 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "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 c93dcb5239..caad8c5c19 100644 --- a/npm/packs/star-rating-svg/package.json +++ b/npm/packs/star-rating-svg/package.json @@ -1,11 +1,11 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/star-rating-svg", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "~4.3.0-rc.1", + "@abp/jquery": "~4.3.0-rc.2", "star-rating-svg": "^3.5.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/sweetalert/package.json b/npm/packs/sweetalert/package.json index c6c2c3d7d8..1edfb6f547 100644 --- a/npm/packs/sweetalert/package.json +++ b/npm/packs/sweetalert/package.json @@ -1,11 +1,11 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/sweetalert", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~4.3.0-rc.1", + "@abp/core": "~4.3.0-rc.2", "sweetalert": "^2.1.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/timeago/package.json b/npm/packs/timeago/package.json index 4e14a7bba8..14ced6af1e 100644 --- a/npm/packs/timeago/package.json +++ b/npm/packs/timeago/package.json @@ -1,11 +1,11 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/timeago", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "~4.3.0-rc.1", + "@abp/jquery": "~4.3.0-rc.2", "timeago": "^1.6.7" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/toastr/package.json b/npm/packs/toastr/package.json index 01b8f205ed..914ef69577 100644 --- a/npm/packs/toastr/package.json +++ b/npm/packs/toastr/package.json @@ -1,11 +1,11 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/toastr", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "~4.3.0-rc.1", + "@abp/jquery": "~4.3.0-rc.2", "toastr": "^2.1.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/tui-editor/package.json b/npm/packs/tui-editor/package.json index 64b8f1292e..a6977a9289 100644 --- a/npm/packs/tui-editor/package.json +++ b/npm/packs/tui-editor/package.json @@ -1,14 +1,14 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/tui-editor", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/codemirror": "~4.3.0-rc.1", - "@abp/highlight.js": "~4.3.0-rc.1", - "@abp/jquery": "~4.3.0-rc.1", - "@abp/markdown-it": "~4.3.0-rc.1", + "@abp/codemirror": "~4.3.0-rc.2", + "@abp/highlight.js": "~4.3.0-rc.2", + "@abp/jquery": "~4.3.0-rc.2", + "@abp/markdown-it": "~4.3.0-rc.2", "tui-code-snippet": "1.5.2", "tui-editor": "^1.4.10" }, diff --git a/npm/packs/uppy/package.json b/npm/packs/uppy/package.json index fab3640760..4f2129557d 100644 --- a/npm/packs/uppy/package.json +++ b/npm/packs/uppy/package.json @@ -1,11 +1,11 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/uppy", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~4.3.0-rc.1", + "@abp/core": "~4.3.0-rc.2", "uppy": "^1.16.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/utils/package.json b/npm/packs/utils/package.json index bda90f7e0f..00afa2ca4c 100644 --- a/npm/packs/utils/package.json +++ b/npm/packs/utils/package.json @@ -1,6 +1,6 @@ { "name": "@abp/utils", - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "scripts": { "prepublish": "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 909d8cfc95..03b4208d7d 100644 --- a/npm/packs/vee-validate/package.json +++ b/npm/packs/vee-validate/package.json @@ -1,11 +1,11 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/vee-validate", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/vue": "~4.3.0-rc.1", + "@abp/vue": "~4.3.0-rc.2", "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 018512b060..bf681888e9 100644 --- a/npm/packs/virtual-file-explorer/package.json +++ b/npm/packs/virtual-file-explorer/package.json @@ -1,12 +1,12 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/virtual-file-explorer", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/clipboard": "~4.3.0-rc.1", - "@abp/prismjs": "~4.3.0-rc.1" + "@abp/clipboard": "~4.3.0-rc.2", + "@abp/prismjs": "~4.3.0-rc.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/vue/package.json b/npm/packs/vue/package.json index dab6fd42cc..fc3b0402c9 100644 --- a/npm/packs/vue/package.json +++ b/npm/packs/vue/package.json @@ -1,5 +1,5 @@ { - "version": "4.3.0-rc.1", + "version": "4.3.0-rc.2", "name": "@abp/vue", "publishConfig": { "access": "public" diff --git a/templates/app/angular/package.json b/templates/app/angular/package.json index 1406186ddf..1252670e2b 100644 --- a/templates/app/angular/package.json +++ b/templates/app/angular/package.json @@ -12,14 +12,14 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~4.3.0-rc.1", - "@abp/ng.components": "~4.3.0-rc.1", - "@abp/ng.core": "~4.3.0-rc.1", - "@abp/ng.identity": "~4.3.0-rc.1", - "@abp/ng.setting-management": "~4.3.0-rc.1", - "@abp/ng.tenant-management": "~4.3.0-rc.1", - "@abp/ng.theme.basic": "~4.3.0-rc.1", - "@abp/ng.theme.shared": "~4.3.0-rc.1", + "@abp/ng.account": "~4.3.0-rc.2", + "@abp/ng.components": "~4.3.0-rc.2", + "@abp/ng.core": "~4.3.0-rc.2", + "@abp/ng.identity": "~4.3.0-rc.2", + "@abp/ng.setting-management": "~4.3.0-rc.2", + "@abp/ng.tenant-management": "~4.3.0-rc.2", + "@abp/ng.theme.basic": "~4.3.0-rc.2", + "@abp/ng.theme.shared": "~4.3.0-rc.2", "@angular/animations": "~11.1.0", "@angular/common": "~11.1.0", "@angular/compiler": "~11.1.0", @@ -33,7 +33,7 @@ "zone.js": "~0.10.2" }, "devDependencies": { - "@abp/ng.schematics": "~4.3.0-rc.1", + "@abp/ng.schematics": "~4.3.0-rc.2", "@angular-devkit/build-angular": "~0.1101.0", "@angular/cli": "~11.1.0", "@angular/compiler-cli": "~11.1.0", diff --git a/templates/app/angular/src/app/home/home.component.scss b/templates/app/angular/src/app/home/home.component.scss new file mode 100644 index 0000000000..4e3bf68aa0 --- /dev/null +++ b/templates/app/angular/src/app/home/home.component.scss @@ -0,0 +1 @@ +/* Styles for the home component */ \ No newline at end of file diff --git a/templates/app/angular/src/app/home/home.component.ts b/templates/app/angular/src/app/home/home.component.ts index c0b4602ee2..5e19367b34 100644 --- a/templates/app/angular/src/app/home/home.component.ts +++ b/templates/app/angular/src/app/home/home.component.ts @@ -5,6 +5,7 @@ import { OAuthService } from 'angular-oauth2-oidc'; @Component({ selector: 'app-home', templateUrl: './home.component.html', + styleUrls: ['./home.component.scss'], }) export class HomeComponent { get hasLoggedIn(): boolean { diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/Controllers/AccountController.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/Controllers/AccountController.cs index 29fa140e4d..44d63fa0f2 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/Controllers/AccountController.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/Controllers/AccountController.cs @@ -1,6 +1,6 @@ using Volo.Abp.AspNetCore.Mvc.Authentication; -namespace MyCompanyName.MyProjectName.Web.Controllers +namespace MyCompanyName.MyProjectName.Blazor.Server.Tiered.Controllers { public class AccountController : ChallengeAccountController { 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 b691486fc0..cd4877cbd4 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 @@ -12,8 +12,8 @@ - - + + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyProjectNameBlazorModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyProjectNameBlazorModule.cs index aa63a0ee6b..d34d9a0192 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyProjectNameBlazorModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyProjectNameBlazorModule.cs @@ -137,6 +137,8 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Tiered bundle => { bundle.AddFiles("/blazor-global-styles.css"); + //You can remove the following line if you don't use Blazor CSS isolation for components + bundle.AddFiles("/MyCompanyName.MyProjectName.Blazor.Server.Tiered.styles.css"); } ); }); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/Pages/Index.razor b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/Pages/Index.razor index c83e436a5d..bdc59498f0 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/Pages/Index.razor +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/Pages/Index.razor @@ -12,6 +12,11 @@

    Welcome to the Application

    @L["LongWelcomeMessage"]

    + + @if (!CurrentUser.IsAuthenticated) + { + @L["Login"] + }
    diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/Pages/Index.razor.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/Pages/Index.razor.cs new file mode 100644 index 0000000000..97cdd22b3f --- /dev/null +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/Pages/Index.razor.cs @@ -0,0 +1,7 @@ +namespace MyCompanyName.MyProjectName.Blazor.Server.Tiered.Pages +{ + public partial class Index + { + + } +} diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/Pages/Index.razor.css b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/Pages/Index.razor.css new file mode 100644 index 0000000000..abef246243 --- /dev/null +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/Pages/Index.razor.css @@ -0,0 +1 @@ +/* Write here your styles for the Index page */ \ No newline at end of file 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 b08d050b0c..8c6e0bb1a7 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": "^4.3.0-rc.1", - "@abp/aspnetcore.components.server.basictheme": "^4.3.0-rc.1" + "@abp/aspnetcore.mvc.ui.theme.basic": "^4.3.0-rc.2", + "@abp/aspnetcore.components.server.basictheme": "^4.3.0-rc.2" } } 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 538bc725a5..2cc57bfb0a 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@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.components.server.basictheme/-/aspnetcore.components.server.basictheme-4.3.0-rc.1.tgz#7e31e3f553a3f6a400cf665c70c6ffdb32437c56" - integrity sha512-8pEvElNeMqd72GESfpCIwuUKivNe5FcI67USYS/7fSXYg/PYKb5FIy0In+07TSQ/pnNZUxbSLB6SmMPRkLq/kg== - dependencies: - "@abp/aspnetcore.components.server.theming" "~4.3.0-rc.1" - -"@abp/aspnetcore.components.server.theming@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.components.server.theming/-/aspnetcore.components.server.theming-4.3.0-rc.1.tgz#23e43527c2f04ba18374b6e8ab87cfb83b987e55" - integrity sha512-bdo6+d8ZauhmfP63SRMAI8VL5LGgLvjogev39NkAgdzB+a+Ff/qAWB3a7MyT7ecQMlGBp/LcTyEfSGYSdPz9dw== - dependencies: - "@abp/bootstrap" "~4.3.0-rc.1" - "@abp/font-awesome" "~4.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui.theme.basic@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.3.0-rc.1.tgz#5dc06d82ee213bc33527b5af72ac94ae06bb7c25" - integrity sha512-Xkwj3NPnqWDgqvaP2eda3gviV7aBtyNOMCdZSvpxWmlaPlvJYN+SnKNnlmX02XVArTlOjaeTapFkE3auJeR6jA== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~4.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui.theme.shared@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.3.0-rc.1.tgz#9d4447f068b490367a20772eb9c2b38480088edb" - integrity sha512-untEVm6cKT375ZVEQFO01/VKIqtdFGIyJd5ZxtoQEV8ueVFRQefCOcvvqaJ8Gfj86T1nacXvJRfBfGihYHY+JQ== - dependencies: - "@abp/aspnetcore.mvc.ui" "~4.3.0-rc.1" - "@abp/bootstrap" "~4.3.0-rc.1" - "@abp/bootstrap-datepicker" "~4.3.0-rc.1" - "@abp/datatables.net-bs4" "~4.3.0-rc.1" - "@abp/font-awesome" "~4.3.0-rc.1" - "@abp/jquery-form" "~4.3.0-rc.1" - "@abp/jquery-validation-unobtrusive" "~4.3.0-rc.1" - "@abp/lodash" "~4.3.0-rc.1" - "@abp/luxon" "~4.3.0-rc.1" - "@abp/malihu-custom-scrollbar-plugin" "~4.3.0-rc.1" - "@abp/select2" "~4.3.0-rc.1" - "@abp/sweetalert" "~4.3.0-rc.1" - "@abp/timeago" "~4.3.0-rc.1" - "@abp/toastr" "~4.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.3.0-rc.1.tgz#1e54da2a668939941ab955f11db69798d04d9e7e" - integrity sha512-969etEb4H/fR9Twz6pcl766M/1AriCh6+B8r4haPB5g7QkOWhyU99mT11BHxQwf+uNV4duGZwvPvrMomrdLj2w== +"@abp/aspnetcore.components.server.basictheme@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.components.server.basictheme/-/aspnetcore.components.server.basictheme-4.3.0-rc.2.tgz#552f26af71583b19e3bcf90283414801a1538e69" + integrity sha512-KuCl2LOz8libAcEAXWWlWQEweH084JG7UtT+Ub+V1c64sIK2j/dKDRruwLccRsbPe02nn/PwdHSuTy3CBu8c6g== + dependencies: + "@abp/aspnetcore.components.server.theming" "~4.3.0-rc.2" + +"@abp/aspnetcore.components.server.theming@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.components.server.theming/-/aspnetcore.components.server.theming-4.3.0-rc.2.tgz#260bb7a7099f7f690c27b938577505fb01dd4457" + integrity sha512-a7KX3C9a5u3rOScrZMM+HUjyxDRwn9LGprNcbl9j6xgEfvBArrdAEOHIfA8xmOrn3aA1muwLDWBnuOlcmu0S5Q== + dependencies: + "@abp/bootstrap" "~4.3.0-rc.2" + "@abp/font-awesome" "~4.3.0-rc.2" + +"@abp/aspnetcore.mvc.ui.theme.basic@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.3.0-rc.2.tgz#4ebafbaade6610e3d405877a148d72d57569c3e3" + integrity sha512-Q3QqxKDFC04gaaj30Rk+9zGNfNxC8FX0jciARATceFV6pdA3F3PgT5EMDSlo6NoGniFVjHPRgay9N09zT6Htyw== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~4.3.0-rc.2" + +"@abp/aspnetcore.mvc.ui.theme.shared@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.3.0-rc.2.tgz#d3bf79929c55c5380d7ca7b913a23031d7a6bd12" + integrity sha512-pz86bIV4wNeG7/UPYzNCXlJ/MdOdIygc+Com7C9Ld7gzsyER7VD9h5U/hkytvL4FBFLJn4DU+xuZNECjv0HS0A== + dependencies: + "@abp/aspnetcore.mvc.ui" "~4.3.0-rc.2" + "@abp/bootstrap" "~4.3.0-rc.2" + "@abp/bootstrap-datepicker" "~4.3.0-rc.2" + "@abp/datatables.net-bs4" "~4.3.0-rc.2" + "@abp/font-awesome" "~4.3.0-rc.2" + "@abp/jquery-form" "~4.3.0-rc.2" + "@abp/jquery-validation-unobtrusive" "~4.3.0-rc.2" + "@abp/lodash" "~4.3.0-rc.2" + "@abp/luxon" "~4.3.0-rc.2" + "@abp/malihu-custom-scrollbar-plugin" "~4.3.0-rc.2" + "@abp/select2" "~4.3.0-rc.2" + "@abp/sweetalert" "~4.3.0-rc.2" + "@abp/timeago" "~4.3.0-rc.2" + "@abp/toastr" "~4.3.0-rc.2" + +"@abp/aspnetcore.mvc.ui@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.3.0-rc.2.tgz#6ff41be179c8d1089778a51ffa54a1f3d7614278" + integrity sha512-2L5zvuqUwPwNPcMauiiJZD1ft0QycqINz+bXEQ8t0EwbB+dzcsukL/rpOQfpeRHWWYy4nIN4C2bTvXhNgQbPqQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -58,145 +58,145 @@ micromatch "^4.0.2" path "^0.12.7" -"@abp/bootstrap-datepicker@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.3.0-rc.1.tgz#879a8ce32a3dbdb0cd80401360d24f25f318670b" - integrity sha512-W2T+rrC3oxuWj2xQUz2virbBK6x7ershWZB9d6FjXTSH89nin9DyBK20dEfskVvhK/IMrmZaW4PWyTTcx9r7dA== +"@abp/bootstrap-datepicker@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.3.0-rc.2.tgz#29a686c3d2bce356967f646d7334cd83c4257b4c" + integrity sha512-3+B7SJRi7DQJe0aNgv0H0zu1BfvMZcwgt06N3ALR9+o3TSJcOqcYrEMed3aG+ASH++CltnohTYnLkVXaxshioA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.3.0-rc.1.tgz#3260de03f29e210e44a55efa3af2ab6d34362227" - integrity sha512-flB18MUnRWpEnS0t/WEjsdhfB5w+zHjsa69Pj733+GHGSsZ1Vppu+rgvSWp38yNHO5uRwGECrwUIGwvd5uD9+A== +"@abp/bootstrap@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.3.0-rc.2.tgz#1416fe639c88b7d958435e45fe19692268a7f932" + integrity sha512-E6svmDhNQlT5nd65VgshexyedRWhbvi9o1oYo/dLTUpJDzR7M9ptDqxFLVB9vVDva3HgxUoEvgRJgb9fXvq4zw== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" bootstrap "^4.6.0" bootstrap-v4-rtl "4.6.0-1" -"@abp/core@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.3.0-rc.1.tgz#201c3be8b5697fe8e1b08b23f87f50e950036a14" - integrity sha512-ET8NGugNmdub+8qGeFf9qGPbloP5gcoBnB7U6ieFz1Eai9S3pSpbM+sdyifucEpzMThUiLS772EP4pJTMXhfEg== +"@abp/core@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.3.0-rc.2.tgz#3c9ea339624ae3b6cbee13e048268d48269ea6a9" + integrity sha512-/89xH+IVSmTOLWeUO4yVB7Hg64uHTbR7bHjgl+b94cFdtITH9Nvr2EGdXUJbHGUK7L6lSDziqiMcG/ic0061+Q== dependencies: - "@abp/utils" "^4.3.0-rc.1" + "@abp/utils" "^4.3.0-rc.2" -"@abp/datatables.net-bs4@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.3.0-rc.1.tgz#f7dad14d13b468949fd161b679f4a70271e0d466" - integrity sha512-812cLTfSZZMvjAFAq5h7R5AeJHigBxbPc+kMReQIcFLH82o6BjA2NqFBqYOvQuh4kqiQ85dqFTW9MTKeY8or6Q== +"@abp/datatables.net-bs4@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.3.0-rc.2.tgz#bbfc0d9d0ed86cdb14b38849fb78b2b1911c4a35" + integrity sha512-PRKYi2NU41KpckJ/d0buHoFbyKVuW5NCQNpUdYzDsPS2riyeXccCsLFJM1bT01TdR4Idla3vx9Fkb+HoJOiDeQ== dependencies: - "@abp/datatables.net" "~4.3.0-rc.1" + "@abp/datatables.net" "~4.3.0-rc.2" datatables.net-bs4 "^1.10.21" -"@abp/datatables.net@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.3.0-rc.1.tgz#aa1640903fe67d20e1fc57ffe0519b2764e4c7df" - integrity sha512-qfdQa43sbXsIEBc3WpxSC7cXyKSFxLiFdCKnLIkQNsC3Wo+WX/Cute2xNbT0+xIQdGznfEBdPxcwQkNE6JQgcA== +"@abp/datatables.net@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.3.0-rc.2.tgz#1923e60db261366a7d2f284b0274d13e253567ca" + integrity sha512-rp53+5Xj1jhjpCj7UBA9+nSNbaTQ4Vc1NWCg1e5aI5tWiyZprUS44dRszIQIDV86XKorfFhog5ihOZyzl1HDyg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" datatables.net "^1.10.21" -"@abp/font-awesome@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.3.0-rc.1.tgz#5d336ead8b8c67b2c0aaff9365c2c856b033196e" - integrity sha512-BU4ycN/gOxX2x8S/Eszi3bJAz6bZRhxa0uPWxEWKul9PNvKSwMJRoVaEVehnIlfTi2raHsLQHk+F7079gt3dlQ== +"@abp/font-awesome@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.3.0-rc.2.tgz#437d3d6bbd8f52e5091251932d6a494d0164694b" + integrity sha512-FeHHtEQwrJBwD5PkFYqjKouCLwNjjRqTNseaN+s/r7gNjv0PgKytfRoqEb+O/BkZg/DwEuMz9jFX/RXCCNa2xA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" "@fortawesome/fontawesome-free" "^5.13.0" -"@abp/jquery-form@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.3.0-rc.1.tgz#4543e3d751519ba12d2c563aa7cbc56e51dfe093" - integrity sha512-ONQeImarHEe4VRSv13da+rHnCv+2Ycyd7YF+Dr77gtBmTKpC5nAFGY4wO7+u0U0px/YsR2dntpyBj2fEw3wjXA== +"@abp/jquery-form@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.3.0-rc.2.tgz#999910deaf46330477b6ed487a771a2123d69f92" + integrity sha512-+fdEIOTlxDOdYXMtc/ujhYeuP2qiI4bmL3TQQWQxSTlW8q5jB6dHLBnHiXXltO8HxX9+7ZsjN3tsV7+Div5joA== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.3.0-rc.1.tgz#15a06257fba8ef8d2cba2ac9da3f6f7185e6c8dd" - integrity sha512-8Tshu/QsqulwNfRnvoX1mViY12OTvCqpHdRldqr7k6MQd+boo6ahybQ4SCoZ9vsDTmqxd5dkV/A8VijMw66WTQ== +"@abp/jquery-validation-unobtrusive@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.3.0-rc.2.tgz#0635e0c77da269e8367c3d7c388613249ce9221d" + integrity sha512-ubmPjVJatAW3AJWjWtT+ZbNLhu+HHNgcxYkFGVNusNuboTGsoBs5G45Cjzp/q5FnggWoPvkllpf8CGuaYUbpUQ== dependencies: - "@abp/jquery-validation" "~4.3.0-rc.1" + "@abp/jquery-validation" "~4.3.0-rc.2" jquery-validation-unobtrusive "^3.2.11" -"@abp/jquery-validation@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.3.0-rc.1.tgz#6a0d771c88e961cb43144cd6ef916d1ab22aceaf" - integrity sha512-kjVF6757xP8wZ9qw8ysI5ve3AD8PoJtxqkkUV4QF4xcrdP8EPk2heX3Imu7MJiYGyMlwLU++FTm8J68UNsWRmQ== +"@abp/jquery-validation@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.3.0-rc.2.tgz#ee145f8c4a633218ccfa50cca0bed503a0ca8dc6" + integrity sha512-SLWzN6jxVqKaHYs/d6Mku8CfhB1vWgfMbFma14upiJ+/VDkTF4Rh27iMCWKYVOS3bukh2ltBp6kPFplrjCAGSg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" jquery-validation "^1.19.2" -"@abp/jquery@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.3.0-rc.1.tgz#06030baf44983175707409eff16a05db72c93bf5" - integrity sha512-Xgptjea/RzgBvwK+paydXWMgenobuvqKsr9LbrIDiYAJuLMMCyGvwJnA7jeszz+OqZShP8ppoeB0ifa5K2Yc2A== +"@abp/jquery@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.3.0-rc.2.tgz#f620628ea0739888cbcb360c058d09bff10d553b" + integrity sha512-+rfyLVJn7E8wJ1oQ9GiCR63Yk6wah1Hqnj4XpsRDMkIaOXKaqrnVHAZd4W2DUunQSe95wqHfkNH/wkvTyNEwUg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" jquery "~3.5.1" -"@abp/lodash@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.3.0-rc.1.tgz#cd9bf0693379ea54f789299ba67483d345da5abf" - integrity sha512-BtsQs6wpJJvdwPDx7sOIIzkVHJnzw4Twrv0q3XNqmsiv5eGIwluFsorm5N6qOk7nC5csor6mpk6YuJuFii8GbQ== +"@abp/lodash@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.3.0-rc.2.tgz#9b5429d3976b34022aaf8cab4afef57479b66821" + integrity sha512-sE2dyofYbiIy4xhL85diZWkfqBcQl1q61T0DbYDOHgaejZAJxk4bVyFpEuMiC2HwWAZ656IN1bzyQIyE1RKzQA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" lodash "^4.17.15" -"@abp/luxon@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.3.0-rc.1.tgz#dd855417224bbf124cdc9f395bb5cf5f0c6a7a03" - integrity sha512-OtxmjCgPiH1JWsdUvQpkvum3k43H6v8Z5okv4lDpcBOah/HZYUP8qOsSS3Tcyw2I66TK15tq13XJeHabmh2lAQ== +"@abp/luxon@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.3.0-rc.2.tgz#6fdbf1624462615dcb1f5ce85c07fc3bc4065e3f" + integrity sha512-C4aT0aN3/TVtTE3m0AZyhFSeeg+RxXpUO+nffAZoM/cH5NL8tir+O1hd+dhtCb7AELaqQNx5+qgXoJLYdWMYVg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" luxon "^1.24.1" -"@abp/malihu-custom-scrollbar-plugin@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.3.0-rc.1.tgz#e07a9a1895ded98150c1ff4470638ab71e6a0561" - integrity sha512-OiCVlh8iHPHFchSZdFzUl/w+MqPbnlZ4jlohbEuqBTV6rbaAnJXA0Tqylv4RKjho7fybGvhxjDbBrZS4kxUFLg== +"@abp/malihu-custom-scrollbar-plugin@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.3.0-rc.2.tgz#28fc1f216c1d84b20acaf8c8c5cf5c3b33e1aeb1" + integrity sha512-LYMXKkPVyBLWV4Qnom2MW8JJ/rZmVg1CyOFxM6JiL+dpsN1Ogw0hRG33CCHQveqUmf2cr3vf96qk5Et5DyDDIg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.3.0-rc.1.tgz#f3d60b42cb82abc6a0ce6a640b82eb53501f9893" - integrity sha512-z+6Dhu6kqgCfTdZReI08N2ONKakQSmdDsNiZDB5/OOP26k2pOefe/j//sRfjTWiI5gCxO5y98ZZ0ccanBF8oTw== +"@abp/select2@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.3.0-rc.2.tgz#42d62daff9e50b1fe211a1560794625ba3f52107" + integrity sha512-okiIXmFaqx0uy/UMcpMKWKjrwop1JINyzN4FS5tafUpWhx6KcYYHudLWJvnPbsdsOeBQx91kw8jjERRJIqfEOA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" select2 "^4.0.13" -"@abp/sweetalert@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.3.0-rc.1.tgz#d54a8628f004c2d22ebcc4bd60f2b6c1cbd3bc8f" - integrity sha512-OpgDbM9vOfCLpjCRFXavPAdoKlZnpxP+DkUH8owHTrtEuxmrSjpLlIa6VOzAKr70GiLtuMCz9QoH3AyMepx9vA== +"@abp/sweetalert@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.3.0-rc.2.tgz#dfb20dfca8449ed3c3f6599d99b51746019eb664" + integrity sha512-NRKOgT80JVQrwI1FRqpbCzALvnLAFKdPwKKNDgm0L7r/5DL0+JbkKCI1AIPl/yiM8MBrCaQqNms+9JES5mjiUQ== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" sweetalert "^2.1.2" -"@abp/timeago@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.3.0-rc.1.tgz#247f3b3a8e54f6732efa3600ba649a81fee6ec82" - integrity sha512-cplxM3jYhhakET1DyERQoWJQxx0mhTKoI7gW93wNeEMyL4FWaF4lgUNEoubJUSBCDs4v/0ni0pKG8c8nldbiew== +"@abp/timeago@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.3.0-rc.2.tgz#22943e219facd7fa0efddb63017198474b5cef89" + integrity sha512-TjKyuli+SpVjTgVJmraBpqJK112I+1DYHPJfso7QAH48Ra4gceGj9EVS0i/420YyLZyJSMtZOruxzYkyJeR/6w== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" timeago "^1.6.7" -"@abp/toastr@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.3.0-rc.1.tgz#7bc5bb071839fbb971f56c41c8bf220b0a6d67e9" - integrity sha512-OQgmdmWPKlpn/Lks6fUL4enEJgnvUeEcoGTuQOKfkh9ybadYd8kcELWw5ttsQ4o35yvDH3Lsh1jLwPDrCheTBg== +"@abp/toastr@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.3.0-rc.2.tgz#143a344b00bbfaa858fe267fb6d627952bf7b3c0" + integrity sha512-cQV9UFWb9zarkb/CbrqkF9RXqn1Fc/TFKKM5mxpUEcYjx52NuM0d+KawdEMoN2y3y2U4ciY44kbTP2W1y+NlBg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" toastr "^2.1.4" -"@abp/utils@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.3.0-rc.1.tgz#82ef26e01e0cb38417bf4fa9459fde85cbc2b424" - integrity sha512-C/sk6jZQDENI7FbylBoPnTb1rC5eVPnsL8B++vAH4jS//OAj2iNvE6tCewK21GYI/JmfmQzzauQBzOiOJR9a6A== +"@abp/utils@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.3.0-rc.2.tgz#6d051f98772e5642c2e3bc2f68e73d6f24f4694c" + integrity sha512-9qYo8OMTxIUG+qQBWXEpkURS6FUrx+J5s3SwC/eerp46hYr72GQ8L38Wq566a+xiLCn7Duxt6oJ/BxhTfQQxdw== dependencies: just-compare "^1.3.0" 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 f764a3f82f..b514d70d25 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 @@ -12,8 +12,8 @@ - - + + 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 e7d8367005..9d860a9030 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 @@ -120,6 +120,8 @@ namespace MyCompanyName.MyProjectName.Blazor.Server bundle => { bundle.AddFiles("/blazor-global-styles.css"); + //You can remove the following line if you don't use Blazor CSS isolation for components + bundle.AddFiles("/MyCompanyName.MyProjectName.Blazor.Server.styles.css"); } ); }); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/Pages/Index.razor b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/Pages/Index.razor index c83e436a5d..bdc59498f0 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/Pages/Index.razor +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/Pages/Index.razor @@ -12,6 +12,11 @@

    Welcome to the Application

    @L["LongWelcomeMessage"]

    + + @if (!CurrentUser.IsAuthenticated) + { + @L["Login"] + }
    diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/Pages/Index.razor.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/Pages/Index.razor.cs new file mode 100644 index 0000000000..e8144b37ca --- /dev/null +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/Pages/Index.razor.cs @@ -0,0 +1,7 @@ +namespace MyCompanyName.MyProjectName.Blazor.Server.Pages +{ + public partial class Index + { + + } +} diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/Pages/Index.razor.css b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/Pages/Index.razor.css new file mode 100644 index 0000000000..abef246243 --- /dev/null +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/Pages/Index.razor.css @@ -0,0 +1 @@ +/* Write here your styles for the Index page */ \ No newline at end of file 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 b08d050b0c..8c6e0bb1a7 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": "^4.3.0-rc.1", - "@abp/aspnetcore.components.server.basictheme": "^4.3.0-rc.1" + "@abp/aspnetcore.mvc.ui.theme.basic": "^4.3.0-rc.2", + "@abp/aspnetcore.components.server.basictheme": "^4.3.0-rc.2" } } 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 538bc725a5..2cc57bfb0a 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@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.components.server.basictheme/-/aspnetcore.components.server.basictheme-4.3.0-rc.1.tgz#7e31e3f553a3f6a400cf665c70c6ffdb32437c56" - integrity sha512-8pEvElNeMqd72GESfpCIwuUKivNe5FcI67USYS/7fSXYg/PYKb5FIy0In+07TSQ/pnNZUxbSLB6SmMPRkLq/kg== - dependencies: - "@abp/aspnetcore.components.server.theming" "~4.3.0-rc.1" - -"@abp/aspnetcore.components.server.theming@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.components.server.theming/-/aspnetcore.components.server.theming-4.3.0-rc.1.tgz#23e43527c2f04ba18374b6e8ab87cfb83b987e55" - integrity sha512-bdo6+d8ZauhmfP63SRMAI8VL5LGgLvjogev39NkAgdzB+a+Ff/qAWB3a7MyT7ecQMlGBp/LcTyEfSGYSdPz9dw== - dependencies: - "@abp/bootstrap" "~4.3.0-rc.1" - "@abp/font-awesome" "~4.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui.theme.basic@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.3.0-rc.1.tgz#5dc06d82ee213bc33527b5af72ac94ae06bb7c25" - integrity sha512-Xkwj3NPnqWDgqvaP2eda3gviV7aBtyNOMCdZSvpxWmlaPlvJYN+SnKNnlmX02XVArTlOjaeTapFkE3auJeR6jA== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~4.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui.theme.shared@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.3.0-rc.1.tgz#9d4447f068b490367a20772eb9c2b38480088edb" - integrity sha512-untEVm6cKT375ZVEQFO01/VKIqtdFGIyJd5ZxtoQEV8ueVFRQefCOcvvqaJ8Gfj86T1nacXvJRfBfGihYHY+JQ== - dependencies: - "@abp/aspnetcore.mvc.ui" "~4.3.0-rc.1" - "@abp/bootstrap" "~4.3.0-rc.1" - "@abp/bootstrap-datepicker" "~4.3.0-rc.1" - "@abp/datatables.net-bs4" "~4.3.0-rc.1" - "@abp/font-awesome" "~4.3.0-rc.1" - "@abp/jquery-form" "~4.3.0-rc.1" - "@abp/jquery-validation-unobtrusive" "~4.3.0-rc.1" - "@abp/lodash" "~4.3.0-rc.1" - "@abp/luxon" "~4.3.0-rc.1" - "@abp/malihu-custom-scrollbar-plugin" "~4.3.0-rc.1" - "@abp/select2" "~4.3.0-rc.1" - "@abp/sweetalert" "~4.3.0-rc.1" - "@abp/timeago" "~4.3.0-rc.1" - "@abp/toastr" "~4.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.3.0-rc.1.tgz#1e54da2a668939941ab955f11db69798d04d9e7e" - integrity sha512-969etEb4H/fR9Twz6pcl766M/1AriCh6+B8r4haPB5g7QkOWhyU99mT11BHxQwf+uNV4duGZwvPvrMomrdLj2w== +"@abp/aspnetcore.components.server.basictheme@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.components.server.basictheme/-/aspnetcore.components.server.basictheme-4.3.0-rc.2.tgz#552f26af71583b19e3bcf90283414801a1538e69" + integrity sha512-KuCl2LOz8libAcEAXWWlWQEweH084JG7UtT+Ub+V1c64sIK2j/dKDRruwLccRsbPe02nn/PwdHSuTy3CBu8c6g== + dependencies: + "@abp/aspnetcore.components.server.theming" "~4.3.0-rc.2" + +"@abp/aspnetcore.components.server.theming@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.components.server.theming/-/aspnetcore.components.server.theming-4.3.0-rc.2.tgz#260bb7a7099f7f690c27b938577505fb01dd4457" + integrity sha512-a7KX3C9a5u3rOScrZMM+HUjyxDRwn9LGprNcbl9j6xgEfvBArrdAEOHIfA8xmOrn3aA1muwLDWBnuOlcmu0S5Q== + dependencies: + "@abp/bootstrap" "~4.3.0-rc.2" + "@abp/font-awesome" "~4.3.0-rc.2" + +"@abp/aspnetcore.mvc.ui.theme.basic@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.3.0-rc.2.tgz#4ebafbaade6610e3d405877a148d72d57569c3e3" + integrity sha512-Q3QqxKDFC04gaaj30Rk+9zGNfNxC8FX0jciARATceFV6pdA3F3PgT5EMDSlo6NoGniFVjHPRgay9N09zT6Htyw== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~4.3.0-rc.2" + +"@abp/aspnetcore.mvc.ui.theme.shared@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.3.0-rc.2.tgz#d3bf79929c55c5380d7ca7b913a23031d7a6bd12" + integrity sha512-pz86bIV4wNeG7/UPYzNCXlJ/MdOdIygc+Com7C9Ld7gzsyER7VD9h5U/hkytvL4FBFLJn4DU+xuZNECjv0HS0A== + dependencies: + "@abp/aspnetcore.mvc.ui" "~4.3.0-rc.2" + "@abp/bootstrap" "~4.3.0-rc.2" + "@abp/bootstrap-datepicker" "~4.3.0-rc.2" + "@abp/datatables.net-bs4" "~4.3.0-rc.2" + "@abp/font-awesome" "~4.3.0-rc.2" + "@abp/jquery-form" "~4.3.0-rc.2" + "@abp/jquery-validation-unobtrusive" "~4.3.0-rc.2" + "@abp/lodash" "~4.3.0-rc.2" + "@abp/luxon" "~4.3.0-rc.2" + "@abp/malihu-custom-scrollbar-plugin" "~4.3.0-rc.2" + "@abp/select2" "~4.3.0-rc.2" + "@abp/sweetalert" "~4.3.0-rc.2" + "@abp/timeago" "~4.3.0-rc.2" + "@abp/toastr" "~4.3.0-rc.2" + +"@abp/aspnetcore.mvc.ui@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.3.0-rc.2.tgz#6ff41be179c8d1089778a51ffa54a1f3d7614278" + integrity sha512-2L5zvuqUwPwNPcMauiiJZD1ft0QycqINz+bXEQ8t0EwbB+dzcsukL/rpOQfpeRHWWYy4nIN4C2bTvXhNgQbPqQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -58,145 +58,145 @@ micromatch "^4.0.2" path "^0.12.7" -"@abp/bootstrap-datepicker@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.3.0-rc.1.tgz#879a8ce32a3dbdb0cd80401360d24f25f318670b" - integrity sha512-W2T+rrC3oxuWj2xQUz2virbBK6x7ershWZB9d6FjXTSH89nin9DyBK20dEfskVvhK/IMrmZaW4PWyTTcx9r7dA== +"@abp/bootstrap-datepicker@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.3.0-rc.2.tgz#29a686c3d2bce356967f646d7334cd83c4257b4c" + integrity sha512-3+B7SJRi7DQJe0aNgv0H0zu1BfvMZcwgt06N3ALR9+o3TSJcOqcYrEMed3aG+ASH++CltnohTYnLkVXaxshioA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.3.0-rc.1.tgz#3260de03f29e210e44a55efa3af2ab6d34362227" - integrity sha512-flB18MUnRWpEnS0t/WEjsdhfB5w+zHjsa69Pj733+GHGSsZ1Vppu+rgvSWp38yNHO5uRwGECrwUIGwvd5uD9+A== +"@abp/bootstrap@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.3.0-rc.2.tgz#1416fe639c88b7d958435e45fe19692268a7f932" + integrity sha512-E6svmDhNQlT5nd65VgshexyedRWhbvi9o1oYo/dLTUpJDzR7M9ptDqxFLVB9vVDva3HgxUoEvgRJgb9fXvq4zw== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" bootstrap "^4.6.0" bootstrap-v4-rtl "4.6.0-1" -"@abp/core@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.3.0-rc.1.tgz#201c3be8b5697fe8e1b08b23f87f50e950036a14" - integrity sha512-ET8NGugNmdub+8qGeFf9qGPbloP5gcoBnB7U6ieFz1Eai9S3pSpbM+sdyifucEpzMThUiLS772EP4pJTMXhfEg== +"@abp/core@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.3.0-rc.2.tgz#3c9ea339624ae3b6cbee13e048268d48269ea6a9" + integrity sha512-/89xH+IVSmTOLWeUO4yVB7Hg64uHTbR7bHjgl+b94cFdtITH9Nvr2EGdXUJbHGUK7L6lSDziqiMcG/ic0061+Q== dependencies: - "@abp/utils" "^4.3.0-rc.1" + "@abp/utils" "^4.3.0-rc.2" -"@abp/datatables.net-bs4@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.3.0-rc.1.tgz#f7dad14d13b468949fd161b679f4a70271e0d466" - integrity sha512-812cLTfSZZMvjAFAq5h7R5AeJHigBxbPc+kMReQIcFLH82o6BjA2NqFBqYOvQuh4kqiQ85dqFTW9MTKeY8or6Q== +"@abp/datatables.net-bs4@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.3.0-rc.2.tgz#bbfc0d9d0ed86cdb14b38849fb78b2b1911c4a35" + integrity sha512-PRKYi2NU41KpckJ/d0buHoFbyKVuW5NCQNpUdYzDsPS2riyeXccCsLFJM1bT01TdR4Idla3vx9Fkb+HoJOiDeQ== dependencies: - "@abp/datatables.net" "~4.3.0-rc.1" + "@abp/datatables.net" "~4.3.0-rc.2" datatables.net-bs4 "^1.10.21" -"@abp/datatables.net@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.3.0-rc.1.tgz#aa1640903fe67d20e1fc57ffe0519b2764e4c7df" - integrity sha512-qfdQa43sbXsIEBc3WpxSC7cXyKSFxLiFdCKnLIkQNsC3Wo+WX/Cute2xNbT0+xIQdGznfEBdPxcwQkNE6JQgcA== +"@abp/datatables.net@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.3.0-rc.2.tgz#1923e60db261366a7d2f284b0274d13e253567ca" + integrity sha512-rp53+5Xj1jhjpCj7UBA9+nSNbaTQ4Vc1NWCg1e5aI5tWiyZprUS44dRszIQIDV86XKorfFhog5ihOZyzl1HDyg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" datatables.net "^1.10.21" -"@abp/font-awesome@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.3.0-rc.1.tgz#5d336ead8b8c67b2c0aaff9365c2c856b033196e" - integrity sha512-BU4ycN/gOxX2x8S/Eszi3bJAz6bZRhxa0uPWxEWKul9PNvKSwMJRoVaEVehnIlfTi2raHsLQHk+F7079gt3dlQ== +"@abp/font-awesome@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.3.0-rc.2.tgz#437d3d6bbd8f52e5091251932d6a494d0164694b" + integrity sha512-FeHHtEQwrJBwD5PkFYqjKouCLwNjjRqTNseaN+s/r7gNjv0PgKytfRoqEb+O/BkZg/DwEuMz9jFX/RXCCNa2xA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" "@fortawesome/fontawesome-free" "^5.13.0" -"@abp/jquery-form@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.3.0-rc.1.tgz#4543e3d751519ba12d2c563aa7cbc56e51dfe093" - integrity sha512-ONQeImarHEe4VRSv13da+rHnCv+2Ycyd7YF+Dr77gtBmTKpC5nAFGY4wO7+u0U0px/YsR2dntpyBj2fEw3wjXA== +"@abp/jquery-form@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.3.0-rc.2.tgz#999910deaf46330477b6ed487a771a2123d69f92" + integrity sha512-+fdEIOTlxDOdYXMtc/ujhYeuP2qiI4bmL3TQQWQxSTlW8q5jB6dHLBnHiXXltO8HxX9+7ZsjN3tsV7+Div5joA== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.3.0-rc.1.tgz#15a06257fba8ef8d2cba2ac9da3f6f7185e6c8dd" - integrity sha512-8Tshu/QsqulwNfRnvoX1mViY12OTvCqpHdRldqr7k6MQd+boo6ahybQ4SCoZ9vsDTmqxd5dkV/A8VijMw66WTQ== +"@abp/jquery-validation-unobtrusive@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.3.0-rc.2.tgz#0635e0c77da269e8367c3d7c388613249ce9221d" + integrity sha512-ubmPjVJatAW3AJWjWtT+ZbNLhu+HHNgcxYkFGVNusNuboTGsoBs5G45Cjzp/q5FnggWoPvkllpf8CGuaYUbpUQ== dependencies: - "@abp/jquery-validation" "~4.3.0-rc.1" + "@abp/jquery-validation" "~4.3.0-rc.2" jquery-validation-unobtrusive "^3.2.11" -"@abp/jquery-validation@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.3.0-rc.1.tgz#6a0d771c88e961cb43144cd6ef916d1ab22aceaf" - integrity sha512-kjVF6757xP8wZ9qw8ysI5ve3AD8PoJtxqkkUV4QF4xcrdP8EPk2heX3Imu7MJiYGyMlwLU++FTm8J68UNsWRmQ== +"@abp/jquery-validation@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.3.0-rc.2.tgz#ee145f8c4a633218ccfa50cca0bed503a0ca8dc6" + integrity sha512-SLWzN6jxVqKaHYs/d6Mku8CfhB1vWgfMbFma14upiJ+/VDkTF4Rh27iMCWKYVOS3bukh2ltBp6kPFplrjCAGSg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" jquery-validation "^1.19.2" -"@abp/jquery@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.3.0-rc.1.tgz#06030baf44983175707409eff16a05db72c93bf5" - integrity sha512-Xgptjea/RzgBvwK+paydXWMgenobuvqKsr9LbrIDiYAJuLMMCyGvwJnA7jeszz+OqZShP8ppoeB0ifa5K2Yc2A== +"@abp/jquery@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.3.0-rc.2.tgz#f620628ea0739888cbcb360c058d09bff10d553b" + integrity sha512-+rfyLVJn7E8wJ1oQ9GiCR63Yk6wah1Hqnj4XpsRDMkIaOXKaqrnVHAZd4W2DUunQSe95wqHfkNH/wkvTyNEwUg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" jquery "~3.5.1" -"@abp/lodash@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.3.0-rc.1.tgz#cd9bf0693379ea54f789299ba67483d345da5abf" - integrity sha512-BtsQs6wpJJvdwPDx7sOIIzkVHJnzw4Twrv0q3XNqmsiv5eGIwluFsorm5N6qOk7nC5csor6mpk6YuJuFii8GbQ== +"@abp/lodash@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.3.0-rc.2.tgz#9b5429d3976b34022aaf8cab4afef57479b66821" + integrity sha512-sE2dyofYbiIy4xhL85diZWkfqBcQl1q61T0DbYDOHgaejZAJxk4bVyFpEuMiC2HwWAZ656IN1bzyQIyE1RKzQA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" lodash "^4.17.15" -"@abp/luxon@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.3.0-rc.1.tgz#dd855417224bbf124cdc9f395bb5cf5f0c6a7a03" - integrity sha512-OtxmjCgPiH1JWsdUvQpkvum3k43H6v8Z5okv4lDpcBOah/HZYUP8qOsSS3Tcyw2I66TK15tq13XJeHabmh2lAQ== +"@abp/luxon@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.3.0-rc.2.tgz#6fdbf1624462615dcb1f5ce85c07fc3bc4065e3f" + integrity sha512-C4aT0aN3/TVtTE3m0AZyhFSeeg+RxXpUO+nffAZoM/cH5NL8tir+O1hd+dhtCb7AELaqQNx5+qgXoJLYdWMYVg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" luxon "^1.24.1" -"@abp/malihu-custom-scrollbar-plugin@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.3.0-rc.1.tgz#e07a9a1895ded98150c1ff4470638ab71e6a0561" - integrity sha512-OiCVlh8iHPHFchSZdFzUl/w+MqPbnlZ4jlohbEuqBTV6rbaAnJXA0Tqylv4RKjho7fybGvhxjDbBrZS4kxUFLg== +"@abp/malihu-custom-scrollbar-plugin@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.3.0-rc.2.tgz#28fc1f216c1d84b20acaf8c8c5cf5c3b33e1aeb1" + integrity sha512-LYMXKkPVyBLWV4Qnom2MW8JJ/rZmVg1CyOFxM6JiL+dpsN1Ogw0hRG33CCHQveqUmf2cr3vf96qk5Et5DyDDIg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.3.0-rc.1.tgz#f3d60b42cb82abc6a0ce6a640b82eb53501f9893" - integrity sha512-z+6Dhu6kqgCfTdZReI08N2ONKakQSmdDsNiZDB5/OOP26k2pOefe/j//sRfjTWiI5gCxO5y98ZZ0ccanBF8oTw== +"@abp/select2@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.3.0-rc.2.tgz#42d62daff9e50b1fe211a1560794625ba3f52107" + integrity sha512-okiIXmFaqx0uy/UMcpMKWKjrwop1JINyzN4FS5tafUpWhx6KcYYHudLWJvnPbsdsOeBQx91kw8jjERRJIqfEOA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" select2 "^4.0.13" -"@abp/sweetalert@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.3.0-rc.1.tgz#d54a8628f004c2d22ebcc4bd60f2b6c1cbd3bc8f" - integrity sha512-OpgDbM9vOfCLpjCRFXavPAdoKlZnpxP+DkUH8owHTrtEuxmrSjpLlIa6VOzAKr70GiLtuMCz9QoH3AyMepx9vA== +"@abp/sweetalert@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.3.0-rc.2.tgz#dfb20dfca8449ed3c3f6599d99b51746019eb664" + integrity sha512-NRKOgT80JVQrwI1FRqpbCzALvnLAFKdPwKKNDgm0L7r/5DL0+JbkKCI1AIPl/yiM8MBrCaQqNms+9JES5mjiUQ== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" sweetalert "^2.1.2" -"@abp/timeago@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.3.0-rc.1.tgz#247f3b3a8e54f6732efa3600ba649a81fee6ec82" - integrity sha512-cplxM3jYhhakET1DyERQoWJQxx0mhTKoI7gW93wNeEMyL4FWaF4lgUNEoubJUSBCDs4v/0ni0pKG8c8nldbiew== +"@abp/timeago@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.3.0-rc.2.tgz#22943e219facd7fa0efddb63017198474b5cef89" + integrity sha512-TjKyuli+SpVjTgVJmraBpqJK112I+1DYHPJfso7QAH48Ra4gceGj9EVS0i/420YyLZyJSMtZOruxzYkyJeR/6w== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" timeago "^1.6.7" -"@abp/toastr@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.3.0-rc.1.tgz#7bc5bb071839fbb971f56c41c8bf220b0a6d67e9" - integrity sha512-OQgmdmWPKlpn/Lks6fUL4enEJgnvUeEcoGTuQOKfkh9ybadYd8kcELWw5ttsQ4o35yvDH3Lsh1jLwPDrCheTBg== +"@abp/toastr@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.3.0-rc.2.tgz#143a344b00bbfaa858fe267fb6d627952bf7b3c0" + integrity sha512-cQV9UFWb9zarkb/CbrqkF9RXqn1Fc/TFKKM5mxpUEcYjx52NuM0d+KawdEMoN2y3y2U4ciY44kbTP2W1y+NlBg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" toastr "^2.1.4" -"@abp/utils@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.3.0-rc.1.tgz#82ef26e01e0cb38417bf4fa9459fde85cbc2b424" - integrity sha512-C/sk6jZQDENI7FbylBoPnTb1rC5eVPnsL8B++vAH4jS//OAj2iNvE6tCewK21GYI/JmfmQzzauQBzOiOJR9a6A== +"@abp/utils@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.3.0-rc.2.tgz#6d051f98772e5642c2e3bc2f68e73d6f24f4694c" + integrity sha512-9qYo8OMTxIUG+qQBWXEpkURS6FUrx+J5s3SwC/eerp46hYr72GQ8L38Wq566a+xiLCn7Duxt6oJ/BxhTfQQxdw== dependencies: just-compare "^1.3.0" 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 32edf49026..d4898cb678 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 @@ -8,8 +8,8 @@ - - + + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBundleContributor.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBundleContributor.cs index 684426ede0..43c0a96ed4 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBundleContributor.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBundleContributor.cs @@ -2,6 +2,9 @@ namespace MyCompanyName.MyProjectName.Blazor { + /* Add your global styles/scripts here. + * See https://docs.abp.io/en/abp/latest/UI/Blazor/Global-Scripts-Styles to learn how to use it + */ public class MyProjectNameBundleContributor : IBundleContributor { public void AddScripts(BundleContext context) diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor.css b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor.css new file mode 100644 index 0000000000..abef246243 --- /dev/null +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor.css @@ -0,0 +1 @@ +/* Write here your styles for the Index page */ \ No newline at end of file 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 bb1185599c..2de0e6b6ff 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 @@ -43,9 +43,9 @@ var ue=function(){var e=new RegExp('(?:false|true|null|[\\{\\}\\[\\]]|(?:-?\\b(? */ var n=r(29),i=r(30),o=r(31);function s(){return u.TYPED_ARRAY_SUPPORT?2147483647:1073741823}function a(e,t){if(s()=s())throw new RangeError("Attempt to allocate Buffer larger than maximum size: 0x"+s().toString(16)+" bytes");return 0|e}function d(e,t){if(u.isBuffer(e))return e.length;if("undefined"!=typeof ArrayBuffer&&"function"==typeof ArrayBuffer.isView&&(ArrayBuffer.isView(e)||e instanceof ArrayBuffer))return e.byteLength;"string"!=typeof e&&(e=""+e);var r=e.length;if(0===r)return 0;for(var n=!1;;)switch(t){case"ascii":case"latin1":case"binary":return r;case"utf8":case"utf-8":case void 0:return j(e).length;case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return 2*r;case"hex":return r>>>1;case"base64":return H(e).length;default:if(n)return j(e).length;t=(""+t).toLowerCase(),n=!0}}function p(e,t,r){var n=e[t];e[t]=e[r],e[r]=n}function v(e,t,r,n,i){if(0===e.length)return-1;if("string"==typeof r?(n=r,r=0):r>2147483647?r=2147483647:r<-2147483648&&(r=-2147483648),r=+r,isNaN(r)&&(r=i?0:e.length-1),r<0&&(r=e.length+r),r>=e.length){if(i)return-1;r=e.length-1}else if(r<0){if(!i)return-1;r=0}if("string"==typeof t&&(t=u.from(t,n)),u.isBuffer(t))return 0===t.length?-1:y(e,t,r,n,i);if("number"==typeof t)return t&=255,u.TYPED_ARRAY_SUPPORT&&"function"==typeof Uint8Array.prototype.indexOf?i?Uint8Array.prototype.indexOf.call(e,t,r):Uint8Array.prototype.lastIndexOf.call(e,t,r):y(e,[t],r,n,i);throw new TypeError("val must be string, number or Buffer")}function y(e,t,r,n,i){var o,s=1,a=e.length,u=t.length;if(void 0!==n&&("ucs2"===(n=String(n).toLowerCase())||"ucs-2"===n||"utf16le"===n||"utf-16le"===n)){if(e.length<2||t.length<2)return-1;s=2,a/=2,u/=2,r/=2}function c(e,t){return 1===s?e[t]:e.readUInt16BE(t*s)}if(i){var h=-1;for(o=r;oa&&(r=a-u),o=r;o>=0;o--){for(var l=!0,f=0;fi&&(n=i):n=i;var o=t.length;if(o%2!=0)throw new TypeError("Invalid hex string");n>o/2&&(n=o/2);for(var s=0;s>8,i=r%256,o.push(i),o.push(n);return o}(t,e.length-r),e,r,n)}function E(e,t,r){return 0===t&&r===e.length?n.fromByteArray(e):n.fromByteArray(e.slice(t,r))}function x(e,t,r){r=Math.min(e.length,r);for(var n=[],i=t;i239?4:c>223?3:c>191?2:1;if(i+l<=r)switch(l){case 1:c<128&&(h=c);break;case 2:128==(192&(o=e[i+1]))&&(u=(31&c)<<6|63&o)>127&&(h=u);break;case 3:o=e[i+1],s=e[i+2],128==(192&o)&&128==(192&s)&&(u=(15&c)<<12|(63&o)<<6|63&s)>2047&&(u<55296||u>57343)&&(h=u);break;case 4:o=e[i+1],s=e[i+2],a=e[i+3],128==(192&o)&&128==(192&s)&&128==(192&a)&&(u=(15&c)<<18|(63&o)<<12|(63&s)<<6|63&a)>65535&&u<1114112&&(h=u)}null===h?(h=65533,l=1):h>65535&&(h-=65536,n.push(h>>>10&1023|55296),h=56320|1023&h),n.push(h),i+=l}return function(e){var t=e.length;if(t<=k)return String.fromCharCode.apply(String,e);for(var r="",n=0;nthis.length)return"";if((void 0===r||r>this.length)&&(r=this.length),r<=0)return"";if((r>>>=0)<=(t>>>=0))return"";for(e||(e="utf8");;)switch(e){case"hex":return C(this,t,r);case"utf8":case"utf-8":return x(this,t,r);case"ascii":return A(this,t,r);case"latin1":case"binary":return P(this,t,r);case"base64":return E(this,t,r);case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return T(this,t,r);default:if(n)throw new TypeError("Unknown encoding: "+e);e=(e+"").toLowerCase(),n=!0}}.apply(this,arguments)},u.prototype.equals=function(e){if(!u.isBuffer(e))throw new TypeError("Argument must be a Buffer");return this===e||0===u.compare(this,e)},u.prototype.inspect=function(){var e="",r=t.INSPECT_MAX_BYTES;return this.length>0&&(e=this.toString("hex",0,r).match(/.{2}/g).join(" "),this.length>r&&(e+=" ... ")),""},u.prototype.compare=function(e,t,r,n,i){if(!u.isBuffer(e))throw new TypeError("Argument must be a Buffer");if(void 0===t&&(t=0),void 0===r&&(r=e?e.length:0),void 0===n&&(n=0),void 0===i&&(i=this.length),t<0||r>e.length||n<0||i>this.length)throw new RangeError("out of range index");if(n>=i&&t>=r)return 0;if(n>=i)return-1;if(t>=r)return 1;if(this===e)return 0;for(var o=(i>>>=0)-(n>>>=0),s=(r>>>=0)-(t>>>=0),a=Math.min(o,s),c=this.slice(n,i),h=e.slice(t,r),l=0;li)&&(r=i),e.length>0&&(r<0||t<0)||t>this.length)throw new RangeError("Attempt to write outside buffer bounds");n||(n="utf8");for(var o=!1;;)switch(n){case"hex":return m(this,e,t,r);case"utf8":case"utf-8":return _(this,e,t,r);case"ascii":return S(this,e,t,r);case"latin1":case"binary":return w(this,e,t,r);case"base64":return F(this,e,t,r);case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return b(this,e,t,r);default:if(o)throw new TypeError("Unknown encoding: "+n);n=(""+n).toLowerCase(),o=!0}},u.prototype.toJSON=function(){return{type:"Buffer",data:Array.prototype.slice.call(this._arr||this,0)}};var k=4096;function A(e,t,r){var n="";r=Math.min(e.length,r);for(var i=t;in)&&(r=n);for(var i="",o=t;or)throw new RangeError("Trying to access beyond buffer length")}function I(e,t,r,n,i,o){if(!u.isBuffer(e))throw new TypeError('"buffer" argument must be a Buffer instance');if(t>i||te.length)throw new RangeError("Index out of range")}function D(e,t,r,n){t<0&&(t=65535+t+1);for(var i=0,o=Math.min(e.length-r,2);i>>8*(n?i:1-i)}function U(e,t,r,n){t<0&&(t=4294967295+t+1);for(var i=0,o=Math.min(e.length-r,4);i>>8*(n?i:3-i)&255}function L(e,t,r,n,i,o){if(r+n>e.length)throw new RangeError("Index out of range");if(r<0)throw new RangeError("Index out of range")}function N(e,t,r,n,o){return o||L(e,0,r,4),i.write(e,t,r,n,23,4),r+4}function O(e,t,r,n,o){return o||L(e,0,r,8),i.write(e,t,r,n,52,8),r+8}u.prototype.slice=function(e,t){var r,n=this.length;if((e=~~e)<0?(e+=n)<0&&(e=0):e>n&&(e=n),(t=void 0===t?n:~~t)<0?(t+=n)<0&&(t=0):t>n&&(t=n),t0&&(i*=256);)n+=this[e+--t]*i;return n},u.prototype.readUInt8=function(e,t){return t||R(e,1,this.length),this[e]},u.prototype.readUInt16LE=function(e,t){return t||R(e,2,this.length),this[e]|this[e+1]<<8},u.prototype.readUInt16BE=function(e,t){return t||R(e,2,this.length),this[e]<<8|this[e+1]},u.prototype.readUInt32LE=function(e,t){return t||R(e,4,this.length),(this[e]|this[e+1]<<8|this[e+2]<<16)+16777216*this[e+3]},u.prototype.readUInt32BE=function(e,t){return t||R(e,4,this.length),16777216*this[e]+(this[e+1]<<16|this[e+2]<<8|this[e+3])},u.prototype.readIntLE=function(e,t,r){e|=0,t|=0,r||R(e,t,this.length);for(var n=this[e],i=1,o=0;++o=(i*=128)&&(n-=Math.pow(2,8*t)),n},u.prototype.readIntBE=function(e,t,r){e|=0,t|=0,r||R(e,t,this.length);for(var n=t,i=1,o=this[e+--n];n>0&&(i*=256);)o+=this[e+--n]*i;return o>=(i*=128)&&(o-=Math.pow(2,8*t)),o},u.prototype.readInt8=function(e,t){return t||R(e,1,this.length),128&this[e]?-1*(255-this[e]+1):this[e]},u.prototype.readInt16LE=function(e,t){t||R(e,2,this.length);var r=this[e]|this[e+1]<<8;return 32768&r?4294901760|r:r},u.prototype.readInt16BE=function(e,t){t||R(e,2,this.length);var r=this[e+1]|this[e]<<8;return 32768&r?4294901760|r:r},u.prototype.readInt32LE=function(e,t){return t||R(e,4,this.length),this[e]|this[e+1]<<8|this[e+2]<<16|this[e+3]<<24},u.prototype.readInt32BE=function(e,t){return t||R(e,4,this.length),this[e]<<24|this[e+1]<<16|this[e+2]<<8|this[e+3]},u.prototype.readFloatLE=function(e,t){return t||R(e,4,this.length),i.read(this,e,!0,23,4)},u.prototype.readFloatBE=function(e,t){return t||R(e,4,this.length),i.read(this,e,!1,23,4)},u.prototype.readDoubleLE=function(e,t){return t||R(e,8,this.length),i.read(this,e,!0,52,8)},u.prototype.readDoubleBE=function(e,t){return t||R(e,8,this.length),i.read(this,e,!1,52,8)},u.prototype.writeUIntLE=function(e,t,r,n){e=+e,t|=0,r|=0,n||I(this,e,t,r,Math.pow(2,8*r)-1,0);var i=1,o=0;for(this[t]=255&e;++o=0&&(o*=256);)this[t+i]=e/o&255;return t+r},u.prototype.writeUInt8=function(e,t,r){return e=+e,t|=0,r||I(this,e,t,1,255,0),u.TYPED_ARRAY_SUPPORT||(e=Math.floor(e)),this[t]=255&e,t+1},u.prototype.writeUInt16LE=function(e,t,r){return e=+e,t|=0,r||I(this,e,t,2,65535,0),u.TYPED_ARRAY_SUPPORT?(this[t]=255&e,this[t+1]=e>>>8):D(this,e,t,!0),t+2},u.prototype.writeUInt16BE=function(e,t,r){return e=+e,t|=0,r||I(this,e,t,2,65535,0),u.TYPED_ARRAY_SUPPORT?(this[t]=e>>>8,this[t+1]=255&e):D(this,e,t,!1),t+2},u.prototype.writeUInt32LE=function(e,t,r){return e=+e,t|=0,r||I(this,e,t,4,4294967295,0),u.TYPED_ARRAY_SUPPORT?(this[t+3]=e>>>24,this[t+2]=e>>>16,this[t+1]=e>>>8,this[t]=255&e):U(this,e,t,!0),t+4},u.prototype.writeUInt32BE=function(e,t,r){return e=+e,t|=0,r||I(this,e,t,4,4294967295,0),u.TYPED_ARRAY_SUPPORT?(this[t]=e>>>24,this[t+1]=e>>>16,this[t+2]=e>>>8,this[t+3]=255&e):U(this,e,t,!1),t+4},u.prototype.writeIntLE=function(e,t,r,n){if(e=+e,t|=0,!n){var i=Math.pow(2,8*r-1);I(this,e,t,r,i-1,-i)}var o=0,s=1,a=0;for(this[t]=255&e;++o>0)-a&255;return t+r},u.prototype.writeIntBE=function(e,t,r,n){if(e=+e,t|=0,!n){var i=Math.pow(2,8*r-1);I(this,e,t,r,i-1,-i)}var o=r-1,s=1,a=0;for(this[t+o]=255&e;--o>=0&&(s*=256);)e<0&&0===a&&0!==this[t+o+1]&&(a=1),this[t+o]=(e/s>>0)-a&255;return t+r},u.prototype.writeInt8=function(e,t,r){return e=+e,t|=0,r||I(this,e,t,1,127,-128),u.TYPED_ARRAY_SUPPORT||(e=Math.floor(e)),e<0&&(e=255+e+1),this[t]=255&e,t+1},u.prototype.writeInt16LE=function(e,t,r){return e=+e,t|=0,r||I(this,e,t,2,32767,-32768),u.TYPED_ARRAY_SUPPORT?(this[t]=255&e,this[t+1]=e>>>8):D(this,e,t,!0),t+2},u.prototype.writeInt16BE=function(e,t,r){return e=+e,t|=0,r||I(this,e,t,2,32767,-32768),u.TYPED_ARRAY_SUPPORT?(this[t]=e>>>8,this[t+1]=255&e):D(this,e,t,!1),t+2},u.prototype.writeInt32LE=function(e,t,r){return e=+e,t|=0,r||I(this,e,t,4,2147483647,-2147483648),u.TYPED_ARRAY_SUPPORT?(this[t]=255&e,this[t+1]=e>>>8,this[t+2]=e>>>16,this[t+3]=e>>>24):U(this,e,t,!0),t+4},u.prototype.writeInt32BE=function(e,t,r){return e=+e,t|=0,r||I(this,e,t,4,2147483647,-2147483648),e<0&&(e=4294967295+e+1),u.TYPED_ARRAY_SUPPORT?(this[t]=e>>>24,this[t+1]=e>>>16,this[t+2]=e>>>8,this[t+3]=255&e):U(this,e,t,!1),t+4},u.prototype.writeFloatLE=function(e,t,r){return N(this,e,t,!0,r)},u.prototype.writeFloatBE=function(e,t,r){return N(this,e,t,!1,r)},u.prototype.writeDoubleLE=function(e,t,r){return O(this,e,t,!0,r)},u.prototype.writeDoubleBE=function(e,t,r){return O(this,e,t,!1,r)},u.prototype.copy=function(e,t,r,n){if(r||(r=0),n||0===n||(n=this.length),t>=e.length&&(t=e.length),t||(t=0),n>0&&n=this.length)throw new RangeError("sourceStart out of bounds");if(n<0)throw new RangeError("sourceEnd out of bounds");n>this.length&&(n=this.length),e.length-t=0;--i)e[i+t]=this[i+r];else if(o<1e3||!u.TYPED_ARRAY_SUPPORT)for(i=0;i>>=0,r=void 0===r?this.length:r>>>0,e||(e=0),"number"==typeof e)for(o=t;o55295&&r<57344){if(!i){if(r>56319){(t-=3)>-1&&o.push(239,191,189);continue}if(s+1===n){(t-=3)>-1&&o.push(239,191,189);continue}i=r;continue}if(r<56320){(t-=3)>-1&&o.push(239,191,189),i=r;continue}r=65536+(i-55296<<10|r-56320)}else i&&(t-=3)>-1&&o.push(239,191,189);if(i=null,r<128){if((t-=1)<0)break;o.push(r)}else if(r<2048){if((t-=2)<0)break;o.push(r>>6|192,63&r|128)}else if(r<65536){if((t-=3)<0)break;o.push(r>>12|224,r>>6&63|128,63&r|128)}else{if(!(r<1114112))throw new Error("Invalid code point");if((t-=4)<0)break;o.push(r>>18|240,r>>12&63|128,r>>6&63|128,63&r|128)}}return o}function H(e){return n.toByteArray(function(e){if((e=function(e){return e.trim?e.trim():e.replace(/^\s+|\s+$/g,"")}(e).replace(B,"")).length<2)return"";for(;e.length%4!=0;)e+="=";return e}(e))}function K(e,t,r,n){for(var i=0;i=t.length||i>=e.length);++i)t[i+r]=e[i];return i}}).call(this,r(28))},function(e,t){var r;r=function(){return this}();try{r=r||new Function("return this")()}catch(e){"object"==typeof window&&(r=window)}e.exports=r},function(e,t,r){"use strict";t.byteLength=function(e){var t=c(e),r=t[0],n=t[1];return 3*(r+n)/4-n},t.toByteArray=function(e){for(var t,r=c(e),n=r[0],s=r[1],a=new o(function(e,t,r){return 3*(t+r)/4-r}(0,n,s)),u=0,h=s>0?n-4:n,l=0;l>16&255,a[u++]=t>>8&255,a[u++]=255&t;return 2===s&&(t=i[e.charCodeAt(l)]<<2|i[e.charCodeAt(l+1)]>>4,a[u++]=255&t),1===s&&(t=i[e.charCodeAt(l)]<<10|i[e.charCodeAt(l+1)]<<4|i[e.charCodeAt(l+2)]>>2,a[u++]=t>>8&255,a[u++]=255&t),a},t.fromByteArray=function(e){for(var t,r=e.length,i=r%3,o=[],s=0,a=r-i;sa?a:s+16383));return 1===i?(t=e[r-1],o.push(n[t>>2]+n[t<<4&63]+"==")):2===i&&(t=(e[r-2]<<8)+e[r-1],o.push(n[t>>10]+n[t>>4&63]+n[t<<2&63]+"=")),o.join("")};for(var n=[],i=[],o="undefined"!=typeof Uint8Array?Uint8Array:Array,s="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",a=0,u=s.length;a0)throw new Error("Invalid string. Length must be a multiple of 4");var r=e.indexOf("=");return-1===r&&(r=t),[r,r===t?0:4-r%4]}function h(e,t,r){for(var i,o,s=[],a=t;a>18&63]+n[o>>12&63]+n[o>>6&63]+n[63&o]);return s.join("")}i["-".charCodeAt(0)]=62,i["_".charCodeAt(0)]=63},function(e,t){t.read=function(e,t,r,n,i){var o,s,a=8*i-n-1,u=(1<>1,h=-7,l=r?i-1:0,f=r?-1:1,g=e[t+l];for(l+=f,o=g&(1<<-h)-1,g>>=-h,h+=a;h>0;o=256*o+e[t+l],l+=f,h-=8);for(s=o&(1<<-h)-1,o>>=-h,h+=n;h>0;s=256*s+e[t+l],l+=f,h-=8);if(0===o)o=1-c;else{if(o===u)return s?NaN:1/0*(g?-1:1);s+=Math.pow(2,n),o-=c}return(g?-1:1)*s*Math.pow(2,o-n)},t.write=function(e,t,r,n,i,o){var s,a,u,c=8*o-i-1,h=(1<>1,f=23===i?Math.pow(2,-24)-Math.pow(2,-77):0,g=n?0:o-1,d=n?1:-1,p=t<0||0===t&&1/t<0?1:0;for(t=Math.abs(t),isNaN(t)||t===1/0?(a=isNaN(t)?1:0,s=h):(s=Math.floor(Math.log(t)/Math.LN2),t*(u=Math.pow(2,-s))<1&&(s--,u*=2),(t+=s+l>=1?f/u:f*Math.pow(2,1-l))*u>=2&&(s++,u/=2),s+l>=h?(a=0,s=h):s+l>=1?(a=(t*u-1)*Math.pow(2,i),s+=l):(a=t*Math.pow(2,l-1)*Math.pow(2,i),s=0));i>=8;e[r+g]=255&a,g+=d,a/=256,i-=8);for(s=s<0;e[r+g]=255&s,g+=d,s/=256,c-=8);e[r+g-d]|=128*p}},function(e,t){var r={}.toString;e.exports=Array.isArray||function(e){return"[object Array]"==r.call(e)}},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(e){var t=e.jws,r=e.KeyUtil,i=e.X509,o=e.crypto,s=e.hextob64u,a=e.b64tohex,u=e.AllowedSigningAlgs;return function(){function e(){!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e)}return e.parseJwt=function e(r){n.Log.debug("JoseUtil.parseJwt");try{var i=t.JWS.parse(r);return{header:i.headerObj,payload:i.payloadObj}}catch(e){n.Log.error(e)}},e.validateJwt=function(t,o,s,u,c,h,l){n.Log.debug("JoseUtil.validateJwt");try{if("RSA"===o.kty)if(o.e&&o.n)o=r.getKey(o);else{if(!o.x5c||!o.x5c.length)return n.Log.error("JoseUtil.validateJwt: RSA key missing key material",o),Promise.reject(new Error("RSA key missing key material"));var f=a(o.x5c[0]);o=i.getPublicKeyFromCertHex(f)}else{if("EC"!==o.kty)return n.Log.error("JoseUtil.validateJwt: Unsupported key type",o&&o.kty),Promise.reject(new Error(o.kty));if(!(o.crv&&o.x&&o.y))return n.Log.error("JoseUtil.validateJwt: EC key missing key material",o),Promise.reject(new Error("EC key missing key material"));o=r.getKey(o)}return e._validateJwt(t,o,s,u,c,h,l)}catch(e){return n.Log.error(e&&e.message||e),Promise.reject("JWT validation failed")}},e.validateJwtAttributes=function(t,r,i,o,s,a){o||(o=0),s||(s=parseInt(Date.now()/1e3));var u=e.parseJwt(t).payload;if(!u.iss)return n.Log.error("JoseUtil._validateJwt: issuer was not provided"),Promise.reject(new Error("issuer was not provided"));if(u.iss!==r)return n.Log.error("JoseUtil._validateJwt: Invalid issuer in token",u.iss),Promise.reject(new Error("Invalid issuer in token: "+u.iss));if(!u.aud)return n.Log.error("JoseUtil._validateJwt: aud was not provided"),Promise.reject(new Error("aud was not provided"));if(!(u.aud===i||Array.isArray(u.aud)&&u.aud.indexOf(i)>=0))return n.Log.error("JoseUtil._validateJwt: Invalid audience in token",u.aud),Promise.reject(new Error("Invalid audience in token: "+u.aud));if(u.azp&&u.azp!==i)return n.Log.error("JoseUtil._validateJwt: Invalid azp in token",u.azp),Promise.reject(new Error("Invalid azp in token: "+u.azp));if(!a){var c=s+o,h=s-o;if(!u.iat)return n.Log.error("JoseUtil._validateJwt: iat was not provided"),Promise.reject(new Error("iat was not provided"));if(c>>((3&t)<<3)&255;return i}}},function(e,t){for(var r=[],n=0;n<256;++n)r[n]=(n+256).toString(16).substr(1);e.exports=function(e,t){var n=t||0,i=r;return[i[e[n++]],i[e[n++]],i[e[n++]],i[e[n++]],"-",i[e[n++]],i[e[n++]],"-",i[e[n++]],i[e[n++]],"-",i[e[n++]],i[e[n++]],"-",i[e[n++]],i[e[n++]],i[e[n++]],i[e[n++]],i[e[n++]],i[e[n++]]].join("")}},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.SigninResponse=void 0;var n=function(){function e(e,t){for(var r=0;r1&&void 0!==arguments[1]?arguments[1]:"#";!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e);var n=i.UrlUtility.parseUrlFragment(t,r);this.error=n.error,this.error_description=n.error_description,this.error_uri=n.error_uri,this.code=n.code,this.state=n.state,this.id_token=n.id_token,this.session_state=n.session_state,this.access_token=n.access_token,this.token_type=n.token_type,this.scope=n.scope,this.profile=void 0,this.expires_in=n.expires_in}return n(e,[{key:"expires_in",get:function(){if(this.expires_at){var e=parseInt(Date.now()/1e3);return this.expires_at-e}},set:function(e){var t=parseInt(e);if("number"==typeof t&&t>0){var r=parseInt(Date.now()/1e3);this.expires_at=r+t}}},{key:"expired",get:function(){var e=this.expires_in;if(void 0!==e)return e<=0}},{key:"scopes",get:function(){return(this.scope||"").split(" ")}},{key:"isOpenIdConnect",get:function(){return this.scopes.indexOf("openid")>=0||!!this.id_token}}]),e}()},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.SignoutRequest=void 0;var n=r(0),i=r(3),o=r(8);t.SignoutRequest=function e(t){var r=t.url,s=t.id_token_hint,a=t.post_logout_redirect_uri,u=t.data,c=t.extraQueryParams,h=t.request_type;if(function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),!r)throw n.Log.error("SignoutRequest.ctor: No url passed"),new Error("url");for(var l in s&&(r=i.UrlUtility.addQueryParam(r,"id_token_hint",s)),a&&(r=i.UrlUtility.addQueryParam(r,"post_logout_redirect_uri",a),u&&(this.state=new o.State({data:u,request_type:h}),r=i.UrlUtility.addQueryParam(r,"state",this.state.id))),c)r=i.UrlUtility.addQueryParam(r,l,c[l]);this.url=r}},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.SignoutResponse=void 0;var n=r(3);t.SignoutResponse=function e(t){!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e);var r=n.UrlUtility.parseUrlFragment(t,"?");this.error=r.error,this.error_description=r.error_description,this.error_uri=r.error_uri,this.state=r.state}},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.InMemoryWebStorage=void 0;var n=function(){function e(e,t){for(var r=0;r0&&void 0!==arguments[0]?arguments[0]:{},n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:c.SilentRenewService,o=arguments.length>2&&void 0!==arguments[2]?arguments[2]:h.SessionMonitor,a=arguments.length>3&&void 0!==arguments[3]?arguments[3]:l.TokenRevocationClient,d=arguments.length>4&&void 0!==arguments[4]?arguments[4]:f.TokenClient,p=arguments.length>5&&void 0!==arguments[5]?arguments[5]:g.JoseUtil;!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,t),r instanceof s.UserManagerSettings||(r=new s.UserManagerSettings(r));var v=function(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}(this,e.call(this,r));return v._events=new u.UserManagerEvents(r),v._silentRenewService=new n(v),v.settings.automaticSilentRenew&&(i.Log.debug("UserManager.ctor: automaticSilentRenew is configured, setting up silent renew"),v.startSilentRenew()),v.settings.monitorSession&&(i.Log.debug("UserManager.ctor: monitorSession is configured, setting up session monitor"),v._sessionMonitor=new o(v)),v._tokenRevocationClient=new a(v._settings),v._tokenClient=new d(v._settings),v._joseUtil=p,v}return function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}(t,e),t.prototype.getUser=function(){var e=this;return this._loadUser().then((function(t){return t?(i.Log.info("UserManager.getUser: user loaded"),e._events.load(t,!1),t):(i.Log.info("UserManager.getUser: user not found in storage"),null)}))},t.prototype.removeUser=function(){var e=this;return this.storeUser(null).then((function(){i.Log.info("UserManager.removeUser: user removed from storage"),e._events.unload()}))},t.prototype.signinRedirect=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};(e=Object.assign({},e)).request_type="si:r";var t={useReplaceToNavigate:e.useReplaceToNavigate};return this._signinStart(e,this._redirectNavigator,t).then((function(){i.Log.info("UserManager.signinRedirect: successful")}))},t.prototype.signinRedirectCallback=function(e){return this._signinEnd(e||this._redirectNavigator.url).then((function(e){return e.profile&&e.profile.sub?i.Log.info("UserManager.signinRedirectCallback: successful, signed in sub: ",e.profile.sub):i.Log.info("UserManager.signinRedirectCallback: no sub"),e}))},t.prototype.signinPopup=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};(e=Object.assign({},e)).request_type="si:p";var t=e.redirect_uri||this.settings.popup_redirect_uri||this.settings.redirect_uri;return t?(e.redirect_uri=t,e.display="popup",this._signin(e,this._popupNavigator,{startUrl:t,popupWindowFeatures:e.popupWindowFeatures||this.settings.popupWindowFeatures,popupWindowTarget:e.popupWindowTarget||this.settings.popupWindowTarget}).then((function(e){return e&&(e.profile&&e.profile.sub?i.Log.info("UserManager.signinPopup: signinPopup successful, signed in sub: ",e.profile.sub):i.Log.info("UserManager.signinPopup: no sub")),e}))):(i.Log.error("UserManager.signinPopup: No popup_redirect_uri or redirect_uri configured"),Promise.reject(new Error("No popup_redirect_uri or redirect_uri configured")))},t.prototype.signinPopupCallback=function(e){return this._signinCallback(e,this._popupNavigator).then((function(e){return e&&(e.profile&&e.profile.sub?i.Log.info("UserManager.signinPopupCallback: successful, signed in sub: ",e.profile.sub):i.Log.info("UserManager.signinPopupCallback: no sub")),e})).catch((function(e){i.Log.error(e.message)}))},t.prototype.signinSilent=function(){var e=this,t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};return(t=Object.assign({},t)).request_type="si:s",this._loadUser().then((function(r){return r&&r.refresh_token?(t.refresh_token=r.refresh_token,e._useRefreshToken(t)):(t.id_token_hint=t.id_token_hint||e.settings.includeIdTokenInSilentRenew&&r&&r.id_token,r&&e._settings.validateSubOnSilentRenew&&(i.Log.debug("UserManager.signinSilent, subject prior to silent renew: ",r.profile.sub),t.current_sub=r.profile.sub),e._signinSilentIframe(t))}))},t.prototype._useRefreshToken=function(){var e=this,t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};return this._tokenClient.exchangeRefreshToken(t).then((function(t){return t?t.access_token?e._loadUser().then((function(r){if(r){var n=Promise.resolve();return t.id_token&&(n=e._validateIdTokenFromTokenRefreshToken(r.profile,t.id_token)),n.then((function(){return i.Log.debug("UserManager._useRefreshToken: refresh token response success"),r.id_token=t.id_token,r.access_token=t.access_token,r.refresh_token=t.refresh_token||r.refresh_token,r.expires_in=t.expires_in,e.storeUser(r).then((function(){return e._events.load(r),r}))}))}return null})):(i.Log.error("UserManager._useRefreshToken: No access token returned from token endpoint"),Promise.reject("No access token returned from token endpoint")):(i.Log.error("UserManager._useRefreshToken: No response returned from token endpoint"),Promise.reject("No response returned from token endpoint"))}))},t.prototype._validateIdTokenFromTokenRefreshToken=function(e,t){var r=this;return this._metadataService.getIssuer().then((function(n){return r._joseUtil.validateJwtAttributes(t,n,r._settings.client_id,r._settings.clockSkew).then((function(t){return t?t.sub!==e.sub?(i.Log.error("UserManager._validateIdTokenFromTokenRefreshToken: sub in id_token does not match current sub"),Promise.reject(new Error("sub in id_token does not match current sub"))):t.auth_time&&t.auth_time!==e.auth_time?(i.Log.error("UserManager._validateIdTokenFromTokenRefreshToken: auth_time in id_token does not match original auth_time"),Promise.reject(new Error("auth_time in id_token does not match original auth_time"))):t.azp&&t.azp!==e.azp?(i.Log.error("UserManager._validateIdTokenFromTokenRefreshToken: azp in id_token does not match original azp"),Promise.reject(new Error("azp in id_token does not match original azp"))):!t.azp&&e.azp?(i.Log.error("UserManager._validateIdTokenFromTokenRefreshToken: azp not in id_token, but present in original id_token"),Promise.reject(new Error("azp not in id_token, but present in original id_token"))):void 0:(i.Log.error("UserManager._validateIdTokenFromTokenRefreshToken: Failed to validate id_token"),Promise.reject(new Error("Failed to validate id_token")))}))}))},t.prototype._signinSilentIframe=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=e.redirect_uri||this.settings.silent_redirect_uri||this.settings.redirect_uri;return t?(e.redirect_uri=t,e.prompt=e.prompt||"none",this._signin(e,this._iframeNavigator,{startUrl:t,silentRequestTimeout:e.silentRequestTimeout||this.settings.silentRequestTimeout}).then((function(e){return e&&(e.profile&&e.profile.sub?i.Log.info("UserManager.signinSilent: successful, signed in sub: ",e.profile.sub):i.Log.info("UserManager.signinSilent: no sub")),e}))):(i.Log.error("UserManager.signinSilent: No silent_redirect_uri configured"),Promise.reject(new Error("No silent_redirect_uri configured")))},t.prototype.signinSilentCallback=function(e){return this._signinCallback(e,this._iframeNavigator).then((function(e){return e&&(e.profile&&e.profile.sub?i.Log.info("UserManager.signinSilentCallback: successful, signed in sub: ",e.profile.sub):i.Log.info("UserManager.signinSilentCallback: no sub")),e}))},t.prototype.signinCallback=function(e){var t=this;return this.readSigninResponseState(e).then((function(r){var n=r.state;return r.response,"si:r"===n.request_type?t.signinRedirectCallback(e):"si:p"===n.request_type?t.signinPopupCallback(e):"si:s"===n.request_type?t.signinSilentCallback(e):Promise.reject(new Error("invalid response_type in state"))}))},t.prototype.signoutCallback=function(e,t){var r=this;return this.readSignoutResponseState(e).then((function(n){var i=n.state,o=n.response;return i?"so:r"===i.request_type?r.signoutRedirectCallback(e):"so:p"===i.request_type?r.signoutPopupCallback(e,t):Promise.reject(new Error("invalid response_type in state")):o}))},t.prototype.querySessionStatus=function(){var e=this,t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};(t=Object.assign({},t)).request_type="si:s";var r=t.redirect_uri||this.settings.silent_redirect_uri||this.settings.redirect_uri;return r?(t.redirect_uri=r,t.prompt="none",t.response_type=t.response_type||this.settings.query_status_response_type,t.scope=t.scope||"openid",t.skipUserInfo=!0,this._signinStart(t,this._iframeNavigator,{startUrl:r,silentRequestTimeout:t.silentRequestTimeout||this.settings.silentRequestTimeout}).then((function(t){return e.processSigninResponse(t.url).then((function(e){if(i.Log.debug("UserManager.querySessionStatus: got signin response"),e.session_state&&e.profile.sub)return i.Log.info("UserManager.querySessionStatus: querySessionStatus success for sub: ",e.profile.sub),{session_state:e.session_state,sub:e.profile.sub,sid:e.profile.sid};i.Log.info("querySessionStatus successful, user not authenticated")})).catch((function(t){if(t.session_state&&e.settings.monitorAnonymousSession&&("login_required"==t.message||"consent_required"==t.message||"interaction_required"==t.message||"account_selection_required"==t.message))return i.Log.info("UserManager.querySessionStatus: querySessionStatus success for anonymous user"),{session_state:t.session_state};throw t}))}))):(i.Log.error("UserManager.querySessionStatus: No silent_redirect_uri configured"),Promise.reject(new Error("No silent_redirect_uri configured")))},t.prototype._signin=function(e,t){var r=this,n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};return this._signinStart(e,t,n).then((function(t){return r._signinEnd(t.url,e)}))},t.prototype._signinStart=function(e,t){var r=this,n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};return t.prepare(n).then((function(t){return i.Log.debug("UserManager._signinStart: got navigator window handle"),r.createSigninRequest(e).then((function(e){return i.Log.debug("UserManager._signinStart: got signin request"),n.url=e.url,n.id=e.state.id,t.navigate(n)})).catch((function(e){throw t.close&&(i.Log.debug("UserManager._signinStart: Error after preparing navigator, closing navigator window"),t.close()),e}))}))},t.prototype._signinEnd=function(e){var t=this,r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return this.processSigninResponse(e).then((function(e){i.Log.debug("UserManager._signinEnd: got signin response");var n=new a.User(e);if(r.current_sub){if(r.current_sub!==n.profile.sub)return i.Log.debug("UserManager._signinEnd: current user does not match user returned from signin. sub from signin: ",n.profile.sub),Promise.reject(new Error("login_required"));i.Log.debug("UserManager._signinEnd: current user matches user returned from signin")}return t.storeUser(n).then((function(){return i.Log.debug("UserManager._signinEnd: user stored"),t._events.load(n),n}))}))},t.prototype._signinCallback=function(e,t){return i.Log.debug("UserManager._signinCallback"),t.callback(e)},t.prototype.signoutRedirect=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};(e=Object.assign({},e)).request_type="so:r";var t=e.post_logout_redirect_uri||this.settings.post_logout_redirect_uri;t&&(e.post_logout_redirect_uri=t);var r={useReplaceToNavigate:e.useReplaceToNavigate};return this._signoutStart(e,this._redirectNavigator,r).then((function(){i.Log.info("UserManager.signoutRedirect: successful")}))},t.prototype.signoutRedirectCallback=function(e){return this._signoutEnd(e||this._redirectNavigator.url).then((function(e){return i.Log.info("UserManager.signoutRedirectCallback: successful"),e}))},t.prototype.signoutPopup=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};(e=Object.assign({},e)).request_type="so:p";var t=e.post_logout_redirect_uri||this.settings.popup_post_logout_redirect_uri||this.settings.post_logout_redirect_uri;return e.post_logout_redirect_uri=t,e.display="popup",e.post_logout_redirect_uri&&(e.state=e.state||{}),this._signout(e,this._popupNavigator,{startUrl:t,popupWindowFeatures:e.popupWindowFeatures||this.settings.popupWindowFeatures,popupWindowTarget:e.popupWindowTarget||this.settings.popupWindowTarget}).then((function(){i.Log.info("UserManager.signoutPopup: successful")}))},t.prototype.signoutPopupCallback=function(e,t){return void 0===t&&"boolean"==typeof e&&(t=e,e=null),this._popupNavigator.callback(e,t,"?").then((function(){i.Log.info("UserManager.signoutPopupCallback: successful")}))},t.prototype._signout=function(e,t){var r=this,n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};return this._signoutStart(e,t,n).then((function(e){return r._signoutEnd(e.url)}))},t.prototype._signoutStart=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=this,r=arguments[1],n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};return r.prepare(n).then((function(r){return i.Log.debug("UserManager._signoutStart: got navigator window handle"),t._loadUser().then((function(o){return i.Log.debug("UserManager._signoutStart: loaded current user from storage"),(t._settings.revokeAccessTokenOnSignout?t._revokeInternal(o):Promise.resolve()).then((function(){var s=e.id_token_hint||o&&o.id_token;return s&&(i.Log.debug("UserManager._signoutStart: Setting id_token into signout request"),e.id_token_hint=s),t.removeUser().then((function(){return i.Log.debug("UserManager._signoutStart: user removed, creating signout request"),t.createSignoutRequest(e).then((function(e){return i.Log.debug("UserManager._signoutStart: got signout request"),n.url=e.url,e.state&&(n.id=e.state.id),r.navigate(n)}))}))}))})).catch((function(e){throw r.close&&(i.Log.debug("UserManager._signoutStart: Error after preparing navigator, closing navigator window"),r.close()),e}))}))},t.prototype._signoutEnd=function(e){return this.processSignoutResponse(e).then((function(e){return i.Log.debug("UserManager._signoutEnd: got signout response"),e}))},t.prototype.revokeAccessToken=function(){var e=this;return this._loadUser().then((function(t){return e._revokeInternal(t,!0).then((function(r){if(r)return i.Log.debug("UserManager.revokeAccessToken: removing token properties from user and re-storing"),t.access_token=null,t.refresh_token=null,t.expires_at=null,t.token_type=null,e.storeUser(t).then((function(){i.Log.debug("UserManager.revokeAccessToken: user stored"),e._events.load(t)}))}))})).then((function(){i.Log.info("UserManager.revokeAccessToken: access token revoked successfully")}))},t.prototype._revokeInternal=function(e,t){var r=this;if(e){var n=e.access_token,o=e.refresh_token;return this._revokeAccessTokenInternal(n,t).then((function(e){return r._revokeRefreshTokenInternal(o,t).then((function(t){return e||t||i.Log.debug("UserManager.revokeAccessToken: no need to revoke due to no token(s), or JWT format"),e||t}))}))}return Promise.resolve(!1)},t.prototype._revokeAccessTokenInternal=function(e,t){return!e||e.indexOf(".")>=0?Promise.resolve(!1):this._tokenRevocationClient.revoke(e,t).then((function(){return!0}))},t.prototype._revokeRefreshTokenInternal=function(e,t){return e?this._tokenRevocationClient.revoke(e,t,"refresh_token").then((function(){return!0})):Promise.resolve(!1)},t.prototype.startSilentRenew=function(){this._silentRenewService.start()},t.prototype.stopSilentRenew=function(){this._silentRenewService.stop()},t.prototype._loadUser=function(){return this._userStore.get(this._userStoreKey).then((function(e){return e?(i.Log.debug("UserManager._loadUser: user storageString loaded"),a.User.fromStorageString(e)):(i.Log.debug("UserManager._loadUser: no user storageString"),null)}))},t.prototype.storeUser=function(e){if(e){i.Log.debug("UserManager.storeUser: storing user");var t=e.toStorageString();return this._userStore.set(this._userStoreKey,t)}return i.Log.debug("storeUser.storeUser: removing user"),this._userStore.remove(this._userStoreKey)},n(t,[{key:"_redirectNavigator",get:function(){return this.settings.redirectNavigator}},{key:"_popupNavigator",get:function(){return this.settings.popupNavigator}},{key:"_iframeNavigator",get:function(){return this.settings.iframeNavigator}},{key:"_userStore",get:function(){return this.settings.userStore}},{key:"events",get:function(){return this._events}},{key:"_userStoreKey",get:function(){return"user:"+this.settings.authority+":"+this.settings.client_id}}]),t}(o.OidcClient)},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.UserManagerSettings=void 0;var n=function(){function e(e,t){for(var r=0;r0&&void 0!==arguments[0]?arguments[0]:{},n=r.popup_redirect_uri,i=r.popup_post_logout_redirect_uri,l=r.popupWindowFeatures,f=r.popupWindowTarget,g=r.silent_redirect_uri,d=r.silentRequestTimeout,p=r.automaticSilentRenew,v=void 0!==p&&p,y=r.validateSubOnSilentRenew,m=void 0!==y&&y,_=r.includeIdTokenInSilentRenew,S=void 0===_||_,w=r.monitorSession,F=void 0===w||w,b=r.monitorAnonymousSession,E=void 0!==b&&b,x=r.checkSessionInterval,k=void 0===x?2e3:x,A=r.stopCheckSessionOnError,P=void 0===A||A,C=r.query_status_response_type,T=r.revokeAccessTokenOnSignout,R=void 0!==T&&T,I=r.accessTokenExpiringNotificationTime,D=void 0===I?60:I,U=r.redirectNavigator,L=void 0===U?new o.RedirectNavigator:U,N=r.popupNavigator,O=void 0===N?new s.PopupNavigator:N,B=r.iframeNavigator,M=void 0===B?new a.IFrameNavigator:B,j=r.userStore,H=void 0===j?new u.WebStorageStateStore({store:c.Global.sessionStorage}):j;!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,t);var K=function(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}(this,e.call(this,arguments[0]));return K._popup_redirect_uri=n,K._popup_post_logout_redirect_uri=i,K._popupWindowFeatures=l,K._popupWindowTarget=f,K._silent_redirect_uri=g,K._silentRequestTimeout=d,K._automaticSilentRenew=v,K._validateSubOnSilentRenew=m,K._includeIdTokenInSilentRenew=S,K._accessTokenExpiringNotificationTime=D,K._monitorSession=F,K._monitorAnonymousSession=E,K._checkSessionInterval=k,K._stopCheckSessionOnError=P,C?K._query_status_response_type=C:arguments[0]&&arguments[0].response_type?K._query_status_response_type=h.SigninRequest.isOidc(arguments[0].response_type)?"id_token":"code":K._query_status_response_type="id_token",K._revokeAccessTokenOnSignout=R,K._redirectNavigator=L,K._popupNavigator=O,K._iframeNavigator=M,K._userStore=H,K}return function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}(t,e),n(t,[{key:"popup_redirect_uri",get:function(){return this._popup_redirect_uri}},{key:"popup_post_logout_redirect_uri",get:function(){return this._popup_post_logout_redirect_uri}},{key:"popupWindowFeatures",get:function(){return this._popupWindowFeatures}},{key:"popupWindowTarget",get:function(){return this._popupWindowTarget}},{key:"silent_redirect_uri",get:function(){return this._silent_redirect_uri}},{key:"silentRequestTimeout",get:function(){return this._silentRequestTimeout}},{key:"automaticSilentRenew",get:function(){return this._automaticSilentRenew}},{key:"validateSubOnSilentRenew",get:function(){return this._validateSubOnSilentRenew}},{key:"includeIdTokenInSilentRenew",get:function(){return this._includeIdTokenInSilentRenew}},{key:"accessTokenExpiringNotificationTime",get:function(){return this._accessTokenExpiringNotificationTime}},{key:"monitorSession",get:function(){return this._monitorSession}},{key:"monitorAnonymousSession",get:function(){return this._monitorAnonymousSession}},{key:"checkSessionInterval",get:function(){return this._checkSessionInterval}},{key:"stopCheckSessionOnError",get:function(){return this._stopCheckSessionOnError}},{key:"query_status_response_type",get:function(){return this._query_status_response_type}},{key:"revokeAccessTokenOnSignout",get:function(){return this._revokeAccessTokenOnSignout}},{key:"redirectNavigator",get:function(){return this._redirectNavigator}},{key:"popupNavigator",get:function(){return this._popupNavigator}},{key:"iframeNavigator",get:function(){return this._iframeNavigator}},{key:"userStore",get:function(){return this._userStore}}]),t}(i.OidcClientSettings)},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.RedirectNavigator=void 0;var n=function(){function e(e,t){for(var r=0;r1&&void 0!==arguments[1])||arguments[1];n.Log.debug("UserManagerEvents.load"),e.prototype.load.call(this,t),r&&this._userLoaded.raise(t)},t.prototype.unload=function(){n.Log.debug("UserManagerEvents.unload"),e.prototype.unload.call(this),this._userUnloaded.raise()},t.prototype.addUserLoaded=function(e){this._userLoaded.addHandler(e)},t.prototype.removeUserLoaded=function(e){this._userLoaded.removeHandler(e)},t.prototype.addUserUnloaded=function(e){this._userUnloaded.addHandler(e)},t.prototype.removeUserUnloaded=function(e){this._userUnloaded.removeHandler(e)},t.prototype.addSilentRenewError=function(e){this._silentRenewError.addHandler(e)},t.prototype.removeSilentRenewError=function(e){this._silentRenewError.removeHandler(e)},t.prototype._raiseSilentRenewError=function(e){n.Log.debug("UserManagerEvents._raiseSilentRenewError",e.message),this._silentRenewError.raise(e)},t.prototype.addUserSignedIn=function(e){this._userSignedIn.addHandler(e)},t.prototype.removeUserSignedIn=function(e){this._userSignedIn.removeHandler(e)},t.prototype._raiseUserSignedIn=function(){n.Log.debug("UserManagerEvents._raiseUserSignedIn"),this._userSignedIn.raise()},t.prototype.addUserSignedOut=function(e){this._userSignedOut.addHandler(e)},t.prototype.removeUserSignedOut=function(e){this._userSignedOut.removeHandler(e)},t.prototype._raiseUserSignedOut=function(){n.Log.debug("UserManagerEvents._raiseUserSignedOut"),this._userSignedOut.raise()},t.prototype.addUserSessionChanged=function(e){this._userSessionChanged.addHandler(e)},t.prototype.removeUserSessionChanged=function(e){this._userSessionChanged.removeHandler(e)},t.prototype._raiseUserSessionChanged=function(){n.Log.debug("UserManagerEvents._raiseUserSessionChanged"),this._userSessionChanged.raise()},t}(i.AccessTokenEvents)},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.Timer=void 0;var n=function(){function e(e,t){for(var r=0;r1&&void 0!==arguments[1]?arguments[1]:o.Global.timer,i=arguments.length>2&&void 0!==arguments[2]?arguments[2]:void 0;!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,t);var s=function(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}(this,e.call(this,r));return s._timer=n,s._nowFunc=i||function(){return Date.now()/1e3},s}return function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}(t,e),t.prototype.init=function(e){e<=0&&(e=1),e=parseInt(e);var t=this.now+e;if(this.expiration===t&&this._timerHandle)i.Log.debug("Timer.init timer "+this._name+" skipping initialization since already initialized for expiration:",this.expiration);else{this.cancel(),i.Log.debug("Timer.init timer "+this._name+" for duration:",e),this._expiration=t;var r=5;en?n:document.getElementById(t)},addClass:(n,t)=>(n.classList.add(t),!0),removeClass:(n,t)=>(n.classList.contains(t)&&n.classList.remove(t),!0),toggleClass:(n,t)=>(n&&(n.classList.contains(t)?n.classList.remove(t):n.classList.add(t)),!0),addClassToBody:n=>blazorise.addClass(document.body,n),removeClassFromBody:n=>blazorise.removeClass(document.body,n),parentHasClass:(n,t)=>n&&n.parentElement?n.parentElement.classList.contains(t):!1,setProperty:(n,t,i)=>{n&&t&&(n[t]=i)},getElementInfo:(n,t)=>{if(n||(n=document.getElementById(t)),n){const t=n.getBoundingClientRect();return{boundingClientRect:{x:t.x,y:t.y,top:t.top,bottom:t.bottom,left:t.left,right:t.right,width:t.width,height:t.height},offsetTop:n.offsetTop,offsetLeft:n.offsetLeft,offsetWidth:n.offsetWidth,offsetHeight:n.offsetHeight,scrollTop:n.scrollTop,scrollLeft:n.scrollLeft,scrollWidth:n.scrollWidth,scrollHeight:n.scrollHeight,clientTop:n.clientTop,clientLeft:n.clientLeft,clientWidth:n.clientWidth,clientHeight:n.clientHeight}}return{}},setTextValue(n,t){return n.value=t,!0},hasSelectionCapabilities:n=>{const t=n&&n.nodeName&&n.nodeName.toLowerCase();return t&&(t==="input"&&(n.type==="text"||n.type==="search"||n.type==="tel"||n.type==="url"||n.type==="password")||t==="textarea"||n.contentEditable==="true")},setCaret:(n,t)=>{window.blazorise.hasSelectionCapabilities(n)&&window.requestAnimationFrame(()=>{n.selectionStart=t,n.selectionEnd=t})},getCaret:n=>window.blazorise.hasSelectionCapabilities(n)?n.selectionStart:-1,getSelectedOptions:n=>{var i,r,t;const u=document.getElementById(n),f=u.options.length;for(i=[],t=0;t{const r=document.getElementById(n),u=r.options.length;for(var i=0;it?.toString()===n.value)?!0:!1}},closableComponents:[],addClosableComponent:(n,t)=>{window.blazorise.closableComponents.push({elementId:n,dotnetAdapter:t})},findClosableComponent:n=>{for(index=0;index{for(index=0;index{for(index=0;index{n&&window.blazorise.isClosableComponent(n.id)!==!0&&window.blazorise.addClosableComponent(n.id,t)},unregisterClosableComponent:n=>{if(n){const t=window.blazorise.findClosableComponentIndex(n.id);t!==-1&&window.blazorise.closableComponents.splice(t,1)}},tryClose:(n,t,i,r)=>{let u=new Promise(u=>{n.dotnetAdapter.invokeMethodAsync("SafeToClose",t,i?"escape":"leave",r).then(t=>u({elementId:n.elementId,dotnetAdapter:n.dotnetAdapter,status:t===!0?"ok":"cancelled"})).catch(()=>u({elementId:n.elementId,status:"error"}))});u&&u.then(n=>{n.status==="ok"&&n.dotnetAdapter.invokeMethodAsync("Close",i?"escape":"leave").catch(()=>window.blazorise.unregisterClosableComponent(n.elementId))})},focus:(n,t,i)=>(n=window.blazorise.utils.getRequiredElement(n,t),n&&n.focus({preventScroll:!i}),!0),tooltip:{initialize:()=>!0},textEdit:{_instances:[],initialize:(n,t,i,r)=>{var u=window.blazorise.textEdit._instances=window.blazorise.textEdit._instances||{};return u[t]=i==="numeric"?new window.blazorise.NumericMaskValidator(n,t):i==="datetime"?new window.blazorise.DateTimeMaskValidator(n,t):i==="regex"?new window.blazorise.RegExMaskValidator(n,t,r):new window.blazorise.NoValidator,n.addEventListener("keypress",n=>{window.blazorise.textEdit.keyPress(u[t],n)}),n.addEventListener("paste",n=>{window.blazorise.textEdit.paste(u[t],n)}),!0},destroy:(n,t)=>{var i=window.blazorise.textEdit._instances||{};return delete i[t],!0},keyPress:(n,t)=>{var i=String.fromCharCode(t.which);return n.isValid(i)||t.preventDefault()},paste:(n,t)=>n.isValid(t.clipboardData.getData("text/plain"))||t.preventDefault()},numericEdit:{_instances:[],initialize:(n,t,i,r,u,f,e,o)=>(window.blazorise.numericEdit._instances[i]=new window.blazorise.NumericMaskValidator(n,t,i,r,u,f,e,o),t.addEventListener("keypress",n=>{window.blazorise.numericEdit.keyPress(window.blazorise.numericEdit._instances[i],n)}),t.addEventListener("keydown",n=>{window.blazorise.numericEdit.keyDown(window.blazorise.numericEdit._instances[i],n)}),t.addEventListener("paste",n=>{window.blazorise.numericEdit.paste(window.blazorise.numericEdit._instances[i],n)}),!0),destroy:(n,t)=>{var i=window.blazorise.numericEdit._instances||{};return delete i[t],!0},keyDown:(n,t)=>(t.which===38?n.stepApply(1):t.which===40&&n.stepApply(-1),!0),keyPress:(n,t)=>{var i=String.fromCharCode(t.which);return t.which===13||n.isValid(i)||t.preventDefault()},paste:(n,t)=>n.isValid(t.clipboardData.getData("text/plain"))||t.preventDefault()},NoValidator:function(){this.isValid=function(){return!0}},NumericMaskValidator:function(n,t,i,r,u,f,e,o){this.dotnetAdapter=n;this.elementId=i;this.element=t;this.decimals=r===null||r===undefined?2:r;this.separator=u||".";this.step=f||1;this.min=e;this.max=o;this.regex=function(){var n="\\"+this.separator,t=this.decimals,i="{0,"+t+"}";return t?new RegExp("^(-)?(((\\d+("+n+"\\d"+i+")?)|("+n+"\\d"+i+")))?$"):/^(-)?(\d*)$/};this.carret=function(){return[this.element.selectionStart,this.element.selectionEnd]};this.isValid=function(n){var t=this.element.value,i=this.carret();return(t=t.substring(0,i[0])+n+t.substring(i[1]),!!this.regex().test(t))?(t||"").replace(this.separator,"."):!1};this.stepApply=function(n){var r=(this.element.value||"").replace(this.separator,"."),t=Number(r)+this.step*n,i;t>=this.min&&t<=this.max&&(i=t.toString().replace(".",this.separator),this.element.value=i,this.dotnetAdapter.invokeMethodAsync("SetValue",i))}},DateTimeMaskValidator:function(n,t){this.elementId=t;this.element=n;this.regex=function(){return/^\d{0,4}$|^\d{4}-0?$|^\d{4}-(?:0?[1-9]|1[012])(?:-(?:0?[1-9]?|[12]\d|3[01])?)?$/};this.carret=function(){return[this.element.selectionStart,this.element.selectionEnd]};this.isValid=function(n){var t=this.element.value,i=this.carret();return t=t.substring(0,i[0])+n+t.substring(i[1]),!!this.regex().test(t)}},RegExMaskValidator:function(n,t,i){this.elementId=t;this.element=n;this.editMask=i;this.regex=function(){return new RegExp(this.editMask)};this.carret=function(){return[this.element.selectionStart,this.element.selectionEnd]};this.isValid=function(n){var t=this.element.value,i=this.carret();return t=t.substring(0,i[0])+n+t.substring(i[1]),!!this.regex().test(t)}},button:{_instances:[],initialize:(n,t,i)=>(window.blazorise.button._instances[t]=new window.blazorise.ButtonInfo(n,t,i),n.type==="submit"&&n.addEventListener("click",n=>{window.blazorise.button.click(window.blazorise.button._instances[t],n)}),!0),destroy:n=>{var t=window.blazorise.button._instances||{};return delete t[n],!0},click:(n,t)=>{if(n.preventDefaultOnSubmit)return t.preventDefault()}},ButtonInfo:function(n,t,i){this.elementId=t;this.element=n;this.preventDefaultOnSubmit=i},link:{scrollIntoView:n=>{var t=document.getElementById(n);return t&&(t.scrollIntoView(),window.location.hash=n),!0}},fileEdit:{_instances:[],initialize:(n,t,i)=>{var r=0;return window.blazorise.fileEdit._instances[i]=new window.blazorise.FileEditInfo(n,t,i),t.addEventListener("change",function(){t._blazorFilesById={};var i=Array.prototype.map.call(t.files,function(n){var i={id:++r,lastModified:new Date(n.lastModified).toISOString(),name:n.name,size:n.size,type:n.type};return t._blazorFilesById[i.id]=i,Object.defineProperty(i,"blob",{value:n}),i});n.invokeMethodAsync("NotifyChange",i).then(null,function(n){throw new Error(n);})}),!0},destroy:(n,t)=>{var i=window.blazorise.fileEdit._instances||{};return delete i[t],!0},reset:(n,t)=>{if(n){n.value="";var i=window.blazorise.fileEdit._instances[t];i&&i.adapter.invokeMethodAsync("NotifyChange",[]).then(null,function(n){throw new Error(n);})}return!0},readFileData:function(n,t,i,r){var u=getArrayBufferFromFileAsync(n,t);return u.then(function(n){var t=new Uint8Array(n,i,r);return uint8ToBase64(t)})},ensureArrayBufferReadyForSharedMemoryInterop:function(n,t){return getArrayBufferFromFileAsync(n,t).then(function(i){getFileById(n,t).arrayBuffer=i})},readFileDataSharedMemory:function(n){var u=Blazor.platform.readStringField(n,0),f=document.querySelector("[_bl_"+u+"]"),e=Blazor.platform.readInt32Field(n,4),t=Blazor.platform.readUint64Field(n,8),o=Blazor.platform.readInt32Field(n,16),s=Blazor.platform.readInt32Field(n,20),h=Blazor.platform.readInt32Field(n,24),i=getFileById(f,e).arrayBuffer,r=Math.min(h,i.byteLength-t),c=new Uint8Array(i,t,r),l=Blazor.platform.toUint8Array(o);return l.set(c,s),r},open:(n,t)=>{!n&&t&&(n=document.getElementById(t)),n&&n.click()}},FileEditInfo:function(n,t,i){this.adapter=n;this.element=t;this.elementId=i},breakpoint:{getBreakpoint:function(){return window.getComputedStyle(document.body,":before").content.replace(/\"/g,"")},breakpointComponents:[],lastBreakpoint:null,addBreakpointComponent:(n,t)=>{window.blazorise.breakpoint.breakpointComponents.push({elementId:n,dotnetAdapter:t})},findBreakpointComponentIndex:n=>{for(index=0;index{for(index=0;index{window.blazorise.breakpoint.isBreakpointComponent(n)!==!0&&window.blazorise.breakpoint.addBreakpointComponent(n,t)},unregisterBreakpointComponent:n=>{const t=window.blazorise.breakpoint.findBreakpointComponentIndex(n);t!==-1&&window.blazorise.breakpoint.breakpointComponents.splice(t,1)},onBreakpoint:(n,t)=>{n.invokeMethodAsync("OnBreakpoint",t)}}};document.addEventListener("click",function(n){if(window.blazorise.closableComponents&&window.blazorise.closableComponents.length>0){const t=window.blazorise.closableComponents[window.blazorise.closableComponents.length-1];t&&window.blazorise.tryClose(t,n.target.id,!1,hasParentInTree(n.target,t.elementId))}});document.addEventListener("keyup",function(n){if(n.keyCode===27&&window.blazorise.closableComponents&&window.blazorise.closableComponents.length>0){const n=window.blazorise.closableComponents[window.blazorise.closableComponents.length-1];n&&window.blazorise.tryClose(n,n.elementId,!0,!1)}});window.addEventListener("resize",function(){if(window.blazorise.breakpoint.breakpointComponents&&window.blazorise.breakpoint.breakpointComponents.length>0){var n=window.blazorise.breakpoint.getBreakpoint();if(window.blazorise.breakpoint.lastBreakpoint!==n)for(window.blazorise.breakpoint.lastBreakpoint=n,index=0;index>18&63]+n[t>>12&63]+n[t>>6&63]+n[t&63]}function f(n,t,i){for(var f,e=[],r=t;rh?h:u+s));return o===1?(i=t[r-1],e.push(n[i>>2]+n[i<<4&63]+"==")):o===2&&(i=(t[r-2]<<8)+t[r-1],e.push(n[i>>10]+n[i>>4&63]+n[i<<2&63]+"=")),e.join("")}}(); +function showPopper(n,t,i,r){return new Popper(n,t,{placement:r,modifiers:{offset:{offset:0},flip:{behavior:"flip"},arrow:{element:i,enabled:!0},preventOverflow:{boundary:"scrollParent"}}})}function getFileById(n,t){var i=n._blazorFilesById[t];if(!i)throw new Error("There is no file with ID "+t+". The file list may have changed");return i}function getArrayBufferFromFileAsync(n,t){var i=getFileById(n,t);return i.readPromise||(i.readPromise=new Promise(function(n,t){var r=new FileReader;r.onload=function(){n(r.result)};r.onerror=function(n){t(n)};r.readAsArrayBuffer(i.blob)})),i.readPromise}function hasParentInTree(n,t){return n.parentElement?n.parentElement.id===t?!0:hasParentInTree(n.parentElement,t):!1}window.blazorise||(window.blazorise={});window.blazorise={lastClickedDocumentElement:null,utils:{getRequiredElement:(n,t)=>n?n:document.getElementById(t)},addClass:(n,t)=>(n.classList.add(t),!0),removeClass:(n,t)=>(n.classList.contains(t)&&n.classList.remove(t),!0),toggleClass:(n,t)=>(n&&(n.classList.contains(t)?n.classList.remove(t):n.classList.add(t)),!0),addClassToBody:n=>blazorise.addClass(document.body,n),removeClassFromBody:n=>blazorise.removeClass(document.body,n),parentHasClass:(n,t)=>n&&n.parentElement?n.parentElement.classList.contains(t):!1,setProperty:(n,t,i)=>{n&&t&&(n[t]=i)},getElementInfo:(n,t)=>{if(n||(n=document.getElementById(t)),n){const t=n.getBoundingClientRect();return{boundingClientRect:{x:t.x,y:t.y,top:t.top,bottom:t.bottom,left:t.left,right:t.right,width:t.width,height:t.height},offsetTop:n.offsetTop,offsetLeft:n.offsetLeft,offsetWidth:n.offsetWidth,offsetHeight:n.offsetHeight,scrollTop:n.scrollTop,scrollLeft:n.scrollLeft,scrollWidth:n.scrollWidth,scrollHeight:n.scrollHeight,clientTop:n.clientTop,clientLeft:n.clientLeft,clientWidth:n.clientWidth,clientHeight:n.clientHeight}}return{}},setTextValue(n,t){return n.value=t,!0},hasSelectionCapabilities:n=>{const t=n&&n.nodeName&&n.nodeName.toLowerCase();return t&&(t==="input"&&(n.type==="text"||n.type==="search"||n.type==="tel"||n.type==="url"||n.type==="password")||t==="textarea"||n.contentEditable==="true")},setCaret:(n,t)=>{window.blazorise.hasSelectionCapabilities(n)&&window.requestAnimationFrame(()=>{n.selectionStart=t,n.selectionEnd=t})},getCaret:n=>window.blazorise.hasSelectionCapabilities(n)?n.selectionStart:-1,getSelectedOptions:n=>{var i,r,t;const u=document.getElementById(n),f=u.options.length;for(i=[],t=0;t{const i=document.getElementById(n);if(i&&i.options){const n=i.options.length;for(var r=0;rt!==null&&t.toString()===n.value)?!0:!1}}},closableComponents:[],addClosableComponent:(n,t)=>{window.blazorise.closableComponents.push({elementId:n,dotnetAdapter:t})},findClosableComponent:n=>{for(index=0;index{for(index=0;index{for(index=0;index{n&&window.blazorise.isClosableComponent(n.id)!==!0&&window.blazorise.addClosableComponent(n.id,t)},unregisterClosableComponent:n=>{if(n){const t=window.blazorise.findClosableComponentIndex(n.id);t!==-1&&window.blazorise.closableComponents.splice(t,1)}},tryClose:(n,t,i,r)=>{let u=new Promise(u=>{n.dotnetAdapter.invokeMethodAsync("SafeToClose",t,i?"escape":"leave",r).then(t=>u({elementId:n.elementId,dotnetAdapter:n.dotnetAdapter,status:t===!0?"ok":"cancelled"})).catch(()=>u({elementId:n.elementId,status:"error"}))});u&&u.then(n=>{n.status==="ok"&&n.dotnetAdapter.invokeMethodAsync("Close",i?"escape":"leave").catch(()=>window.blazorise.unregisterClosableComponent(n.elementId))})},focus:(n,t,i)=>(n=window.blazorise.utils.getRequiredElement(n,t),n&&n.focus({preventScroll:!i}),!0),tooltip:{initialize:()=>!0},textEdit:{_instances:[],initialize:(n,t,i,r)=>{var u=window.blazorise.textEdit._instances=window.blazorise.textEdit._instances||{};return u[t]=i==="numeric"?new window.blazorise.NumericMaskValidator(n,t):i==="datetime"?new window.blazorise.DateTimeMaskValidator(n,t):i==="regex"?new window.blazorise.RegExMaskValidator(n,t,r):new window.blazorise.NoValidator,n.addEventListener("keypress",n=>{window.blazorise.textEdit.keyPress(u[t],n)}),n.addEventListener("paste",n=>{window.blazorise.textEdit.paste(u[t],n)}),!0},destroy:(n,t)=>{var i=window.blazorise.textEdit._instances||{};return delete i[t],!0},keyPress:(n,t)=>{var i=String.fromCharCode(t.which);return n.isValid(i)||t.preventDefault()},paste:(n,t)=>n.isValid(t.clipboardData.getData("text/plain"))||t.preventDefault()},numericEdit:{_instances:[],initialize:(n,t,i,r,u,f,e,o)=>(window.blazorise.numericEdit._instances[i]=new window.blazorise.NumericMaskValidator(n,t,i,r,u,f,e,o),t.addEventListener("keypress",n=>{window.blazorise.numericEdit.keyPress(window.blazorise.numericEdit._instances[i],n)}),t.addEventListener("keydown",n=>{window.blazorise.numericEdit.keyDown(window.blazorise.numericEdit._instances[i],n)}),t.addEventListener("paste",n=>{window.blazorise.numericEdit.paste(window.blazorise.numericEdit._instances[i],n)}),!0),destroy:(n,t)=>{var i=window.blazorise.numericEdit._instances||{};return delete i[t],!0},keyDown:(n,t)=>(t.which===38?n.stepApply(1):t.which===40&&n.stepApply(-1),!0),keyPress:(n,t)=>{var i=String.fromCharCode(t.which);return t.which===13||n.isValid(i)||t.preventDefault()},paste:(n,t)=>n.isValid(t.clipboardData.getData("text/plain"))||t.preventDefault()},NoValidator:function(){this.isValid=function(){return!0}},NumericMaskValidator:function(n,t,i,r,u,f,e,o){this.dotnetAdapter=n;this.elementId=i;this.element=t;this.decimals=r===null||r===undefined?2:r;this.separator=u||".";this.step=f||1;this.min=e;this.max=o;this.regex=function(){var n="\\"+this.separator,t=this.decimals,i="{0,"+t+"}";return t?new RegExp("^(-)?(((\\d+("+n+"\\d"+i+")?)|("+n+"\\d"+i+")))?$"):/^(-)?(\d*)$/};this.carret=function(){return[this.element.selectionStart,this.element.selectionEnd]};this.isValid=function(n){var t=this.element.value,i=this.carret();return(t=t.substring(0,i[0])+n+t.substring(i[1]),!!this.regex().test(t))?(t||"").replace(this.separator,"."):!1};this.stepApply=function(n){var r=(this.element.value||"").replace(this.separator,"."),t=Number(r)+this.step*n,i;t>=this.min&&t<=this.max&&(i=t.toString().replace(".",this.separator),this.element.value=i,this.dotnetAdapter.invokeMethodAsync("SetValue",i))}},DateTimeMaskValidator:function(n,t){this.elementId=t;this.element=n;this.regex=function(){return/^\d{0,4}$|^\d{4}-0?$|^\d{4}-(?:0?[1-9]|1[012])(?:-(?:0?[1-9]?|[12]\d|3[01])?)?$/};this.carret=function(){return[this.element.selectionStart,this.element.selectionEnd]};this.isValid=function(n){var t=this.element.value,i=this.carret();return t=t.substring(0,i[0])+n+t.substring(i[1]),!!this.regex().test(t)}},RegExMaskValidator:function(n,t,i){this.elementId=t;this.element=n;this.editMask=i;this.regex=function(){return new RegExp(this.editMask)};this.carret=function(){return[this.element.selectionStart,this.element.selectionEnd]};this.isValid=function(n){var t=this.element.value,i=this.carret();return t=t.substring(0,i[0])+n+t.substring(i[1]),!!this.regex().test(t)}},button:{_instances:[],initialize:(n,t,i)=>(window.blazorise.button._instances[t]=new window.blazorise.ButtonInfo(n,t,i),n.type==="submit"&&n.addEventListener("click",n=>{window.blazorise.button.click(window.blazorise.button._instances[t],n)}),!0),destroy:n=>{var t=window.blazorise.button._instances||{};return delete t[n],!0},click:(n,t)=>{if(n.preventDefaultOnSubmit)return t.preventDefault()}},ButtonInfo:function(n,t,i){this.elementId=t;this.element=n;this.preventDefaultOnSubmit=i},link:{scrollIntoView:n=>{var t=document.getElementById(n);return t&&(t.scrollIntoView(),window.location.hash=n),!0}},fileEdit:{_instances:[],initialize:(n,t,i)=>{var r=0;return window.blazorise.fileEdit._instances[i]=new window.blazorise.FileEditInfo(n,t,i),t.addEventListener("change",function(){t._blazorFilesById={};var i=Array.prototype.map.call(t.files,function(n){var i={id:++r,lastModified:new Date(n.lastModified).toISOString(),name:n.name,size:n.size,type:n.type};return t._blazorFilesById[i.id]=i,Object.defineProperty(i,"blob",{value:n}),i});n.invokeMethodAsync("NotifyChange",i).then(null,function(n){throw new Error(n);})}),!0},destroy:(n,t)=>{var i=window.blazorise.fileEdit._instances||{};return delete i[t],!0},reset:(n,t)=>{if(n){n.value="";var i=window.blazorise.fileEdit._instances[t];i&&i.adapter.invokeMethodAsync("NotifyChange",[]).then(null,function(n){throw new Error(n);})}return!0},readFileData:function(n,t,i,r){var u=getArrayBufferFromFileAsync(n,t);return u.then(function(n){var t=new Uint8Array(n,i,r);return uint8ToBase64(t)})},ensureArrayBufferReadyForSharedMemoryInterop:function(n,t){return getArrayBufferFromFileAsync(n,t).then(function(i){getFileById(n,t).arrayBuffer=i})},readFileDataSharedMemory:function(n){var u=Blazor.platform.readStringField(n,0),f=document.querySelector("[_bl_"+u+"]"),e=Blazor.platform.readInt32Field(n,4),t=Blazor.platform.readUint64Field(n,8),o=Blazor.platform.readInt32Field(n,16),s=Blazor.platform.readInt32Field(n,20),h=Blazor.platform.readInt32Field(n,24),i=getFileById(f,e).arrayBuffer,r=Math.min(h,i.byteLength-t),c=new Uint8Array(i,t,r),l=Blazor.platform.toUint8Array(o);return l.set(c,s),r},open:(n,t)=>{!n&&t&&(n=document.getElementById(t)),n&&n.click()}},FileEditInfo:function(n,t,i){this.adapter=n;this.element=t;this.elementId=i},breakpoint:{getBreakpoint:function(){return window.getComputedStyle(document.body,":before").content.replace(/\"/g,"")},breakpointComponents:[],lastBreakpoint:null,addBreakpointComponent:(n,t)=>{window.blazorise.breakpoint.breakpointComponents.push({elementId:n,dotnetAdapter:t})},findBreakpointComponentIndex:n=>{for(index=0;index{for(index=0;index{window.blazorise.breakpoint.isBreakpointComponent(n)!==!0&&window.blazorise.breakpoint.addBreakpointComponent(n,t)},unregisterBreakpointComponent:n=>{const t=window.blazorise.breakpoint.findBreakpointComponentIndex(n);t!==-1&&window.blazorise.breakpoint.breakpointComponents.splice(t,1)},onBreakpoint:(n,t)=>{n.invokeMethodAsync("OnBreakpoint",t)}}};document.addEventListener("mousedown",function(n){window.blazorise.lastClickedDocumentElement=n.target});document.addEventListener("mouseup",function(n){if(n.target===window.blazorise.lastClickedDocumentElement&&window.blazorise.closableComponents&&window.blazorise.closableComponents.length>0){const t=window.blazorise.closableComponents[window.blazorise.closableComponents.length-1];t&&window.blazorise.tryClose(t,n.target.id,!1,hasParentInTree(n.target,t.elementId))}});document.addEventListener("keyup",function(n){if(n.keyCode===27&&window.blazorise.closableComponents&&window.blazorise.closableComponents.length>0){const n=window.blazorise.closableComponents[window.blazorise.closableComponents.length-1];n&&window.blazorise.tryClose(n,n.elementId,!0,!1)}});window.addEventListener("resize",function(){if(window.blazorise.breakpoint.breakpointComponents&&window.blazorise.breakpoint.breakpointComponents.length>0){var n=window.blazorise.breakpoint.getBreakpoint();if(window.blazorise.breakpoint.lastBreakpoint!==n)for(window.blazorise.breakpoint.lastBreakpoint=n,index=0;index>18&63]+n[t>>12&63]+n[t>>6&63]+n[t&63]}function f(n,t,i){for(var f,e=[],r=t;rh?h:u+s));return o===1?(i=t[r-1],e.push(n[i>>2]+n[i<<4&63]+"==")):o===2&&(i=(t[r-2]<<8)+t[r-1],e.push(n[i>>10]+n[i>>4&63]+n[i<<2&63]+"=")),e.join("")}}(); -function mutateDOMChange(n){el=document.getElementById(n);ev=document.createEvent("Event");ev.initEvent("change",!0,!1);el.dispatchEvent(ev)}window.blazoriseBootstrap||(window.blazoriseBootstrap={});window.blazoriseBootstrap={tooltip:{initialize:n=>(n.querySelector(".custom-control-input,.btn")&&n.classList.add("b-tooltip-inline"),!0)},modal:{open:(n,t)=>{var i=Number(document.body.getAttribute("data-modals")||"0");return i===0&&window.blazorise.addClassToBody("modal-open"),i+=1,document.body.setAttribute("data-modals",i.toString()),t&&(n.querySelector(".modal-body").scrollTop=0),!0},close:()=>{var n=Number(document.body.getAttribute("data-modals")||"0");return n-=1,n===0&&window.blazorise.removeClassFromBody("modal-open"),document.body.setAttribute("data-modals",n.toString()),!0}}}; +function mutateDOMChange(n){el=document.getElementById(n);ev=document.createEvent("Event");ev.initEvent("change",!0,!1);el.dispatchEvent(ev)}window.blazoriseBootstrap||(window.blazoriseBootstrap={});window.blazoriseBootstrap={tooltip:{initialize:n=>(n.querySelector(".custom-control-input,.btn")&&n.classList.add("b-tooltip-inline"),!0)},modal:{open:(n,t)=>{var i=Number(document.body.getAttribute("data-modals")||"0");return i===0&&window.blazorise.addClassToBody("modal-open"),i+=1,document.body.setAttribute("data-modals",i.toString()),t&&(n.querySelector(".modal-body").scrollTop=0),!0},close:()=>{var n=Number(document.body.getAttribute("data-modals")||"0");return n-=1,n<0&&(n=0),n===0&&window.blazorise.removeClassFromBody("modal-open"),document.body.setAttribute("data-modals",n.toString()),!0}}}; var abp=abp||{};(function(){abp.utils=abp.utils||{};abp.domReady=function(n){document.readyState==="complete"||document.readyState==="interactive"?setTimeout(n,1):document.addEventListener("DOMContentLoaded",n)};abp.utils.setCookieValue=function(n,t,i,r,u){var f=encodeURIComponent(n)+"=";t&&(f=f+encodeURIComponent(t));i&&(f=f+"; expires="+i);r&&(f=f+"; path="+r);u&&(f=f+"; secure");document.cookie=f};abp.utils.getCookieValue=function(n){for(var i,r=document.cookie.split("; "),t=0;t - + + @@ -22,7 +23,7 @@
    - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/main.css b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/main.css index eb9395b846..471b4d8bf7 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/main.css +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/main.css @@ -1,4 +1,5 @@ -.spinner { +/* Global styles for the MyProjectName application */ +.spinner { width: 40px; height: 40px; display: block; @@ -45,4 +46,4 @@ transform: scale(1.0); -webkit-transform: scale(1.0); } -} +} \ No newline at end of file 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 321ad21fba..4bc77c8984 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": "^4.3.0-rc.1" + "@abp/aspnetcore.mvc.ui.theme.basic": "^4.3.0-rc.2" } } \ No newline at end of file diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/yarn.lock b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/yarn.lock index 903182ef8e..831073a8bf 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/yarn.lock +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.3.0-rc.1.tgz#5dc06d82ee213bc33527b5af72ac94ae06bb7c25" - integrity sha512-Xkwj3NPnqWDgqvaP2eda3gviV7aBtyNOMCdZSvpxWmlaPlvJYN+SnKNnlmX02XVArTlOjaeTapFkE3auJeR6jA== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~4.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui.theme.shared@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.3.0-rc.1.tgz#9d4447f068b490367a20772eb9c2b38480088edb" - integrity sha512-untEVm6cKT375ZVEQFO01/VKIqtdFGIyJd5ZxtoQEV8ueVFRQefCOcvvqaJ8Gfj86T1nacXvJRfBfGihYHY+JQ== - dependencies: - "@abp/aspnetcore.mvc.ui" "~4.3.0-rc.1" - "@abp/bootstrap" "~4.3.0-rc.1" - "@abp/bootstrap-datepicker" "~4.3.0-rc.1" - "@abp/datatables.net-bs4" "~4.3.0-rc.1" - "@abp/font-awesome" "~4.3.0-rc.1" - "@abp/jquery-form" "~4.3.0-rc.1" - "@abp/jquery-validation-unobtrusive" "~4.3.0-rc.1" - "@abp/lodash" "~4.3.0-rc.1" - "@abp/luxon" "~4.3.0-rc.1" - "@abp/malihu-custom-scrollbar-plugin" "~4.3.0-rc.1" - "@abp/select2" "~4.3.0-rc.1" - "@abp/sweetalert" "~4.3.0-rc.1" - "@abp/timeago" "~4.3.0-rc.1" - "@abp/toastr" "~4.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.3.0-rc.1.tgz#1e54da2a668939941ab955f11db69798d04d9e7e" - integrity sha512-969etEb4H/fR9Twz6pcl766M/1AriCh6+B8r4haPB5g7QkOWhyU99mT11BHxQwf+uNV4duGZwvPvrMomrdLj2w== +"@abp/aspnetcore.mvc.ui.theme.basic@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.3.0-rc.2.tgz#4ebafbaade6610e3d405877a148d72d57569c3e3" + integrity sha512-Q3QqxKDFC04gaaj30Rk+9zGNfNxC8FX0jciARATceFV6pdA3F3PgT5EMDSlo6NoGniFVjHPRgay9N09zT6Htyw== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~4.3.0-rc.2" + +"@abp/aspnetcore.mvc.ui.theme.shared@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.3.0-rc.2.tgz#d3bf79929c55c5380d7ca7b913a23031d7a6bd12" + integrity sha512-pz86bIV4wNeG7/UPYzNCXlJ/MdOdIygc+Com7C9Ld7gzsyER7VD9h5U/hkytvL4FBFLJn4DU+xuZNECjv0HS0A== + dependencies: + "@abp/aspnetcore.mvc.ui" "~4.3.0-rc.2" + "@abp/bootstrap" "~4.3.0-rc.2" + "@abp/bootstrap-datepicker" "~4.3.0-rc.2" + "@abp/datatables.net-bs4" "~4.3.0-rc.2" + "@abp/font-awesome" "~4.3.0-rc.2" + "@abp/jquery-form" "~4.3.0-rc.2" + "@abp/jquery-validation-unobtrusive" "~4.3.0-rc.2" + "@abp/lodash" "~4.3.0-rc.2" + "@abp/luxon" "~4.3.0-rc.2" + "@abp/malihu-custom-scrollbar-plugin" "~4.3.0-rc.2" + "@abp/select2" "~4.3.0-rc.2" + "@abp/sweetalert" "~4.3.0-rc.2" + "@abp/timeago" "~4.3.0-rc.2" + "@abp/toastr" "~4.3.0-rc.2" + +"@abp/aspnetcore.mvc.ui@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.3.0-rc.2.tgz#6ff41be179c8d1089778a51ffa54a1f3d7614278" + integrity sha512-2L5zvuqUwPwNPcMauiiJZD1ft0QycqINz+bXEQ8t0EwbB+dzcsukL/rpOQfpeRHWWYy4nIN4C2bTvXhNgQbPqQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -43,145 +43,145 @@ micromatch "^4.0.2" path "^0.12.7" -"@abp/bootstrap-datepicker@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.3.0-rc.1.tgz#879a8ce32a3dbdb0cd80401360d24f25f318670b" - integrity sha512-W2T+rrC3oxuWj2xQUz2virbBK6x7ershWZB9d6FjXTSH89nin9DyBK20dEfskVvhK/IMrmZaW4PWyTTcx9r7dA== +"@abp/bootstrap-datepicker@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.3.0-rc.2.tgz#29a686c3d2bce356967f646d7334cd83c4257b4c" + integrity sha512-3+B7SJRi7DQJe0aNgv0H0zu1BfvMZcwgt06N3ALR9+o3TSJcOqcYrEMed3aG+ASH++CltnohTYnLkVXaxshioA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.3.0-rc.1.tgz#3260de03f29e210e44a55efa3af2ab6d34362227" - integrity sha512-flB18MUnRWpEnS0t/WEjsdhfB5w+zHjsa69Pj733+GHGSsZ1Vppu+rgvSWp38yNHO5uRwGECrwUIGwvd5uD9+A== +"@abp/bootstrap@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.3.0-rc.2.tgz#1416fe639c88b7d958435e45fe19692268a7f932" + integrity sha512-E6svmDhNQlT5nd65VgshexyedRWhbvi9o1oYo/dLTUpJDzR7M9ptDqxFLVB9vVDva3HgxUoEvgRJgb9fXvq4zw== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" bootstrap "^4.6.0" bootstrap-v4-rtl "4.6.0-1" -"@abp/core@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.3.0-rc.1.tgz#201c3be8b5697fe8e1b08b23f87f50e950036a14" - integrity sha512-ET8NGugNmdub+8qGeFf9qGPbloP5gcoBnB7U6ieFz1Eai9S3pSpbM+sdyifucEpzMThUiLS772EP4pJTMXhfEg== +"@abp/core@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.3.0-rc.2.tgz#3c9ea339624ae3b6cbee13e048268d48269ea6a9" + integrity sha512-/89xH+IVSmTOLWeUO4yVB7Hg64uHTbR7bHjgl+b94cFdtITH9Nvr2EGdXUJbHGUK7L6lSDziqiMcG/ic0061+Q== dependencies: - "@abp/utils" "^4.3.0-rc.1" + "@abp/utils" "^4.3.0-rc.2" -"@abp/datatables.net-bs4@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.3.0-rc.1.tgz#f7dad14d13b468949fd161b679f4a70271e0d466" - integrity sha512-812cLTfSZZMvjAFAq5h7R5AeJHigBxbPc+kMReQIcFLH82o6BjA2NqFBqYOvQuh4kqiQ85dqFTW9MTKeY8or6Q== +"@abp/datatables.net-bs4@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.3.0-rc.2.tgz#bbfc0d9d0ed86cdb14b38849fb78b2b1911c4a35" + integrity sha512-PRKYi2NU41KpckJ/d0buHoFbyKVuW5NCQNpUdYzDsPS2riyeXccCsLFJM1bT01TdR4Idla3vx9Fkb+HoJOiDeQ== dependencies: - "@abp/datatables.net" "~4.3.0-rc.1" + "@abp/datatables.net" "~4.3.0-rc.2" datatables.net-bs4 "^1.10.21" -"@abp/datatables.net@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.3.0-rc.1.tgz#aa1640903fe67d20e1fc57ffe0519b2764e4c7df" - integrity sha512-qfdQa43sbXsIEBc3WpxSC7cXyKSFxLiFdCKnLIkQNsC3Wo+WX/Cute2xNbT0+xIQdGznfEBdPxcwQkNE6JQgcA== +"@abp/datatables.net@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.3.0-rc.2.tgz#1923e60db261366a7d2f284b0274d13e253567ca" + integrity sha512-rp53+5Xj1jhjpCj7UBA9+nSNbaTQ4Vc1NWCg1e5aI5tWiyZprUS44dRszIQIDV86XKorfFhog5ihOZyzl1HDyg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" datatables.net "^1.10.21" -"@abp/font-awesome@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.3.0-rc.1.tgz#5d336ead8b8c67b2c0aaff9365c2c856b033196e" - integrity sha512-BU4ycN/gOxX2x8S/Eszi3bJAz6bZRhxa0uPWxEWKul9PNvKSwMJRoVaEVehnIlfTi2raHsLQHk+F7079gt3dlQ== +"@abp/font-awesome@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.3.0-rc.2.tgz#437d3d6bbd8f52e5091251932d6a494d0164694b" + integrity sha512-FeHHtEQwrJBwD5PkFYqjKouCLwNjjRqTNseaN+s/r7gNjv0PgKytfRoqEb+O/BkZg/DwEuMz9jFX/RXCCNa2xA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" "@fortawesome/fontawesome-free" "^5.13.0" -"@abp/jquery-form@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.3.0-rc.1.tgz#4543e3d751519ba12d2c563aa7cbc56e51dfe093" - integrity sha512-ONQeImarHEe4VRSv13da+rHnCv+2Ycyd7YF+Dr77gtBmTKpC5nAFGY4wO7+u0U0px/YsR2dntpyBj2fEw3wjXA== +"@abp/jquery-form@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.3.0-rc.2.tgz#999910deaf46330477b6ed487a771a2123d69f92" + integrity sha512-+fdEIOTlxDOdYXMtc/ujhYeuP2qiI4bmL3TQQWQxSTlW8q5jB6dHLBnHiXXltO8HxX9+7ZsjN3tsV7+Div5joA== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.3.0-rc.1.tgz#15a06257fba8ef8d2cba2ac9da3f6f7185e6c8dd" - integrity sha512-8Tshu/QsqulwNfRnvoX1mViY12OTvCqpHdRldqr7k6MQd+boo6ahybQ4SCoZ9vsDTmqxd5dkV/A8VijMw66WTQ== +"@abp/jquery-validation-unobtrusive@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.3.0-rc.2.tgz#0635e0c77da269e8367c3d7c388613249ce9221d" + integrity sha512-ubmPjVJatAW3AJWjWtT+ZbNLhu+HHNgcxYkFGVNusNuboTGsoBs5G45Cjzp/q5FnggWoPvkllpf8CGuaYUbpUQ== dependencies: - "@abp/jquery-validation" "~4.3.0-rc.1" + "@abp/jquery-validation" "~4.3.0-rc.2" jquery-validation-unobtrusive "^3.2.11" -"@abp/jquery-validation@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.3.0-rc.1.tgz#6a0d771c88e961cb43144cd6ef916d1ab22aceaf" - integrity sha512-kjVF6757xP8wZ9qw8ysI5ve3AD8PoJtxqkkUV4QF4xcrdP8EPk2heX3Imu7MJiYGyMlwLU++FTm8J68UNsWRmQ== +"@abp/jquery-validation@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.3.0-rc.2.tgz#ee145f8c4a633218ccfa50cca0bed503a0ca8dc6" + integrity sha512-SLWzN6jxVqKaHYs/d6Mku8CfhB1vWgfMbFma14upiJ+/VDkTF4Rh27iMCWKYVOS3bukh2ltBp6kPFplrjCAGSg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" jquery-validation "^1.19.2" -"@abp/jquery@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.3.0-rc.1.tgz#06030baf44983175707409eff16a05db72c93bf5" - integrity sha512-Xgptjea/RzgBvwK+paydXWMgenobuvqKsr9LbrIDiYAJuLMMCyGvwJnA7jeszz+OqZShP8ppoeB0ifa5K2Yc2A== +"@abp/jquery@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.3.0-rc.2.tgz#f620628ea0739888cbcb360c058d09bff10d553b" + integrity sha512-+rfyLVJn7E8wJ1oQ9GiCR63Yk6wah1Hqnj4XpsRDMkIaOXKaqrnVHAZd4W2DUunQSe95wqHfkNH/wkvTyNEwUg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" jquery "~3.5.1" -"@abp/lodash@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.3.0-rc.1.tgz#cd9bf0693379ea54f789299ba67483d345da5abf" - integrity sha512-BtsQs6wpJJvdwPDx7sOIIzkVHJnzw4Twrv0q3XNqmsiv5eGIwluFsorm5N6qOk7nC5csor6mpk6YuJuFii8GbQ== +"@abp/lodash@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.3.0-rc.2.tgz#9b5429d3976b34022aaf8cab4afef57479b66821" + integrity sha512-sE2dyofYbiIy4xhL85diZWkfqBcQl1q61T0DbYDOHgaejZAJxk4bVyFpEuMiC2HwWAZ656IN1bzyQIyE1RKzQA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" lodash "^4.17.15" -"@abp/luxon@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.3.0-rc.1.tgz#dd855417224bbf124cdc9f395bb5cf5f0c6a7a03" - integrity sha512-OtxmjCgPiH1JWsdUvQpkvum3k43H6v8Z5okv4lDpcBOah/HZYUP8qOsSS3Tcyw2I66TK15tq13XJeHabmh2lAQ== +"@abp/luxon@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.3.0-rc.2.tgz#6fdbf1624462615dcb1f5ce85c07fc3bc4065e3f" + integrity sha512-C4aT0aN3/TVtTE3m0AZyhFSeeg+RxXpUO+nffAZoM/cH5NL8tir+O1hd+dhtCb7AELaqQNx5+qgXoJLYdWMYVg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" luxon "^1.24.1" -"@abp/malihu-custom-scrollbar-plugin@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.3.0-rc.1.tgz#e07a9a1895ded98150c1ff4470638ab71e6a0561" - integrity sha512-OiCVlh8iHPHFchSZdFzUl/w+MqPbnlZ4jlohbEuqBTV6rbaAnJXA0Tqylv4RKjho7fybGvhxjDbBrZS4kxUFLg== +"@abp/malihu-custom-scrollbar-plugin@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.3.0-rc.2.tgz#28fc1f216c1d84b20acaf8c8c5cf5c3b33e1aeb1" + integrity sha512-LYMXKkPVyBLWV4Qnom2MW8JJ/rZmVg1CyOFxM6JiL+dpsN1Ogw0hRG33CCHQveqUmf2cr3vf96qk5Et5DyDDIg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.3.0-rc.1.tgz#f3d60b42cb82abc6a0ce6a640b82eb53501f9893" - integrity sha512-z+6Dhu6kqgCfTdZReI08N2ONKakQSmdDsNiZDB5/OOP26k2pOefe/j//sRfjTWiI5gCxO5y98ZZ0ccanBF8oTw== +"@abp/select2@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.3.0-rc.2.tgz#42d62daff9e50b1fe211a1560794625ba3f52107" + integrity sha512-okiIXmFaqx0uy/UMcpMKWKjrwop1JINyzN4FS5tafUpWhx6KcYYHudLWJvnPbsdsOeBQx91kw8jjERRJIqfEOA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" select2 "^4.0.13" -"@abp/sweetalert@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.3.0-rc.1.tgz#d54a8628f004c2d22ebcc4bd60f2b6c1cbd3bc8f" - integrity sha512-OpgDbM9vOfCLpjCRFXavPAdoKlZnpxP+DkUH8owHTrtEuxmrSjpLlIa6VOzAKr70GiLtuMCz9QoH3AyMepx9vA== +"@abp/sweetalert@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.3.0-rc.2.tgz#dfb20dfca8449ed3c3f6599d99b51746019eb664" + integrity sha512-NRKOgT80JVQrwI1FRqpbCzALvnLAFKdPwKKNDgm0L7r/5DL0+JbkKCI1AIPl/yiM8MBrCaQqNms+9JES5mjiUQ== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" sweetalert "^2.1.2" -"@abp/timeago@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.3.0-rc.1.tgz#247f3b3a8e54f6732efa3600ba649a81fee6ec82" - integrity sha512-cplxM3jYhhakET1DyERQoWJQxx0mhTKoI7gW93wNeEMyL4FWaF4lgUNEoubJUSBCDs4v/0ni0pKG8c8nldbiew== +"@abp/timeago@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.3.0-rc.2.tgz#22943e219facd7fa0efddb63017198474b5cef89" + integrity sha512-TjKyuli+SpVjTgVJmraBpqJK112I+1DYHPJfso7QAH48Ra4gceGj9EVS0i/420YyLZyJSMtZOruxzYkyJeR/6w== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" timeago "^1.6.7" -"@abp/toastr@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.3.0-rc.1.tgz#7bc5bb071839fbb971f56c41c8bf220b0a6d67e9" - integrity sha512-OQgmdmWPKlpn/Lks6fUL4enEJgnvUeEcoGTuQOKfkh9ybadYd8kcELWw5ttsQ4o35yvDH3Lsh1jLwPDrCheTBg== +"@abp/toastr@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.3.0-rc.2.tgz#143a344b00bbfaa858fe267fb6d627952bf7b3c0" + integrity sha512-cQV9UFWb9zarkb/CbrqkF9RXqn1Fc/TFKKM5mxpUEcYjx52NuM0d+KawdEMoN2y3y2U4ciY44kbTP2W1y+NlBg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" toastr "^2.1.4" -"@abp/utils@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.3.0-rc.1.tgz#82ef26e01e0cb38417bf4fa9459fde85cbc2b424" - integrity sha512-C/sk6jZQDENI7FbylBoPnTb1rC5eVPnsL8B++vAH4jS//OAj2iNvE6tCewK21GYI/JmfmQzzauQBzOiOJR9a6A== +"@abp/utils@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.3.0-rc.2.tgz#6d051f98772e5642c2e3bc2f68e73d6f24f4694c" + integrity sha512-9qYo8OMTxIUG+qQBWXEpkURS6FUrx+J5s3SwC/eerp46hYr72GQ8L38Wq566a+xiLCn7Duxt6oJ/BxhTfQQxdw== dependencies: just-compare "^1.3.0" 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 b9e8623fe2..00e47b60e7 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": "^4.3.0-rc.1" + "@abp/aspnetcore.mvc.ui.theme.basic": "^4.3.0-rc.2" } } \ No newline at end of file diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/yarn.lock b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/yarn.lock index e068e01f38..429ce75f04 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/yarn.lock +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.3.0-rc.1.tgz#5dc06d82ee213bc33527b5af72ac94ae06bb7c25" - integrity sha512-Xkwj3NPnqWDgqvaP2eda3gviV7aBtyNOMCdZSvpxWmlaPlvJYN+SnKNnlmX02XVArTlOjaeTapFkE3auJeR6jA== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~4.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui.theme.shared@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.3.0-rc.1.tgz#9d4447f068b490367a20772eb9c2b38480088edb" - integrity sha512-untEVm6cKT375ZVEQFO01/VKIqtdFGIyJd5ZxtoQEV8ueVFRQefCOcvvqaJ8Gfj86T1nacXvJRfBfGihYHY+JQ== - dependencies: - "@abp/aspnetcore.mvc.ui" "~4.3.0-rc.1" - "@abp/bootstrap" "~4.3.0-rc.1" - "@abp/bootstrap-datepicker" "~4.3.0-rc.1" - "@abp/datatables.net-bs4" "~4.3.0-rc.1" - "@abp/font-awesome" "~4.3.0-rc.1" - "@abp/jquery-form" "~4.3.0-rc.1" - "@abp/jquery-validation-unobtrusive" "~4.3.0-rc.1" - "@abp/lodash" "~4.3.0-rc.1" - "@abp/luxon" "~4.3.0-rc.1" - "@abp/malihu-custom-scrollbar-plugin" "~4.3.0-rc.1" - "@abp/select2" "~4.3.0-rc.1" - "@abp/sweetalert" "~4.3.0-rc.1" - "@abp/timeago" "~4.3.0-rc.1" - "@abp/toastr" "~4.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.3.0-rc.1.tgz#1e54da2a668939941ab955f11db69798d04d9e7e" - integrity sha512-969etEb4H/fR9Twz6pcl766M/1AriCh6+B8r4haPB5g7QkOWhyU99mT11BHxQwf+uNV4duGZwvPvrMomrdLj2w== +"@abp/aspnetcore.mvc.ui.theme.basic@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.3.0-rc.2.tgz#4ebafbaade6610e3d405877a148d72d57569c3e3" + integrity sha512-Q3QqxKDFC04gaaj30Rk+9zGNfNxC8FX0jciARATceFV6pdA3F3PgT5EMDSlo6NoGniFVjHPRgay9N09zT6Htyw== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~4.3.0-rc.2" + +"@abp/aspnetcore.mvc.ui.theme.shared@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.3.0-rc.2.tgz#d3bf79929c55c5380d7ca7b913a23031d7a6bd12" + integrity sha512-pz86bIV4wNeG7/UPYzNCXlJ/MdOdIygc+Com7C9Ld7gzsyER7VD9h5U/hkytvL4FBFLJn4DU+xuZNECjv0HS0A== + dependencies: + "@abp/aspnetcore.mvc.ui" "~4.3.0-rc.2" + "@abp/bootstrap" "~4.3.0-rc.2" + "@abp/bootstrap-datepicker" "~4.3.0-rc.2" + "@abp/datatables.net-bs4" "~4.3.0-rc.2" + "@abp/font-awesome" "~4.3.0-rc.2" + "@abp/jquery-form" "~4.3.0-rc.2" + "@abp/jquery-validation-unobtrusive" "~4.3.0-rc.2" + "@abp/lodash" "~4.3.0-rc.2" + "@abp/luxon" "~4.3.0-rc.2" + "@abp/malihu-custom-scrollbar-plugin" "~4.3.0-rc.2" + "@abp/select2" "~4.3.0-rc.2" + "@abp/sweetalert" "~4.3.0-rc.2" + "@abp/timeago" "~4.3.0-rc.2" + "@abp/toastr" "~4.3.0-rc.2" + +"@abp/aspnetcore.mvc.ui@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.3.0-rc.2.tgz#6ff41be179c8d1089778a51ffa54a1f3d7614278" + integrity sha512-2L5zvuqUwPwNPcMauiiJZD1ft0QycqINz+bXEQ8t0EwbB+dzcsukL/rpOQfpeRHWWYy4nIN4C2bTvXhNgQbPqQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -43,145 +43,145 @@ micromatch "^4.0.2" path "^0.12.7" -"@abp/bootstrap-datepicker@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.3.0-rc.1.tgz#879a8ce32a3dbdb0cd80401360d24f25f318670b" - integrity sha512-W2T+rrC3oxuWj2xQUz2virbBK6x7ershWZB9d6FjXTSH89nin9DyBK20dEfskVvhK/IMrmZaW4PWyTTcx9r7dA== +"@abp/bootstrap-datepicker@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.3.0-rc.2.tgz#29a686c3d2bce356967f646d7334cd83c4257b4c" + integrity sha512-3+B7SJRi7DQJe0aNgv0H0zu1BfvMZcwgt06N3ALR9+o3TSJcOqcYrEMed3aG+ASH++CltnohTYnLkVXaxshioA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.3.0-rc.1.tgz#3260de03f29e210e44a55efa3af2ab6d34362227" - integrity sha512-flB18MUnRWpEnS0t/WEjsdhfB5w+zHjsa69Pj733+GHGSsZ1Vppu+rgvSWp38yNHO5uRwGECrwUIGwvd5uD9+A== +"@abp/bootstrap@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.3.0-rc.2.tgz#1416fe639c88b7d958435e45fe19692268a7f932" + integrity sha512-E6svmDhNQlT5nd65VgshexyedRWhbvi9o1oYo/dLTUpJDzR7M9ptDqxFLVB9vVDva3HgxUoEvgRJgb9fXvq4zw== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" bootstrap "^4.6.0" bootstrap-v4-rtl "4.6.0-1" -"@abp/core@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.3.0-rc.1.tgz#201c3be8b5697fe8e1b08b23f87f50e950036a14" - integrity sha512-ET8NGugNmdub+8qGeFf9qGPbloP5gcoBnB7U6ieFz1Eai9S3pSpbM+sdyifucEpzMThUiLS772EP4pJTMXhfEg== +"@abp/core@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.3.0-rc.2.tgz#3c9ea339624ae3b6cbee13e048268d48269ea6a9" + integrity sha512-/89xH+IVSmTOLWeUO4yVB7Hg64uHTbR7bHjgl+b94cFdtITH9Nvr2EGdXUJbHGUK7L6lSDziqiMcG/ic0061+Q== dependencies: - "@abp/utils" "^4.3.0-rc.1" + "@abp/utils" "^4.3.0-rc.2" -"@abp/datatables.net-bs4@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.3.0-rc.1.tgz#f7dad14d13b468949fd161b679f4a70271e0d466" - integrity sha512-812cLTfSZZMvjAFAq5h7R5AeJHigBxbPc+kMReQIcFLH82o6BjA2NqFBqYOvQuh4kqiQ85dqFTW9MTKeY8or6Q== +"@abp/datatables.net-bs4@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.3.0-rc.2.tgz#bbfc0d9d0ed86cdb14b38849fb78b2b1911c4a35" + integrity sha512-PRKYi2NU41KpckJ/d0buHoFbyKVuW5NCQNpUdYzDsPS2riyeXccCsLFJM1bT01TdR4Idla3vx9Fkb+HoJOiDeQ== dependencies: - "@abp/datatables.net" "~4.3.0-rc.1" + "@abp/datatables.net" "~4.3.0-rc.2" datatables.net-bs4 "^1.10.21" -"@abp/datatables.net@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.3.0-rc.1.tgz#aa1640903fe67d20e1fc57ffe0519b2764e4c7df" - integrity sha512-qfdQa43sbXsIEBc3WpxSC7cXyKSFxLiFdCKnLIkQNsC3Wo+WX/Cute2xNbT0+xIQdGznfEBdPxcwQkNE6JQgcA== +"@abp/datatables.net@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.3.0-rc.2.tgz#1923e60db261366a7d2f284b0274d13e253567ca" + integrity sha512-rp53+5Xj1jhjpCj7UBA9+nSNbaTQ4Vc1NWCg1e5aI5tWiyZprUS44dRszIQIDV86XKorfFhog5ihOZyzl1HDyg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" datatables.net "^1.10.21" -"@abp/font-awesome@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.3.0-rc.1.tgz#5d336ead8b8c67b2c0aaff9365c2c856b033196e" - integrity sha512-BU4ycN/gOxX2x8S/Eszi3bJAz6bZRhxa0uPWxEWKul9PNvKSwMJRoVaEVehnIlfTi2raHsLQHk+F7079gt3dlQ== +"@abp/font-awesome@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.3.0-rc.2.tgz#437d3d6bbd8f52e5091251932d6a494d0164694b" + integrity sha512-FeHHtEQwrJBwD5PkFYqjKouCLwNjjRqTNseaN+s/r7gNjv0PgKytfRoqEb+O/BkZg/DwEuMz9jFX/RXCCNa2xA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" "@fortawesome/fontawesome-free" "^5.13.0" -"@abp/jquery-form@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.3.0-rc.1.tgz#4543e3d751519ba12d2c563aa7cbc56e51dfe093" - integrity sha512-ONQeImarHEe4VRSv13da+rHnCv+2Ycyd7YF+Dr77gtBmTKpC5nAFGY4wO7+u0U0px/YsR2dntpyBj2fEw3wjXA== +"@abp/jquery-form@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.3.0-rc.2.tgz#999910deaf46330477b6ed487a771a2123d69f92" + integrity sha512-+fdEIOTlxDOdYXMtc/ujhYeuP2qiI4bmL3TQQWQxSTlW8q5jB6dHLBnHiXXltO8HxX9+7ZsjN3tsV7+Div5joA== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.3.0-rc.1.tgz#15a06257fba8ef8d2cba2ac9da3f6f7185e6c8dd" - integrity sha512-8Tshu/QsqulwNfRnvoX1mViY12OTvCqpHdRldqr7k6MQd+boo6ahybQ4SCoZ9vsDTmqxd5dkV/A8VijMw66WTQ== +"@abp/jquery-validation-unobtrusive@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.3.0-rc.2.tgz#0635e0c77da269e8367c3d7c388613249ce9221d" + integrity sha512-ubmPjVJatAW3AJWjWtT+ZbNLhu+HHNgcxYkFGVNusNuboTGsoBs5G45Cjzp/q5FnggWoPvkllpf8CGuaYUbpUQ== dependencies: - "@abp/jquery-validation" "~4.3.0-rc.1" + "@abp/jquery-validation" "~4.3.0-rc.2" jquery-validation-unobtrusive "^3.2.11" -"@abp/jquery-validation@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.3.0-rc.1.tgz#6a0d771c88e961cb43144cd6ef916d1ab22aceaf" - integrity sha512-kjVF6757xP8wZ9qw8ysI5ve3AD8PoJtxqkkUV4QF4xcrdP8EPk2heX3Imu7MJiYGyMlwLU++FTm8J68UNsWRmQ== +"@abp/jquery-validation@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.3.0-rc.2.tgz#ee145f8c4a633218ccfa50cca0bed503a0ca8dc6" + integrity sha512-SLWzN6jxVqKaHYs/d6Mku8CfhB1vWgfMbFma14upiJ+/VDkTF4Rh27iMCWKYVOS3bukh2ltBp6kPFplrjCAGSg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" jquery-validation "^1.19.2" -"@abp/jquery@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.3.0-rc.1.tgz#06030baf44983175707409eff16a05db72c93bf5" - integrity sha512-Xgptjea/RzgBvwK+paydXWMgenobuvqKsr9LbrIDiYAJuLMMCyGvwJnA7jeszz+OqZShP8ppoeB0ifa5K2Yc2A== +"@abp/jquery@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.3.0-rc.2.tgz#f620628ea0739888cbcb360c058d09bff10d553b" + integrity sha512-+rfyLVJn7E8wJ1oQ9GiCR63Yk6wah1Hqnj4XpsRDMkIaOXKaqrnVHAZd4W2DUunQSe95wqHfkNH/wkvTyNEwUg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" jquery "~3.5.1" -"@abp/lodash@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.3.0-rc.1.tgz#cd9bf0693379ea54f789299ba67483d345da5abf" - integrity sha512-BtsQs6wpJJvdwPDx7sOIIzkVHJnzw4Twrv0q3XNqmsiv5eGIwluFsorm5N6qOk7nC5csor6mpk6YuJuFii8GbQ== +"@abp/lodash@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.3.0-rc.2.tgz#9b5429d3976b34022aaf8cab4afef57479b66821" + integrity sha512-sE2dyofYbiIy4xhL85diZWkfqBcQl1q61T0DbYDOHgaejZAJxk4bVyFpEuMiC2HwWAZ656IN1bzyQIyE1RKzQA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" lodash "^4.17.15" -"@abp/luxon@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.3.0-rc.1.tgz#dd855417224bbf124cdc9f395bb5cf5f0c6a7a03" - integrity sha512-OtxmjCgPiH1JWsdUvQpkvum3k43H6v8Z5okv4lDpcBOah/HZYUP8qOsSS3Tcyw2I66TK15tq13XJeHabmh2lAQ== +"@abp/luxon@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.3.0-rc.2.tgz#6fdbf1624462615dcb1f5ce85c07fc3bc4065e3f" + integrity sha512-C4aT0aN3/TVtTE3m0AZyhFSeeg+RxXpUO+nffAZoM/cH5NL8tir+O1hd+dhtCb7AELaqQNx5+qgXoJLYdWMYVg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" luxon "^1.24.1" -"@abp/malihu-custom-scrollbar-plugin@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.3.0-rc.1.tgz#e07a9a1895ded98150c1ff4470638ab71e6a0561" - integrity sha512-OiCVlh8iHPHFchSZdFzUl/w+MqPbnlZ4jlohbEuqBTV6rbaAnJXA0Tqylv4RKjho7fybGvhxjDbBrZS4kxUFLg== +"@abp/malihu-custom-scrollbar-plugin@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.3.0-rc.2.tgz#28fc1f216c1d84b20acaf8c8c5cf5c3b33e1aeb1" + integrity sha512-LYMXKkPVyBLWV4Qnom2MW8JJ/rZmVg1CyOFxM6JiL+dpsN1Ogw0hRG33CCHQveqUmf2cr3vf96qk5Et5DyDDIg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.3.0-rc.1.tgz#f3d60b42cb82abc6a0ce6a640b82eb53501f9893" - integrity sha512-z+6Dhu6kqgCfTdZReI08N2ONKakQSmdDsNiZDB5/OOP26k2pOefe/j//sRfjTWiI5gCxO5y98ZZ0ccanBF8oTw== +"@abp/select2@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.3.0-rc.2.tgz#42d62daff9e50b1fe211a1560794625ba3f52107" + integrity sha512-okiIXmFaqx0uy/UMcpMKWKjrwop1JINyzN4FS5tafUpWhx6KcYYHudLWJvnPbsdsOeBQx91kw8jjERRJIqfEOA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" select2 "^4.0.13" -"@abp/sweetalert@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.3.0-rc.1.tgz#d54a8628f004c2d22ebcc4bd60f2b6c1cbd3bc8f" - integrity sha512-OpgDbM9vOfCLpjCRFXavPAdoKlZnpxP+DkUH8owHTrtEuxmrSjpLlIa6VOzAKr70GiLtuMCz9QoH3AyMepx9vA== +"@abp/sweetalert@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.3.0-rc.2.tgz#dfb20dfca8449ed3c3f6599d99b51746019eb664" + integrity sha512-NRKOgT80JVQrwI1FRqpbCzALvnLAFKdPwKKNDgm0L7r/5DL0+JbkKCI1AIPl/yiM8MBrCaQqNms+9JES5mjiUQ== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" sweetalert "^2.1.2" -"@abp/timeago@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.3.0-rc.1.tgz#247f3b3a8e54f6732efa3600ba649a81fee6ec82" - integrity sha512-cplxM3jYhhakET1DyERQoWJQxx0mhTKoI7gW93wNeEMyL4FWaF4lgUNEoubJUSBCDs4v/0ni0pKG8c8nldbiew== +"@abp/timeago@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.3.0-rc.2.tgz#22943e219facd7fa0efddb63017198474b5cef89" + integrity sha512-TjKyuli+SpVjTgVJmraBpqJK112I+1DYHPJfso7QAH48Ra4gceGj9EVS0i/420YyLZyJSMtZOruxzYkyJeR/6w== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" timeago "^1.6.7" -"@abp/toastr@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.3.0-rc.1.tgz#7bc5bb071839fbb971f56c41c8bf220b0a6d67e9" - integrity sha512-OQgmdmWPKlpn/Lks6fUL4enEJgnvUeEcoGTuQOKfkh9ybadYd8kcELWw5ttsQ4o35yvDH3Lsh1jLwPDrCheTBg== +"@abp/toastr@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.3.0-rc.2.tgz#143a344b00bbfaa858fe267fb6d627952bf7b3c0" + integrity sha512-cQV9UFWb9zarkb/CbrqkF9RXqn1Fc/TFKKM5mxpUEcYjx52NuM0d+KawdEMoN2y3y2U4ciY44kbTP2W1y+NlBg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" toastr "^2.1.4" -"@abp/utils@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.3.0-rc.1.tgz#82ef26e01e0cb38417bf4fa9459fde85cbc2b424" - integrity sha512-C/sk6jZQDENI7FbylBoPnTb1rC5eVPnsL8B++vAH4jS//OAj2iNvE6tCewK21GYI/JmfmQzzauQBzOiOJR9a6A== +"@abp/utils@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.3.0-rc.2.tgz#6d051f98772e5642c2e3bc2f68e73d6f24f4694c" + integrity sha512-9qYo8OMTxIUG+qQBWXEpkURS6FUrx+J5s3SwC/eerp46hYr72GQ8L38Wq566a+xiLCn7Duxt6oJ/BxhTfQQxdw== dependencies: just-compare "^1.3.0" 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 321ad21fba..4bc77c8984 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": "^4.3.0-rc.1" + "@abp/aspnetcore.mvc.ui.theme.basic": "^4.3.0-rc.2" } } \ No newline at end of file diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/yarn.lock b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/yarn.lock index e068e01f38..429ce75f04 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/yarn.lock +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.3.0-rc.1.tgz#5dc06d82ee213bc33527b5af72ac94ae06bb7c25" - integrity sha512-Xkwj3NPnqWDgqvaP2eda3gviV7aBtyNOMCdZSvpxWmlaPlvJYN+SnKNnlmX02XVArTlOjaeTapFkE3auJeR6jA== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~4.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui.theme.shared@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.3.0-rc.1.tgz#9d4447f068b490367a20772eb9c2b38480088edb" - integrity sha512-untEVm6cKT375ZVEQFO01/VKIqtdFGIyJd5ZxtoQEV8ueVFRQefCOcvvqaJ8Gfj86T1nacXvJRfBfGihYHY+JQ== - dependencies: - "@abp/aspnetcore.mvc.ui" "~4.3.0-rc.1" - "@abp/bootstrap" "~4.3.0-rc.1" - "@abp/bootstrap-datepicker" "~4.3.0-rc.1" - "@abp/datatables.net-bs4" "~4.3.0-rc.1" - "@abp/font-awesome" "~4.3.0-rc.1" - "@abp/jquery-form" "~4.3.0-rc.1" - "@abp/jquery-validation-unobtrusive" "~4.3.0-rc.1" - "@abp/lodash" "~4.3.0-rc.1" - "@abp/luxon" "~4.3.0-rc.1" - "@abp/malihu-custom-scrollbar-plugin" "~4.3.0-rc.1" - "@abp/select2" "~4.3.0-rc.1" - "@abp/sweetalert" "~4.3.0-rc.1" - "@abp/timeago" "~4.3.0-rc.1" - "@abp/toastr" "~4.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.3.0-rc.1.tgz#1e54da2a668939941ab955f11db69798d04d9e7e" - integrity sha512-969etEb4H/fR9Twz6pcl766M/1AriCh6+B8r4haPB5g7QkOWhyU99mT11BHxQwf+uNV4duGZwvPvrMomrdLj2w== +"@abp/aspnetcore.mvc.ui.theme.basic@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.3.0-rc.2.tgz#4ebafbaade6610e3d405877a148d72d57569c3e3" + integrity sha512-Q3QqxKDFC04gaaj30Rk+9zGNfNxC8FX0jciARATceFV6pdA3F3PgT5EMDSlo6NoGniFVjHPRgay9N09zT6Htyw== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~4.3.0-rc.2" + +"@abp/aspnetcore.mvc.ui.theme.shared@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.3.0-rc.2.tgz#d3bf79929c55c5380d7ca7b913a23031d7a6bd12" + integrity sha512-pz86bIV4wNeG7/UPYzNCXlJ/MdOdIygc+Com7C9Ld7gzsyER7VD9h5U/hkytvL4FBFLJn4DU+xuZNECjv0HS0A== + dependencies: + "@abp/aspnetcore.mvc.ui" "~4.3.0-rc.2" + "@abp/bootstrap" "~4.3.0-rc.2" + "@abp/bootstrap-datepicker" "~4.3.0-rc.2" + "@abp/datatables.net-bs4" "~4.3.0-rc.2" + "@abp/font-awesome" "~4.3.0-rc.2" + "@abp/jquery-form" "~4.3.0-rc.2" + "@abp/jquery-validation-unobtrusive" "~4.3.0-rc.2" + "@abp/lodash" "~4.3.0-rc.2" + "@abp/luxon" "~4.3.0-rc.2" + "@abp/malihu-custom-scrollbar-plugin" "~4.3.0-rc.2" + "@abp/select2" "~4.3.0-rc.2" + "@abp/sweetalert" "~4.3.0-rc.2" + "@abp/timeago" "~4.3.0-rc.2" + "@abp/toastr" "~4.3.0-rc.2" + +"@abp/aspnetcore.mvc.ui@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.3.0-rc.2.tgz#6ff41be179c8d1089778a51ffa54a1f3d7614278" + integrity sha512-2L5zvuqUwPwNPcMauiiJZD1ft0QycqINz+bXEQ8t0EwbB+dzcsukL/rpOQfpeRHWWYy4nIN4C2bTvXhNgQbPqQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -43,145 +43,145 @@ micromatch "^4.0.2" path "^0.12.7" -"@abp/bootstrap-datepicker@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.3.0-rc.1.tgz#879a8ce32a3dbdb0cd80401360d24f25f318670b" - integrity sha512-W2T+rrC3oxuWj2xQUz2virbBK6x7ershWZB9d6FjXTSH89nin9DyBK20dEfskVvhK/IMrmZaW4PWyTTcx9r7dA== +"@abp/bootstrap-datepicker@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.3.0-rc.2.tgz#29a686c3d2bce356967f646d7334cd83c4257b4c" + integrity sha512-3+B7SJRi7DQJe0aNgv0H0zu1BfvMZcwgt06N3ALR9+o3TSJcOqcYrEMed3aG+ASH++CltnohTYnLkVXaxshioA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.3.0-rc.1.tgz#3260de03f29e210e44a55efa3af2ab6d34362227" - integrity sha512-flB18MUnRWpEnS0t/WEjsdhfB5w+zHjsa69Pj733+GHGSsZ1Vppu+rgvSWp38yNHO5uRwGECrwUIGwvd5uD9+A== +"@abp/bootstrap@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.3.0-rc.2.tgz#1416fe639c88b7d958435e45fe19692268a7f932" + integrity sha512-E6svmDhNQlT5nd65VgshexyedRWhbvi9o1oYo/dLTUpJDzR7M9ptDqxFLVB9vVDva3HgxUoEvgRJgb9fXvq4zw== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" bootstrap "^4.6.0" bootstrap-v4-rtl "4.6.0-1" -"@abp/core@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.3.0-rc.1.tgz#201c3be8b5697fe8e1b08b23f87f50e950036a14" - integrity sha512-ET8NGugNmdub+8qGeFf9qGPbloP5gcoBnB7U6ieFz1Eai9S3pSpbM+sdyifucEpzMThUiLS772EP4pJTMXhfEg== +"@abp/core@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.3.0-rc.2.tgz#3c9ea339624ae3b6cbee13e048268d48269ea6a9" + integrity sha512-/89xH+IVSmTOLWeUO4yVB7Hg64uHTbR7bHjgl+b94cFdtITH9Nvr2EGdXUJbHGUK7L6lSDziqiMcG/ic0061+Q== dependencies: - "@abp/utils" "^4.3.0-rc.1" + "@abp/utils" "^4.3.0-rc.2" -"@abp/datatables.net-bs4@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.3.0-rc.1.tgz#f7dad14d13b468949fd161b679f4a70271e0d466" - integrity sha512-812cLTfSZZMvjAFAq5h7R5AeJHigBxbPc+kMReQIcFLH82o6BjA2NqFBqYOvQuh4kqiQ85dqFTW9MTKeY8or6Q== +"@abp/datatables.net-bs4@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.3.0-rc.2.tgz#bbfc0d9d0ed86cdb14b38849fb78b2b1911c4a35" + integrity sha512-PRKYi2NU41KpckJ/d0buHoFbyKVuW5NCQNpUdYzDsPS2riyeXccCsLFJM1bT01TdR4Idla3vx9Fkb+HoJOiDeQ== dependencies: - "@abp/datatables.net" "~4.3.0-rc.1" + "@abp/datatables.net" "~4.3.0-rc.2" datatables.net-bs4 "^1.10.21" -"@abp/datatables.net@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.3.0-rc.1.tgz#aa1640903fe67d20e1fc57ffe0519b2764e4c7df" - integrity sha512-qfdQa43sbXsIEBc3WpxSC7cXyKSFxLiFdCKnLIkQNsC3Wo+WX/Cute2xNbT0+xIQdGznfEBdPxcwQkNE6JQgcA== +"@abp/datatables.net@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.3.0-rc.2.tgz#1923e60db261366a7d2f284b0274d13e253567ca" + integrity sha512-rp53+5Xj1jhjpCj7UBA9+nSNbaTQ4Vc1NWCg1e5aI5tWiyZprUS44dRszIQIDV86XKorfFhog5ihOZyzl1HDyg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" datatables.net "^1.10.21" -"@abp/font-awesome@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.3.0-rc.1.tgz#5d336ead8b8c67b2c0aaff9365c2c856b033196e" - integrity sha512-BU4ycN/gOxX2x8S/Eszi3bJAz6bZRhxa0uPWxEWKul9PNvKSwMJRoVaEVehnIlfTi2raHsLQHk+F7079gt3dlQ== +"@abp/font-awesome@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.3.0-rc.2.tgz#437d3d6bbd8f52e5091251932d6a494d0164694b" + integrity sha512-FeHHtEQwrJBwD5PkFYqjKouCLwNjjRqTNseaN+s/r7gNjv0PgKytfRoqEb+O/BkZg/DwEuMz9jFX/RXCCNa2xA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" "@fortawesome/fontawesome-free" "^5.13.0" -"@abp/jquery-form@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.3.0-rc.1.tgz#4543e3d751519ba12d2c563aa7cbc56e51dfe093" - integrity sha512-ONQeImarHEe4VRSv13da+rHnCv+2Ycyd7YF+Dr77gtBmTKpC5nAFGY4wO7+u0U0px/YsR2dntpyBj2fEw3wjXA== +"@abp/jquery-form@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.3.0-rc.2.tgz#999910deaf46330477b6ed487a771a2123d69f92" + integrity sha512-+fdEIOTlxDOdYXMtc/ujhYeuP2qiI4bmL3TQQWQxSTlW8q5jB6dHLBnHiXXltO8HxX9+7ZsjN3tsV7+Div5joA== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.3.0-rc.1.tgz#15a06257fba8ef8d2cba2ac9da3f6f7185e6c8dd" - integrity sha512-8Tshu/QsqulwNfRnvoX1mViY12OTvCqpHdRldqr7k6MQd+boo6ahybQ4SCoZ9vsDTmqxd5dkV/A8VijMw66WTQ== +"@abp/jquery-validation-unobtrusive@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.3.0-rc.2.tgz#0635e0c77da269e8367c3d7c388613249ce9221d" + integrity sha512-ubmPjVJatAW3AJWjWtT+ZbNLhu+HHNgcxYkFGVNusNuboTGsoBs5G45Cjzp/q5FnggWoPvkllpf8CGuaYUbpUQ== dependencies: - "@abp/jquery-validation" "~4.3.0-rc.1" + "@abp/jquery-validation" "~4.3.0-rc.2" jquery-validation-unobtrusive "^3.2.11" -"@abp/jquery-validation@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.3.0-rc.1.tgz#6a0d771c88e961cb43144cd6ef916d1ab22aceaf" - integrity sha512-kjVF6757xP8wZ9qw8ysI5ve3AD8PoJtxqkkUV4QF4xcrdP8EPk2heX3Imu7MJiYGyMlwLU++FTm8J68UNsWRmQ== +"@abp/jquery-validation@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.3.0-rc.2.tgz#ee145f8c4a633218ccfa50cca0bed503a0ca8dc6" + integrity sha512-SLWzN6jxVqKaHYs/d6Mku8CfhB1vWgfMbFma14upiJ+/VDkTF4Rh27iMCWKYVOS3bukh2ltBp6kPFplrjCAGSg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" jquery-validation "^1.19.2" -"@abp/jquery@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.3.0-rc.1.tgz#06030baf44983175707409eff16a05db72c93bf5" - integrity sha512-Xgptjea/RzgBvwK+paydXWMgenobuvqKsr9LbrIDiYAJuLMMCyGvwJnA7jeszz+OqZShP8ppoeB0ifa5K2Yc2A== +"@abp/jquery@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.3.0-rc.2.tgz#f620628ea0739888cbcb360c058d09bff10d553b" + integrity sha512-+rfyLVJn7E8wJ1oQ9GiCR63Yk6wah1Hqnj4XpsRDMkIaOXKaqrnVHAZd4W2DUunQSe95wqHfkNH/wkvTyNEwUg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" jquery "~3.5.1" -"@abp/lodash@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.3.0-rc.1.tgz#cd9bf0693379ea54f789299ba67483d345da5abf" - integrity sha512-BtsQs6wpJJvdwPDx7sOIIzkVHJnzw4Twrv0q3XNqmsiv5eGIwluFsorm5N6qOk7nC5csor6mpk6YuJuFii8GbQ== +"@abp/lodash@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.3.0-rc.2.tgz#9b5429d3976b34022aaf8cab4afef57479b66821" + integrity sha512-sE2dyofYbiIy4xhL85diZWkfqBcQl1q61T0DbYDOHgaejZAJxk4bVyFpEuMiC2HwWAZ656IN1bzyQIyE1RKzQA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" lodash "^4.17.15" -"@abp/luxon@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.3.0-rc.1.tgz#dd855417224bbf124cdc9f395bb5cf5f0c6a7a03" - integrity sha512-OtxmjCgPiH1JWsdUvQpkvum3k43H6v8Z5okv4lDpcBOah/HZYUP8qOsSS3Tcyw2I66TK15tq13XJeHabmh2lAQ== +"@abp/luxon@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.3.0-rc.2.tgz#6fdbf1624462615dcb1f5ce85c07fc3bc4065e3f" + integrity sha512-C4aT0aN3/TVtTE3m0AZyhFSeeg+RxXpUO+nffAZoM/cH5NL8tir+O1hd+dhtCb7AELaqQNx5+qgXoJLYdWMYVg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" luxon "^1.24.1" -"@abp/malihu-custom-scrollbar-plugin@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.3.0-rc.1.tgz#e07a9a1895ded98150c1ff4470638ab71e6a0561" - integrity sha512-OiCVlh8iHPHFchSZdFzUl/w+MqPbnlZ4jlohbEuqBTV6rbaAnJXA0Tqylv4RKjho7fybGvhxjDbBrZS4kxUFLg== +"@abp/malihu-custom-scrollbar-plugin@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.3.0-rc.2.tgz#28fc1f216c1d84b20acaf8c8c5cf5c3b33e1aeb1" + integrity sha512-LYMXKkPVyBLWV4Qnom2MW8JJ/rZmVg1CyOFxM6JiL+dpsN1Ogw0hRG33CCHQveqUmf2cr3vf96qk5Et5DyDDIg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.3.0-rc.1.tgz#f3d60b42cb82abc6a0ce6a640b82eb53501f9893" - integrity sha512-z+6Dhu6kqgCfTdZReI08N2ONKakQSmdDsNiZDB5/OOP26k2pOefe/j//sRfjTWiI5gCxO5y98ZZ0ccanBF8oTw== +"@abp/select2@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.3.0-rc.2.tgz#42d62daff9e50b1fe211a1560794625ba3f52107" + integrity sha512-okiIXmFaqx0uy/UMcpMKWKjrwop1JINyzN4FS5tafUpWhx6KcYYHudLWJvnPbsdsOeBQx91kw8jjERRJIqfEOA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" select2 "^4.0.13" -"@abp/sweetalert@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.3.0-rc.1.tgz#d54a8628f004c2d22ebcc4bd60f2b6c1cbd3bc8f" - integrity sha512-OpgDbM9vOfCLpjCRFXavPAdoKlZnpxP+DkUH8owHTrtEuxmrSjpLlIa6VOzAKr70GiLtuMCz9QoH3AyMepx9vA== +"@abp/sweetalert@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.3.0-rc.2.tgz#dfb20dfca8449ed3c3f6599d99b51746019eb664" + integrity sha512-NRKOgT80JVQrwI1FRqpbCzALvnLAFKdPwKKNDgm0L7r/5DL0+JbkKCI1AIPl/yiM8MBrCaQqNms+9JES5mjiUQ== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" sweetalert "^2.1.2" -"@abp/timeago@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.3.0-rc.1.tgz#247f3b3a8e54f6732efa3600ba649a81fee6ec82" - integrity sha512-cplxM3jYhhakET1DyERQoWJQxx0mhTKoI7gW93wNeEMyL4FWaF4lgUNEoubJUSBCDs4v/0ni0pKG8c8nldbiew== +"@abp/timeago@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.3.0-rc.2.tgz#22943e219facd7fa0efddb63017198474b5cef89" + integrity sha512-TjKyuli+SpVjTgVJmraBpqJK112I+1DYHPJfso7QAH48Ra4gceGj9EVS0i/420YyLZyJSMtZOruxzYkyJeR/6w== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" timeago "^1.6.7" -"@abp/toastr@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.3.0-rc.1.tgz#7bc5bb071839fbb971f56c41c8bf220b0a6d67e9" - integrity sha512-OQgmdmWPKlpn/Lks6fUL4enEJgnvUeEcoGTuQOKfkh9ybadYd8kcELWw5ttsQ4o35yvDH3Lsh1jLwPDrCheTBg== +"@abp/toastr@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.3.0-rc.2.tgz#143a344b00bbfaa858fe267fb6d627952bf7b3c0" + integrity sha512-cQV9UFWb9zarkb/CbrqkF9RXqn1Fc/TFKKM5mxpUEcYjx52NuM0d+KawdEMoN2y3y2U4ciY44kbTP2W1y+NlBg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" toastr "^2.1.4" -"@abp/utils@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.3.0-rc.1.tgz#82ef26e01e0cb38417bf4fa9459fde85cbc2b424" - integrity sha512-C/sk6jZQDENI7FbylBoPnTb1rC5eVPnsL8B++vAH4jS//OAj2iNvE6tCewK21GYI/JmfmQzzauQBzOiOJR9a6A== +"@abp/utils@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.3.0-rc.2.tgz#6d051f98772e5642c2e3bc2f68e73d6f24f4694c" + integrity sha512-9qYo8OMTxIUG+qQBWXEpkURS6FUrx+J5s3SwC/eerp46hYr72GQ8L38Wq566a+xiLCn7Duxt6oJ/BxhTfQQxdw== dependencies: just-compare "^1.3.0" 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 321ad21fba..4bc77c8984 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": "^4.3.0-rc.1" + "@abp/aspnetcore.mvc.ui.theme.basic": "^4.3.0-rc.2" } } \ No newline at end of file diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/yarn.lock b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/yarn.lock index 903182ef8e..831073a8bf 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/yarn.lock +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.3.0-rc.1.tgz#5dc06d82ee213bc33527b5af72ac94ae06bb7c25" - integrity sha512-Xkwj3NPnqWDgqvaP2eda3gviV7aBtyNOMCdZSvpxWmlaPlvJYN+SnKNnlmX02XVArTlOjaeTapFkE3auJeR6jA== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~4.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui.theme.shared@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.3.0-rc.1.tgz#9d4447f068b490367a20772eb9c2b38480088edb" - integrity sha512-untEVm6cKT375ZVEQFO01/VKIqtdFGIyJd5ZxtoQEV8ueVFRQefCOcvvqaJ8Gfj86T1nacXvJRfBfGihYHY+JQ== - dependencies: - "@abp/aspnetcore.mvc.ui" "~4.3.0-rc.1" - "@abp/bootstrap" "~4.3.0-rc.1" - "@abp/bootstrap-datepicker" "~4.3.0-rc.1" - "@abp/datatables.net-bs4" "~4.3.0-rc.1" - "@abp/font-awesome" "~4.3.0-rc.1" - "@abp/jquery-form" "~4.3.0-rc.1" - "@abp/jquery-validation-unobtrusive" "~4.3.0-rc.1" - "@abp/lodash" "~4.3.0-rc.1" - "@abp/luxon" "~4.3.0-rc.1" - "@abp/malihu-custom-scrollbar-plugin" "~4.3.0-rc.1" - "@abp/select2" "~4.3.0-rc.1" - "@abp/sweetalert" "~4.3.0-rc.1" - "@abp/timeago" "~4.3.0-rc.1" - "@abp/toastr" "~4.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.3.0-rc.1.tgz#1e54da2a668939941ab955f11db69798d04d9e7e" - integrity sha512-969etEb4H/fR9Twz6pcl766M/1AriCh6+B8r4haPB5g7QkOWhyU99mT11BHxQwf+uNV4duGZwvPvrMomrdLj2w== +"@abp/aspnetcore.mvc.ui.theme.basic@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.3.0-rc.2.tgz#4ebafbaade6610e3d405877a148d72d57569c3e3" + integrity sha512-Q3QqxKDFC04gaaj30Rk+9zGNfNxC8FX0jciARATceFV6pdA3F3PgT5EMDSlo6NoGniFVjHPRgay9N09zT6Htyw== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~4.3.0-rc.2" + +"@abp/aspnetcore.mvc.ui.theme.shared@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.3.0-rc.2.tgz#d3bf79929c55c5380d7ca7b913a23031d7a6bd12" + integrity sha512-pz86bIV4wNeG7/UPYzNCXlJ/MdOdIygc+Com7C9Ld7gzsyER7VD9h5U/hkytvL4FBFLJn4DU+xuZNECjv0HS0A== + dependencies: + "@abp/aspnetcore.mvc.ui" "~4.3.0-rc.2" + "@abp/bootstrap" "~4.3.0-rc.2" + "@abp/bootstrap-datepicker" "~4.3.0-rc.2" + "@abp/datatables.net-bs4" "~4.3.0-rc.2" + "@abp/font-awesome" "~4.3.0-rc.2" + "@abp/jquery-form" "~4.3.0-rc.2" + "@abp/jquery-validation-unobtrusive" "~4.3.0-rc.2" + "@abp/lodash" "~4.3.0-rc.2" + "@abp/luxon" "~4.3.0-rc.2" + "@abp/malihu-custom-scrollbar-plugin" "~4.3.0-rc.2" + "@abp/select2" "~4.3.0-rc.2" + "@abp/sweetalert" "~4.3.0-rc.2" + "@abp/timeago" "~4.3.0-rc.2" + "@abp/toastr" "~4.3.0-rc.2" + +"@abp/aspnetcore.mvc.ui@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.3.0-rc.2.tgz#6ff41be179c8d1089778a51ffa54a1f3d7614278" + integrity sha512-2L5zvuqUwPwNPcMauiiJZD1ft0QycqINz+bXEQ8t0EwbB+dzcsukL/rpOQfpeRHWWYy4nIN4C2bTvXhNgQbPqQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -43,145 +43,145 @@ micromatch "^4.0.2" path "^0.12.7" -"@abp/bootstrap-datepicker@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.3.0-rc.1.tgz#879a8ce32a3dbdb0cd80401360d24f25f318670b" - integrity sha512-W2T+rrC3oxuWj2xQUz2virbBK6x7ershWZB9d6FjXTSH89nin9DyBK20dEfskVvhK/IMrmZaW4PWyTTcx9r7dA== +"@abp/bootstrap-datepicker@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.3.0-rc.2.tgz#29a686c3d2bce356967f646d7334cd83c4257b4c" + integrity sha512-3+B7SJRi7DQJe0aNgv0H0zu1BfvMZcwgt06N3ALR9+o3TSJcOqcYrEMed3aG+ASH++CltnohTYnLkVXaxshioA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.3.0-rc.1.tgz#3260de03f29e210e44a55efa3af2ab6d34362227" - integrity sha512-flB18MUnRWpEnS0t/WEjsdhfB5w+zHjsa69Pj733+GHGSsZ1Vppu+rgvSWp38yNHO5uRwGECrwUIGwvd5uD9+A== +"@abp/bootstrap@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.3.0-rc.2.tgz#1416fe639c88b7d958435e45fe19692268a7f932" + integrity sha512-E6svmDhNQlT5nd65VgshexyedRWhbvi9o1oYo/dLTUpJDzR7M9ptDqxFLVB9vVDva3HgxUoEvgRJgb9fXvq4zw== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" bootstrap "^4.6.0" bootstrap-v4-rtl "4.6.0-1" -"@abp/core@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.3.0-rc.1.tgz#201c3be8b5697fe8e1b08b23f87f50e950036a14" - integrity sha512-ET8NGugNmdub+8qGeFf9qGPbloP5gcoBnB7U6ieFz1Eai9S3pSpbM+sdyifucEpzMThUiLS772EP4pJTMXhfEg== +"@abp/core@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.3.0-rc.2.tgz#3c9ea339624ae3b6cbee13e048268d48269ea6a9" + integrity sha512-/89xH+IVSmTOLWeUO4yVB7Hg64uHTbR7bHjgl+b94cFdtITH9Nvr2EGdXUJbHGUK7L6lSDziqiMcG/ic0061+Q== dependencies: - "@abp/utils" "^4.3.0-rc.1" + "@abp/utils" "^4.3.0-rc.2" -"@abp/datatables.net-bs4@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.3.0-rc.1.tgz#f7dad14d13b468949fd161b679f4a70271e0d466" - integrity sha512-812cLTfSZZMvjAFAq5h7R5AeJHigBxbPc+kMReQIcFLH82o6BjA2NqFBqYOvQuh4kqiQ85dqFTW9MTKeY8or6Q== +"@abp/datatables.net-bs4@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.3.0-rc.2.tgz#bbfc0d9d0ed86cdb14b38849fb78b2b1911c4a35" + integrity sha512-PRKYi2NU41KpckJ/d0buHoFbyKVuW5NCQNpUdYzDsPS2riyeXccCsLFJM1bT01TdR4Idla3vx9Fkb+HoJOiDeQ== dependencies: - "@abp/datatables.net" "~4.3.0-rc.1" + "@abp/datatables.net" "~4.3.0-rc.2" datatables.net-bs4 "^1.10.21" -"@abp/datatables.net@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.3.0-rc.1.tgz#aa1640903fe67d20e1fc57ffe0519b2764e4c7df" - integrity sha512-qfdQa43sbXsIEBc3WpxSC7cXyKSFxLiFdCKnLIkQNsC3Wo+WX/Cute2xNbT0+xIQdGznfEBdPxcwQkNE6JQgcA== +"@abp/datatables.net@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.3.0-rc.2.tgz#1923e60db261366a7d2f284b0274d13e253567ca" + integrity sha512-rp53+5Xj1jhjpCj7UBA9+nSNbaTQ4Vc1NWCg1e5aI5tWiyZprUS44dRszIQIDV86XKorfFhog5ihOZyzl1HDyg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" datatables.net "^1.10.21" -"@abp/font-awesome@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.3.0-rc.1.tgz#5d336ead8b8c67b2c0aaff9365c2c856b033196e" - integrity sha512-BU4ycN/gOxX2x8S/Eszi3bJAz6bZRhxa0uPWxEWKul9PNvKSwMJRoVaEVehnIlfTi2raHsLQHk+F7079gt3dlQ== +"@abp/font-awesome@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.3.0-rc.2.tgz#437d3d6bbd8f52e5091251932d6a494d0164694b" + integrity sha512-FeHHtEQwrJBwD5PkFYqjKouCLwNjjRqTNseaN+s/r7gNjv0PgKytfRoqEb+O/BkZg/DwEuMz9jFX/RXCCNa2xA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" "@fortawesome/fontawesome-free" "^5.13.0" -"@abp/jquery-form@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.3.0-rc.1.tgz#4543e3d751519ba12d2c563aa7cbc56e51dfe093" - integrity sha512-ONQeImarHEe4VRSv13da+rHnCv+2Ycyd7YF+Dr77gtBmTKpC5nAFGY4wO7+u0U0px/YsR2dntpyBj2fEw3wjXA== +"@abp/jquery-form@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.3.0-rc.2.tgz#999910deaf46330477b6ed487a771a2123d69f92" + integrity sha512-+fdEIOTlxDOdYXMtc/ujhYeuP2qiI4bmL3TQQWQxSTlW8q5jB6dHLBnHiXXltO8HxX9+7ZsjN3tsV7+Div5joA== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.3.0-rc.1.tgz#15a06257fba8ef8d2cba2ac9da3f6f7185e6c8dd" - integrity sha512-8Tshu/QsqulwNfRnvoX1mViY12OTvCqpHdRldqr7k6MQd+boo6ahybQ4SCoZ9vsDTmqxd5dkV/A8VijMw66WTQ== +"@abp/jquery-validation-unobtrusive@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.3.0-rc.2.tgz#0635e0c77da269e8367c3d7c388613249ce9221d" + integrity sha512-ubmPjVJatAW3AJWjWtT+ZbNLhu+HHNgcxYkFGVNusNuboTGsoBs5G45Cjzp/q5FnggWoPvkllpf8CGuaYUbpUQ== dependencies: - "@abp/jquery-validation" "~4.3.0-rc.1" + "@abp/jquery-validation" "~4.3.0-rc.2" jquery-validation-unobtrusive "^3.2.11" -"@abp/jquery-validation@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.3.0-rc.1.tgz#6a0d771c88e961cb43144cd6ef916d1ab22aceaf" - integrity sha512-kjVF6757xP8wZ9qw8ysI5ve3AD8PoJtxqkkUV4QF4xcrdP8EPk2heX3Imu7MJiYGyMlwLU++FTm8J68UNsWRmQ== +"@abp/jquery-validation@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.3.0-rc.2.tgz#ee145f8c4a633218ccfa50cca0bed503a0ca8dc6" + integrity sha512-SLWzN6jxVqKaHYs/d6Mku8CfhB1vWgfMbFma14upiJ+/VDkTF4Rh27iMCWKYVOS3bukh2ltBp6kPFplrjCAGSg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" jquery-validation "^1.19.2" -"@abp/jquery@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.3.0-rc.1.tgz#06030baf44983175707409eff16a05db72c93bf5" - integrity sha512-Xgptjea/RzgBvwK+paydXWMgenobuvqKsr9LbrIDiYAJuLMMCyGvwJnA7jeszz+OqZShP8ppoeB0ifa5K2Yc2A== +"@abp/jquery@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.3.0-rc.2.tgz#f620628ea0739888cbcb360c058d09bff10d553b" + integrity sha512-+rfyLVJn7E8wJ1oQ9GiCR63Yk6wah1Hqnj4XpsRDMkIaOXKaqrnVHAZd4W2DUunQSe95wqHfkNH/wkvTyNEwUg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" jquery "~3.5.1" -"@abp/lodash@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.3.0-rc.1.tgz#cd9bf0693379ea54f789299ba67483d345da5abf" - integrity sha512-BtsQs6wpJJvdwPDx7sOIIzkVHJnzw4Twrv0q3XNqmsiv5eGIwluFsorm5N6qOk7nC5csor6mpk6YuJuFii8GbQ== +"@abp/lodash@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.3.0-rc.2.tgz#9b5429d3976b34022aaf8cab4afef57479b66821" + integrity sha512-sE2dyofYbiIy4xhL85diZWkfqBcQl1q61T0DbYDOHgaejZAJxk4bVyFpEuMiC2HwWAZ656IN1bzyQIyE1RKzQA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" lodash "^4.17.15" -"@abp/luxon@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.3.0-rc.1.tgz#dd855417224bbf124cdc9f395bb5cf5f0c6a7a03" - integrity sha512-OtxmjCgPiH1JWsdUvQpkvum3k43H6v8Z5okv4lDpcBOah/HZYUP8qOsSS3Tcyw2I66TK15tq13XJeHabmh2lAQ== +"@abp/luxon@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.3.0-rc.2.tgz#6fdbf1624462615dcb1f5ce85c07fc3bc4065e3f" + integrity sha512-C4aT0aN3/TVtTE3m0AZyhFSeeg+RxXpUO+nffAZoM/cH5NL8tir+O1hd+dhtCb7AELaqQNx5+qgXoJLYdWMYVg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" luxon "^1.24.1" -"@abp/malihu-custom-scrollbar-plugin@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.3.0-rc.1.tgz#e07a9a1895ded98150c1ff4470638ab71e6a0561" - integrity sha512-OiCVlh8iHPHFchSZdFzUl/w+MqPbnlZ4jlohbEuqBTV6rbaAnJXA0Tqylv4RKjho7fybGvhxjDbBrZS4kxUFLg== +"@abp/malihu-custom-scrollbar-plugin@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.3.0-rc.2.tgz#28fc1f216c1d84b20acaf8c8c5cf5c3b33e1aeb1" + integrity sha512-LYMXKkPVyBLWV4Qnom2MW8JJ/rZmVg1CyOFxM6JiL+dpsN1Ogw0hRG33CCHQveqUmf2cr3vf96qk5Et5DyDDIg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.3.0-rc.1.tgz#f3d60b42cb82abc6a0ce6a640b82eb53501f9893" - integrity sha512-z+6Dhu6kqgCfTdZReI08N2ONKakQSmdDsNiZDB5/OOP26k2pOefe/j//sRfjTWiI5gCxO5y98ZZ0ccanBF8oTw== +"@abp/select2@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.3.0-rc.2.tgz#42d62daff9e50b1fe211a1560794625ba3f52107" + integrity sha512-okiIXmFaqx0uy/UMcpMKWKjrwop1JINyzN4FS5tafUpWhx6KcYYHudLWJvnPbsdsOeBQx91kw8jjERRJIqfEOA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" select2 "^4.0.13" -"@abp/sweetalert@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.3.0-rc.1.tgz#d54a8628f004c2d22ebcc4bd60f2b6c1cbd3bc8f" - integrity sha512-OpgDbM9vOfCLpjCRFXavPAdoKlZnpxP+DkUH8owHTrtEuxmrSjpLlIa6VOzAKr70GiLtuMCz9QoH3AyMepx9vA== +"@abp/sweetalert@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.3.0-rc.2.tgz#dfb20dfca8449ed3c3f6599d99b51746019eb664" + integrity sha512-NRKOgT80JVQrwI1FRqpbCzALvnLAFKdPwKKNDgm0L7r/5DL0+JbkKCI1AIPl/yiM8MBrCaQqNms+9JES5mjiUQ== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" sweetalert "^2.1.2" -"@abp/timeago@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.3.0-rc.1.tgz#247f3b3a8e54f6732efa3600ba649a81fee6ec82" - integrity sha512-cplxM3jYhhakET1DyERQoWJQxx0mhTKoI7gW93wNeEMyL4FWaF4lgUNEoubJUSBCDs4v/0ni0pKG8c8nldbiew== +"@abp/timeago@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.3.0-rc.2.tgz#22943e219facd7fa0efddb63017198474b5cef89" + integrity sha512-TjKyuli+SpVjTgVJmraBpqJK112I+1DYHPJfso7QAH48Ra4gceGj9EVS0i/420YyLZyJSMtZOruxzYkyJeR/6w== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" timeago "^1.6.7" -"@abp/toastr@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.3.0-rc.1.tgz#7bc5bb071839fbb971f56c41c8bf220b0a6d67e9" - integrity sha512-OQgmdmWPKlpn/Lks6fUL4enEJgnvUeEcoGTuQOKfkh9ybadYd8kcELWw5ttsQ4o35yvDH3Lsh1jLwPDrCheTBg== +"@abp/toastr@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.3.0-rc.2.tgz#143a344b00bbfaa858fe267fb6d627952bf7b3c0" + integrity sha512-cQV9UFWb9zarkb/CbrqkF9RXqn1Fc/TFKKM5mxpUEcYjx52NuM0d+KawdEMoN2y3y2U4ciY44kbTP2W1y+NlBg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" toastr "^2.1.4" -"@abp/utils@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.3.0-rc.1.tgz#82ef26e01e0cb38417bf4fa9459fde85cbc2b424" - integrity sha512-C/sk6jZQDENI7FbylBoPnTb1rC5eVPnsL8B++vAH4jS//OAj2iNvE6tCewK21GYI/JmfmQzzauQBzOiOJR9a6A== +"@abp/utils@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.3.0-rc.2.tgz#6d051f98772e5642c2e3bc2f68e73d6f24f4694c" + integrity sha512-9qYo8OMTxIUG+qQBWXEpkURS6FUrx+J5s3SwC/eerp46hYr72GQ8L38Wq566a+xiLCn7Duxt6oJ/BxhTfQQxdw== dependencies: just-compare "^1.3.0" diff --git a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.csproj b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.csproj index 333f9dd2ea..bbdf89f9ca 100644 --- a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.csproj +++ b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.csproj @@ -14,7 +14,7 @@ - + diff --git a/templates/module/angular/package.json b/templates/module/angular/package.json index 656e2239eb..c226ef0fd7 100644 --- a/templates/module/angular/package.json +++ b/templates/module/angular/package.json @@ -15,14 +15,14 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~4.3.0-rc.1", - "@abp/ng.components": "~4.3.0-rc.1", - "@abp/ng.core": "~4.3.0-rc.1", - "@abp/ng.identity": "~4.3.0-rc.1", - "@abp/ng.setting-management": "~4.3.0-rc.1", - "@abp/ng.tenant-management": "~4.3.0-rc.1", - "@abp/ng.theme.basic": "~4.3.0-rc.1", - "@abp/ng.theme.shared": "~4.3.0-rc.1", + "@abp/ng.account": "~4.3.0-rc.2", + "@abp/ng.components": "~4.3.0-rc.2", + "@abp/ng.core": "~4.3.0-rc.2", + "@abp/ng.identity": "~4.3.0-rc.2", + "@abp/ng.setting-management": "~4.3.0-rc.2", + "@abp/ng.tenant-management": "~4.3.0-rc.2", + "@abp/ng.theme.basic": "~4.3.0-rc.2", + "@abp/ng.theme.shared": "~4.3.0-rc.2", "@angular/animations": "~11.1.0", "@angular/common": "~11.1.0", "@angular/compiler": "~11.1.0", @@ -36,7 +36,7 @@ "zone.js": "~0.10.2" }, "devDependencies": { - "@abp/ng.schematics": "~4.3.0-rc.1", + "@abp/ng.schematics": "~4.3.0-rc.2", "@angular-devkit/build-angular": "~0.1101.1", "@angular/cli": "~11.1.1", "@angular/compiler-cli": "~11.1.0", diff --git a/templates/module/angular/projects/my-project-name/package.json b/templates/module/angular/projects/my-project-name/package.json index 9512c95216..fe041724cf 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.1.11", "@angular/core": "^9.1.11", - "@abp/ng.core": ">=4.3.0-rc.1", - "@abp/ng.theme.shared": ">=4.3.0-rc.1" + "@abp/ng.core": ">=4.3.0-rc.2", + "@abp/ng.theme.shared": ">=4.3.0-rc.2" }, "dependencies": { "tslib": "^2.0.0" diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj index 1235886462..c71d10e65a 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj @@ -8,8 +8,8 @@ - - + + 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 b9e8623fe2..00e47b60e7 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": "^4.3.0-rc.1" + "@abp/aspnetcore.mvc.ui.theme.basic": "^4.3.0-rc.2" } } \ No newline at end of file diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/yarn.lock b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/yarn.lock index e068e01f38..429ce75f04 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/yarn.lock +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.3.0-rc.1.tgz#5dc06d82ee213bc33527b5af72ac94ae06bb7c25" - integrity sha512-Xkwj3NPnqWDgqvaP2eda3gviV7aBtyNOMCdZSvpxWmlaPlvJYN+SnKNnlmX02XVArTlOjaeTapFkE3auJeR6jA== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~4.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui.theme.shared@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.3.0-rc.1.tgz#9d4447f068b490367a20772eb9c2b38480088edb" - integrity sha512-untEVm6cKT375ZVEQFO01/VKIqtdFGIyJd5ZxtoQEV8ueVFRQefCOcvvqaJ8Gfj86T1nacXvJRfBfGihYHY+JQ== - dependencies: - "@abp/aspnetcore.mvc.ui" "~4.3.0-rc.1" - "@abp/bootstrap" "~4.3.0-rc.1" - "@abp/bootstrap-datepicker" "~4.3.0-rc.1" - "@abp/datatables.net-bs4" "~4.3.0-rc.1" - "@abp/font-awesome" "~4.3.0-rc.1" - "@abp/jquery-form" "~4.3.0-rc.1" - "@abp/jquery-validation-unobtrusive" "~4.3.0-rc.1" - "@abp/lodash" "~4.3.0-rc.1" - "@abp/luxon" "~4.3.0-rc.1" - "@abp/malihu-custom-scrollbar-plugin" "~4.3.0-rc.1" - "@abp/select2" "~4.3.0-rc.1" - "@abp/sweetalert" "~4.3.0-rc.1" - "@abp/timeago" "~4.3.0-rc.1" - "@abp/toastr" "~4.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.3.0-rc.1.tgz#1e54da2a668939941ab955f11db69798d04d9e7e" - integrity sha512-969etEb4H/fR9Twz6pcl766M/1AriCh6+B8r4haPB5g7QkOWhyU99mT11BHxQwf+uNV4duGZwvPvrMomrdLj2w== +"@abp/aspnetcore.mvc.ui.theme.basic@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.3.0-rc.2.tgz#4ebafbaade6610e3d405877a148d72d57569c3e3" + integrity sha512-Q3QqxKDFC04gaaj30Rk+9zGNfNxC8FX0jciARATceFV6pdA3F3PgT5EMDSlo6NoGniFVjHPRgay9N09zT6Htyw== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~4.3.0-rc.2" + +"@abp/aspnetcore.mvc.ui.theme.shared@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.3.0-rc.2.tgz#d3bf79929c55c5380d7ca7b913a23031d7a6bd12" + integrity sha512-pz86bIV4wNeG7/UPYzNCXlJ/MdOdIygc+Com7C9Ld7gzsyER7VD9h5U/hkytvL4FBFLJn4DU+xuZNECjv0HS0A== + dependencies: + "@abp/aspnetcore.mvc.ui" "~4.3.0-rc.2" + "@abp/bootstrap" "~4.3.0-rc.2" + "@abp/bootstrap-datepicker" "~4.3.0-rc.2" + "@abp/datatables.net-bs4" "~4.3.0-rc.2" + "@abp/font-awesome" "~4.3.0-rc.2" + "@abp/jquery-form" "~4.3.0-rc.2" + "@abp/jquery-validation-unobtrusive" "~4.3.0-rc.2" + "@abp/lodash" "~4.3.0-rc.2" + "@abp/luxon" "~4.3.0-rc.2" + "@abp/malihu-custom-scrollbar-plugin" "~4.3.0-rc.2" + "@abp/select2" "~4.3.0-rc.2" + "@abp/sweetalert" "~4.3.0-rc.2" + "@abp/timeago" "~4.3.0-rc.2" + "@abp/toastr" "~4.3.0-rc.2" + +"@abp/aspnetcore.mvc.ui@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.3.0-rc.2.tgz#6ff41be179c8d1089778a51ffa54a1f3d7614278" + integrity sha512-2L5zvuqUwPwNPcMauiiJZD1ft0QycqINz+bXEQ8t0EwbB+dzcsukL/rpOQfpeRHWWYy4nIN4C2bTvXhNgQbPqQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -43,145 +43,145 @@ micromatch "^4.0.2" path "^0.12.7" -"@abp/bootstrap-datepicker@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.3.0-rc.1.tgz#879a8ce32a3dbdb0cd80401360d24f25f318670b" - integrity sha512-W2T+rrC3oxuWj2xQUz2virbBK6x7ershWZB9d6FjXTSH89nin9DyBK20dEfskVvhK/IMrmZaW4PWyTTcx9r7dA== +"@abp/bootstrap-datepicker@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.3.0-rc.2.tgz#29a686c3d2bce356967f646d7334cd83c4257b4c" + integrity sha512-3+B7SJRi7DQJe0aNgv0H0zu1BfvMZcwgt06N3ALR9+o3TSJcOqcYrEMed3aG+ASH++CltnohTYnLkVXaxshioA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.3.0-rc.1.tgz#3260de03f29e210e44a55efa3af2ab6d34362227" - integrity sha512-flB18MUnRWpEnS0t/WEjsdhfB5w+zHjsa69Pj733+GHGSsZ1Vppu+rgvSWp38yNHO5uRwGECrwUIGwvd5uD9+A== +"@abp/bootstrap@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.3.0-rc.2.tgz#1416fe639c88b7d958435e45fe19692268a7f932" + integrity sha512-E6svmDhNQlT5nd65VgshexyedRWhbvi9o1oYo/dLTUpJDzR7M9ptDqxFLVB9vVDva3HgxUoEvgRJgb9fXvq4zw== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" bootstrap "^4.6.0" bootstrap-v4-rtl "4.6.0-1" -"@abp/core@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.3.0-rc.1.tgz#201c3be8b5697fe8e1b08b23f87f50e950036a14" - integrity sha512-ET8NGugNmdub+8qGeFf9qGPbloP5gcoBnB7U6ieFz1Eai9S3pSpbM+sdyifucEpzMThUiLS772EP4pJTMXhfEg== +"@abp/core@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.3.0-rc.2.tgz#3c9ea339624ae3b6cbee13e048268d48269ea6a9" + integrity sha512-/89xH+IVSmTOLWeUO4yVB7Hg64uHTbR7bHjgl+b94cFdtITH9Nvr2EGdXUJbHGUK7L6lSDziqiMcG/ic0061+Q== dependencies: - "@abp/utils" "^4.3.0-rc.1" + "@abp/utils" "^4.3.0-rc.2" -"@abp/datatables.net-bs4@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.3.0-rc.1.tgz#f7dad14d13b468949fd161b679f4a70271e0d466" - integrity sha512-812cLTfSZZMvjAFAq5h7R5AeJHigBxbPc+kMReQIcFLH82o6BjA2NqFBqYOvQuh4kqiQ85dqFTW9MTKeY8or6Q== +"@abp/datatables.net-bs4@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.3.0-rc.2.tgz#bbfc0d9d0ed86cdb14b38849fb78b2b1911c4a35" + integrity sha512-PRKYi2NU41KpckJ/d0buHoFbyKVuW5NCQNpUdYzDsPS2riyeXccCsLFJM1bT01TdR4Idla3vx9Fkb+HoJOiDeQ== dependencies: - "@abp/datatables.net" "~4.3.0-rc.1" + "@abp/datatables.net" "~4.3.0-rc.2" datatables.net-bs4 "^1.10.21" -"@abp/datatables.net@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.3.0-rc.1.tgz#aa1640903fe67d20e1fc57ffe0519b2764e4c7df" - integrity sha512-qfdQa43sbXsIEBc3WpxSC7cXyKSFxLiFdCKnLIkQNsC3Wo+WX/Cute2xNbT0+xIQdGznfEBdPxcwQkNE6JQgcA== +"@abp/datatables.net@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.3.0-rc.2.tgz#1923e60db261366a7d2f284b0274d13e253567ca" + integrity sha512-rp53+5Xj1jhjpCj7UBA9+nSNbaTQ4Vc1NWCg1e5aI5tWiyZprUS44dRszIQIDV86XKorfFhog5ihOZyzl1HDyg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" datatables.net "^1.10.21" -"@abp/font-awesome@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.3.0-rc.1.tgz#5d336ead8b8c67b2c0aaff9365c2c856b033196e" - integrity sha512-BU4ycN/gOxX2x8S/Eszi3bJAz6bZRhxa0uPWxEWKul9PNvKSwMJRoVaEVehnIlfTi2raHsLQHk+F7079gt3dlQ== +"@abp/font-awesome@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.3.0-rc.2.tgz#437d3d6bbd8f52e5091251932d6a494d0164694b" + integrity sha512-FeHHtEQwrJBwD5PkFYqjKouCLwNjjRqTNseaN+s/r7gNjv0PgKytfRoqEb+O/BkZg/DwEuMz9jFX/RXCCNa2xA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" "@fortawesome/fontawesome-free" "^5.13.0" -"@abp/jquery-form@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.3.0-rc.1.tgz#4543e3d751519ba12d2c563aa7cbc56e51dfe093" - integrity sha512-ONQeImarHEe4VRSv13da+rHnCv+2Ycyd7YF+Dr77gtBmTKpC5nAFGY4wO7+u0U0px/YsR2dntpyBj2fEw3wjXA== +"@abp/jquery-form@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.3.0-rc.2.tgz#999910deaf46330477b6ed487a771a2123d69f92" + integrity sha512-+fdEIOTlxDOdYXMtc/ujhYeuP2qiI4bmL3TQQWQxSTlW8q5jB6dHLBnHiXXltO8HxX9+7ZsjN3tsV7+Div5joA== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.3.0-rc.1.tgz#15a06257fba8ef8d2cba2ac9da3f6f7185e6c8dd" - integrity sha512-8Tshu/QsqulwNfRnvoX1mViY12OTvCqpHdRldqr7k6MQd+boo6ahybQ4SCoZ9vsDTmqxd5dkV/A8VijMw66WTQ== +"@abp/jquery-validation-unobtrusive@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.3.0-rc.2.tgz#0635e0c77da269e8367c3d7c388613249ce9221d" + integrity sha512-ubmPjVJatAW3AJWjWtT+ZbNLhu+HHNgcxYkFGVNusNuboTGsoBs5G45Cjzp/q5FnggWoPvkllpf8CGuaYUbpUQ== dependencies: - "@abp/jquery-validation" "~4.3.0-rc.1" + "@abp/jquery-validation" "~4.3.0-rc.2" jquery-validation-unobtrusive "^3.2.11" -"@abp/jquery-validation@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.3.0-rc.1.tgz#6a0d771c88e961cb43144cd6ef916d1ab22aceaf" - integrity sha512-kjVF6757xP8wZ9qw8ysI5ve3AD8PoJtxqkkUV4QF4xcrdP8EPk2heX3Imu7MJiYGyMlwLU++FTm8J68UNsWRmQ== +"@abp/jquery-validation@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.3.0-rc.2.tgz#ee145f8c4a633218ccfa50cca0bed503a0ca8dc6" + integrity sha512-SLWzN6jxVqKaHYs/d6Mku8CfhB1vWgfMbFma14upiJ+/VDkTF4Rh27iMCWKYVOS3bukh2ltBp6kPFplrjCAGSg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" jquery-validation "^1.19.2" -"@abp/jquery@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.3.0-rc.1.tgz#06030baf44983175707409eff16a05db72c93bf5" - integrity sha512-Xgptjea/RzgBvwK+paydXWMgenobuvqKsr9LbrIDiYAJuLMMCyGvwJnA7jeszz+OqZShP8ppoeB0ifa5K2Yc2A== +"@abp/jquery@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.3.0-rc.2.tgz#f620628ea0739888cbcb360c058d09bff10d553b" + integrity sha512-+rfyLVJn7E8wJ1oQ9GiCR63Yk6wah1Hqnj4XpsRDMkIaOXKaqrnVHAZd4W2DUunQSe95wqHfkNH/wkvTyNEwUg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" jquery "~3.5.1" -"@abp/lodash@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.3.0-rc.1.tgz#cd9bf0693379ea54f789299ba67483d345da5abf" - integrity sha512-BtsQs6wpJJvdwPDx7sOIIzkVHJnzw4Twrv0q3XNqmsiv5eGIwluFsorm5N6qOk7nC5csor6mpk6YuJuFii8GbQ== +"@abp/lodash@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.3.0-rc.2.tgz#9b5429d3976b34022aaf8cab4afef57479b66821" + integrity sha512-sE2dyofYbiIy4xhL85diZWkfqBcQl1q61T0DbYDOHgaejZAJxk4bVyFpEuMiC2HwWAZ656IN1bzyQIyE1RKzQA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" lodash "^4.17.15" -"@abp/luxon@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.3.0-rc.1.tgz#dd855417224bbf124cdc9f395bb5cf5f0c6a7a03" - integrity sha512-OtxmjCgPiH1JWsdUvQpkvum3k43H6v8Z5okv4lDpcBOah/HZYUP8qOsSS3Tcyw2I66TK15tq13XJeHabmh2lAQ== +"@abp/luxon@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.3.0-rc.2.tgz#6fdbf1624462615dcb1f5ce85c07fc3bc4065e3f" + integrity sha512-C4aT0aN3/TVtTE3m0AZyhFSeeg+RxXpUO+nffAZoM/cH5NL8tir+O1hd+dhtCb7AELaqQNx5+qgXoJLYdWMYVg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" luxon "^1.24.1" -"@abp/malihu-custom-scrollbar-plugin@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.3.0-rc.1.tgz#e07a9a1895ded98150c1ff4470638ab71e6a0561" - integrity sha512-OiCVlh8iHPHFchSZdFzUl/w+MqPbnlZ4jlohbEuqBTV6rbaAnJXA0Tqylv4RKjho7fybGvhxjDbBrZS4kxUFLg== +"@abp/malihu-custom-scrollbar-plugin@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.3.0-rc.2.tgz#28fc1f216c1d84b20acaf8c8c5cf5c3b33e1aeb1" + integrity sha512-LYMXKkPVyBLWV4Qnom2MW8JJ/rZmVg1CyOFxM6JiL+dpsN1Ogw0hRG33CCHQveqUmf2cr3vf96qk5Et5DyDDIg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.3.0-rc.1.tgz#f3d60b42cb82abc6a0ce6a640b82eb53501f9893" - integrity sha512-z+6Dhu6kqgCfTdZReI08N2ONKakQSmdDsNiZDB5/OOP26k2pOefe/j//sRfjTWiI5gCxO5y98ZZ0ccanBF8oTw== +"@abp/select2@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.3.0-rc.2.tgz#42d62daff9e50b1fe211a1560794625ba3f52107" + integrity sha512-okiIXmFaqx0uy/UMcpMKWKjrwop1JINyzN4FS5tafUpWhx6KcYYHudLWJvnPbsdsOeBQx91kw8jjERRJIqfEOA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" select2 "^4.0.13" -"@abp/sweetalert@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.3.0-rc.1.tgz#d54a8628f004c2d22ebcc4bd60f2b6c1cbd3bc8f" - integrity sha512-OpgDbM9vOfCLpjCRFXavPAdoKlZnpxP+DkUH8owHTrtEuxmrSjpLlIa6VOzAKr70GiLtuMCz9QoH3AyMepx9vA== +"@abp/sweetalert@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.3.0-rc.2.tgz#dfb20dfca8449ed3c3f6599d99b51746019eb664" + integrity sha512-NRKOgT80JVQrwI1FRqpbCzALvnLAFKdPwKKNDgm0L7r/5DL0+JbkKCI1AIPl/yiM8MBrCaQqNms+9JES5mjiUQ== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" sweetalert "^2.1.2" -"@abp/timeago@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.3.0-rc.1.tgz#247f3b3a8e54f6732efa3600ba649a81fee6ec82" - integrity sha512-cplxM3jYhhakET1DyERQoWJQxx0mhTKoI7gW93wNeEMyL4FWaF4lgUNEoubJUSBCDs4v/0ni0pKG8c8nldbiew== +"@abp/timeago@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.3.0-rc.2.tgz#22943e219facd7fa0efddb63017198474b5cef89" + integrity sha512-TjKyuli+SpVjTgVJmraBpqJK112I+1DYHPJfso7QAH48Ra4gceGj9EVS0i/420YyLZyJSMtZOruxzYkyJeR/6w== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" timeago "^1.6.7" -"@abp/toastr@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.3.0-rc.1.tgz#7bc5bb071839fbb971f56c41c8bf220b0a6d67e9" - integrity sha512-OQgmdmWPKlpn/Lks6fUL4enEJgnvUeEcoGTuQOKfkh9ybadYd8kcELWw5ttsQ4o35yvDH3Lsh1jLwPDrCheTBg== +"@abp/toastr@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.3.0-rc.2.tgz#143a344b00bbfaa858fe267fb6d627952bf7b3c0" + integrity sha512-cQV9UFWb9zarkb/CbrqkF9RXqn1Fc/TFKKM5mxpUEcYjx52NuM0d+KawdEMoN2y3y2U4ciY44kbTP2W1y+NlBg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" toastr "^2.1.4" -"@abp/utils@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.3.0-rc.1.tgz#82ef26e01e0cb38417bf4fa9459fde85cbc2b424" - integrity sha512-C/sk6jZQDENI7FbylBoPnTb1rC5eVPnsL8B++vAH4jS//OAj2iNvE6tCewK21GYI/JmfmQzzauQBzOiOJR9a6A== +"@abp/utils@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.3.0-rc.2.tgz#6d051f98772e5642c2e3bc2f68e73d6f24f4694c" + integrity sha512-9qYo8OMTxIUG+qQBWXEpkURS6FUrx+J5s3SwC/eerp46hYr72GQ8L38Wq566a+xiLCn7Duxt6oJ/BxhTfQQxdw== dependencies: just-compare "^1.3.0" 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 321ad21fba..4bc77c8984 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": "^4.3.0-rc.1" + "@abp/aspnetcore.mvc.ui.theme.basic": "^4.3.0-rc.2" } } \ No newline at end of file diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/yarn.lock b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/yarn.lock index e068e01f38..429ce75f04 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/yarn.lock +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.3.0-rc.1.tgz#5dc06d82ee213bc33527b5af72ac94ae06bb7c25" - integrity sha512-Xkwj3NPnqWDgqvaP2eda3gviV7aBtyNOMCdZSvpxWmlaPlvJYN+SnKNnlmX02XVArTlOjaeTapFkE3auJeR6jA== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~4.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui.theme.shared@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.3.0-rc.1.tgz#9d4447f068b490367a20772eb9c2b38480088edb" - integrity sha512-untEVm6cKT375ZVEQFO01/VKIqtdFGIyJd5ZxtoQEV8ueVFRQefCOcvvqaJ8Gfj86T1nacXvJRfBfGihYHY+JQ== - dependencies: - "@abp/aspnetcore.mvc.ui" "~4.3.0-rc.1" - "@abp/bootstrap" "~4.3.0-rc.1" - "@abp/bootstrap-datepicker" "~4.3.0-rc.1" - "@abp/datatables.net-bs4" "~4.3.0-rc.1" - "@abp/font-awesome" "~4.3.0-rc.1" - "@abp/jquery-form" "~4.3.0-rc.1" - "@abp/jquery-validation-unobtrusive" "~4.3.0-rc.1" - "@abp/lodash" "~4.3.0-rc.1" - "@abp/luxon" "~4.3.0-rc.1" - "@abp/malihu-custom-scrollbar-plugin" "~4.3.0-rc.1" - "@abp/select2" "~4.3.0-rc.1" - "@abp/sweetalert" "~4.3.0-rc.1" - "@abp/timeago" "~4.3.0-rc.1" - "@abp/toastr" "~4.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.3.0-rc.1.tgz#1e54da2a668939941ab955f11db69798d04d9e7e" - integrity sha512-969etEb4H/fR9Twz6pcl766M/1AriCh6+B8r4haPB5g7QkOWhyU99mT11BHxQwf+uNV4duGZwvPvrMomrdLj2w== +"@abp/aspnetcore.mvc.ui.theme.basic@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.3.0-rc.2.tgz#4ebafbaade6610e3d405877a148d72d57569c3e3" + integrity sha512-Q3QqxKDFC04gaaj30Rk+9zGNfNxC8FX0jciARATceFV6pdA3F3PgT5EMDSlo6NoGniFVjHPRgay9N09zT6Htyw== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~4.3.0-rc.2" + +"@abp/aspnetcore.mvc.ui.theme.shared@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.3.0-rc.2.tgz#d3bf79929c55c5380d7ca7b913a23031d7a6bd12" + integrity sha512-pz86bIV4wNeG7/UPYzNCXlJ/MdOdIygc+Com7C9Ld7gzsyER7VD9h5U/hkytvL4FBFLJn4DU+xuZNECjv0HS0A== + dependencies: + "@abp/aspnetcore.mvc.ui" "~4.3.0-rc.2" + "@abp/bootstrap" "~4.3.0-rc.2" + "@abp/bootstrap-datepicker" "~4.3.0-rc.2" + "@abp/datatables.net-bs4" "~4.3.0-rc.2" + "@abp/font-awesome" "~4.3.0-rc.2" + "@abp/jquery-form" "~4.3.0-rc.2" + "@abp/jquery-validation-unobtrusive" "~4.3.0-rc.2" + "@abp/lodash" "~4.3.0-rc.2" + "@abp/luxon" "~4.3.0-rc.2" + "@abp/malihu-custom-scrollbar-plugin" "~4.3.0-rc.2" + "@abp/select2" "~4.3.0-rc.2" + "@abp/sweetalert" "~4.3.0-rc.2" + "@abp/timeago" "~4.3.0-rc.2" + "@abp/toastr" "~4.3.0-rc.2" + +"@abp/aspnetcore.mvc.ui@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.3.0-rc.2.tgz#6ff41be179c8d1089778a51ffa54a1f3d7614278" + integrity sha512-2L5zvuqUwPwNPcMauiiJZD1ft0QycqINz+bXEQ8t0EwbB+dzcsukL/rpOQfpeRHWWYy4nIN4C2bTvXhNgQbPqQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -43,145 +43,145 @@ micromatch "^4.0.2" path "^0.12.7" -"@abp/bootstrap-datepicker@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.3.0-rc.1.tgz#879a8ce32a3dbdb0cd80401360d24f25f318670b" - integrity sha512-W2T+rrC3oxuWj2xQUz2virbBK6x7ershWZB9d6FjXTSH89nin9DyBK20dEfskVvhK/IMrmZaW4PWyTTcx9r7dA== +"@abp/bootstrap-datepicker@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.3.0-rc.2.tgz#29a686c3d2bce356967f646d7334cd83c4257b4c" + integrity sha512-3+B7SJRi7DQJe0aNgv0H0zu1BfvMZcwgt06N3ALR9+o3TSJcOqcYrEMed3aG+ASH++CltnohTYnLkVXaxshioA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.3.0-rc.1.tgz#3260de03f29e210e44a55efa3af2ab6d34362227" - integrity sha512-flB18MUnRWpEnS0t/WEjsdhfB5w+zHjsa69Pj733+GHGSsZ1Vppu+rgvSWp38yNHO5uRwGECrwUIGwvd5uD9+A== +"@abp/bootstrap@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.3.0-rc.2.tgz#1416fe639c88b7d958435e45fe19692268a7f932" + integrity sha512-E6svmDhNQlT5nd65VgshexyedRWhbvi9o1oYo/dLTUpJDzR7M9ptDqxFLVB9vVDva3HgxUoEvgRJgb9fXvq4zw== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" bootstrap "^4.6.0" bootstrap-v4-rtl "4.6.0-1" -"@abp/core@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.3.0-rc.1.tgz#201c3be8b5697fe8e1b08b23f87f50e950036a14" - integrity sha512-ET8NGugNmdub+8qGeFf9qGPbloP5gcoBnB7U6ieFz1Eai9S3pSpbM+sdyifucEpzMThUiLS772EP4pJTMXhfEg== +"@abp/core@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.3.0-rc.2.tgz#3c9ea339624ae3b6cbee13e048268d48269ea6a9" + integrity sha512-/89xH+IVSmTOLWeUO4yVB7Hg64uHTbR7bHjgl+b94cFdtITH9Nvr2EGdXUJbHGUK7L6lSDziqiMcG/ic0061+Q== dependencies: - "@abp/utils" "^4.3.0-rc.1" + "@abp/utils" "^4.3.0-rc.2" -"@abp/datatables.net-bs4@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.3.0-rc.1.tgz#f7dad14d13b468949fd161b679f4a70271e0d466" - integrity sha512-812cLTfSZZMvjAFAq5h7R5AeJHigBxbPc+kMReQIcFLH82o6BjA2NqFBqYOvQuh4kqiQ85dqFTW9MTKeY8or6Q== +"@abp/datatables.net-bs4@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.3.0-rc.2.tgz#bbfc0d9d0ed86cdb14b38849fb78b2b1911c4a35" + integrity sha512-PRKYi2NU41KpckJ/d0buHoFbyKVuW5NCQNpUdYzDsPS2riyeXccCsLFJM1bT01TdR4Idla3vx9Fkb+HoJOiDeQ== dependencies: - "@abp/datatables.net" "~4.3.0-rc.1" + "@abp/datatables.net" "~4.3.0-rc.2" datatables.net-bs4 "^1.10.21" -"@abp/datatables.net@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.3.0-rc.1.tgz#aa1640903fe67d20e1fc57ffe0519b2764e4c7df" - integrity sha512-qfdQa43sbXsIEBc3WpxSC7cXyKSFxLiFdCKnLIkQNsC3Wo+WX/Cute2xNbT0+xIQdGznfEBdPxcwQkNE6JQgcA== +"@abp/datatables.net@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.3.0-rc.2.tgz#1923e60db261366a7d2f284b0274d13e253567ca" + integrity sha512-rp53+5Xj1jhjpCj7UBA9+nSNbaTQ4Vc1NWCg1e5aI5tWiyZprUS44dRszIQIDV86XKorfFhog5ihOZyzl1HDyg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" datatables.net "^1.10.21" -"@abp/font-awesome@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.3.0-rc.1.tgz#5d336ead8b8c67b2c0aaff9365c2c856b033196e" - integrity sha512-BU4ycN/gOxX2x8S/Eszi3bJAz6bZRhxa0uPWxEWKul9PNvKSwMJRoVaEVehnIlfTi2raHsLQHk+F7079gt3dlQ== +"@abp/font-awesome@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.3.0-rc.2.tgz#437d3d6bbd8f52e5091251932d6a494d0164694b" + integrity sha512-FeHHtEQwrJBwD5PkFYqjKouCLwNjjRqTNseaN+s/r7gNjv0PgKytfRoqEb+O/BkZg/DwEuMz9jFX/RXCCNa2xA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" "@fortawesome/fontawesome-free" "^5.13.0" -"@abp/jquery-form@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.3.0-rc.1.tgz#4543e3d751519ba12d2c563aa7cbc56e51dfe093" - integrity sha512-ONQeImarHEe4VRSv13da+rHnCv+2Ycyd7YF+Dr77gtBmTKpC5nAFGY4wO7+u0U0px/YsR2dntpyBj2fEw3wjXA== +"@abp/jquery-form@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.3.0-rc.2.tgz#999910deaf46330477b6ed487a771a2123d69f92" + integrity sha512-+fdEIOTlxDOdYXMtc/ujhYeuP2qiI4bmL3TQQWQxSTlW8q5jB6dHLBnHiXXltO8HxX9+7ZsjN3tsV7+Div5joA== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.3.0-rc.1.tgz#15a06257fba8ef8d2cba2ac9da3f6f7185e6c8dd" - integrity sha512-8Tshu/QsqulwNfRnvoX1mViY12OTvCqpHdRldqr7k6MQd+boo6ahybQ4SCoZ9vsDTmqxd5dkV/A8VijMw66WTQ== +"@abp/jquery-validation-unobtrusive@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.3.0-rc.2.tgz#0635e0c77da269e8367c3d7c388613249ce9221d" + integrity sha512-ubmPjVJatAW3AJWjWtT+ZbNLhu+HHNgcxYkFGVNusNuboTGsoBs5G45Cjzp/q5FnggWoPvkllpf8CGuaYUbpUQ== dependencies: - "@abp/jquery-validation" "~4.3.0-rc.1" + "@abp/jquery-validation" "~4.3.0-rc.2" jquery-validation-unobtrusive "^3.2.11" -"@abp/jquery-validation@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.3.0-rc.1.tgz#6a0d771c88e961cb43144cd6ef916d1ab22aceaf" - integrity sha512-kjVF6757xP8wZ9qw8ysI5ve3AD8PoJtxqkkUV4QF4xcrdP8EPk2heX3Imu7MJiYGyMlwLU++FTm8J68UNsWRmQ== +"@abp/jquery-validation@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.3.0-rc.2.tgz#ee145f8c4a633218ccfa50cca0bed503a0ca8dc6" + integrity sha512-SLWzN6jxVqKaHYs/d6Mku8CfhB1vWgfMbFma14upiJ+/VDkTF4Rh27iMCWKYVOS3bukh2ltBp6kPFplrjCAGSg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" jquery-validation "^1.19.2" -"@abp/jquery@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.3.0-rc.1.tgz#06030baf44983175707409eff16a05db72c93bf5" - integrity sha512-Xgptjea/RzgBvwK+paydXWMgenobuvqKsr9LbrIDiYAJuLMMCyGvwJnA7jeszz+OqZShP8ppoeB0ifa5K2Yc2A== +"@abp/jquery@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.3.0-rc.2.tgz#f620628ea0739888cbcb360c058d09bff10d553b" + integrity sha512-+rfyLVJn7E8wJ1oQ9GiCR63Yk6wah1Hqnj4XpsRDMkIaOXKaqrnVHAZd4W2DUunQSe95wqHfkNH/wkvTyNEwUg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" jquery "~3.5.1" -"@abp/lodash@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.3.0-rc.1.tgz#cd9bf0693379ea54f789299ba67483d345da5abf" - integrity sha512-BtsQs6wpJJvdwPDx7sOIIzkVHJnzw4Twrv0q3XNqmsiv5eGIwluFsorm5N6qOk7nC5csor6mpk6YuJuFii8GbQ== +"@abp/lodash@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.3.0-rc.2.tgz#9b5429d3976b34022aaf8cab4afef57479b66821" + integrity sha512-sE2dyofYbiIy4xhL85diZWkfqBcQl1q61T0DbYDOHgaejZAJxk4bVyFpEuMiC2HwWAZ656IN1bzyQIyE1RKzQA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" lodash "^4.17.15" -"@abp/luxon@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.3.0-rc.1.tgz#dd855417224bbf124cdc9f395bb5cf5f0c6a7a03" - integrity sha512-OtxmjCgPiH1JWsdUvQpkvum3k43H6v8Z5okv4lDpcBOah/HZYUP8qOsSS3Tcyw2I66TK15tq13XJeHabmh2lAQ== +"@abp/luxon@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.3.0-rc.2.tgz#6fdbf1624462615dcb1f5ce85c07fc3bc4065e3f" + integrity sha512-C4aT0aN3/TVtTE3m0AZyhFSeeg+RxXpUO+nffAZoM/cH5NL8tir+O1hd+dhtCb7AELaqQNx5+qgXoJLYdWMYVg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" luxon "^1.24.1" -"@abp/malihu-custom-scrollbar-plugin@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.3.0-rc.1.tgz#e07a9a1895ded98150c1ff4470638ab71e6a0561" - integrity sha512-OiCVlh8iHPHFchSZdFzUl/w+MqPbnlZ4jlohbEuqBTV6rbaAnJXA0Tqylv4RKjho7fybGvhxjDbBrZS4kxUFLg== +"@abp/malihu-custom-scrollbar-plugin@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.3.0-rc.2.tgz#28fc1f216c1d84b20acaf8c8c5cf5c3b33e1aeb1" + integrity sha512-LYMXKkPVyBLWV4Qnom2MW8JJ/rZmVg1CyOFxM6JiL+dpsN1Ogw0hRG33CCHQveqUmf2cr3vf96qk5Et5DyDDIg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.3.0-rc.1.tgz#f3d60b42cb82abc6a0ce6a640b82eb53501f9893" - integrity sha512-z+6Dhu6kqgCfTdZReI08N2ONKakQSmdDsNiZDB5/OOP26k2pOefe/j//sRfjTWiI5gCxO5y98ZZ0ccanBF8oTw== +"@abp/select2@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.3.0-rc.2.tgz#42d62daff9e50b1fe211a1560794625ba3f52107" + integrity sha512-okiIXmFaqx0uy/UMcpMKWKjrwop1JINyzN4FS5tafUpWhx6KcYYHudLWJvnPbsdsOeBQx91kw8jjERRJIqfEOA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" select2 "^4.0.13" -"@abp/sweetalert@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.3.0-rc.1.tgz#d54a8628f004c2d22ebcc4bd60f2b6c1cbd3bc8f" - integrity sha512-OpgDbM9vOfCLpjCRFXavPAdoKlZnpxP+DkUH8owHTrtEuxmrSjpLlIa6VOzAKr70GiLtuMCz9QoH3AyMepx9vA== +"@abp/sweetalert@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.3.0-rc.2.tgz#dfb20dfca8449ed3c3f6599d99b51746019eb664" + integrity sha512-NRKOgT80JVQrwI1FRqpbCzALvnLAFKdPwKKNDgm0L7r/5DL0+JbkKCI1AIPl/yiM8MBrCaQqNms+9JES5mjiUQ== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" sweetalert "^2.1.2" -"@abp/timeago@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.3.0-rc.1.tgz#247f3b3a8e54f6732efa3600ba649a81fee6ec82" - integrity sha512-cplxM3jYhhakET1DyERQoWJQxx0mhTKoI7gW93wNeEMyL4FWaF4lgUNEoubJUSBCDs4v/0ni0pKG8c8nldbiew== +"@abp/timeago@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.3.0-rc.2.tgz#22943e219facd7fa0efddb63017198474b5cef89" + integrity sha512-TjKyuli+SpVjTgVJmraBpqJK112I+1DYHPJfso7QAH48Ra4gceGj9EVS0i/420YyLZyJSMtZOruxzYkyJeR/6w== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" timeago "^1.6.7" -"@abp/toastr@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.3.0-rc.1.tgz#7bc5bb071839fbb971f56c41c8bf220b0a6d67e9" - integrity sha512-OQgmdmWPKlpn/Lks6fUL4enEJgnvUeEcoGTuQOKfkh9ybadYd8kcELWw5ttsQ4o35yvDH3Lsh1jLwPDrCheTBg== +"@abp/toastr@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.3.0-rc.2.tgz#143a344b00bbfaa858fe267fb6d627952bf7b3c0" + integrity sha512-cQV9UFWb9zarkb/CbrqkF9RXqn1Fc/TFKKM5mxpUEcYjx52NuM0d+KawdEMoN2y3y2U4ciY44kbTP2W1y+NlBg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" toastr "^2.1.4" -"@abp/utils@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.3.0-rc.1.tgz#82ef26e01e0cb38417bf4fa9459fde85cbc2b424" - integrity sha512-C/sk6jZQDENI7FbylBoPnTb1rC5eVPnsL8B++vAH4jS//OAj2iNvE6tCewK21GYI/JmfmQzzauQBzOiOJR9a6A== +"@abp/utils@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.3.0-rc.2.tgz#6d051f98772e5642c2e3bc2f68e73d6f24f4694c" + integrity sha512-9qYo8OMTxIUG+qQBWXEpkURS6FUrx+J5s3SwC/eerp46hYr72GQ8L38Wq566a+xiLCn7Duxt6oJ/BxhTfQQxdw== dependencies: just-compare "^1.3.0" 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 321ad21fba..4bc77c8984 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": "^4.3.0-rc.1" + "@abp/aspnetcore.mvc.ui.theme.basic": "^4.3.0-rc.2" } } \ No newline at end of file diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/yarn.lock b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/yarn.lock index 056c0779d9..4442e8a45e 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/yarn.lock +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.3.0-rc.1.tgz#5dc06d82ee213bc33527b5af72ac94ae06bb7c25" - integrity sha512-Xkwj3NPnqWDgqvaP2eda3gviV7aBtyNOMCdZSvpxWmlaPlvJYN+SnKNnlmX02XVArTlOjaeTapFkE3auJeR6jA== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~4.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui.theme.shared@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.3.0-rc.1.tgz#9d4447f068b490367a20772eb9c2b38480088edb" - integrity sha512-untEVm6cKT375ZVEQFO01/VKIqtdFGIyJd5ZxtoQEV8ueVFRQefCOcvvqaJ8Gfj86T1nacXvJRfBfGihYHY+JQ== - dependencies: - "@abp/aspnetcore.mvc.ui" "~4.3.0-rc.1" - "@abp/bootstrap" "~4.3.0-rc.1" - "@abp/bootstrap-datepicker" "~4.3.0-rc.1" - "@abp/datatables.net-bs4" "~4.3.0-rc.1" - "@abp/font-awesome" "~4.3.0-rc.1" - "@abp/jquery-form" "~4.3.0-rc.1" - "@abp/jquery-validation-unobtrusive" "~4.3.0-rc.1" - "@abp/lodash" "~4.3.0-rc.1" - "@abp/luxon" "~4.3.0-rc.1" - "@abp/malihu-custom-scrollbar-plugin" "~4.3.0-rc.1" - "@abp/select2" "~4.3.0-rc.1" - "@abp/sweetalert" "~4.3.0-rc.1" - "@abp/timeago" "~4.3.0-rc.1" - "@abp/toastr" "~4.3.0-rc.1" - -"@abp/aspnetcore.mvc.ui@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.3.0-rc.1.tgz#1e54da2a668939941ab955f11db69798d04d9e7e" - integrity sha512-969etEb4H/fR9Twz6pcl766M/1AriCh6+B8r4haPB5g7QkOWhyU99mT11BHxQwf+uNV4duGZwvPvrMomrdLj2w== +"@abp/aspnetcore.mvc.ui.theme.basic@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.3.0-rc.2.tgz#4ebafbaade6610e3d405877a148d72d57569c3e3" + integrity sha512-Q3QqxKDFC04gaaj30Rk+9zGNfNxC8FX0jciARATceFV6pdA3F3PgT5EMDSlo6NoGniFVjHPRgay9N09zT6Htyw== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~4.3.0-rc.2" + +"@abp/aspnetcore.mvc.ui.theme.shared@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.3.0-rc.2.tgz#d3bf79929c55c5380d7ca7b913a23031d7a6bd12" + integrity sha512-pz86bIV4wNeG7/UPYzNCXlJ/MdOdIygc+Com7C9Ld7gzsyER7VD9h5U/hkytvL4FBFLJn4DU+xuZNECjv0HS0A== + dependencies: + "@abp/aspnetcore.mvc.ui" "~4.3.0-rc.2" + "@abp/bootstrap" "~4.3.0-rc.2" + "@abp/bootstrap-datepicker" "~4.3.0-rc.2" + "@abp/datatables.net-bs4" "~4.3.0-rc.2" + "@abp/font-awesome" "~4.3.0-rc.2" + "@abp/jquery-form" "~4.3.0-rc.2" + "@abp/jquery-validation-unobtrusive" "~4.3.0-rc.2" + "@abp/lodash" "~4.3.0-rc.2" + "@abp/luxon" "~4.3.0-rc.2" + "@abp/malihu-custom-scrollbar-plugin" "~4.3.0-rc.2" + "@abp/select2" "~4.3.0-rc.2" + "@abp/sweetalert" "~4.3.0-rc.2" + "@abp/timeago" "~4.3.0-rc.2" + "@abp/toastr" "~4.3.0-rc.2" + +"@abp/aspnetcore.mvc.ui@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.3.0-rc.2.tgz#6ff41be179c8d1089778a51ffa54a1f3d7614278" + integrity sha512-2L5zvuqUwPwNPcMauiiJZD1ft0QycqINz+bXEQ8t0EwbB+dzcsukL/rpOQfpeRHWWYy4nIN4C2bTvXhNgQbPqQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -43,145 +43,145 @@ micromatch "^4.0.2" path "^0.12.7" -"@abp/bootstrap-datepicker@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.3.0-rc.1.tgz#879a8ce32a3dbdb0cd80401360d24f25f318670b" - integrity sha512-W2T+rrC3oxuWj2xQUz2virbBK6x7ershWZB9d6FjXTSH89nin9DyBK20dEfskVvhK/IMrmZaW4PWyTTcx9r7dA== +"@abp/bootstrap-datepicker@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.3.0-rc.2.tgz#29a686c3d2bce356967f646d7334cd83c4257b4c" + integrity sha512-3+B7SJRi7DQJe0aNgv0H0zu1BfvMZcwgt06N3ALR9+o3TSJcOqcYrEMed3aG+ASH++CltnohTYnLkVXaxshioA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.3.0-rc.1.tgz#3260de03f29e210e44a55efa3af2ab6d34362227" - integrity sha512-flB18MUnRWpEnS0t/WEjsdhfB5w+zHjsa69Pj733+GHGSsZ1Vppu+rgvSWp38yNHO5uRwGECrwUIGwvd5uD9+A== +"@abp/bootstrap@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.3.0-rc.2.tgz#1416fe639c88b7d958435e45fe19692268a7f932" + integrity sha512-E6svmDhNQlT5nd65VgshexyedRWhbvi9o1oYo/dLTUpJDzR7M9ptDqxFLVB9vVDva3HgxUoEvgRJgb9fXvq4zw== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" bootstrap "^4.6.0" bootstrap-v4-rtl "4.6.0-1" -"@abp/core@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.3.0-rc.1.tgz#201c3be8b5697fe8e1b08b23f87f50e950036a14" - integrity sha512-ET8NGugNmdub+8qGeFf9qGPbloP5gcoBnB7U6ieFz1Eai9S3pSpbM+sdyifucEpzMThUiLS772EP4pJTMXhfEg== +"@abp/core@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.3.0-rc.2.tgz#3c9ea339624ae3b6cbee13e048268d48269ea6a9" + integrity sha512-/89xH+IVSmTOLWeUO4yVB7Hg64uHTbR7bHjgl+b94cFdtITH9Nvr2EGdXUJbHGUK7L6lSDziqiMcG/ic0061+Q== dependencies: - "@abp/utils" "^4.3.0-rc.1" + "@abp/utils" "^4.3.0-rc.2" -"@abp/datatables.net-bs4@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.3.0-rc.1.tgz#f7dad14d13b468949fd161b679f4a70271e0d466" - integrity sha512-812cLTfSZZMvjAFAq5h7R5AeJHigBxbPc+kMReQIcFLH82o6BjA2NqFBqYOvQuh4kqiQ85dqFTW9MTKeY8or6Q== +"@abp/datatables.net-bs4@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.3.0-rc.2.tgz#bbfc0d9d0ed86cdb14b38849fb78b2b1911c4a35" + integrity sha512-PRKYi2NU41KpckJ/d0buHoFbyKVuW5NCQNpUdYzDsPS2riyeXccCsLFJM1bT01TdR4Idla3vx9Fkb+HoJOiDeQ== dependencies: - "@abp/datatables.net" "~4.3.0-rc.1" + "@abp/datatables.net" "~4.3.0-rc.2" datatables.net-bs4 "^1.10.21" -"@abp/datatables.net@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.3.0-rc.1.tgz#aa1640903fe67d20e1fc57ffe0519b2764e4c7df" - integrity sha512-qfdQa43sbXsIEBc3WpxSC7cXyKSFxLiFdCKnLIkQNsC3Wo+WX/Cute2xNbT0+xIQdGznfEBdPxcwQkNE6JQgcA== +"@abp/datatables.net@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.3.0-rc.2.tgz#1923e60db261366a7d2f284b0274d13e253567ca" + integrity sha512-rp53+5Xj1jhjpCj7UBA9+nSNbaTQ4Vc1NWCg1e5aI5tWiyZprUS44dRszIQIDV86XKorfFhog5ihOZyzl1HDyg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" datatables.net "^1.10.21" -"@abp/font-awesome@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.3.0-rc.1.tgz#5d336ead8b8c67b2c0aaff9365c2c856b033196e" - integrity sha512-BU4ycN/gOxX2x8S/Eszi3bJAz6bZRhxa0uPWxEWKul9PNvKSwMJRoVaEVehnIlfTi2raHsLQHk+F7079gt3dlQ== +"@abp/font-awesome@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.3.0-rc.2.tgz#437d3d6bbd8f52e5091251932d6a494d0164694b" + integrity sha512-FeHHtEQwrJBwD5PkFYqjKouCLwNjjRqTNseaN+s/r7gNjv0PgKytfRoqEb+O/BkZg/DwEuMz9jFX/RXCCNa2xA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" "@fortawesome/fontawesome-free" "^5.13.0" -"@abp/jquery-form@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.3.0-rc.1.tgz#4543e3d751519ba12d2c563aa7cbc56e51dfe093" - integrity sha512-ONQeImarHEe4VRSv13da+rHnCv+2Ycyd7YF+Dr77gtBmTKpC5nAFGY4wO7+u0U0px/YsR2dntpyBj2fEw3wjXA== +"@abp/jquery-form@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.3.0-rc.2.tgz#999910deaf46330477b6ed487a771a2123d69f92" + integrity sha512-+fdEIOTlxDOdYXMtc/ujhYeuP2qiI4bmL3TQQWQxSTlW8q5jB6dHLBnHiXXltO8HxX9+7ZsjN3tsV7+Div5joA== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.3.0-rc.1.tgz#15a06257fba8ef8d2cba2ac9da3f6f7185e6c8dd" - integrity sha512-8Tshu/QsqulwNfRnvoX1mViY12OTvCqpHdRldqr7k6MQd+boo6ahybQ4SCoZ9vsDTmqxd5dkV/A8VijMw66WTQ== +"@abp/jquery-validation-unobtrusive@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.3.0-rc.2.tgz#0635e0c77da269e8367c3d7c388613249ce9221d" + integrity sha512-ubmPjVJatAW3AJWjWtT+ZbNLhu+HHNgcxYkFGVNusNuboTGsoBs5G45Cjzp/q5FnggWoPvkllpf8CGuaYUbpUQ== dependencies: - "@abp/jquery-validation" "~4.3.0-rc.1" + "@abp/jquery-validation" "~4.3.0-rc.2" jquery-validation-unobtrusive "^3.2.11" -"@abp/jquery-validation@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.3.0-rc.1.tgz#6a0d771c88e961cb43144cd6ef916d1ab22aceaf" - integrity sha512-kjVF6757xP8wZ9qw8ysI5ve3AD8PoJtxqkkUV4QF4xcrdP8EPk2heX3Imu7MJiYGyMlwLU++FTm8J68UNsWRmQ== +"@abp/jquery-validation@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.3.0-rc.2.tgz#ee145f8c4a633218ccfa50cca0bed503a0ca8dc6" + integrity sha512-SLWzN6jxVqKaHYs/d6Mku8CfhB1vWgfMbFma14upiJ+/VDkTF4Rh27iMCWKYVOS3bukh2ltBp6kPFplrjCAGSg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" jquery-validation "^1.19.2" -"@abp/jquery@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.3.0-rc.1.tgz#06030baf44983175707409eff16a05db72c93bf5" - integrity sha512-Xgptjea/RzgBvwK+paydXWMgenobuvqKsr9LbrIDiYAJuLMMCyGvwJnA7jeszz+OqZShP8ppoeB0ifa5K2Yc2A== +"@abp/jquery@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.3.0-rc.2.tgz#f620628ea0739888cbcb360c058d09bff10d553b" + integrity sha512-+rfyLVJn7E8wJ1oQ9GiCR63Yk6wah1Hqnj4XpsRDMkIaOXKaqrnVHAZd4W2DUunQSe95wqHfkNH/wkvTyNEwUg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" jquery "~3.5.1" -"@abp/lodash@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.3.0-rc.1.tgz#cd9bf0693379ea54f789299ba67483d345da5abf" - integrity sha512-BtsQs6wpJJvdwPDx7sOIIzkVHJnzw4Twrv0q3XNqmsiv5eGIwluFsorm5N6qOk7nC5csor6mpk6YuJuFii8GbQ== +"@abp/lodash@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.3.0-rc.2.tgz#9b5429d3976b34022aaf8cab4afef57479b66821" + integrity sha512-sE2dyofYbiIy4xhL85diZWkfqBcQl1q61T0DbYDOHgaejZAJxk4bVyFpEuMiC2HwWAZ656IN1bzyQIyE1RKzQA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" lodash "^4.17.15" -"@abp/luxon@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.3.0-rc.1.tgz#dd855417224bbf124cdc9f395bb5cf5f0c6a7a03" - integrity sha512-OtxmjCgPiH1JWsdUvQpkvum3k43H6v8Z5okv4lDpcBOah/HZYUP8qOsSS3Tcyw2I66TK15tq13XJeHabmh2lAQ== +"@abp/luxon@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.3.0-rc.2.tgz#6fdbf1624462615dcb1f5ce85c07fc3bc4065e3f" + integrity sha512-C4aT0aN3/TVtTE3m0AZyhFSeeg+RxXpUO+nffAZoM/cH5NL8tir+O1hd+dhtCb7AELaqQNx5+qgXoJLYdWMYVg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" luxon "^1.24.1" -"@abp/malihu-custom-scrollbar-plugin@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.3.0-rc.1.tgz#e07a9a1895ded98150c1ff4470638ab71e6a0561" - integrity sha512-OiCVlh8iHPHFchSZdFzUl/w+MqPbnlZ4jlohbEuqBTV6rbaAnJXA0Tqylv4RKjho7fybGvhxjDbBrZS4kxUFLg== +"@abp/malihu-custom-scrollbar-plugin@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.3.0-rc.2.tgz#28fc1f216c1d84b20acaf8c8c5cf5c3b33e1aeb1" + integrity sha512-LYMXKkPVyBLWV4Qnom2MW8JJ/rZmVg1CyOFxM6JiL+dpsN1Ogw0hRG33CCHQveqUmf2cr3vf96qk5Et5DyDDIg== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.3.0-rc.1.tgz#f3d60b42cb82abc6a0ce6a640b82eb53501f9893" - integrity sha512-z+6Dhu6kqgCfTdZReI08N2ONKakQSmdDsNiZDB5/OOP26k2pOefe/j//sRfjTWiI5gCxO5y98ZZ0ccanBF8oTw== +"@abp/select2@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.3.0-rc.2.tgz#42d62daff9e50b1fe211a1560794625ba3f52107" + integrity sha512-okiIXmFaqx0uy/UMcpMKWKjrwop1JINyzN4FS5tafUpWhx6KcYYHudLWJvnPbsdsOeBQx91kw8jjERRJIqfEOA== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" select2 "^4.0.13" -"@abp/sweetalert@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.3.0-rc.1.tgz#d54a8628f004c2d22ebcc4bd60f2b6c1cbd3bc8f" - integrity sha512-OpgDbM9vOfCLpjCRFXavPAdoKlZnpxP+DkUH8owHTrtEuxmrSjpLlIa6VOzAKr70GiLtuMCz9QoH3AyMepx9vA== +"@abp/sweetalert@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.3.0-rc.2.tgz#dfb20dfca8449ed3c3f6599d99b51746019eb664" + integrity sha512-NRKOgT80JVQrwI1FRqpbCzALvnLAFKdPwKKNDgm0L7r/5DL0+JbkKCI1AIPl/yiM8MBrCaQqNms+9JES5mjiUQ== dependencies: - "@abp/core" "~4.3.0-rc.1" + "@abp/core" "~4.3.0-rc.2" sweetalert "^2.1.2" -"@abp/timeago@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.3.0-rc.1.tgz#247f3b3a8e54f6732efa3600ba649a81fee6ec82" - integrity sha512-cplxM3jYhhakET1DyERQoWJQxx0mhTKoI7gW93wNeEMyL4FWaF4lgUNEoubJUSBCDs4v/0ni0pKG8c8nldbiew== +"@abp/timeago@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.3.0-rc.2.tgz#22943e219facd7fa0efddb63017198474b5cef89" + integrity sha512-TjKyuli+SpVjTgVJmraBpqJK112I+1DYHPJfso7QAH48Ra4gceGj9EVS0i/420YyLZyJSMtZOruxzYkyJeR/6w== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" timeago "^1.6.7" -"@abp/toastr@~4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.3.0-rc.1.tgz#7bc5bb071839fbb971f56c41c8bf220b0a6d67e9" - integrity sha512-OQgmdmWPKlpn/Lks6fUL4enEJgnvUeEcoGTuQOKfkh9ybadYd8kcELWw5ttsQ4o35yvDH3Lsh1jLwPDrCheTBg== +"@abp/toastr@~4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.3.0-rc.2.tgz#143a344b00bbfaa858fe267fb6d627952bf7b3c0" + integrity sha512-cQV9UFWb9zarkb/CbrqkF9RXqn1Fc/TFKKM5mxpUEcYjx52NuM0d+KawdEMoN2y3y2U4ciY44kbTP2W1y+NlBg== dependencies: - "@abp/jquery" "~4.3.0-rc.1" + "@abp/jquery" "~4.3.0-rc.2" toastr "^2.1.4" -"@abp/utils@^4.3.0-rc.1": - version "4.3.0-rc.1" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.3.0-rc.1.tgz#82ef26e01e0cb38417bf4fa9459fde85cbc2b424" - integrity sha512-C/sk6jZQDENI7FbylBoPnTb1rC5eVPnsL8B++vAH4jS//OAj2iNvE6tCewK21GYI/JmfmQzzauQBzOiOJR9a6A== +"@abp/utils@^4.3.0-rc.2": + version "4.3.0-rc.2" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.3.0-rc.2.tgz#6d051f98772e5642c2e3bc2f68e73d6f24f4694c" + integrity sha512-9qYo8OMTxIUG+qQBWXEpkURS6FUrx+J5s3SwC/eerp46hYr72GQ8L38Wq566a+xiLCn7Duxt6oJ/BxhTfQQxdw== dependencies: just-compare "^1.3.0" diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.csproj b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.csproj index 069545e840..6efa2c13ec 100644 --- a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.csproj +++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.csproj @@ -9,7 +9,7 @@ - +