diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/AbpIoWwwResource.cs b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/AbpIoWwwResource.cs index 552b5949e1..f64552be30 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/AbpIoWwwResource.cs +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/AbpIoWwwResource.cs @@ -1,5 +1,8 @@ -namespace AbpIoLocalization.Www +using Volo.Abp.Localization; + +namespace AbpIoLocalization.Www { + [LocalizationResourceName("AbpIoWww")] public class AbpIoWwwResource { diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json index 41eda60de6..c4098bab35 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json @@ -372,6 +372,13 @@ "MasteringAbpFramework_Book_What_You_Will_Learn_8": "Write unit, integration, and UI tests using ABP Framework.", "MasteringAbpFramework_Book_WhoIsThisBookFor": "Who's this book for", "MasteringAbpFramework_Book_WhoIsThisBookFor_Description": "This book is for web developers who want to learn software architectures and best practices for building\n maintainable web-based solutions using Microsoft technologies and ABP Framework. Basic knowledge of C#\n and ASP.NET Core is necessary to get started with this book.", - "ComputersAndTechnology": "Computers & Technology" + "ComputersAndTechnology": "Computers & Technology", + "SelectUITheme": "Select UI Theme", + "LeptonXLiteTheme": "LeptonX Lite Theme", + "BasicTheme": "Basic Theme", + "LeptonXLiteThemeInfo": " A modern and stylish Bootstrap UI theme. Ideal if you want to have a production ready UI theme. This is the newest theme and is the default.", + "BasicThemeInfo": "Minimalist UI theme with plain Bootstrap colors and styles. Ideal if you will build your own UI theme.", + "SeeDocumentation": "See documentation.", + "SeeFullScreen": "🖼️ See the screenshot" } } diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/POST.md b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/POST.md new file mode 100644 index 0000000000..2b756f2958 --- /dev/null +++ b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/POST.md @@ -0,0 +1,380 @@ +# ABP.IO Platform 6.0 RC Has Been Released + +Today, we are happy to release the [ABP Framework](https://abp.io/) and [ABP Commercial](https://commercial.abp.io/) version **6.0 RC** (release candidate). This blog post introduces the new features and important changes in this new version. + +> **The planned release date for the [6.0.0 Stable](https://github.com/abpframework/abp/milestone/71) version is September 06, 2022**. + +Try this version and provide feedback for the stable ABP v6.0! Thank you to all. + +## Get Started with the 6.0 RC + +Follow the steps below to try version 6.0.0 RC today: + +1) **Upgrade** the ABP CLI to version `6.0.0-rc.1` using a command line terminal: + +````bash +dotnet tool update Volo.Abp.Cli -g --version 6.0.0-rc.1 +```` + +**or install** it if you haven't before: + +````bash +dotnet tool install Volo.Abp.Cli -g --version 6.0.0-rc.1 +```` + +2) Create a **new application** with the `--preview` option: + +````bash +abp new BookStore --preview +```` + +See the [ABP CLI documentation](https://docs.abp.io/en/abp/latest/CLI) for all the available options. + +> You can also use the *Direct Download* tab on the [Get Started](https://abp.io/get-started) page by selecting the **Preview checkbox**. + +You can use any IDE that supports .NET 6.x, like **[Visual Studio 2022](https://visualstudio.microsoft.com/downloads/)**. + +## Migration Guides + +There are breaking changes in this version that may affect your application. +Please see the following migration documents, if you are upgrading from v5.3.0: + +* [ABP Framework 5.3 to 6.0 Migration Guide](https://docs.abp.io/en/abp/6.0/Migration-Guides/Abp-6_0) +* [ABP Commercial 5.3 to 6.0 Migration Guide](https://docs.abp.io/en/commercial/6.0/migration-guides/v6_0) + +## What's New with ABP Framework 6.0? + +In this section, I will introduce some major features released in this version. Here is a brief list of titles explained in the next sections: + +* **LeptonX Lite** is now the **default theme** for startup templates. +* Optional PWA support is added to [*Get Started*](https://abp.io/get-started) page. +* Introducing the **OpenIddict Module** and switching to OpenIddict for the startup templates. +* New **.NET MAUI** Startup Template. +* Introducing the `ITransientCachedServiceProvider` interface. +* Introducing the dynamic components for Blazor UI. +* Improvements on ABP CLI. +* Introducing the `Volo.Abp.RemoteServices` package. +* Create/Update user accounts for external logins. +* Sending test email in the setting page for MVC and Blazor user interfaces. +* Improvements on the **eShopOnAbp** project. +* Other news... + +### LeptonX Lite Theme on Startup Templates + +![](leptonx-lite-theme.png) + +With this version, startup templates (`app` and `app-nolayers` templates) use the **LeptonX Lite** as the default theme. However, it's still possible to create a project with **Basic Theme** either using the **ABP CLI** or downloading the project via [*Get Started*](https://abp.io/get-started) page on the [abp.io](https://abp.io/) website. + +#### via ABP CLI + +To create a new project with **Basic Theme**, you can use the `--theme` option as below: + +```bash +abp new Acme.BookStore --theme basic --preview +``` + +#### via Get Started page + +Also, you can create a new project with **LeptonX Lite** or **Basic Theme** on *Get Started* page. + +![](get-started-page.png) + +> The "Preview" checkbox should be checked to be able to see the theme selection section on the *Get Started* page. + + + +### Optional PWA Support is Added to the Get Started Page + +We've introduced the PWA (Progressive Web Application) support for the startup templates for Angular & Blazor WASM UIs in **v5.3**. In this version, we also added this PWA support to the [*Get Started*](https://abp.io/get-started) page on the [abp.io](https://abp.io/) website. + +![](pwa-support-get-started-page.png) + +If you check the "Progressive Web Application" checkbox while creating an application, the all required configurations will be done for you and you will get the benefit of PWA features in your application. + + + +### Introducing the **OpenIddict Module** and Switching to OpenIddict in the Startup Templates + +We already [announced the plan of replacing the IdentityServer with OpenIddict](https://github.com/abpframework/abp/issues/11989). + +Therefore, we have created the `OpenIddict` module in this version and switched to **OpenIddict** in the startup templates. The ABP Framework uses this module to add **OAuth** features to the applications. We created documentation for the **OpenIddict Module**. + +- You can see the following document to **learn about the OpenIddict Module**: + [https://docs.abp.io/en/abp/6.0/Modules/OpenIddict](https://docs.abp.io/en/abp/6.0/Modules/OpenIddict) +- You can check out the following migration guide to learn **how to migrate to OpenIddict**: + [https://docs.abp.io/en/abp/6.0/Migration-Guides/IdentityServer_To_OpenIddict](https://docs.abp.io/en/abp/6.0/Migration-Guides/IdentityServer_To_OpenIddict) + + + +> We will continue to ship Identity Server packages for a while but in the long term, you may need to replace it, because Identity Server support ends at the end of 2022. Please see the [announcement]((https://github.com/abpframework/abp/issues/11989)) for more info. + + + +### New .NET MAUI Startup Template + +![](maui-template.png) + +ABP Framework provides .NET MAUI startup templates with **v6.0.0**. You can create a new .NET MAUI project with the command below: + +```bash +abp new Acme.BookStore -t maui +``` + + + +### Introducing the `ITransientCachedServiceProvider` + +`ICachedServiceProvider` interface is used to resolve the cached services within a new scope. We created a new interface to resolve cached services **without creating scopes**. It's called `ITransientCachedServiceProvider`. The difference between `ICachedServiceProvider` and `ITransientCachedServiceProvider` is; `ITransientCachedServiceProvider` is transient. Check out [this issue](https://github.com/abpframework/abp/issues/12918) for more information. + + + +### Introducing the dynamic layout components for Blazor UI + +ABP Framework provides different ways of customizing the UI and one of them is to use [Layout Hooks](https://docs.abp.io/en/abp/latest/UI/AspNetCore/Layout-Hooks) in MVC. The **Layout Hook System** allows you to add code to some specific parts of the layout and all layouts of the themes provided by the ABP Framework implement these hooks. + +However, Blazor UI doesn't have such a system yet and we are planning to implement [Layout Hooks for the Blazor UI](https://github.com/abpframework/abp/issues/6261) in version 7.0. + +We are introducing the dynamic layout components for the Blazor UI to be able to add components to the Blazor layouts. + +You can configure the `AbpDynamicLayoutComponentOptions` to render your components in the layout, as below: + +```csharp +Configure(options => +{ + options.Components.Add(typeof(MyBlazorComponent), null); +}); +``` + + + +### Improvements in ABP CLI + +There are some enhancements in [ABP CLI](https://docs.abp.io/en/abp/6.0/CLI). You can see the brief list of some of these improvements below: + +* You can list all available templates by using the `abp list-templates` command with v6.0. See [#13083](https://github.com/abpframework/abp/pull/13083). +* You can select the theme when creating a new project by specifying the `--theme` option. You can see the *LeptonX Lite Theme on the Startup Templates* section above for an example. +* `abp update` command has been updating the version of the main application until now. With v6.0.0, this command updates all package versions **inside all solutions in the sub-folders**. Checkout the issue [#12735](https://github.com/abpframework/abp/pull/12738) for more information. + + + +### Introducing the `Volo.Abp.RemoteService` Package + +A new `Volo.Abp.RemoteService` package has been added to the framework. Some of the classes that are related to the remote service configurations such as `AbpRemoteServiceOptions` class moved from `Volo.Abp.Http.Client` to this package. In this way, it became more reusable for further usages. + + + +### Create/Update User Accounts For External Logins + +If a user authenticates from an external provider like `Keycloak`, the user is being redirected to this external provider, and comes back to the main application. In this process, the user's data is not being saved in the main application's database. With this version, ABP saves the user information and lists in the users page. And this fixes permission management, user information mismatches and other issues. For more info, see [the related issue](https://github.com/abpframework/abp/issues/12203). + + + +### Sending test email in the setting page for MVC and Blazor UIs + +"Sending Test Email" feature is added to the [Setting Management](https://docs.abp.io/en/abp/6.0/Modules/Setting-Management) module, which allows checking the email settings are configured properly and sending emails successfully to the target email address. + +![](setting-management-emailing.png) + +After configuring the email settings such as the target email address, you can click the "Send" button to send a test email to see if everything went well. + +> Note that this feature will be implemented for the Angular UI in the stable v6.0. + + + +### Improvements on eShopOnAbp Project + +The following improvements have been made on [eShopOnAbp project](https://github.com/abpframework/eShopOnAbp) with this version: + +* Some improvements have been made on the Admin Application for Order Management for Angular UI. See [#110](https://github.com/abpframework/eShopOnAbp/pull/110). +* `SignalR` error on Kubernetes & Docker Compose has been fixed. See [#113](https://github.com/abpframework/eShopOnAbp/pull/113). +* eShopOnAbp project has been deployed to Azure Kubernetes Service. See [#114](https://github.com/abpframework/eShopOnAbp/pull/114). The live demo can be seen from [eshoponabp.com](https://eshoponabp.com/). +* Configurations have been made for some services on the `docker-compose.yml` file. See [#112](https://github.com/abpframework/eShopOnAbp/pull/112). +* Gateway Redirect Loop problem on Kubernetes has been fixed. See [the commit](https://github.com/abpframework/eShopOnAbp/commit/6413ef15c91cd8a5309050b63bb4dbca23587607). + + + +### Other News + +* Autofac library has been upgraded to **v6.4.0**. Please see [#12816](https://github.com/abpframework/abp/pull/12816) for more info. +* Performance Improvements have been made in the **Settings Module** and tabs on the *Settings* page are lazy loading now. +* Some improvements have been made in the CMS Kit Module. You can see the improvements from [here](https://github.com/abpframework/abp/issues/11965). + +If you want to see more details, you can check [the release on GitHub](https://github.com/abpframework/abp/releases/tag/6.0.0-rc.1), which contains a list of all the issues and pull requests closed in this version. + + + +## What's New with ABP Commercial 6.0? + + + +### LeptonX Theme is the Default Theme + +With this version, the startup templates (`app-pro`, `app-nolayers-pro` and `microservice-pro` templates) use the **LeptonX Theme** as the default theme. However, it's still possible to create a new project with **Lepton Theme** or **Basic Theme**, either using the **ABP CLI** or **ABP Suite**. + +#### via ABP CLI + +To create a new project with **Lepton Theme** or **Basic Theme**, you can use the `--theme` option as below. For "Basic Theme" specify the theme name as `--theme basic`. + +```bash +abp new Acme.BookStore --theme lepton --preview +``` + + + +#### via ABP Suite + +Also, you can create a new project with **Lepton Theme** or **Basic Theme** from ABP Suite. + +![](suite-create-new-solution.png) + +### Switching to OpenIddict in the Startup Templates + +We have also switched to the **OpenIddict** for the startup templates for ABP Commercial as explained above. + + + +### New .NET MAUI Mobile + +![](maui-mobile-option.gif) + +ABP Commercial has been providing a [React Native](https://docs.abp.io/en/commercial/latest/getting-started-react-native) mobile app since with the very early versions. Alternative to this application, we created a new .NET MAUI mobile app. To create a new `app-pro` ABP project with the .NET MAUI mobile app, you can use the command below: + +```bash +abp new Acme.BookStore -t app-pro --mobile maui +``` + +> Note that, when Microsoft supports `WebAuthenticator` on Windows, we'll also support it to work on Windows OS. + + + +### GDPR: Cookie Consent + +![](cookie-banner.png) + +With this version, the **Cookie Consent** feature has been added to the **GDPR** module. It's enabled by default for the new startup templates. There are two pages in the templates: "Cookie Policy" page and "Privacy Policy" page. + +If you want to disable/hide the "Cookie Consent", you can simply open the startup project module class and set the `IsEnabled` property as **false** for the **AddAbpCookieConsent** method as below: + +```csharp +context.Services.AddAbpCookieConsent(options => +{ + options.IsEnabled = false; //disabled + options.CookiePolicyUrl = "/CookiePolicy"; + options.PrivacyPolicyUrl = "/PrivacyPolicy"; +}); +``` + +> These pages are used to build up the cookie consent text and you can change the content or url of these pages by your needs. + +If you want to use the Cookie Consent feature of the GDPR module in your existing project, please see the [GDPR Module](https://docs.abp.io/en/commercial/6.0/modules/gdpr) documentation for configurations. + +### Improvements/Developments on CMS Kit Poll + +Some improvements have been made on the Poll System of CMS Kit module as listed below: + +* The Widget rendering and Admin side for the Blazor UI improvements. +* A Widget can be picked from the editor as seen in the image below. + +![](poll-add-widget.png) + + + +### Blazor UI for the Chat Module + +Chat Module is now also available for the Blazor UI after the MVC and Angular UIs. You can read the [Chat Module](https://docs.abp.io/en/commercial/6.0/modules/chat) documentation to get the overall knowledge about the module and add to your application. + +![](blazor-chat-module-1.png) +![](blazor-chat-module-2.png) + + + +### Blazor Admin UI for CMS Kit Module + +All admin side **CMS Kit** and **CMS Kit Pro** features have been implemented for the Blazor UI. Blazor UI will only be available to ABP Commercial customers. + +![](cms-blog-blazor.png) + +![](cms-blog-post-blazor.png) + + +### Suite: Excel Export + +With v6.0, now it's possible to export the records as Excel for Blazor & MVC UIs. Angular UI is still in-progress, and we will implement it with the stable v6.0 release. Check the "Excel export" checkbox to add this feature. + +![](excel-export.png) + + + +A new Excel Export button is being located at the top of the generated page as seen below: + +![](export-excel-page.png) + +Then, you can download the records as `.xlsx` format by clicking the "Excel Export" button. Note that the exported Excel list is the filtered list. + + + +### ABP Suite: Optional PWA Support + +With this version, it's possible to add the [PWA (Progressive Web App)](https://web.dev/progressive-web-apps/?gclid=Cj0KCQjwxIOXBhCrARIsAL1QFCY0IB-W5k-lsXmRCbm00sl4nyBIYynAX3IdJkjyizyNUjuCE8zeu24aApxtEALw_wcB) support for Blazor & Angular UIs while creating the application via Suite. + +![](suite-pwa-support.png) + +You just need to check the "Progressive web application" checkbox, when creating a new application. Then, ABP Suite will add the PWA support to your application. When you publish your application, you get the full benefits of PWA features such as offline support. + + + +### Other News + +#### Explainer Videos + +We are creating explainer videos for the ABP Commercial Modules to provide an overview. Within this milestone, we've created four new explainer videos: + +* [Audit Logging Module](https://www.youtube.com/watch?v=NzSuFBpqfsc) +* [Identity Module](https://www.youtube.com/watch?v=W87jA_GBE54) +* [SaaS Module](https://www.youtube.com/watch?v=xXlaaXP6qqQ) +* [Forms Module](https://www.youtube.com/watch?v=MousWEPfrA8) + +You can subscribe to [Volosoft's YouTube channel](https://www.youtube.com/channel/UCO3XKlpvq8CA5MQNVS6b3dQ) to be informed about the future ABP events and videos. + + + +### Trial License is now available! + +![](pricing-page.png) + +If you are considering purchasing a new ABP Commercial license, and you want to see ABP in action then, check out https://commercial.abp.io/pricing and click FREE TRIAL button. + + + +## Community News + +### New ABP Community Posts + +* [Alper Ebicoglu](https://twitter.com/alperebicoglu) has created a new community article to give a full overview of .NET MAUI. You can read it [here](https://community.abp.io/posts/all-about-.net-maui-gb4gkdg5). +* [Anto Subash](https://twitter.com/antosubash) has created a new video content to show "State Management in Blazor with Fluxor". You can read it [here](https://community.abp.io/posts/blazor-state-management-with-fluxor-raskpv19). +* [Learn ABP Framework](https://community.abp.io/members/learnabp) has also created a new video content to show "How to install LeptonX Lite Theme for ABP Framework 5.3 MVC UI". You can read it [here](https://community.abp.io/posts/how-to-install-leptonx-lite-theme-on-abp-framework-5.3-mvc-ui-epzng137). +* [Kirti Kulkarni](https://twitter.com/kirtimkulkarni) has created three new community articles. You can use the links below to read the articles: + * [Integrating the file management module with ABP Commercial application](https://community.abp.io/posts/integrating-the-file-management-module-with-abp-commercial-application-qd6v4dsr) + * [Work with PDF's in ABP Commercial Project using PDFTron](https://community.abp.io/posts/work-with-pdfs-in-abp-commercial-project-using-pdftron-tjw0hlgu) + * [Create a custom login page in ABP Commercial Angular app](https://community.abp.io/posts/create-a-custom-login-page-in-abp-commercial-angular-app-r2huidx7) +* [Don Boutwell](https://community.abp.io/members/dboutwell) has created his first ABP Community article. You can read it from [here](https://community.abp.io/posts/password-required-redis-with-abp-framework-and-docker-94old5rm). + + + +### Volosoft Has Attended the DNF Summit 2022 + +![](dnf-summit.png) + +Core team members of ABP Framework, [Halil Ibrahim Kalkan](https://twitter.com/hibrahimkalkan) and [Alper Ebicoglu](https://twitter.com/alperebicoglu) have attended the [DNF Summit](https://t.co/ngWnBLiAn5) on the 20th of July. Halil Ibrahim Kalkan talked about the creation of the ABP Framework and Alper Ebicoglu showed how easy to create a project with ABP Framework within 15 minutes. + +Watch DNF Summit session 👉 https://www.youtube.com/embed/VL0ewZ-0ruo + +![](dnf-summit-attendees.jpg) + + + +## Conclusion + +This version comes with some features and enhancements to the existing features. You can see the [Road Map](https://docs.abp.io/en/abp/6.0/Road-Map) documentation to learn about the release schedule and planned features for the next releases. The planned release date for the [6.0.0 Stable](https://github.com/abpframework/abp/milestone/71) version is September 06, 2022. Please try the ABP v6.0 RC and provide feedback to us. + +Thanks for being a part of this community! \ No newline at end of file diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/blazor-chat-module-1.png b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/blazor-chat-module-1.png new file mode 100644 index 0000000000..6d847c9065 Binary files /dev/null and b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/blazor-chat-module-1.png differ diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/blazor-chat-module-2.png b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/blazor-chat-module-2.png new file mode 100644 index 0000000000..24f0688319 Binary files /dev/null and b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/blazor-chat-module-2.png differ diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/cms-blog-blazor.png b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/cms-blog-blazor.png new file mode 100644 index 0000000000..5d169aa322 Binary files /dev/null and b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/cms-blog-blazor.png differ diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/cms-blog-post-blazor.png b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/cms-blog-post-blazor.png new file mode 100644 index 0000000000..1722a85b10 Binary files /dev/null and b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/cms-blog-post-blazor.png differ diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/cookie-banner.png b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/cookie-banner.png new file mode 100644 index 0000000000..cbfafbc907 Binary files /dev/null and b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/cookie-banner.png differ diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/cover-image.png b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/cover-image.png new file mode 100644 index 0000000000..1a6e267b86 Binary files /dev/null and b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/cover-image.png differ diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/dnf-summit-attendees.jpg b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/dnf-summit-attendees.jpg new file mode 100644 index 0000000000..42df8aaf4e Binary files /dev/null and b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/dnf-summit-attendees.jpg differ diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/dnf-summit.png b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/dnf-summit.png new file mode 100644 index 0000000000..dff3609c20 Binary files /dev/null and b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/dnf-summit.png differ diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/excel-export.png b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/excel-export.png new file mode 100644 index 0000000000..393ea33ada Binary files /dev/null and b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/excel-export.png differ diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/export-excel-page.png b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/export-excel-page.png new file mode 100644 index 0000000000..243752969e Binary files /dev/null and b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/export-excel-page.png differ diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/get-started-page.png b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/get-started-page.png new file mode 100644 index 0000000000..5ae76b1398 Binary files /dev/null and b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/get-started-page.png differ diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/leptonx-lite-theme.png b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/leptonx-lite-theme.png new file mode 100644 index 0000000000..e87a06f4fb Binary files /dev/null and b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/leptonx-lite-theme.png differ diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/maui-mobile-option.gif b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/maui-mobile-option.gif new file mode 100644 index 0000000000..645346abc6 Binary files /dev/null and b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/maui-mobile-option.gif differ diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/maui-template.png b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/maui-template.png new file mode 100644 index 0000000000..0d9df0e63f Binary files /dev/null and b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/maui-template.png differ diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/poll-add-widget.png b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/poll-add-widget.png new file mode 100644 index 0000000000..51cd34b9bf Binary files /dev/null and b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/poll-add-widget.png differ diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/pricing-page.png b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/pricing-page.png new file mode 100644 index 0000000000..21b19b4ed7 Binary files /dev/null and b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/pricing-page.png differ diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/pwa-support-get-started-page.png b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/pwa-support-get-started-page.png new file mode 100644 index 0000000000..e91e4e5223 Binary files /dev/null and b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/pwa-support-get-started-page.png differ diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/setting-management-emailing.png b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/setting-management-emailing.png new file mode 100644 index 0000000000..f2c5475655 Binary files /dev/null and b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/setting-management-emailing.png differ diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/suite-create-new-solution.png b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/suite-create-new-solution.png new file mode 100644 index 0000000000..5756a65ad0 Binary files /dev/null and b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/suite-create-new-solution.png differ diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/suite-pwa-support.png b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/suite-pwa-support.png new file mode 100644 index 0000000000..bf5982b68a Binary files /dev/null and b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/suite-pwa-support.png differ diff --git a/docs/en/Migration-Guides/Abp-6_0.md b/docs/en/Migration-Guides/Abp-6_0.md new file mode 100644 index 0000000000..0d99ee5a2d --- /dev/null +++ b/docs/en/Migration-Guides/Abp-6_0.md @@ -0,0 +1,27 @@ +# ABP Version 6.0 Migration Guide + +This document is a guide for upgrading ABP v5.3 solutions to ABP v6.0. There is a change in this version that may affect your applications, please read it carefully and apply the necessary changes to your application. + +## Added IsActive property + +`IsActive` property is added to `IUserData`. This property is set to **true** by default. **Cmskit** and **Blog** modules are affected by this change. You need to add new migration to your existing application if you are using any of these modules. Please see [#11417](https://github.com/abpframework/abp/pull/11417) for more info. + +## Default behavior change in MultiTenancyMiddlewareErrorPageBuilder + +If you have customized the `MultiTenancyMiddlewareErrorPageBuilder` of `AbpMultiTenancyOptions`, the pipeline now returns **true** to stop the pipeline as the default behavior. See [AbpMultiTenancyOptions: Handle inactive and non-existent tenants](https://github.com/abpframework/abp/blob/dev/docs/en/Multi-Tenancy.md#abpmultitenancyoptions-handle-inactive-and-non-existent-tenants) for more info. + +## Migrating to LeptonX Lite + +LeptonX Lite is now being introduced and you can follow the guides below to migrate your existing applications: + +- [Migrating to LeptonX MVC UI](../themes/LeptonXLite/AspNetCore.md) +- [Migrating to LeptonX Angular UI](../themes/LeptonXLite/angular.md) +- [Migrating to LeptonX Blazor UI](../themes/LeptonXLite/blazor.md) + +## Migrating to OpenIddict + +After the [announcement of plan to replace the IdentityServer](https://github.com/abpframework/abp/issues/11989), we have successfully implemented [Openiddict](https://github.com/openiddict/openiddict-core) as a replacement for IdentityServer4 as OpenID-Provider. You can follow [Migrating Identity Server to OpenIddict guide](./IdentityServer_To_OpenIddict.md). + +## See Also + +* [Official blog post for the 6.0 release](https://blog.abp.io/abp/ABP.IO-Platform-6.0-RC-Has-Been-Published) diff --git a/docs/en/Migration-Guides/IdentityServer_To_OpenIddict.md b/docs/en/Migration-Guides/IdentityServer_To_OpenIddict.md new file mode 100644 index 0000000000..a4baa79d9f --- /dev/null +++ b/docs/en/Migration-Guides/IdentityServer_To_OpenIddict.md @@ -0,0 +1,78 @@ +# Migration Identity Server to OpenIddict Guide + +This document explains how to migrate to [OpenIddict](https://github.com/openiddict/openiddict-core) from Identity Server. From now on the ABP startup templates uses `OpenIddict` as the auth server by default since version v6.0.0. + +## History +We are not removing Identity Server packages and we will continue to release new versions of Identity Server related NuGet/NPM packages. That means you won't have an issue while upgrading to v6.0 when the stable version releases. We will continue to fix bugs in our packages for a while. ABP 7.0 will be based on .NET 7. If Identity Server continues to work with .NET 7, we will also continue to ship NuGet packages for our IDS integration. + +On the other hand, Identity Server ends support for the open-source Identity Server in the end of 2022. The Identity Server team has decided to move to Duende IDS and ABP will not be migrated to the commercial Duende IDS. You can see the Duende Identity Server announcement from [this link](https://blog.duendesoftware.com/posts/20220111_fair_trade). + +## OpenIddict Migration Steps + +* Update all `Volo's` packages to `6.x`. +* Replace all `Volo's` `IdentityServer.*` packages with corresponding `OpenIddict.*` packages. eg `Volo.Abp.IdentityServer.Domain` to `Volo.Abp.OpenIddict.Domain`, `Volo.Abp.Account.Web.IdentityServer` to `Volo.Abp.Account.Web.OpenIddict`. +* Replace all `IdentityServer` modules with corresponding `OpenIddict` modules. eg `AbpIdentityServerDomainModule` to `AbpOpenIddictDomainModule`, `AbpAccountWebIdentityServerModule` to `AbpAccountWebOpenIddictModule`. +* Rename the `ConfigureIdentityServer` to `ConfigureOpenIddict` in your `ProjectNameDbContext` class. +* Remove the `UseIdentityServer` and add `UseAbpOpenIddictValidation` after `UseAuthentication`. +* Add follow code to your startup module. + +```cs +public override void PreConfigureServices(ServiceConfigurationContext context) +{ + PreConfigure(builder => + { + builder.AddValidation(options => + { + options.AddAudiences("ProjectName"); // Change ProjectName to your project name. + options.UseLocalServer(); + options.UseAspNetCore(); + }); + }); +} +``` + +* If your project is not separate AuthServer please also add `ForwardIdentityAuthenticationForBearer` + +```cs +private void ConfigureAuthentication(ServiceConfigurationContext context) +{ + context.Services.ForwardIdentityAuthenticationForBearer(OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme); +} +``` + +* Remove the `IdentityServerDataSeedContributor` from the `Domain` project. +* Create a new version of the project, with the same name as your existing project. +* Copy the `ProjectName.Domain\OpenIddict\OpenIddictDataSeedContributor.cs` of new project into your project and update `appsettings.json` base on `ProjectName.DbMigrator\appsettings.json`, Be careful to change the port number. +* Copy the `Index.cshtml.cs` and `Index.cs` of new project to your project if you're using `IClientRepository` in `IndexModel`. +* Update the scope name from `role` to `roles` in `AddAbpOpenIdConnect` method. +* Remove `options.OAuthClientSecret(configuration["AuthServer:SwaggerClientSecret"]);` from `HttpApi.Host` project. +* AuthServer no longer requires `JWT bearer authentication`. Please remove it. eg `AddJwtBearer` and `UseJwtTokenMiddleware`. +* Try compiling the project in the IDE and following the errors to remove and reference the code and namespaces. +* Add migrations and update the database if you are using EF Core as the database provider. + +## Module packages +### Open source side +* Volo.Abp.OpenIddict.Domain (`AbpOpenIddictDomainModule`) +* Volo.Abp.OpenIddict.Domain.Shared (`AbpOpenIddictDomainSharedModule`) +* Volo.Abp.OpenIddict.EntityFrameworkCore (`AbpOpenIddictEntityFrameworkCoreModule`) +* Volo.Abp.OpenIddict.AspNetCore (`AbpOpenIddictAspNetCoreModule`) +* Volo.Abp.OpenIddict.MongoDB (`AbpOpenIddictMongoDbModule`) +* Volo.Abp.Account.Web.OpenIddict (`AbpAccountWebOpenIddictModule`) +* Volo.Abp.PermissionManagement.Domain.OpenIddict (`AbpPermissionManagementDomainOpenIddictModule`) + +### Commercial side +* Volo.Abp.OpenIddict.Pro.Application.Contracts (`AbpOpenIddictProApplicationContractsModule`) +* Volo.Abp.OpenIddict.Pro.Application (`AbpOpenIddictProApplicationModule`) +* Volo.Abp.OpenIddict.Pro.HttpApi.Client (`AbpOpenIddictProHttpApiClientModule`) +* Volo.Abp.OpenIddict.Pro.HttpApi (`AbpOpenIddictProHttpApiModule`) +* Volo.Abp.OpenIddict.Pro.Blazor(`AbpOpenIddictProBlazorModule`) +* Volo.Abp.OpenIddict.Pro.Blazor.Server (`AbpOpenIddictProBlazorServerModule`) +* Volo.Abp.OpenIddict.Pro.Blazor.WebAssembly (`AbpOpenIddictProBlazorWebAssemblyModule`) +* Volo.Abp.OpenIddict.Pro.Web (`AbpOpenIddictProWebModule`) + +## Source code of samples and module + +* [Open source tiered & separate auth server application migrate Identity Server to OpenIddct](https://github.com/abpframework/abp-samples/tree/master/Ids2OpenId) +* [Commercial tiered & separate auth server application migrate Identity Server to OpenIddct](https://abp.io/Account/Login?returnUrl=/api/download/samples/Ids2OpenId) +* [OpenIddict module document](https://docs.abp.io/en/abp/6.0/Modules/OpenIddict) +* [OpenIddict module source code](https://github.com/abpframework/abp/tree/rel-6.0/modules/openiddict) diff --git a/docs/en/Migration-Guides/Index.md b/docs/en/Migration-Guides/Index.md index c24ac09eee..e3ea77db1f 100644 --- a/docs/en/Migration-Guides/Index.md +++ b/docs/en/Migration-Guides/Index.md @@ -2,6 +2,7 @@ The following documents explain how to migrate your existing ABP applications. We write migration documents only if you need to take an action while upgrading your solution. Otherwise, you can easily upgrade your solution using the [abp update command](../Upgrading.md). +- [5.3 to 6.0](Abp-6_0.md) - [5.2 to 5.3](Abp-5_3.md) - [5.1 to 5.2](Abp-5_2.md) - [4.x to 5.0](Abp-5_0.md) diff --git a/docs/en/Modules/OpenIddict.md b/docs/en/Modules/OpenIddict.md index ed25147be2..9e603f76a8 100644 --- a/docs/en/Modules/OpenIddict.md +++ b/docs/en/Modules/OpenIddict.md @@ -1,9 +1,5 @@ ## ABP OpenIddict Modules -## How to Install - -TODO: - ## User Interface This module implements the domain logic and database integrations, but not provides any UI. Management UI is useful if you need to add applications and scopes on the fly. In this case, you may build the management UI yourself or consider to purchase the [ABP Commercial](https://commercial.abp.io/) which provides the management UI for this module. diff --git a/docs/en/Themes/LeptonXLite/angular.md b/docs/en/Themes/LeptonXLite/Angular.md similarity index 100% rename from docs/en/Themes/LeptonXLite/angular.md rename to docs/en/Themes/LeptonXLite/Angular.md diff --git a/docs/en/Themes/LeptonXLite/blazor.md b/docs/en/Themes/LeptonXLite/Blazor.md similarity index 100% rename from docs/en/Themes/LeptonXLite/blazor.md rename to docs/en/Themes/LeptonXLite/Blazor.md diff --git a/docs/en/Tutorials/Part-2.md b/docs/en/Tutorials/Part-2.md index 50b90b516d..3e7a1bc735 100644 --- a/docs/en/Tutorials/Part-2.md +++ b/docs/en/Tutorials/Part-2.md @@ -135,22 +135,22 @@ Open the `en.json` (*the English translations*) file and change the content as s "CreationTime": "Creation time", "AreYouSure": "Are you sure?", "AreYouSureToDelete": "Are you sure you want to delete this item?", - "Enum:BookType:0": "Undefined", - "Enum:BookType:1": "Adventure", - "Enum:BookType:2": "Biography", - "Enum:BookType:3": "Dystopia", - "Enum:BookType:4": "Fantastic", - "Enum:BookType:5": "Horror", - "Enum:BookType:6": "Science", - "Enum:BookType:7": "Science fiction", - "Enum:BookType:8": "Poetry" + "Enum:BookType.Undefined": "Undefined", + "Enum:BookType.Adventure": "Adventure", + "Enum:BookType.Biography": "Biography", + "Enum:BookType.Dystopia": "Dystopia", + "Enum:BookType.Fantastic": "Fantastic", + "Enum:BookType.Horror": "Horror", + "Enum:BookType.Science": "Science", + "Enum:BookType.ScienceFiction": "Science fiction", + "Enum:BookType.Poetry": "Poetry" } } ```` * Localization key names are arbitrary. You can set any name. We prefer some conventions for specific text types; * Add `Menu:` prefix for menu items. - * Use `Enum::` naming convention to localize the enum members. When you do it like that, ABP can automatically localize the enums in some proper cases. + * Use `Enum:.` or `.` or `` naming convention to localize the enum members. When you do it like that, ABP can automatically localize the enums in some proper cases. If a text is not defined in the localization file, it **falls back** to the localization key (as ASP.NET Core's standard behavior). @@ -624,7 +624,7 @@ Open the `Books.razor` and replace the content as the following: Field="@nameof(BookDto.Type)" Caption="@L["Type"]"> - @L[$"Enum:BookType:{(int)context.Type}"] + @L[$"Enum:BookType.{Enum.GetName(context.Type)}"] - @L[$"Enum:BookType:{bookTypeValue}"] + @L[$"Enum:BookType.{Enum.GetName((BookType)bookTypeValue)}"] } @@ -1322,7 +1322,7 @@ We can now define a modal to edit the book. Add the following code to the end of @foreach (int bookTypeValue in Enum.GetValues(typeof(BookType))) { - @L[$"Enum:BookType:{bookTypeValue}"] + @L[$"Enum:BookType.{Enum.GetName((BookType)bookTypeValue)}"] } @@ -1459,7 +1459,7 @@ Here's the complete code to create the book management CRUD page, that has been Field="@nameof(BookDto.Type)" Caption="@L["Type"]"> - @L[$"Enum:BookType:{(int) context.Type}"] + @L[$"Enum:BookType.{Enum.GetName(context.Type)}"] - @L[$"Enum:BookType:{bookTypeValue}"] + @L[$"Enum:BookType.{Enum.GetName((BookType)bookTypeValue)}"] } @@ -1564,7 +1564,7 @@ Here's the complete code to create the book management CRUD page, that has been @foreach (int bookTypeValue in Enum.GetValues(typeof(BookType))) { - @L[$"Enum:BookType:{bookTypeValue}"] + @L[$"Enum:BookType.{Enum.GetName((BookType)bookTypeValue)}"] } diff --git a/docs/en/UI/AspNetCore/Theming.md b/docs/en/UI/AspNetCore/Theming.md index fd2e7312de..050228de2d 100644 --- a/docs/en/UI/AspNetCore/Theming.md +++ b/docs/en/UI/AspNetCore/Theming.md @@ -16,10 +16,12 @@ In order to accomplish these goals, ABP Framework; ### Current Themes -Currently, two themes are **officially provided**: +Currently, four themes are **officially provided**: * The [Basic Theme](Basic-Theme.md) is the minimalist theme with the plain Bootstrap style. It is **open source and free**. +* The [LeptonX Lite Theme](../../Themes/LeptonXLite/AspNetCore.md) is modern and stylish Bootstrap UI theme. It is ideal if you want to have a production ready UI theme. It is also **open source and free**. * The [Lepton Theme](https://commercial.abp.io/themes) is a **commercial** theme developed by the core ABP team and is a part of the [ABP Commercial](https://commercial.abp.io/) license. +* The [LeptonX Theme](https://docs.abp.io/en/commercial/6.0/themes/leptonx) is also a **commercial** theme developed by the core ABP theme and is a part of the [ABP Commercial](https://commercial.abp.io/) license. This is the default theme after ABP v6.0.0. There are also some community-driven themes for the ABP Framework (you can search on the web). diff --git a/docs/es/Getting-Started-AspNetCore-Application.md b/docs/es/Getting-Started-AspNetCore-Application.md new file mode 100644 index 0000000000..c4d124d827 --- /dev/null +++ b/docs/es/Getting-Started-AspNetCore-Application.md @@ -0,0 +1,140 @@ +# Empezando con ABP y una Aplicacion AspNet Core MVC Web + +Este tutorial explica como empezar una aplicacion ABP desde cero usando las dependencias minimas. Uno generalmente desea +empezar con la **[plantilla de inicio](Getting-Started-AspNetCore-MVC-Template.md)**. + +## Crea un Proyecto Nuevo + +1. Crea una Aplicacion Web AspNet Core nueva usando Visual Studio 2022 (17.0.0+): + +![](images/create-new-aspnet-core-application-v2.png) + +2. Configura el nuevo proyecto: + +![](images/select-empty-web-application-v2.png) + +3. Presione el boton Create: + +![create-aspnet-core-application](images/create-aspnet-core-application.png) + +## Instale el paquete Volo.Abp.AspNetCore.Mvc + +Volo.Abp.AspNetCore.Mvc es el paquete de integracion con AspNet Core MVC para ABP. Siendo asi, instalalo en su proyecto: + +```` +Install-Package Volo.Abp.AspNetCore.Mvc +```` + +## Crea el primer modulo ABP + +ABP es un marco de referencia modular y require una clase de **inicio (raíz) tipo modulo** derivada de ``AbpModule``: + +````C# +using Microsoft.AspNetCore.Builder; +using Microsoft.Extensions.Hosting; +using Volo.Abp; +using Volo.Abp.AspNetCore.Mvc; +using Volo.Abp.Modularity; + +namespace BasicAspNetCoreApplication +{ + [DependsOn(typeof(AbpAspNetCoreMvcModule))] + public class AppModule : AbpModule + { + public override void OnApplicationInitialization(ApplicationInitializationContext context) + { + var app = context.GetApplicationBuilder(); + var env = context.GetEnvironment(); + + // Configura la canalización de peticiones HTTP. + if (env.IsDevelopment()) + { + app.UseExceptionHandler("/Error"); + // El valor por defecto de HSTS es 30 dias. Debes cambiar esto en ambientes productivos. Referencia https://aka.ms/aspnetcore-hsts. + app.UseHsts(); + } + + app.UseHttpsRedirection(); + app.UseStaticFiles(); + app.UseRouting(); + app.UseConfiguredEndpoints(); + } + } +} +```` + +``AppModule`` es un buen nombre para el modulo de inicio de una aplicacion. + +Los paquetes de ABP definen clases de tipo modulo y cada modulo puede depender de otro. +En el codigo anterior, el ``AppModule`` depende de el modulo ``AbpAspNetCoreMvcModule`` (definido por el paquete [Volo.Abp.AspNetCore.Mvc](https://www.nuget.org/packages/Volo.Abp.AspNetCore.Mvc)). Es comun agregar el atributo ``DependsOn`` despues de instalar un paquete ABP nuevo. + +En vez de la clase de inicion Startup, estamos configurando una canalizacion de ASP.NET Core en este modulo. + +## La clase Program + +El proximo paso es modificar la clase Program para integrate el sistema de modulos ABP: + +````C# +using BasicAspNetCoreApplication; + +var builder = WebApplication.CreateBuilder(args); + +await builder.Services.AddApplicationAsync(); + +var app = builder.Build(); + +await app.InitializeApplicationAsync(); +await app.RunAsync(); +```` + +``builder.Services.AddApplicationAsync();`` Agrega todos los servicios definidos en todos los modulos empezando desde ``AppModule``. + +``app.InitializeApplicationAsync()`` inicializa y empieza la aplicacion. + +## Ejecutar la Aplicación + +Es todo! Ejecuta la aplicación, debe funcionar como esperado. + +## Uso de Autofac como Marco de Inyección de Dependencia + +Mientras el sistema de Inyección de Dependencia de ASP.NET Core es suficiente para requerimientos basico, [Autofac](https://autofac.org/) proporciona características avanzadas como Inyección de Propiedades e Intercepcion de Metodos, los cuales son necesarios para que ABP pueda llevar a cabo funciones avanzadas. + +El acto de remplazar el sistema DI de ASP.NET Core por Autofac e integrarlo con ABP es facil. + +1. Instala el paquete [Volo.Abp.Autofac](https://www.nuget.org/packages/Volo.Abp.Autofac) + +```` +Install-Package Volo.Abp.Autofac +```` + +2. Agrega la dependencia sobre el modulo ``AbpAutofacModule`` + +````C# +[DependsOn(typeof(AbpAspNetCoreMvcModule))] +[DependsOn(typeof(AbpAutofacModule))] //Agrega la dependencia sobre el modulo ABP Autofac +public class AppModule : AbpModule +{ + ... +} +```` + +3. Actualiza `Program.cs` para que use Autofac: + +````C# +using BasicAspNetCoreApplication; + +var builder = WebApplication.CreateBuilder(args); + +builder.Host.UseAutofac(); //Agrega esta linea + +await builder.Services.AddApplicationAsync(); + +var app = builder.Build(); + +await app.InitializeApplicationAsync(); +await app.RunAsync(); +```` + +## Codigo fuente + + Obten el codigo fuente del ejemplo creado en este tutorial de [aqui](https://github.com/abpframework/abp-samples/tree/master/BasicAspNetCoreApplication). diff --git a/docs/es/images/create-aspnet-core-application.png b/docs/es/images/create-aspnet-core-application.png new file mode 100644 index 0000000000..b8b98f5c32 Binary files /dev/null and b/docs/es/images/create-aspnet-core-application.png differ diff --git a/docs/es/images/create-new-aspnet-core-application-v2.png b/docs/es/images/create-new-aspnet-core-application-v2.png new file mode 100644 index 0000000000..f8274ae2a4 Binary files /dev/null and b/docs/es/images/create-new-aspnet-core-application-v2.png differ diff --git a/docs/es/images/select-empty-web-application-v2.png b/docs/es/images/select-empty-web-application-v2.png new file mode 100644 index 0000000000..da32f71857 Binary files /dev/null and b/docs/es/images/select-empty-web-application-v2.png differ diff --git a/docs/zh-Hans/Tutorials/Part-2.md b/docs/zh-Hans/Tutorials/Part-2.md index 346927acbe..dc8d804d5e 100644 --- a/docs/zh-Hans/Tutorials/Part-2.md +++ b/docs/zh-Hans/Tutorials/Part-2.md @@ -135,15 +135,15 @@ successfully created the book with id: 439b0ea8-923e-8e1e-5d97-39f2c7ac4246 "CreationTime": "Creation time", "AreYouSure": "Are you sure?", "AreYouSureToDelete": "Are you sure you want to delete this item?", - "Enum:BookType:0": "Undefined", - "Enum:BookType:1": "Adventure", - "Enum:BookType:2": "Biography", - "Enum:BookType:3": "Dystopia", - "Enum:BookType:4": "Fantastic", - "Enum:BookType:5": "Horror", - "Enum:BookType:6": "Science", - "Enum:BookType:7": "Science fiction", - "Enum:BookType:8": "Poetry" + "Enum:BookType.Undefined": "Undefined", + "Enum:BookType.Adventure": "Adventure", + "Enum:BookType.Biography": "Biography", + "Enum:BookType.Dystopia": "Dystopia", + "Enum:BookType.Fantastic": "Fantastic", + "Enum:BookType.Horror": "Horror", + "Enum:BookType.Science": "Science", + "Enum:BookType.ScienceFiction": "Science fiction", + "Enum:BookType.Poetry": "Poetry" } } ```` @@ -152,7 +152,7 @@ successfully created the book with id: 439b0ea8-923e-8e1e-5d97-39f2c7ac4246 * 本地化关键字名称是任意的. 你可以设置任何名称. 对于特定的文本类型,我们更喜欢遵循一些约定: * 为按钮项添加 `Menu:` 前缀. - * 使用 `Enum::` 命名约定来本地化枚举成员. 当您这样做时ABP可以在某些适当的情况下自动将枚举本地化. + * 使用 `Enum::` 或 `.` 或 `` 命名约定来本地化枚举成员. 当您这样做时ABP可以在某些适当的情况下自动将枚举本地化. 如果未在本地化文件中定义文本,则文本将**回退**到本地化键(ASP.NET Core的标准行为). @@ -626,7 +626,7 @@ ABP提供了一个通用的基类,`AbpCrudPageBase<...>`,用来创建CRUD风格 Field="@nameof(BookDto.Type)" Caption="@L["Type"]"> - @L[$"Enum:BookType:{(int)context.Type}"] + @L[$"Enum:BookType.{Enum.GetName(context.Type)}"] - @L[$"Enum:BookType:{bookTypeValue}"] + @L[$"Enum:BookType.{Enum.GetName((BookType)bookTypeValue)}"] } @@ -1323,7 +1323,7 @@ delete(id: string) { @foreach (int bookTypeValue in Enum.GetValues(typeof(BookType))) { - @L[$"Enum:BookType:{bookTypeValue}"] + @L[$"Enum:BookType.{Enum.GetName((BookType)bookTypeValue)}"] } @@ -1460,7 +1460,7 @@ namespace Acme.BookStore.Blazor Field="@nameof(BookDto.Type)" Caption="@L["Type"]"> - @L[$"Enum:BookType:{(int) context.Type}"] + @L[$"Enum:BookType.{Enum.GetName(context.Type)}"] - @L[$"Enum:BookType:{bookTypeValue}"] + @L[$"Enum:BookType.{Enum.GetName((BookType)bookTypeValue)}"] } @@ -1565,7 +1565,7 @@ namespace Acme.BookStore.Blazor @foreach (int bookTypeValue in Enum.GetValues(typeof(BookType))) { - @L[$"Enum:BookType:{bookTypeValue}"] + @L[$"Enum:BookType.{Enum.GetName((BookType)bookTypeValue)}"] } diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.PlugIn/Volo.Abp.AspNetCore.Mvc.PlugIn.csproj b/framework/test/Volo.Abp.AspNetCore.Mvc.PlugIn/Volo.Abp.AspNetCore.Mvc.PlugIn.csproj index 91ca2b1312..d917afa97f 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.PlugIn/Volo.Abp.AspNetCore.Mvc.PlugIn.csproj +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.PlugIn/Volo.Abp.AspNetCore.Mvc.PlugIn.csproj @@ -4,6 +4,7 @@ net6.0 Library true + true diff --git a/framework/test/Volo.Abp.TestApp/Volo.Abp.TestApp.csproj b/framework/test/Volo.Abp.TestApp/Volo.Abp.TestApp.csproj index 0664ad2b7b..5a6382eb80 100644 --- a/framework/test/Volo.Abp.TestApp/Volo.Abp.TestApp.csproj +++ b/framework/test/Volo.Abp.TestApp/Volo.Abp.TestApp.csproj @@ -5,6 +5,7 @@ net6.0 + true diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json index 0782bbfb73..ce0c493e42 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json @@ -3,7 +3,7 @@ "name": "asp.net", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.shared": "^5.3.3", + "@abp/aspnetcore.mvc.ui.theme.shared": "^6.0.0-rc.1", "highlight.js": "^9.13.1" }, "devDependencies": {} diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/wwwroot/libs/abp/core/abp.js b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/wwwroot/libs/abp/core/abp.js index 9445e4e7f4..d8b7531660 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/wwwroot/libs/abp/core/abp.js +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/wwwroot/libs/abp/core/abp.js @@ -372,7 +372,9 @@ var abp = abp || {}; setTimeout(function () { if (element) { element.classList.remove('abp-block-area-disappearing'); - element.parentElement.removeChild(element); + if (element.parentElement) { + element.parentElement.removeChild(element); + } } }, 250); } diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock index 22aacbd31b..541f9566e3 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock @@ -2,30 +2,30 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.shared@^5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.3.tgz#65f97d787647e7760bb0c2a5b0f0ff815dc9630a" - integrity sha512-p/Z++QPM7S2lm7obXsZXIarcw0Y88y/Ghy5hyZqdc3uNHL6j8LRlD2qfuRXzl0k9HytXa859UKtSMLSZij1DiA== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.3" - "@abp/bootstrap" "~5.3.3" - "@abp/bootstrap-datepicker" "~5.3.3" - "@abp/datatables.net-bs5" "~5.3.3" - "@abp/font-awesome" "~5.3.3" - "@abp/jquery-form" "~5.3.3" - "@abp/jquery-validation-unobtrusive" "~5.3.3" - "@abp/lodash" "~5.3.3" - "@abp/luxon" "~5.3.3" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.3" - "@abp/select2" "~5.3.3" - "@abp/sweetalert2" "~5.3.3" - "@abp/timeago" "~5.3.3" - "@abp/toastr" "~5.3.3" - -"@abp/aspnetcore.mvc.ui@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.3.tgz#b8beb98bde3e4f0340335014ced7653c7913a621" - integrity sha512-aDQxdfQmlEXIjWGW8wru58imh9cncHAijafvdXlmyfKHM2JfnSSCG/RPMiaoJq/iyDVEggbhx8z4VHODC1eitg== +"@abp/aspnetcore.mvc.ui.theme.shared@^6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.1.tgz#5b0afe34c485f8e11ef21b0bce86e231602d8c1b" + integrity sha512-lY8ToScqRSlIHKMMiut+yiXzJG/+B8/ZXS+O9+nNOZ97G6oJZr3TYFuLcR8Rr5tFSZ65dUYivshHAM7HcRYyNA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.1" + "@abp/bootstrap" "~6.0.0-rc.1" + "@abp/bootstrap-datepicker" "~6.0.0-rc.1" + "@abp/datatables.net-bs5" "~6.0.0-rc.1" + "@abp/font-awesome" "~6.0.0-rc.1" + "@abp/jquery-form" "~6.0.0-rc.1" + "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.1" + "@abp/lodash" "~6.0.0-rc.1" + "@abp/luxon" "~6.0.0-rc.1" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.1" + "@abp/select2" "~6.0.0-rc.1" + "@abp/sweetalert2" "~6.0.0-rc.1" + "@abp/timeago" "~6.0.0-rc.1" + "@abp/toastr" "~6.0.0-rc.1" + +"@abp/aspnetcore.mvc.ui@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.1.tgz#cec27a35b336ef8319308ac24995def0f26e00be" + integrity sha512-wH4ar4DHJiMPfe+z6IO1nCCz5L+/1W//Kh+wdtuU2QGmJX4mavAgO+ZXKGeA1QYsUY8NBXWj0Xwoyp9PgbqsyQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -34,144 +34,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.3.tgz#66bf2be128e6389877ed4465149c1933ca182c71" - integrity sha512-w/gPj4BVzVnmwekWVHKPYkwnhZFFH1XtCtw5LeJVM5bSYQBrvVTvvUPdKiiTDV59OYf2sbsA+PscwcTWAG6t/Q== +"@abp/bootstrap-datepicker@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.1.tgz#33bd5d9e1d6b351eb1e7a278ccd9a79db119e461" + integrity sha512-/y4v/JZ5YXJ2ew0v7//C//ShK3cf7IPd23d2kVb/7vypdR7yquxyoM7nxpnsfJBs5dQLsH8D5tAhFyTJBZUovA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.3.tgz#56335b46bd42fba0a522712fbb6591fb6aeb5b68" - integrity sha512-xOtC690pE+QxZYhhQrpTE1rapEjg9BrJg7e0qvrkt4TLMZ4mIbau6/Qlh6x8uuMASCUUuRTLNUzHijxvOJh7Mg== +"@abp/bootstrap@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.1.tgz#c6f64f1f34870b75da623ed9cee7b3b1159611fc" + integrity sha512-/cAVvgmp/jYTxsuz1RmfNZ7r0X01SKvAB7yjJPvBuEdLj/5ms9HyEa3K4ifnALoShFOKP9yQN1aJtmHN7hepiQ== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" bootstrap "^5.1.3" -"@abp/core@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.3.tgz#b03fc281d650d483c9276591f2adb26ea43dcd1e" - integrity sha512-Pp8U+LjchtSxc9lTRaPNQhb+Eh7X2LVERmZvoWyET0y/st28PJZ4eZ4iyGmV00pEmCpadF5aTWVhJcGH32scdQ== +"@abp/core@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.1.tgz#ec88b3339d854c91e93c342206984daf01b745df" + integrity sha512-V3X4fFm4A13LX47JNpjyxLs9IQ+StISHYMld6srEgCatHx1+dUfLcA4v5uj4IHIrPaRxhX/wv4iDND6FYcGJ2Q== dependencies: - "@abp/utils" "~5.3.3" + "@abp/utils" "~6.0.0-rc.1" -"@abp/datatables.net-bs5@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.3.tgz#e00304fbe7e6d9d33e1082485f7aa07de48fac0c" - integrity sha512-dkbP3PPkMRJqxravYO7NIVww+MQC3FxHP7mPCg/+PG/LttaNJ5L5hoNcb7BMK2K76hBRMdvlSIzvjycb1w1ooA== +"@abp/datatables.net-bs5@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.1.tgz#111c8c04e7d31f1b417602c7dde87d5a49104890" + integrity sha512-r4pxy1FYc06Ju4tYBVXe9HcE9LFDPCQJYP+01fPAAXcIDM7f02nCqdBjUJdv/z0VSejs9Ttn9ZIVSc85Y9JNoA== dependencies: - "@abp/datatables.net" "~5.3.3" + "@abp/datatables.net" "~6.0.0-rc.1" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.3.tgz#6d8eca1034e26708b9adf0d5917aefd5772cbf30" - integrity sha512-1JuXMzHDtrvGRNBYdwEVobiYmhd7VxM432ciARX8hzvSkE0jcgzeTrSlBXfenFMPOIAUJsSOE4YVshtqrY0G4g== +"@abp/datatables.net@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.1.tgz#278762acd0df9c7fd50ef0caef9a9e6c32665e6f" + integrity sha512-NQSKDdpUvsY6JgGHTrTSNAp2ZcMb3L4PwSv9vJVoDSYYF7+f/KFO/bZWlamig+gucX917auRvxzD5bFSL9ub8Q== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" datatables.net "^1.11.4" -"@abp/font-awesome@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.3.tgz#b10a530c9dee28838536746ea2a40342ff2ee3a8" - integrity sha512-c+cvsQ1uolSoyTkM9rZYYM07iiq/Zu8zKOQaDbitQMfPkcfSnC3PG/PTNauSYuwh/SyFfacFXeaDQ5Y/kAGRLw== +"@abp/font-awesome@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.1.tgz#87b89f8923b262a8531cf4702cf318d9fab155b6" + integrity sha512-lxY1ONRR0sW/uLbgY/6KJpaeZ1ueQfARjcTfHdCmnat72Qd2jID/jKGKUW2fmK0SHmAZiBnKWHLFvF+JcB3JPQ== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.3.tgz#94234207aa991e098e49e7d1244dc86d289a48e6" - integrity sha512-TY5c4ODfSidYGWqUR+QMNbxasfSufSg9gLY8lTEaJn2Wd2+o3GlauPxlTeNIRCRsxqb8e5+fBJspq1YbtE8vQg== +"@abp/jquery-form@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.1.tgz#5bb68fbb2ce0c3b9a59a52ab20c4ea971258c3b1" + integrity sha512-RZ6v6ZbF+05gSBLltsjIMWd8a3bE8bKEPGfHgIPBJr2+xl7TGwuBB0GmDYa+2X6ctBN1BvGsNvMtOB41ahSaGA== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.3.tgz#03f776807b60f32d2470c3d3c975ee20f33a993d" - integrity sha512-BNa2oSOfc5CSLW62SLCOinP7ybDDSVjfn0LYdDOdkIpSPnoL/3E1ZmgEzkDCUdTfJ67320kGDtIHCpb+Wbik+Q== +"@abp/jquery-validation-unobtrusive@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.1.tgz#d082de2aa6c2d8bc2a0808b4159d0f5d281afdd2" + integrity sha512-Wv7/W8CXvO5+GFfYVSRXR7MnI5Vv+grDal8onwPTZ8OZS1dsTUnXe5enQMfuyzSBkq/YKTve6vFOOx8sNi0Tfg== dependencies: - "@abp/jquery-validation" "~5.3.3" + "@abp/jquery-validation" "~6.0.0-rc.1" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.3.tgz#a0544428b94966f35d3aebb40c354d3f4485137d" - integrity sha512-GFhrS4pVmbQRI0eiW2aBYmRTB0rR2s3Wj4NIVB69ZHwvy+uADA3M/oMs8Q4wuT+gmPu2GCjPNCc5RPsC173VPA== +"@abp/jquery-validation@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.1.tgz#e30227075f6d7eabe6224faf2e033622ce0fe3b1" + integrity sha512-xdEVHDsPUmZRyQS5qJYs+FurK6rjGH4ARzlDjtZCwiP85pFQ3+dglF+2/KZxzsNWfHwHl3DdoKWufzzT1qYbrg== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.3.tgz#be70aa671129fac192b8f858a973e65018960cbd" - integrity sha512-sUy0aquZPq+HyxChYJMTjUZxaTo5/Aav5JcbMq1RczIFidjOrFHthWnYZveDVSKryaCfX3tXutag1sPakUOTtg== +"@abp/jquery@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.1.tgz#6f486cfc16dd915ccd4fe4a3029fa6359fea49c0" + integrity sha512-WLcF9BHjRPjtz/QVWfrkltA0eYXVfUPrKmodeJ0q3wmndPqmmMyTMFSrsnoos2bSxd1Z/WGqqB3vVEYGUc1E4g== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" jquery "~3.6.0" -"@abp/lodash@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.3.tgz#365684a338ab5d68adffa93207d0035eaa494ef9" - integrity sha512-Lqb2DkmKBPBHNbUd1QeATv8G/qUPamd06bKbe7xHesX3DZtlIwTmimwTpV4tqmJqOLKB67uUtapPYCfKyxs1RQ== +"@abp/lodash@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.1.tgz#5e143be48e1d266356bd726764a89f520c55e8a5" + integrity sha512-lPui/un/eZcUaeJ2r/I9DgtfIVVoASy/e+gj3opCIGv9cgBQwoV9vlAZGCsUwRFy1RO7EUUsJR4jgxWSmj1JFw== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" lodash "^4.17.21" -"@abp/luxon@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.3.tgz#97a60ae64e865d2b1c04107302d4ec50d4e09217" - integrity sha512-/7Lb463HREBFlt17tUFinTpYxfbZ8UIi1+d7Fqp8spJv78qCxvpWmD4iuJJJdCExO00ztZWY9GkCDPrAbfP/dA== +"@abp/luxon@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.1.tgz#a4242d862576b4151912d48fbf81d89862b6a91e" + integrity sha512-O0nbZk1PA7RryFG+J3gKRtuT4+FV4eSkth8GZvhCOKoN8SpDu/92G2cIEzR0l9O1TYlrKAEbUpmsA+d6abSG+w== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.3.tgz#96be03f79be929b1a2cb67acb38e9d6638f04f15" - integrity sha512-hr5qmcVl+Wr6sIS10QerWRTfFvhmhq9e48G9Hx5oQZFjrIkfJRlxla0TYViHR2tRYCeDQGb4gYmN4Fc71mdcPg== +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.1.tgz#738efa17783450971c6f47608cfafc0ef87d8ec6" + integrity sha512-6Q9slGs6A1d1v+lpTfzI8W+QrpTtY0LTKQkRbYYpm31Lf5zQ55QFoinDpV9wnxDPrfh2u5aX/dSYMrHjdzj6Qg== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.3.tgz#bdb8de1fcc5c9964233fdf1d4b88f7b90099f293" - integrity sha512-yk4CDpgksM5pAXMgFnULlgDovBk0oeXRhAA6lpt0TizzJ353WkpcASUblHbWOePzXbJFBBB2cj3XBD9vdWx7Ig== +"@abp/select2@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.1.tgz#d4ba6e71536c56ef2c98c1b3342f15fc286d3c1b" + integrity sha512-j1mebFXYiLOaOqK9FW5FqafTvT6oydEbcKj2Dk4JdgbcwdY+Mf5DPrb4cu61IPR7SzMCfeZX6j6d2LCdnW7o4g== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" select2 "^4.0.13" -"@abp/sweetalert2@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.3.tgz#54a2d45ddbdaa2f7a4485aa5731f2fec65a9c771" - integrity sha512-Lbw6S+xTNMtHeFaMJNbYTMtqznDwRtlN4+f+hRGWbqNIpHuMfTi1jUgdeZTYRjbhY+RTduUJrs8lvvPMKWgrTw== +"@abp/sweetalert2@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.1.tgz#2633ed54227a703dbd81e2db0923d6f402561232" + integrity sha512-JxrLUnsntCoimJTpY+9uQ+CK6VW1sRTv0qhOX7EJTEefvA+YZjSSk0MwyG4KNzF46JSMW1OctXqWihl/UHZzTQ== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.3.tgz#6e13a178d67e635ebe65d01db220d09f1673bafa" - integrity sha512-mBwaioPVnIeMXP6tDG24NZaTCAGvk8cMah8ems3OLWNK+tsPU4Jy8BVHTSmd/7rA69EL0REuSw2GmiCvaCL+RQ== +"@abp/timeago@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.1.tgz#78903b3d523da6985a83a306d6a31d223b244d8b" + integrity sha512-f5AaVRCKXS4+U4axVE6B1gQIo28gmJ5iOsn+tGhH9YANsfybS7in7dN8Nu89oqx10tVyHZ6r5/ESd21aV34VDA== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" timeago "^1.6.7" -"@abp/toastr@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.3.tgz#a3d2d19963fe96da9566a0f320c7f9911901e69a" - integrity sha512-F1FJPQ0nnu/jZY4XpJFS7uFJgpoEl8aOeFkm6kvshK76ABFLvsWHYW88htW5gXIwOf+G/QClZdx39Os+IQaUJw== +"@abp/toastr@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.1.tgz#2cb0898d48bad1cb8cb5e994b55e51d60e5a6b90" + integrity sha512-RPp6J5IWtYW1q27+fFc5UxramldBIbCyEU9aniH9rfkEs4F5SF4RJphqjSKeYMclvT0PheUnR1x26PJbi179MQ== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" toastr "^2.1.4" -"@abp/utils@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.3.tgz#b47f11cb9a0ac963a7f4e5a44360d933e19896fc" - integrity sha512-owTYsROGHfXuHTOFe1uKMAwLbgjzQLKDnmApUy4taYy93rWsu98vFXX6rYJTK7U/X8nZq5y0BtH4covHyfsAxQ== +"@abp/utils@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.1.tgz#f25b383d6d7ba28c1220399397247cdef9704daf" + integrity sha512-Fi8dBDDAjdPE6tsWCP7iNlBb7WpoF8V3wOnoGmeg/ZklEcHDNZymjSa2RG8+6Qc4fSuUfti/Qyyj4CoDHhsOBw== dependencies: just-compare "^1.3.0" diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json index 62a79b49e6..eb6278a743 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json @@ -3,8 +3,8 @@ "name": "asp.net", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.3", - "@abp/prismjs": "^5.3.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.1", + "@abp/prismjs": "^6.0.0-rc.1" }, "devDependencies": {} } diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/wwwroot/libs/abp/core/abp.js b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/wwwroot/libs/abp/core/abp.js index 9445e4e7f4..d8b7531660 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/wwwroot/libs/abp/core/abp.js +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/wwwroot/libs/abp/core/abp.js @@ -372,7 +372,9 @@ var abp = abp || {}; setTimeout(function () { if (element) { element.classList.remove('abp-block-area-disappearing'); - element.parentElement.removeChild(element); + if (element.parentElement) { + element.parentElement.removeChild(element); + } } }, 250); } diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock index 6291ec8bf6..3cfae59be7 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.3.tgz#dc6a1bdd583ef5ea0f8a0110753b0869d5f1cb61" - integrity sha512-det7xCtVZK6Dmvr0ENAkYdE+jRW0cVi3BCKZc7c6Hy0VKsKsKlnyz5j/D2rJSAmrap9hyQSWXBJUiho8W92wUQ== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.3" - -"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.3.tgz#65f97d787647e7760bb0c2a5b0f0ff815dc9630a" - integrity sha512-p/Z++QPM7S2lm7obXsZXIarcw0Y88y/Ghy5hyZqdc3uNHL6j8LRlD2qfuRXzl0k9HytXa859UKtSMLSZij1DiA== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.3" - "@abp/bootstrap" "~5.3.3" - "@abp/bootstrap-datepicker" "~5.3.3" - "@abp/datatables.net-bs5" "~5.3.3" - "@abp/font-awesome" "~5.3.3" - "@abp/jquery-form" "~5.3.3" - "@abp/jquery-validation-unobtrusive" "~5.3.3" - "@abp/lodash" "~5.3.3" - "@abp/luxon" "~5.3.3" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.3" - "@abp/select2" "~5.3.3" - "@abp/sweetalert2" "~5.3.3" - "@abp/timeago" "~5.3.3" - "@abp/toastr" "~5.3.3" - -"@abp/aspnetcore.mvc.ui@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.3.tgz#b8beb98bde3e4f0340335014ced7653c7913a621" - integrity sha512-aDQxdfQmlEXIjWGW8wru58imh9cncHAijafvdXlmyfKHM2JfnSSCG/RPMiaoJq/iyDVEggbhx8z4VHODC1eitg== +"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.1.tgz#561522e75e850bfa33243c91b9c37e4791039455" + integrity sha512-oov7mcynMOjeBxD3oBXzSuarwLYxB902O/TMbQsdiU50oJmfgidsaHC7W3lAvfXbuZiok9+zkUW9uaGXS+OuXA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.1" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.1.tgz#5b0afe34c485f8e11ef21b0bce86e231602d8c1b" + integrity sha512-lY8ToScqRSlIHKMMiut+yiXzJG/+B8/ZXS+O9+nNOZ97G6oJZr3TYFuLcR8Rr5tFSZ65dUYivshHAM7HcRYyNA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.1" + "@abp/bootstrap" "~6.0.0-rc.1" + "@abp/bootstrap-datepicker" "~6.0.0-rc.1" + "@abp/datatables.net-bs5" "~6.0.0-rc.1" + "@abp/font-awesome" "~6.0.0-rc.1" + "@abp/jquery-form" "~6.0.0-rc.1" + "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.1" + "@abp/lodash" "~6.0.0-rc.1" + "@abp/luxon" "~6.0.0-rc.1" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.1" + "@abp/select2" "~6.0.0-rc.1" + "@abp/sweetalert2" "~6.0.0-rc.1" + "@abp/timeago" "~6.0.0-rc.1" + "@abp/toastr" "~6.0.0-rc.1" + +"@abp/aspnetcore.mvc.ui@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.1.tgz#cec27a35b336ef8319308ac24995def0f26e00be" + integrity sha512-wH4ar4DHJiMPfe+z6IO1nCCz5L+/1W//Kh+wdtuU2QGmJX4mavAgO+ZXKGeA1QYsUY8NBXWj0Xwoyp9PgbqsyQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,161 +41,161 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.3.tgz#66bf2be128e6389877ed4465149c1933ca182c71" - integrity sha512-w/gPj4BVzVnmwekWVHKPYkwnhZFFH1XtCtw5LeJVM5bSYQBrvVTvvUPdKiiTDV59OYf2sbsA+PscwcTWAG6t/Q== +"@abp/bootstrap-datepicker@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.1.tgz#33bd5d9e1d6b351eb1e7a278ccd9a79db119e461" + integrity sha512-/y4v/JZ5YXJ2ew0v7//C//ShK3cf7IPd23d2kVb/7vypdR7yquxyoM7nxpnsfJBs5dQLsH8D5tAhFyTJBZUovA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.3.tgz#56335b46bd42fba0a522712fbb6591fb6aeb5b68" - integrity sha512-xOtC690pE+QxZYhhQrpTE1rapEjg9BrJg7e0qvrkt4TLMZ4mIbau6/Qlh6x8uuMASCUUuRTLNUzHijxvOJh7Mg== +"@abp/bootstrap@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.1.tgz#c6f64f1f34870b75da623ed9cee7b3b1159611fc" + integrity sha512-/cAVvgmp/jYTxsuz1RmfNZ7r0X01SKvAB7yjJPvBuEdLj/5ms9HyEa3K4ifnALoShFOKP9yQN1aJtmHN7hepiQ== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" bootstrap "^5.1.3" -"@abp/clipboard@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-5.3.3.tgz#62c3c12f1ff503091924f672f71a50e2e5d0b47c" - integrity sha512-FRJPM9/P3WPuK4Id1KVfmpkOB3MrlrYp/beNqZtjqQuG8WDjVgnHrDnsPYfzeLdK5n6bEvtGWwtHwiaBOXhWZg== +"@abp/clipboard@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-6.0.0-rc.1.tgz#3dc6808637f116a07f11c6e727f55ce9bd4b64de" + integrity sha512-u/OPfgXRmrrjkbJrzKB1YSW8rTqUWIPRVx1VAT7RdT5UMzX4DOupd7SRJFr6u7OZFP1p7umUtl6k4wY1lAv6rw== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" clipboard "^2.0.8" -"@abp/core@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.3.tgz#b03fc281d650d483c9276591f2adb26ea43dcd1e" - integrity sha512-Pp8U+LjchtSxc9lTRaPNQhb+Eh7X2LVERmZvoWyET0y/st28PJZ4eZ4iyGmV00pEmCpadF5aTWVhJcGH32scdQ== +"@abp/core@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.1.tgz#ec88b3339d854c91e93c342206984daf01b745df" + integrity sha512-V3X4fFm4A13LX47JNpjyxLs9IQ+StISHYMld6srEgCatHx1+dUfLcA4v5uj4IHIrPaRxhX/wv4iDND6FYcGJ2Q== dependencies: - "@abp/utils" "~5.3.3" + "@abp/utils" "~6.0.0-rc.1" -"@abp/datatables.net-bs5@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.3.tgz#e00304fbe7e6d9d33e1082485f7aa07de48fac0c" - integrity sha512-dkbP3PPkMRJqxravYO7NIVww+MQC3FxHP7mPCg/+PG/LttaNJ5L5hoNcb7BMK2K76hBRMdvlSIzvjycb1w1ooA== +"@abp/datatables.net-bs5@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.1.tgz#111c8c04e7d31f1b417602c7dde87d5a49104890" + integrity sha512-r4pxy1FYc06Ju4tYBVXe9HcE9LFDPCQJYP+01fPAAXcIDM7f02nCqdBjUJdv/z0VSejs9Ttn9ZIVSc85Y9JNoA== dependencies: - "@abp/datatables.net" "~5.3.3" + "@abp/datatables.net" "~6.0.0-rc.1" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.3.tgz#6d8eca1034e26708b9adf0d5917aefd5772cbf30" - integrity sha512-1JuXMzHDtrvGRNBYdwEVobiYmhd7VxM432ciARX8hzvSkE0jcgzeTrSlBXfenFMPOIAUJsSOE4YVshtqrY0G4g== +"@abp/datatables.net@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.1.tgz#278762acd0df9c7fd50ef0caef9a9e6c32665e6f" + integrity sha512-NQSKDdpUvsY6JgGHTrTSNAp2ZcMb3L4PwSv9vJVoDSYYF7+f/KFO/bZWlamig+gucX917auRvxzD5bFSL9ub8Q== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" datatables.net "^1.11.4" -"@abp/font-awesome@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.3.tgz#b10a530c9dee28838536746ea2a40342ff2ee3a8" - integrity sha512-c+cvsQ1uolSoyTkM9rZYYM07iiq/Zu8zKOQaDbitQMfPkcfSnC3PG/PTNauSYuwh/SyFfacFXeaDQ5Y/kAGRLw== +"@abp/font-awesome@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.1.tgz#87b89f8923b262a8531cf4702cf318d9fab155b6" + integrity sha512-lxY1ONRR0sW/uLbgY/6KJpaeZ1ueQfARjcTfHdCmnat72Qd2jID/jKGKUW2fmK0SHmAZiBnKWHLFvF+JcB3JPQ== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.3.tgz#94234207aa991e098e49e7d1244dc86d289a48e6" - integrity sha512-TY5c4ODfSidYGWqUR+QMNbxasfSufSg9gLY8lTEaJn2Wd2+o3GlauPxlTeNIRCRsxqb8e5+fBJspq1YbtE8vQg== +"@abp/jquery-form@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.1.tgz#5bb68fbb2ce0c3b9a59a52ab20c4ea971258c3b1" + integrity sha512-RZ6v6ZbF+05gSBLltsjIMWd8a3bE8bKEPGfHgIPBJr2+xl7TGwuBB0GmDYa+2X6ctBN1BvGsNvMtOB41ahSaGA== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.3.tgz#03f776807b60f32d2470c3d3c975ee20f33a993d" - integrity sha512-BNa2oSOfc5CSLW62SLCOinP7ybDDSVjfn0LYdDOdkIpSPnoL/3E1ZmgEzkDCUdTfJ67320kGDtIHCpb+Wbik+Q== +"@abp/jquery-validation-unobtrusive@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.1.tgz#d082de2aa6c2d8bc2a0808b4159d0f5d281afdd2" + integrity sha512-Wv7/W8CXvO5+GFfYVSRXR7MnI5Vv+grDal8onwPTZ8OZS1dsTUnXe5enQMfuyzSBkq/YKTve6vFOOx8sNi0Tfg== dependencies: - "@abp/jquery-validation" "~5.3.3" + "@abp/jquery-validation" "~6.0.0-rc.1" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.3.tgz#a0544428b94966f35d3aebb40c354d3f4485137d" - integrity sha512-GFhrS4pVmbQRI0eiW2aBYmRTB0rR2s3Wj4NIVB69ZHwvy+uADA3M/oMs8Q4wuT+gmPu2GCjPNCc5RPsC173VPA== +"@abp/jquery-validation@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.1.tgz#e30227075f6d7eabe6224faf2e033622ce0fe3b1" + integrity sha512-xdEVHDsPUmZRyQS5qJYs+FurK6rjGH4ARzlDjtZCwiP85pFQ3+dglF+2/KZxzsNWfHwHl3DdoKWufzzT1qYbrg== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.3.tgz#be70aa671129fac192b8f858a973e65018960cbd" - integrity sha512-sUy0aquZPq+HyxChYJMTjUZxaTo5/Aav5JcbMq1RczIFidjOrFHthWnYZveDVSKryaCfX3tXutag1sPakUOTtg== +"@abp/jquery@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.1.tgz#6f486cfc16dd915ccd4fe4a3029fa6359fea49c0" + integrity sha512-WLcF9BHjRPjtz/QVWfrkltA0eYXVfUPrKmodeJ0q3wmndPqmmMyTMFSrsnoos2bSxd1Z/WGqqB3vVEYGUc1E4g== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" jquery "~3.6.0" -"@abp/lodash@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.3.tgz#365684a338ab5d68adffa93207d0035eaa494ef9" - integrity sha512-Lqb2DkmKBPBHNbUd1QeATv8G/qUPamd06bKbe7xHesX3DZtlIwTmimwTpV4tqmJqOLKB67uUtapPYCfKyxs1RQ== +"@abp/lodash@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.1.tgz#5e143be48e1d266356bd726764a89f520c55e8a5" + integrity sha512-lPui/un/eZcUaeJ2r/I9DgtfIVVoASy/e+gj3opCIGv9cgBQwoV9vlAZGCsUwRFy1RO7EUUsJR4jgxWSmj1JFw== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" lodash "^4.17.21" -"@abp/luxon@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.3.tgz#97a60ae64e865d2b1c04107302d4ec50d4e09217" - integrity sha512-/7Lb463HREBFlt17tUFinTpYxfbZ8UIi1+d7Fqp8spJv78qCxvpWmD4iuJJJdCExO00ztZWY9GkCDPrAbfP/dA== +"@abp/luxon@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.1.tgz#a4242d862576b4151912d48fbf81d89862b6a91e" + integrity sha512-O0nbZk1PA7RryFG+J3gKRtuT4+FV4eSkth8GZvhCOKoN8SpDu/92G2cIEzR0l9O1TYlrKAEbUpmsA+d6abSG+w== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.3.tgz#96be03f79be929b1a2cb67acb38e9d6638f04f15" - integrity sha512-hr5qmcVl+Wr6sIS10QerWRTfFvhmhq9e48G9Hx5oQZFjrIkfJRlxla0TYViHR2tRYCeDQGb4gYmN4Fc71mdcPg== +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.1.tgz#738efa17783450971c6f47608cfafc0ef87d8ec6" + integrity sha512-6Q9slGs6A1d1v+lpTfzI8W+QrpTtY0LTKQkRbYYpm31Lf5zQ55QFoinDpV9wnxDPrfh2u5aX/dSYMrHjdzj6Qg== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/prismjs@^5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-5.3.3.tgz#eccea1469cb4dfc15b87704d267bb36ad6f25758" - integrity sha512-XC0jQa9LqcuqpciDKSbc0wRo4sOK9sebX6eZBlbOnGIoHhNNbiwG0Vt60MHQ5DmaOz7k5jWP0gOISQMJ5GJfTw== +"@abp/prismjs@^6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-6.0.0-rc.1.tgz#1c1afcf0533c54989d1eaf0d94a0a71f61213d70" + integrity sha512-rDkIdCEdiHw9ervlfrRyoMB0eiDGSbjM0PG+M7ePXoatDiFdDsTz/XYR3ygvdk1/8h7GM2KkNjrx8OLzWMlblQ== dependencies: - "@abp/clipboard" "~5.3.3" - "@abp/core" "~5.3.3" + "@abp/clipboard" "~6.0.0-rc.1" + "@abp/core" "~6.0.0-rc.1" prismjs "^1.26.0" -"@abp/select2@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.3.tgz#bdb8de1fcc5c9964233fdf1d4b88f7b90099f293" - integrity sha512-yk4CDpgksM5pAXMgFnULlgDovBk0oeXRhAA6lpt0TizzJ353WkpcASUblHbWOePzXbJFBBB2cj3XBD9vdWx7Ig== +"@abp/select2@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.1.tgz#d4ba6e71536c56ef2c98c1b3342f15fc286d3c1b" + integrity sha512-j1mebFXYiLOaOqK9FW5FqafTvT6oydEbcKj2Dk4JdgbcwdY+Mf5DPrb4cu61IPR7SzMCfeZX6j6d2LCdnW7o4g== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" select2 "^4.0.13" -"@abp/sweetalert2@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.3.tgz#54a2d45ddbdaa2f7a4485aa5731f2fec65a9c771" - integrity sha512-Lbw6S+xTNMtHeFaMJNbYTMtqznDwRtlN4+f+hRGWbqNIpHuMfTi1jUgdeZTYRjbhY+RTduUJrs8lvvPMKWgrTw== +"@abp/sweetalert2@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.1.tgz#2633ed54227a703dbd81e2db0923d6f402561232" + integrity sha512-JxrLUnsntCoimJTpY+9uQ+CK6VW1sRTv0qhOX7EJTEefvA+YZjSSk0MwyG4KNzF46JSMW1OctXqWihl/UHZzTQ== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.3.tgz#6e13a178d67e635ebe65d01db220d09f1673bafa" - integrity sha512-mBwaioPVnIeMXP6tDG24NZaTCAGvk8cMah8ems3OLWNK+tsPU4Jy8BVHTSmd/7rA69EL0REuSw2GmiCvaCL+RQ== +"@abp/timeago@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.1.tgz#78903b3d523da6985a83a306d6a31d223b244d8b" + integrity sha512-f5AaVRCKXS4+U4axVE6B1gQIo28gmJ5iOsn+tGhH9YANsfybS7in7dN8Nu89oqx10tVyHZ6r5/ESd21aV34VDA== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" timeago "^1.6.7" -"@abp/toastr@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.3.tgz#a3d2d19963fe96da9566a0f320c7f9911901e69a" - integrity sha512-F1FJPQ0nnu/jZY4XpJFS7uFJgpoEl8aOeFkm6kvshK76ABFLvsWHYW88htW5gXIwOf+G/QClZdx39Os+IQaUJw== +"@abp/toastr@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.1.tgz#2cb0898d48bad1cb8cb5e994b55e51d60e5a6b90" + integrity sha512-RPp6J5IWtYW1q27+fFc5UxramldBIbCyEU9aniH9rfkEs4F5SF4RJphqjSKeYMclvT0PheUnR1x26PJbi179MQ== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" toastr "^2.1.4" -"@abp/utils@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.3.tgz#b47f11cb9a0ac963a7f4e5a44360d933e19896fc" - integrity sha512-owTYsROGHfXuHTOFe1uKMAwLbgjzQLKDnmApUy4taYy93rWsu98vFXX6rYJTK7U/X8nZq5y0BtH4covHyfsAxQ== +"@abp/utils@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.1.tgz#f25b383d6d7ba28c1220399397247cdef9704daf" + integrity sha512-Fi8dBDDAjdPE6tsWCP7iNlBb7WpoF8V3wOnoGmeg/ZklEcHDNZymjSa2RG8+6Qc4fSuUfti/Qyyj4CoDHhsOBw== 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 74dc82cda9..99070e0bd4 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/package.json +++ b/modules/blogging/app/Volo.BloggingTestApp/package.json @@ -3,7 +3,7 @@ "name": "volo.blogtestapp", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.3", - "@abp/blogging": "^5.3.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.1", + "@abp/blogging": "^6.0.0-rc.1" } } diff --git a/modules/blogging/app/Volo.BloggingTestApp/wwwroot/libs/abp/core/abp.js b/modules/blogging/app/Volo.BloggingTestApp/wwwroot/libs/abp/core/abp.js index 9445e4e7f4..d8b7531660 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/wwwroot/libs/abp/core/abp.js +++ b/modules/blogging/app/Volo.BloggingTestApp/wwwroot/libs/abp/core/abp.js @@ -372,7 +372,9 @@ var abp = abp || {}; setTimeout(function () { if (element) { element.classList.remove('abp-block-area-disappearing'); - element.parentElement.removeChild(element); + if (element.parentElement) { + element.parentElement.removeChild(element); + } } }, 250); } diff --git a/modules/blogging/app/Volo.BloggingTestApp/yarn.lock b/modules/blogging/app/Volo.BloggingTestApp/yarn.lock index 0c0d9a0db9..56a2ce435c 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/yarn.lock +++ b/modules/blogging/app/Volo.BloggingTestApp/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.3.tgz#dc6a1bdd583ef5ea0f8a0110753b0869d5f1cb61" - integrity sha512-det7xCtVZK6Dmvr0ENAkYdE+jRW0cVi3BCKZc7c6Hy0VKsKsKlnyz5j/D2rJSAmrap9hyQSWXBJUiho8W92wUQ== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.3" - -"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.3.tgz#65f97d787647e7760bb0c2a5b0f0ff815dc9630a" - integrity sha512-p/Z++QPM7S2lm7obXsZXIarcw0Y88y/Ghy5hyZqdc3uNHL6j8LRlD2qfuRXzl0k9HytXa859UKtSMLSZij1DiA== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.3" - "@abp/bootstrap" "~5.3.3" - "@abp/bootstrap-datepicker" "~5.3.3" - "@abp/datatables.net-bs5" "~5.3.3" - "@abp/font-awesome" "~5.3.3" - "@abp/jquery-form" "~5.3.3" - "@abp/jquery-validation-unobtrusive" "~5.3.3" - "@abp/lodash" "~5.3.3" - "@abp/luxon" "~5.3.3" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.3" - "@abp/select2" "~5.3.3" - "@abp/sweetalert2" "~5.3.3" - "@abp/timeago" "~5.3.3" - "@abp/toastr" "~5.3.3" - -"@abp/aspnetcore.mvc.ui@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.3.tgz#b8beb98bde3e4f0340335014ced7653c7913a621" - integrity sha512-aDQxdfQmlEXIjWGW8wru58imh9cncHAijafvdXlmyfKHM2JfnSSCG/RPMiaoJq/iyDVEggbhx8z4VHODC1eitg== +"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.1.tgz#561522e75e850bfa33243c91b9c37e4791039455" + integrity sha512-oov7mcynMOjeBxD3oBXzSuarwLYxB902O/TMbQsdiU50oJmfgidsaHC7W3lAvfXbuZiok9+zkUW9uaGXS+OuXA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.1" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.1.tgz#5b0afe34c485f8e11ef21b0bce86e231602d8c1b" + integrity sha512-lY8ToScqRSlIHKMMiut+yiXzJG/+B8/ZXS+O9+nNOZ97G6oJZr3TYFuLcR8Rr5tFSZ65dUYivshHAM7HcRYyNA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.1" + "@abp/bootstrap" "~6.0.0-rc.1" + "@abp/bootstrap-datepicker" "~6.0.0-rc.1" + "@abp/datatables.net-bs5" "~6.0.0-rc.1" + "@abp/font-awesome" "~6.0.0-rc.1" + "@abp/jquery-form" "~6.0.0-rc.1" + "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.1" + "@abp/lodash" "~6.0.0-rc.1" + "@abp/luxon" "~6.0.0-rc.1" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.1" + "@abp/select2" "~6.0.0-rc.1" + "@abp/sweetalert2" "~6.0.0-rc.1" + "@abp/timeago" "~6.0.0-rc.1" + "@abp/toastr" "~6.0.0-rc.1" + +"@abp/aspnetcore.mvc.ui@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.1.tgz#cec27a35b336ef8319308ac24995def0f26e00be" + integrity sha512-wH4ar4DHJiMPfe+z6IO1nCCz5L+/1W//Kh+wdtuU2QGmJX4mavAgO+ZXKGeA1QYsUY8NBXWj0Xwoyp9PgbqsyQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,187 +41,187 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/blogging@^5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/blogging/-/blogging-5.3.3.tgz#b2be335e0e54fd59b5542e28d447d048bcfb0c4c" - integrity sha512-eMs3IzErwnQ4XG/NJXk3xRF0tEOStetx7EBWHvF423NK8fW4tvM5imy+Q44LXYSqHQgz39ekIslov/mtD2lHQw== +"@abp/blogging@^6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/blogging/-/blogging-6.0.0-rc.1.tgz#f74168adb95fc7f36ba28b93f4801c2e7d41fe6b" + integrity sha512-yjLuiVEuC1+v6bxLLze0MCn9yyciPdaikFRQ76Tgi+5oBNCOncaPuq8thO8YM8t4uqHGuQ6GFpKA2I4O9BSelg== dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.3" - "@abp/owl.carousel" "~5.3.3" - "@abp/prismjs" "~5.3.3" - "@abp/tui-editor" "~5.3.3" + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.1" + "@abp/owl.carousel" "~6.0.0-rc.1" + "@abp/prismjs" "~6.0.0-rc.1" + "@abp/tui-editor" "~6.0.0-rc.1" -"@abp/bootstrap-datepicker@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.3.tgz#66bf2be128e6389877ed4465149c1933ca182c71" - integrity sha512-w/gPj4BVzVnmwekWVHKPYkwnhZFFH1XtCtw5LeJVM5bSYQBrvVTvvUPdKiiTDV59OYf2sbsA+PscwcTWAG6t/Q== +"@abp/bootstrap-datepicker@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.1.tgz#33bd5d9e1d6b351eb1e7a278ccd9a79db119e461" + integrity sha512-/y4v/JZ5YXJ2ew0v7//C//ShK3cf7IPd23d2kVb/7vypdR7yquxyoM7nxpnsfJBs5dQLsH8D5tAhFyTJBZUovA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.3.tgz#56335b46bd42fba0a522712fbb6591fb6aeb5b68" - integrity sha512-xOtC690pE+QxZYhhQrpTE1rapEjg9BrJg7e0qvrkt4TLMZ4mIbau6/Qlh6x8uuMASCUUuRTLNUzHijxvOJh7Mg== +"@abp/bootstrap@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.1.tgz#c6f64f1f34870b75da623ed9cee7b3b1159611fc" + integrity sha512-/cAVvgmp/jYTxsuz1RmfNZ7r0X01SKvAB7yjJPvBuEdLj/5ms9HyEa3K4ifnALoShFOKP9yQN1aJtmHN7hepiQ== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" bootstrap "^5.1.3" -"@abp/clipboard@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-5.3.3.tgz#62c3c12f1ff503091924f672f71a50e2e5d0b47c" - integrity sha512-FRJPM9/P3WPuK4Id1KVfmpkOB3MrlrYp/beNqZtjqQuG8WDjVgnHrDnsPYfzeLdK5n6bEvtGWwtHwiaBOXhWZg== +"@abp/clipboard@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-6.0.0-rc.1.tgz#3dc6808637f116a07f11c6e727f55ce9bd4b64de" + integrity sha512-u/OPfgXRmrrjkbJrzKB1YSW8rTqUWIPRVx1VAT7RdT5UMzX4DOupd7SRJFr6u7OZFP1p7umUtl6k4wY1lAv6rw== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" clipboard "^2.0.8" -"@abp/core@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.3.tgz#b03fc281d650d483c9276591f2adb26ea43dcd1e" - integrity sha512-Pp8U+LjchtSxc9lTRaPNQhb+Eh7X2LVERmZvoWyET0y/st28PJZ4eZ4iyGmV00pEmCpadF5aTWVhJcGH32scdQ== +"@abp/core@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.1.tgz#ec88b3339d854c91e93c342206984daf01b745df" + integrity sha512-V3X4fFm4A13LX47JNpjyxLs9IQ+StISHYMld6srEgCatHx1+dUfLcA4v5uj4IHIrPaRxhX/wv4iDND6FYcGJ2Q== dependencies: - "@abp/utils" "~5.3.3" + "@abp/utils" "~6.0.0-rc.1" -"@abp/datatables.net-bs5@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.3.tgz#e00304fbe7e6d9d33e1082485f7aa07de48fac0c" - integrity sha512-dkbP3PPkMRJqxravYO7NIVww+MQC3FxHP7mPCg/+PG/LttaNJ5L5hoNcb7BMK2K76hBRMdvlSIzvjycb1w1ooA== +"@abp/datatables.net-bs5@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.1.tgz#111c8c04e7d31f1b417602c7dde87d5a49104890" + integrity sha512-r4pxy1FYc06Ju4tYBVXe9HcE9LFDPCQJYP+01fPAAXcIDM7f02nCqdBjUJdv/z0VSejs9Ttn9ZIVSc85Y9JNoA== dependencies: - "@abp/datatables.net" "~5.3.3" + "@abp/datatables.net" "~6.0.0-rc.1" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.3.tgz#6d8eca1034e26708b9adf0d5917aefd5772cbf30" - integrity sha512-1JuXMzHDtrvGRNBYdwEVobiYmhd7VxM432ciARX8hzvSkE0jcgzeTrSlBXfenFMPOIAUJsSOE4YVshtqrY0G4g== +"@abp/datatables.net@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.1.tgz#278762acd0df9c7fd50ef0caef9a9e6c32665e6f" + integrity sha512-NQSKDdpUvsY6JgGHTrTSNAp2ZcMb3L4PwSv9vJVoDSYYF7+f/KFO/bZWlamig+gucX917auRvxzD5bFSL9ub8Q== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" datatables.net "^1.11.4" -"@abp/font-awesome@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.3.tgz#b10a530c9dee28838536746ea2a40342ff2ee3a8" - integrity sha512-c+cvsQ1uolSoyTkM9rZYYM07iiq/Zu8zKOQaDbitQMfPkcfSnC3PG/PTNauSYuwh/SyFfacFXeaDQ5Y/kAGRLw== +"@abp/font-awesome@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.1.tgz#87b89f8923b262a8531cf4702cf318d9fab155b6" + integrity sha512-lxY1ONRR0sW/uLbgY/6KJpaeZ1ueQfARjcTfHdCmnat72Qd2jID/jKGKUW2fmK0SHmAZiBnKWHLFvF+JcB3JPQ== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.3.tgz#94234207aa991e098e49e7d1244dc86d289a48e6" - integrity sha512-TY5c4ODfSidYGWqUR+QMNbxasfSufSg9gLY8lTEaJn2Wd2+o3GlauPxlTeNIRCRsxqb8e5+fBJspq1YbtE8vQg== +"@abp/jquery-form@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.1.tgz#5bb68fbb2ce0c3b9a59a52ab20c4ea971258c3b1" + integrity sha512-RZ6v6ZbF+05gSBLltsjIMWd8a3bE8bKEPGfHgIPBJr2+xl7TGwuBB0GmDYa+2X6ctBN1BvGsNvMtOB41ahSaGA== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.3.tgz#03f776807b60f32d2470c3d3c975ee20f33a993d" - integrity sha512-BNa2oSOfc5CSLW62SLCOinP7ybDDSVjfn0LYdDOdkIpSPnoL/3E1ZmgEzkDCUdTfJ67320kGDtIHCpb+Wbik+Q== +"@abp/jquery-validation-unobtrusive@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.1.tgz#d082de2aa6c2d8bc2a0808b4159d0f5d281afdd2" + integrity sha512-Wv7/W8CXvO5+GFfYVSRXR7MnI5Vv+grDal8onwPTZ8OZS1dsTUnXe5enQMfuyzSBkq/YKTve6vFOOx8sNi0Tfg== dependencies: - "@abp/jquery-validation" "~5.3.3" + "@abp/jquery-validation" "~6.0.0-rc.1" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.3.tgz#a0544428b94966f35d3aebb40c354d3f4485137d" - integrity sha512-GFhrS4pVmbQRI0eiW2aBYmRTB0rR2s3Wj4NIVB69ZHwvy+uADA3M/oMs8Q4wuT+gmPu2GCjPNCc5RPsC173VPA== +"@abp/jquery-validation@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.1.tgz#e30227075f6d7eabe6224faf2e033622ce0fe3b1" + integrity sha512-xdEVHDsPUmZRyQS5qJYs+FurK6rjGH4ARzlDjtZCwiP85pFQ3+dglF+2/KZxzsNWfHwHl3DdoKWufzzT1qYbrg== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.3.tgz#be70aa671129fac192b8f858a973e65018960cbd" - integrity sha512-sUy0aquZPq+HyxChYJMTjUZxaTo5/Aav5JcbMq1RczIFidjOrFHthWnYZveDVSKryaCfX3tXutag1sPakUOTtg== +"@abp/jquery@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.1.tgz#6f486cfc16dd915ccd4fe4a3029fa6359fea49c0" + integrity sha512-WLcF9BHjRPjtz/QVWfrkltA0eYXVfUPrKmodeJ0q3wmndPqmmMyTMFSrsnoos2bSxd1Z/WGqqB3vVEYGUc1E4g== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" jquery "~3.6.0" -"@abp/lodash@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.3.tgz#365684a338ab5d68adffa93207d0035eaa494ef9" - integrity sha512-Lqb2DkmKBPBHNbUd1QeATv8G/qUPamd06bKbe7xHesX3DZtlIwTmimwTpV4tqmJqOLKB67uUtapPYCfKyxs1RQ== +"@abp/lodash@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.1.tgz#5e143be48e1d266356bd726764a89f520c55e8a5" + integrity sha512-lPui/un/eZcUaeJ2r/I9DgtfIVVoASy/e+gj3opCIGv9cgBQwoV9vlAZGCsUwRFy1RO7EUUsJR4jgxWSmj1JFw== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" lodash "^4.17.21" -"@abp/luxon@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.3.tgz#97a60ae64e865d2b1c04107302d4ec50d4e09217" - integrity sha512-/7Lb463HREBFlt17tUFinTpYxfbZ8UIi1+d7Fqp8spJv78qCxvpWmD4iuJJJdCExO00ztZWY9GkCDPrAbfP/dA== +"@abp/luxon@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.1.tgz#a4242d862576b4151912d48fbf81d89862b6a91e" + integrity sha512-O0nbZk1PA7RryFG+J3gKRtuT4+FV4eSkth8GZvhCOKoN8SpDu/92G2cIEzR0l9O1TYlrKAEbUpmsA+d6abSG+w== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.3.tgz#96be03f79be929b1a2cb67acb38e9d6638f04f15" - integrity sha512-hr5qmcVl+Wr6sIS10QerWRTfFvhmhq9e48G9Hx5oQZFjrIkfJRlxla0TYViHR2tRYCeDQGb4gYmN4Fc71mdcPg== +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.1.tgz#738efa17783450971c6f47608cfafc0ef87d8ec6" + integrity sha512-6Q9slGs6A1d1v+lpTfzI8W+QrpTtY0LTKQkRbYYpm31Lf5zQ55QFoinDpV9wnxDPrfh2u5aX/dSYMrHjdzj6Qg== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/owl.carousel@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/owl.carousel/-/owl.carousel-5.3.3.tgz#72af5b9648c795a331a6213c685428cb6f4e9ddb" - integrity sha512-9cxU+gYa+Xbps44j/4PfdNLmOiwY4sqHxw6/UHdQ3x9jKM1uEPjWZ8KvhQHMc0G/wMPkBoosMTZhgf5fCt4YYg== +"@abp/owl.carousel@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/owl.carousel/-/owl.carousel-6.0.0-rc.1.tgz#b81d2f906494f7f37de15a3b35769751fbf01e5c" + integrity sha512-8zSsi8ivbqDnzIHEVnHcznihm4y2/60mcNP6nWdB99B7z8hpBdP9c+A4Wq/mwcJvtfWwV8Mx2lR8tLmm14PxCA== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" owl.carousel "^2.3.4" -"@abp/prismjs@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-5.3.3.tgz#eccea1469cb4dfc15b87704d267bb36ad6f25758" - integrity sha512-XC0jQa9LqcuqpciDKSbc0wRo4sOK9sebX6eZBlbOnGIoHhNNbiwG0Vt60MHQ5DmaOz7k5jWP0gOISQMJ5GJfTw== +"@abp/prismjs@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-6.0.0-rc.1.tgz#1c1afcf0533c54989d1eaf0d94a0a71f61213d70" + integrity sha512-rDkIdCEdiHw9ervlfrRyoMB0eiDGSbjM0PG+M7ePXoatDiFdDsTz/XYR3ygvdk1/8h7GM2KkNjrx8OLzWMlblQ== dependencies: - "@abp/clipboard" "~5.3.3" - "@abp/core" "~5.3.3" + "@abp/clipboard" "~6.0.0-rc.1" + "@abp/core" "~6.0.0-rc.1" prismjs "^1.26.0" -"@abp/select2@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.3.tgz#bdb8de1fcc5c9964233fdf1d4b88f7b90099f293" - integrity sha512-yk4CDpgksM5pAXMgFnULlgDovBk0oeXRhAA6lpt0TizzJ353WkpcASUblHbWOePzXbJFBBB2cj3XBD9vdWx7Ig== +"@abp/select2@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.1.tgz#d4ba6e71536c56ef2c98c1b3342f15fc286d3c1b" + integrity sha512-j1mebFXYiLOaOqK9FW5FqafTvT6oydEbcKj2Dk4JdgbcwdY+Mf5DPrb4cu61IPR7SzMCfeZX6j6d2LCdnW7o4g== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" select2 "^4.0.13" -"@abp/sweetalert2@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.3.tgz#54a2d45ddbdaa2f7a4485aa5731f2fec65a9c771" - integrity sha512-Lbw6S+xTNMtHeFaMJNbYTMtqznDwRtlN4+f+hRGWbqNIpHuMfTi1jUgdeZTYRjbhY+RTduUJrs8lvvPMKWgrTw== +"@abp/sweetalert2@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.1.tgz#2633ed54227a703dbd81e2db0923d6f402561232" + integrity sha512-JxrLUnsntCoimJTpY+9uQ+CK6VW1sRTv0qhOX7EJTEefvA+YZjSSk0MwyG4KNzF46JSMW1OctXqWihl/UHZzTQ== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.3.tgz#6e13a178d67e635ebe65d01db220d09f1673bafa" - integrity sha512-mBwaioPVnIeMXP6tDG24NZaTCAGvk8cMah8ems3OLWNK+tsPU4Jy8BVHTSmd/7rA69EL0REuSw2GmiCvaCL+RQ== +"@abp/timeago@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.1.tgz#78903b3d523da6985a83a306d6a31d223b244d8b" + integrity sha512-f5AaVRCKXS4+U4axVE6B1gQIo28gmJ5iOsn+tGhH9YANsfybS7in7dN8Nu89oqx10tVyHZ6r5/ESd21aV34VDA== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" timeago "^1.6.7" -"@abp/toastr@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.3.tgz#a3d2d19963fe96da9566a0f320c7f9911901e69a" - integrity sha512-F1FJPQ0nnu/jZY4XpJFS7uFJgpoEl8aOeFkm6kvshK76ABFLvsWHYW88htW5gXIwOf+G/QClZdx39Os+IQaUJw== +"@abp/toastr@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.1.tgz#2cb0898d48bad1cb8cb5e994b55e51d60e5a6b90" + integrity sha512-RPp6J5IWtYW1q27+fFc5UxramldBIbCyEU9aniH9rfkEs4F5SF4RJphqjSKeYMclvT0PheUnR1x26PJbi179MQ== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" toastr "^2.1.4" -"@abp/tui-editor@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-5.3.3.tgz#2c9f09fb8cf1dd98656d425f4f94896e9e3297ce" - integrity sha512-gXumOvfQc4D2e2fEG/nSja4sHwDARwnp2K41M7eSdaB/ENR0GT1SRfK24SdpnYSuzPnuhNR/GMY1c3jOJFNCRg== +"@abp/tui-editor@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-6.0.0-rc.1.tgz#1d3a3cd51ee9a15019813c3d854fe51dd27021f1" + integrity sha512-3dwvKJfbgJXOhaS2hXED+pm1ZEyy3tsq4KaqCkFsowRbrKvNQcaRUi3eSdrV4FCQmmtphS9+K+/c85SsIcPUIQ== dependencies: - "@abp/jquery" "~5.3.3" - "@abp/prismjs" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" + "@abp/prismjs" "~6.0.0-rc.1" -"@abp/utils@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.3.tgz#b47f11cb9a0ac963a7f4e5a44360d933e19896fc" - integrity sha512-owTYsROGHfXuHTOFe1uKMAwLbgjzQLKDnmApUy4taYy93rWsu98vFXX6rYJTK7U/X8nZq5y0BtH4covHyfsAxQ== +"@abp/utils@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.1.tgz#f25b383d6d7ba28c1220399397247cdef9704daf" + integrity sha512-Fi8dBDDAjdPE6tsWCP7iNlBb7WpoF8V3wOnoGmeg/ZklEcHDNZymjSa2RG8+6Qc4fSuUfti/Qyyj4CoDHhsOBw== dependencies: just-compare "^1.3.0" diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json index a3129da17f..99c3281cfa 100644 --- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json +++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json @@ -3,6 +3,6 @@ "name": "client-simulation-web", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.1" } } diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/wwwroot/libs/abp/core/abp.js b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/wwwroot/libs/abp/core/abp.js index 9445e4e7f4..d8b7531660 100644 --- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/wwwroot/libs/abp/core/abp.js +++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/wwwroot/libs/abp/core/abp.js @@ -372,7 +372,9 @@ var abp = abp || {}; setTimeout(function () { if (element) { element.classList.remove('abp-block-area-disappearing'); - element.parentElement.removeChild(element); + if (element.parentElement) { + element.parentElement.removeChild(element); + } } }, 250); } diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock index b16b62a682..bc822ce865 100644 --- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock +++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.3.tgz#dc6a1bdd583ef5ea0f8a0110753b0869d5f1cb61" - integrity sha512-det7xCtVZK6Dmvr0ENAkYdE+jRW0cVi3BCKZc7c6Hy0VKsKsKlnyz5j/D2rJSAmrap9hyQSWXBJUiho8W92wUQ== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.3" - -"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.3.tgz#65f97d787647e7760bb0c2a5b0f0ff815dc9630a" - integrity sha512-p/Z++QPM7S2lm7obXsZXIarcw0Y88y/Ghy5hyZqdc3uNHL6j8LRlD2qfuRXzl0k9HytXa859UKtSMLSZij1DiA== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.3" - "@abp/bootstrap" "~5.3.3" - "@abp/bootstrap-datepicker" "~5.3.3" - "@abp/datatables.net-bs5" "~5.3.3" - "@abp/font-awesome" "~5.3.3" - "@abp/jquery-form" "~5.3.3" - "@abp/jquery-validation-unobtrusive" "~5.3.3" - "@abp/lodash" "~5.3.3" - "@abp/luxon" "~5.3.3" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.3" - "@abp/select2" "~5.3.3" - "@abp/sweetalert2" "~5.3.3" - "@abp/timeago" "~5.3.3" - "@abp/toastr" "~5.3.3" - -"@abp/aspnetcore.mvc.ui@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.3.tgz#b8beb98bde3e4f0340335014ced7653c7913a621" - integrity sha512-aDQxdfQmlEXIjWGW8wru58imh9cncHAijafvdXlmyfKHM2JfnSSCG/RPMiaoJq/iyDVEggbhx8z4VHODC1eitg== +"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.1.tgz#561522e75e850bfa33243c91b9c37e4791039455" + integrity sha512-oov7mcynMOjeBxD3oBXzSuarwLYxB902O/TMbQsdiU50oJmfgidsaHC7W3lAvfXbuZiok9+zkUW9uaGXS+OuXA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.1" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.1.tgz#5b0afe34c485f8e11ef21b0bce86e231602d8c1b" + integrity sha512-lY8ToScqRSlIHKMMiut+yiXzJG/+B8/ZXS+O9+nNOZ97G6oJZr3TYFuLcR8Rr5tFSZ65dUYivshHAM7HcRYyNA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.1" + "@abp/bootstrap" "~6.0.0-rc.1" + "@abp/bootstrap-datepicker" "~6.0.0-rc.1" + "@abp/datatables.net-bs5" "~6.0.0-rc.1" + "@abp/font-awesome" "~6.0.0-rc.1" + "@abp/jquery-form" "~6.0.0-rc.1" + "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.1" + "@abp/lodash" "~6.0.0-rc.1" + "@abp/luxon" "~6.0.0-rc.1" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.1" + "@abp/select2" "~6.0.0-rc.1" + "@abp/sweetalert2" "~6.0.0-rc.1" + "@abp/timeago" "~6.0.0-rc.1" + "@abp/toastr" "~6.0.0-rc.1" + +"@abp/aspnetcore.mvc.ui@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.1.tgz#cec27a35b336ef8319308ac24995def0f26e00be" + integrity sha512-wH4ar4DHJiMPfe+z6IO1nCCz5L+/1W//Kh+wdtuU2QGmJX4mavAgO+ZXKGeA1QYsUY8NBXWj0Xwoyp9PgbqsyQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,144 +41,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.3.tgz#66bf2be128e6389877ed4465149c1933ca182c71" - integrity sha512-w/gPj4BVzVnmwekWVHKPYkwnhZFFH1XtCtw5LeJVM5bSYQBrvVTvvUPdKiiTDV59OYf2sbsA+PscwcTWAG6t/Q== +"@abp/bootstrap-datepicker@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.1.tgz#33bd5d9e1d6b351eb1e7a278ccd9a79db119e461" + integrity sha512-/y4v/JZ5YXJ2ew0v7//C//ShK3cf7IPd23d2kVb/7vypdR7yquxyoM7nxpnsfJBs5dQLsH8D5tAhFyTJBZUovA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.3.tgz#56335b46bd42fba0a522712fbb6591fb6aeb5b68" - integrity sha512-xOtC690pE+QxZYhhQrpTE1rapEjg9BrJg7e0qvrkt4TLMZ4mIbau6/Qlh6x8uuMASCUUuRTLNUzHijxvOJh7Mg== +"@abp/bootstrap@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.1.tgz#c6f64f1f34870b75da623ed9cee7b3b1159611fc" + integrity sha512-/cAVvgmp/jYTxsuz1RmfNZ7r0X01SKvAB7yjJPvBuEdLj/5ms9HyEa3K4ifnALoShFOKP9yQN1aJtmHN7hepiQ== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" bootstrap "^5.1.3" -"@abp/core@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.3.tgz#b03fc281d650d483c9276591f2adb26ea43dcd1e" - integrity sha512-Pp8U+LjchtSxc9lTRaPNQhb+Eh7X2LVERmZvoWyET0y/st28PJZ4eZ4iyGmV00pEmCpadF5aTWVhJcGH32scdQ== +"@abp/core@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.1.tgz#ec88b3339d854c91e93c342206984daf01b745df" + integrity sha512-V3X4fFm4A13LX47JNpjyxLs9IQ+StISHYMld6srEgCatHx1+dUfLcA4v5uj4IHIrPaRxhX/wv4iDND6FYcGJ2Q== dependencies: - "@abp/utils" "~5.3.3" + "@abp/utils" "~6.0.0-rc.1" -"@abp/datatables.net-bs5@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.3.tgz#e00304fbe7e6d9d33e1082485f7aa07de48fac0c" - integrity sha512-dkbP3PPkMRJqxravYO7NIVww+MQC3FxHP7mPCg/+PG/LttaNJ5L5hoNcb7BMK2K76hBRMdvlSIzvjycb1w1ooA== +"@abp/datatables.net-bs5@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.1.tgz#111c8c04e7d31f1b417602c7dde87d5a49104890" + integrity sha512-r4pxy1FYc06Ju4tYBVXe9HcE9LFDPCQJYP+01fPAAXcIDM7f02nCqdBjUJdv/z0VSejs9Ttn9ZIVSc85Y9JNoA== dependencies: - "@abp/datatables.net" "~5.3.3" + "@abp/datatables.net" "~6.0.0-rc.1" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.3.tgz#6d8eca1034e26708b9adf0d5917aefd5772cbf30" - integrity sha512-1JuXMzHDtrvGRNBYdwEVobiYmhd7VxM432ciARX8hzvSkE0jcgzeTrSlBXfenFMPOIAUJsSOE4YVshtqrY0G4g== +"@abp/datatables.net@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.1.tgz#278762acd0df9c7fd50ef0caef9a9e6c32665e6f" + integrity sha512-NQSKDdpUvsY6JgGHTrTSNAp2ZcMb3L4PwSv9vJVoDSYYF7+f/KFO/bZWlamig+gucX917auRvxzD5bFSL9ub8Q== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" datatables.net "^1.11.4" -"@abp/font-awesome@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.3.tgz#b10a530c9dee28838536746ea2a40342ff2ee3a8" - integrity sha512-c+cvsQ1uolSoyTkM9rZYYM07iiq/Zu8zKOQaDbitQMfPkcfSnC3PG/PTNauSYuwh/SyFfacFXeaDQ5Y/kAGRLw== +"@abp/font-awesome@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.1.tgz#87b89f8923b262a8531cf4702cf318d9fab155b6" + integrity sha512-lxY1ONRR0sW/uLbgY/6KJpaeZ1ueQfARjcTfHdCmnat72Qd2jID/jKGKUW2fmK0SHmAZiBnKWHLFvF+JcB3JPQ== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.3.tgz#94234207aa991e098e49e7d1244dc86d289a48e6" - integrity sha512-TY5c4ODfSidYGWqUR+QMNbxasfSufSg9gLY8lTEaJn2Wd2+o3GlauPxlTeNIRCRsxqb8e5+fBJspq1YbtE8vQg== +"@abp/jquery-form@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.1.tgz#5bb68fbb2ce0c3b9a59a52ab20c4ea971258c3b1" + integrity sha512-RZ6v6ZbF+05gSBLltsjIMWd8a3bE8bKEPGfHgIPBJr2+xl7TGwuBB0GmDYa+2X6ctBN1BvGsNvMtOB41ahSaGA== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.3.tgz#03f776807b60f32d2470c3d3c975ee20f33a993d" - integrity sha512-BNa2oSOfc5CSLW62SLCOinP7ybDDSVjfn0LYdDOdkIpSPnoL/3E1ZmgEzkDCUdTfJ67320kGDtIHCpb+Wbik+Q== +"@abp/jquery-validation-unobtrusive@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.1.tgz#d082de2aa6c2d8bc2a0808b4159d0f5d281afdd2" + integrity sha512-Wv7/W8CXvO5+GFfYVSRXR7MnI5Vv+grDal8onwPTZ8OZS1dsTUnXe5enQMfuyzSBkq/YKTve6vFOOx8sNi0Tfg== dependencies: - "@abp/jquery-validation" "~5.3.3" + "@abp/jquery-validation" "~6.0.0-rc.1" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.3.tgz#a0544428b94966f35d3aebb40c354d3f4485137d" - integrity sha512-GFhrS4pVmbQRI0eiW2aBYmRTB0rR2s3Wj4NIVB69ZHwvy+uADA3M/oMs8Q4wuT+gmPu2GCjPNCc5RPsC173VPA== +"@abp/jquery-validation@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.1.tgz#e30227075f6d7eabe6224faf2e033622ce0fe3b1" + integrity sha512-xdEVHDsPUmZRyQS5qJYs+FurK6rjGH4ARzlDjtZCwiP85pFQ3+dglF+2/KZxzsNWfHwHl3DdoKWufzzT1qYbrg== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.3.tgz#be70aa671129fac192b8f858a973e65018960cbd" - integrity sha512-sUy0aquZPq+HyxChYJMTjUZxaTo5/Aav5JcbMq1RczIFidjOrFHthWnYZveDVSKryaCfX3tXutag1sPakUOTtg== +"@abp/jquery@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.1.tgz#6f486cfc16dd915ccd4fe4a3029fa6359fea49c0" + integrity sha512-WLcF9BHjRPjtz/QVWfrkltA0eYXVfUPrKmodeJ0q3wmndPqmmMyTMFSrsnoos2bSxd1Z/WGqqB3vVEYGUc1E4g== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" jquery "~3.6.0" -"@abp/lodash@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.3.tgz#365684a338ab5d68adffa93207d0035eaa494ef9" - integrity sha512-Lqb2DkmKBPBHNbUd1QeATv8G/qUPamd06bKbe7xHesX3DZtlIwTmimwTpV4tqmJqOLKB67uUtapPYCfKyxs1RQ== +"@abp/lodash@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.1.tgz#5e143be48e1d266356bd726764a89f520c55e8a5" + integrity sha512-lPui/un/eZcUaeJ2r/I9DgtfIVVoASy/e+gj3opCIGv9cgBQwoV9vlAZGCsUwRFy1RO7EUUsJR4jgxWSmj1JFw== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" lodash "^4.17.21" -"@abp/luxon@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.3.tgz#97a60ae64e865d2b1c04107302d4ec50d4e09217" - integrity sha512-/7Lb463HREBFlt17tUFinTpYxfbZ8UIi1+d7Fqp8spJv78qCxvpWmD4iuJJJdCExO00ztZWY9GkCDPrAbfP/dA== +"@abp/luxon@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.1.tgz#a4242d862576b4151912d48fbf81d89862b6a91e" + integrity sha512-O0nbZk1PA7RryFG+J3gKRtuT4+FV4eSkth8GZvhCOKoN8SpDu/92G2cIEzR0l9O1TYlrKAEbUpmsA+d6abSG+w== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.3.tgz#96be03f79be929b1a2cb67acb38e9d6638f04f15" - integrity sha512-hr5qmcVl+Wr6sIS10QerWRTfFvhmhq9e48G9Hx5oQZFjrIkfJRlxla0TYViHR2tRYCeDQGb4gYmN4Fc71mdcPg== +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.1.tgz#738efa17783450971c6f47608cfafc0ef87d8ec6" + integrity sha512-6Q9slGs6A1d1v+lpTfzI8W+QrpTtY0LTKQkRbYYpm31Lf5zQ55QFoinDpV9wnxDPrfh2u5aX/dSYMrHjdzj6Qg== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.3.tgz#bdb8de1fcc5c9964233fdf1d4b88f7b90099f293" - integrity sha512-yk4CDpgksM5pAXMgFnULlgDovBk0oeXRhAA6lpt0TizzJ353WkpcASUblHbWOePzXbJFBBB2cj3XBD9vdWx7Ig== +"@abp/select2@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.1.tgz#d4ba6e71536c56ef2c98c1b3342f15fc286d3c1b" + integrity sha512-j1mebFXYiLOaOqK9FW5FqafTvT6oydEbcKj2Dk4JdgbcwdY+Mf5DPrb4cu61IPR7SzMCfeZX6j6d2LCdnW7o4g== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" select2 "^4.0.13" -"@abp/sweetalert2@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.3.tgz#54a2d45ddbdaa2f7a4485aa5731f2fec65a9c771" - integrity sha512-Lbw6S+xTNMtHeFaMJNbYTMtqznDwRtlN4+f+hRGWbqNIpHuMfTi1jUgdeZTYRjbhY+RTduUJrs8lvvPMKWgrTw== +"@abp/sweetalert2@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.1.tgz#2633ed54227a703dbd81e2db0923d6f402561232" + integrity sha512-JxrLUnsntCoimJTpY+9uQ+CK6VW1sRTv0qhOX7EJTEefvA+YZjSSk0MwyG4KNzF46JSMW1OctXqWihl/UHZzTQ== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.3.tgz#6e13a178d67e635ebe65d01db220d09f1673bafa" - integrity sha512-mBwaioPVnIeMXP6tDG24NZaTCAGvk8cMah8ems3OLWNK+tsPU4Jy8BVHTSmd/7rA69EL0REuSw2GmiCvaCL+RQ== +"@abp/timeago@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.1.tgz#78903b3d523da6985a83a306d6a31d223b244d8b" + integrity sha512-f5AaVRCKXS4+U4axVE6B1gQIo28gmJ5iOsn+tGhH9YANsfybS7in7dN8Nu89oqx10tVyHZ6r5/ESd21aV34VDA== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" timeago "^1.6.7" -"@abp/toastr@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.3.tgz#a3d2d19963fe96da9566a0f320c7f9911901e69a" - integrity sha512-F1FJPQ0nnu/jZY4XpJFS7uFJgpoEl8aOeFkm6kvshK76ABFLvsWHYW88htW5gXIwOf+G/QClZdx39Os+IQaUJw== +"@abp/toastr@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.1.tgz#2cb0898d48bad1cb8cb5e994b55e51d60e5a6b90" + integrity sha512-RPp6J5IWtYW1q27+fFc5UxramldBIbCyEU9aniH9rfkEs4F5SF4RJphqjSKeYMclvT0PheUnR1x26PJbi179MQ== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" toastr "^2.1.4" -"@abp/utils@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.3.tgz#b47f11cb9a0ac963a7f4e5a44360d933e19896fc" - integrity sha512-owTYsROGHfXuHTOFe1uKMAwLbgjzQLKDnmApUy4taYy93rWsu98vFXX6rYJTK7U/X8nZq5y0BtH4covHyfsAxQ== +"@abp/utils@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.1.tgz#f25b383d6d7ba28c1220399397247cdef9704daf" + integrity sha512-Fi8dBDDAjdPE6tsWCP7iNlBb7WpoF8V3wOnoGmeg/ZklEcHDNZymjSa2RG8+6Qc4fSuUfti/Qyyj4CoDHhsOBw== dependencies: just-compare "^1.3.0" diff --git a/modules/cms-kit/angular/package.json b/modules/cms-kit/angular/package.json index 799be1c6ef..4496a23613 100644 --- a/modules/cms-kit/angular/package.json +++ b/modules/cms-kit/angular/package.json @@ -15,11 +15,11 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~5.3.3", - "@abp/ng.identity": "~5.3.3", - "@abp/ng.setting-management": "~5.3.3", - "@abp/ng.tenant-management": "~5.3.3", - "@abp/ng.theme.basic": "~5.3.3", + "@abp/ng.account": "~6.0.0-rc.1", + "@abp/ng.identity": "~6.0.0-rc.1", + "@abp/ng.setting-management": "~6.0.0-rc.1", + "@abp/ng.tenant-management": "~6.0.0-rc.1", + "@abp/ng.theme.basic": "~6.0.0-rc.1", "@angular/animations": "~10.0.0", "@angular/common": "~10.0.0", "@angular/compiler": "~10.0.0", diff --git a/modules/cms-kit/angular/projects/cms-kit/package.json b/modules/cms-kit/angular/projects/cms-kit/package.json index d561067392..0a10f5182b 100644 --- a/modules/cms-kit/angular/projects/cms-kit/package.json +++ b/modules/cms-kit/angular/projects/cms-kit/package.json @@ -4,8 +4,8 @@ "peerDependencies": { "@angular/common": "^9.1.11", "@angular/core": "^9.1.11", - "@abp/ng.core": ">=5.3.3", - "@abp/ng.theme.shared": ">=5.3.3" + "@abp/ng.core": ">=6.0.0-rc.1", + "@abp/ng.theme.shared": ">=6.0.0-rc.1" }, "dependencies": { "tslib": "^2.0.0" diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json index a96f05fa85..7c098a9017 100644 --- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json +++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json @@ -3,6 +3,6 @@ "name": "my-app-identityserver", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.1" } } diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/wwwroot/libs/abp/core/abp.js b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/wwwroot/libs/abp/core/abp.js index 9445e4e7f4..d8b7531660 100644 --- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/wwwroot/libs/abp/core/abp.js +++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/wwwroot/libs/abp/core/abp.js @@ -372,7 +372,9 @@ var abp = abp || {}; setTimeout(function () { if (element) { element.classList.remove('abp-block-area-disappearing'); - element.parentElement.removeChild(element); + if (element.parentElement) { + element.parentElement.removeChild(element); + } } }, 250); } diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock index 97fba3888b..85ac9f5e66 100644 --- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock +++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.3.tgz#dc6a1bdd583ef5ea0f8a0110753b0869d5f1cb61" - integrity sha512-det7xCtVZK6Dmvr0ENAkYdE+jRW0cVi3BCKZc7c6Hy0VKsKsKlnyz5j/D2rJSAmrap9hyQSWXBJUiho8W92wUQ== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.3" - -"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.3.tgz#65f97d787647e7760bb0c2a5b0f0ff815dc9630a" - integrity sha512-p/Z++QPM7S2lm7obXsZXIarcw0Y88y/Ghy5hyZqdc3uNHL6j8LRlD2qfuRXzl0k9HytXa859UKtSMLSZij1DiA== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.3" - "@abp/bootstrap" "~5.3.3" - "@abp/bootstrap-datepicker" "~5.3.3" - "@abp/datatables.net-bs5" "~5.3.3" - "@abp/font-awesome" "~5.3.3" - "@abp/jquery-form" "~5.3.3" - "@abp/jquery-validation-unobtrusive" "~5.3.3" - "@abp/lodash" "~5.3.3" - "@abp/luxon" "~5.3.3" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.3" - "@abp/select2" "~5.3.3" - "@abp/sweetalert2" "~5.3.3" - "@abp/timeago" "~5.3.3" - "@abp/toastr" "~5.3.3" - -"@abp/aspnetcore.mvc.ui@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.3.tgz#b8beb98bde3e4f0340335014ced7653c7913a621" - integrity sha512-aDQxdfQmlEXIjWGW8wru58imh9cncHAijafvdXlmyfKHM2JfnSSCG/RPMiaoJq/iyDVEggbhx8z4VHODC1eitg== +"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.1.tgz#561522e75e850bfa33243c91b9c37e4791039455" + integrity sha512-oov7mcynMOjeBxD3oBXzSuarwLYxB902O/TMbQsdiU50oJmfgidsaHC7W3lAvfXbuZiok9+zkUW9uaGXS+OuXA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.1" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.1.tgz#5b0afe34c485f8e11ef21b0bce86e231602d8c1b" + integrity sha512-lY8ToScqRSlIHKMMiut+yiXzJG/+B8/ZXS+O9+nNOZ97G6oJZr3TYFuLcR8Rr5tFSZ65dUYivshHAM7HcRYyNA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.1" + "@abp/bootstrap" "~6.0.0-rc.1" + "@abp/bootstrap-datepicker" "~6.0.0-rc.1" + "@abp/datatables.net-bs5" "~6.0.0-rc.1" + "@abp/font-awesome" "~6.0.0-rc.1" + "@abp/jquery-form" "~6.0.0-rc.1" + "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.1" + "@abp/lodash" "~6.0.0-rc.1" + "@abp/luxon" "~6.0.0-rc.1" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.1" + "@abp/select2" "~6.0.0-rc.1" + "@abp/sweetalert2" "~6.0.0-rc.1" + "@abp/timeago" "~6.0.0-rc.1" + "@abp/toastr" "~6.0.0-rc.1" + +"@abp/aspnetcore.mvc.ui@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.1.tgz#cec27a35b336ef8319308ac24995def0f26e00be" + integrity sha512-wH4ar4DHJiMPfe+z6IO1nCCz5L+/1W//Kh+wdtuU2QGmJX4mavAgO+ZXKGeA1QYsUY8NBXWj0Xwoyp9PgbqsyQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,144 +41,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.3.tgz#66bf2be128e6389877ed4465149c1933ca182c71" - integrity sha512-w/gPj4BVzVnmwekWVHKPYkwnhZFFH1XtCtw5LeJVM5bSYQBrvVTvvUPdKiiTDV59OYf2sbsA+PscwcTWAG6t/Q== +"@abp/bootstrap-datepicker@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.1.tgz#33bd5d9e1d6b351eb1e7a278ccd9a79db119e461" + integrity sha512-/y4v/JZ5YXJ2ew0v7//C//ShK3cf7IPd23d2kVb/7vypdR7yquxyoM7nxpnsfJBs5dQLsH8D5tAhFyTJBZUovA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.3.tgz#56335b46bd42fba0a522712fbb6591fb6aeb5b68" - integrity sha512-xOtC690pE+QxZYhhQrpTE1rapEjg9BrJg7e0qvrkt4TLMZ4mIbau6/Qlh6x8uuMASCUUuRTLNUzHijxvOJh7Mg== +"@abp/bootstrap@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.1.tgz#c6f64f1f34870b75da623ed9cee7b3b1159611fc" + integrity sha512-/cAVvgmp/jYTxsuz1RmfNZ7r0X01SKvAB7yjJPvBuEdLj/5ms9HyEa3K4ifnALoShFOKP9yQN1aJtmHN7hepiQ== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" bootstrap "^5.1.3" -"@abp/core@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.3.tgz#b03fc281d650d483c9276591f2adb26ea43dcd1e" - integrity sha512-Pp8U+LjchtSxc9lTRaPNQhb+Eh7X2LVERmZvoWyET0y/st28PJZ4eZ4iyGmV00pEmCpadF5aTWVhJcGH32scdQ== +"@abp/core@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.1.tgz#ec88b3339d854c91e93c342206984daf01b745df" + integrity sha512-V3X4fFm4A13LX47JNpjyxLs9IQ+StISHYMld6srEgCatHx1+dUfLcA4v5uj4IHIrPaRxhX/wv4iDND6FYcGJ2Q== dependencies: - "@abp/utils" "~5.3.3" + "@abp/utils" "~6.0.0-rc.1" -"@abp/datatables.net-bs5@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.3.tgz#e00304fbe7e6d9d33e1082485f7aa07de48fac0c" - integrity sha512-dkbP3PPkMRJqxravYO7NIVww+MQC3FxHP7mPCg/+PG/LttaNJ5L5hoNcb7BMK2K76hBRMdvlSIzvjycb1w1ooA== +"@abp/datatables.net-bs5@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.1.tgz#111c8c04e7d31f1b417602c7dde87d5a49104890" + integrity sha512-r4pxy1FYc06Ju4tYBVXe9HcE9LFDPCQJYP+01fPAAXcIDM7f02nCqdBjUJdv/z0VSejs9Ttn9ZIVSc85Y9JNoA== dependencies: - "@abp/datatables.net" "~5.3.3" + "@abp/datatables.net" "~6.0.0-rc.1" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.3.tgz#6d8eca1034e26708b9adf0d5917aefd5772cbf30" - integrity sha512-1JuXMzHDtrvGRNBYdwEVobiYmhd7VxM432ciARX8hzvSkE0jcgzeTrSlBXfenFMPOIAUJsSOE4YVshtqrY0G4g== +"@abp/datatables.net@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.1.tgz#278762acd0df9c7fd50ef0caef9a9e6c32665e6f" + integrity sha512-NQSKDdpUvsY6JgGHTrTSNAp2ZcMb3L4PwSv9vJVoDSYYF7+f/KFO/bZWlamig+gucX917auRvxzD5bFSL9ub8Q== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" datatables.net "^1.11.4" -"@abp/font-awesome@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.3.tgz#b10a530c9dee28838536746ea2a40342ff2ee3a8" - integrity sha512-c+cvsQ1uolSoyTkM9rZYYM07iiq/Zu8zKOQaDbitQMfPkcfSnC3PG/PTNauSYuwh/SyFfacFXeaDQ5Y/kAGRLw== +"@abp/font-awesome@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.1.tgz#87b89f8923b262a8531cf4702cf318d9fab155b6" + integrity sha512-lxY1ONRR0sW/uLbgY/6KJpaeZ1ueQfARjcTfHdCmnat72Qd2jID/jKGKUW2fmK0SHmAZiBnKWHLFvF+JcB3JPQ== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.3.tgz#94234207aa991e098e49e7d1244dc86d289a48e6" - integrity sha512-TY5c4ODfSidYGWqUR+QMNbxasfSufSg9gLY8lTEaJn2Wd2+o3GlauPxlTeNIRCRsxqb8e5+fBJspq1YbtE8vQg== +"@abp/jquery-form@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.1.tgz#5bb68fbb2ce0c3b9a59a52ab20c4ea971258c3b1" + integrity sha512-RZ6v6ZbF+05gSBLltsjIMWd8a3bE8bKEPGfHgIPBJr2+xl7TGwuBB0GmDYa+2X6ctBN1BvGsNvMtOB41ahSaGA== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.3.tgz#03f776807b60f32d2470c3d3c975ee20f33a993d" - integrity sha512-BNa2oSOfc5CSLW62SLCOinP7ybDDSVjfn0LYdDOdkIpSPnoL/3E1ZmgEzkDCUdTfJ67320kGDtIHCpb+Wbik+Q== +"@abp/jquery-validation-unobtrusive@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.1.tgz#d082de2aa6c2d8bc2a0808b4159d0f5d281afdd2" + integrity sha512-Wv7/W8CXvO5+GFfYVSRXR7MnI5Vv+grDal8onwPTZ8OZS1dsTUnXe5enQMfuyzSBkq/YKTve6vFOOx8sNi0Tfg== dependencies: - "@abp/jquery-validation" "~5.3.3" + "@abp/jquery-validation" "~6.0.0-rc.1" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.3.tgz#a0544428b94966f35d3aebb40c354d3f4485137d" - integrity sha512-GFhrS4pVmbQRI0eiW2aBYmRTB0rR2s3Wj4NIVB69ZHwvy+uADA3M/oMs8Q4wuT+gmPu2GCjPNCc5RPsC173VPA== +"@abp/jquery-validation@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.1.tgz#e30227075f6d7eabe6224faf2e033622ce0fe3b1" + integrity sha512-xdEVHDsPUmZRyQS5qJYs+FurK6rjGH4ARzlDjtZCwiP85pFQ3+dglF+2/KZxzsNWfHwHl3DdoKWufzzT1qYbrg== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.3.tgz#be70aa671129fac192b8f858a973e65018960cbd" - integrity sha512-sUy0aquZPq+HyxChYJMTjUZxaTo5/Aav5JcbMq1RczIFidjOrFHthWnYZveDVSKryaCfX3tXutag1sPakUOTtg== +"@abp/jquery@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.1.tgz#6f486cfc16dd915ccd4fe4a3029fa6359fea49c0" + integrity sha512-WLcF9BHjRPjtz/QVWfrkltA0eYXVfUPrKmodeJ0q3wmndPqmmMyTMFSrsnoos2bSxd1Z/WGqqB3vVEYGUc1E4g== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" jquery "~3.6.0" -"@abp/lodash@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.3.tgz#365684a338ab5d68adffa93207d0035eaa494ef9" - integrity sha512-Lqb2DkmKBPBHNbUd1QeATv8G/qUPamd06bKbe7xHesX3DZtlIwTmimwTpV4tqmJqOLKB67uUtapPYCfKyxs1RQ== +"@abp/lodash@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.1.tgz#5e143be48e1d266356bd726764a89f520c55e8a5" + integrity sha512-lPui/un/eZcUaeJ2r/I9DgtfIVVoASy/e+gj3opCIGv9cgBQwoV9vlAZGCsUwRFy1RO7EUUsJR4jgxWSmj1JFw== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" lodash "^4.17.21" -"@abp/luxon@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.3.tgz#97a60ae64e865d2b1c04107302d4ec50d4e09217" - integrity sha512-/7Lb463HREBFlt17tUFinTpYxfbZ8UIi1+d7Fqp8spJv78qCxvpWmD4iuJJJdCExO00ztZWY9GkCDPrAbfP/dA== +"@abp/luxon@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.1.tgz#a4242d862576b4151912d48fbf81d89862b6a91e" + integrity sha512-O0nbZk1PA7RryFG+J3gKRtuT4+FV4eSkth8GZvhCOKoN8SpDu/92G2cIEzR0l9O1TYlrKAEbUpmsA+d6abSG+w== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.3.tgz#96be03f79be929b1a2cb67acb38e9d6638f04f15" - integrity sha512-hr5qmcVl+Wr6sIS10QerWRTfFvhmhq9e48G9Hx5oQZFjrIkfJRlxla0TYViHR2tRYCeDQGb4gYmN4Fc71mdcPg== +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.1.tgz#738efa17783450971c6f47608cfafc0ef87d8ec6" + integrity sha512-6Q9slGs6A1d1v+lpTfzI8W+QrpTtY0LTKQkRbYYpm31Lf5zQ55QFoinDpV9wnxDPrfh2u5aX/dSYMrHjdzj6Qg== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.3.tgz#bdb8de1fcc5c9964233fdf1d4b88f7b90099f293" - integrity sha512-yk4CDpgksM5pAXMgFnULlgDovBk0oeXRhAA6lpt0TizzJ353WkpcASUblHbWOePzXbJFBBB2cj3XBD9vdWx7Ig== +"@abp/select2@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.1.tgz#d4ba6e71536c56ef2c98c1b3342f15fc286d3c1b" + integrity sha512-j1mebFXYiLOaOqK9FW5FqafTvT6oydEbcKj2Dk4JdgbcwdY+Mf5DPrb4cu61IPR7SzMCfeZX6j6d2LCdnW7o4g== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" select2 "^4.0.13" -"@abp/sweetalert2@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.3.tgz#54a2d45ddbdaa2f7a4485aa5731f2fec65a9c771" - integrity sha512-Lbw6S+xTNMtHeFaMJNbYTMtqznDwRtlN4+f+hRGWbqNIpHuMfTi1jUgdeZTYRjbhY+RTduUJrs8lvvPMKWgrTw== +"@abp/sweetalert2@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.1.tgz#2633ed54227a703dbd81e2db0923d6f402561232" + integrity sha512-JxrLUnsntCoimJTpY+9uQ+CK6VW1sRTv0qhOX7EJTEefvA+YZjSSk0MwyG4KNzF46JSMW1OctXqWihl/UHZzTQ== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.3.tgz#6e13a178d67e635ebe65d01db220d09f1673bafa" - integrity sha512-mBwaioPVnIeMXP6tDG24NZaTCAGvk8cMah8ems3OLWNK+tsPU4Jy8BVHTSmd/7rA69EL0REuSw2GmiCvaCL+RQ== +"@abp/timeago@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.1.tgz#78903b3d523da6985a83a306d6a31d223b244d8b" + integrity sha512-f5AaVRCKXS4+U4axVE6B1gQIo28gmJ5iOsn+tGhH9YANsfybS7in7dN8Nu89oqx10tVyHZ6r5/ESd21aV34VDA== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" timeago "^1.6.7" -"@abp/toastr@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.3.tgz#a3d2d19963fe96da9566a0f320c7f9911901e69a" - integrity sha512-F1FJPQ0nnu/jZY4XpJFS7uFJgpoEl8aOeFkm6kvshK76ABFLvsWHYW88htW5gXIwOf+G/QClZdx39Os+IQaUJw== +"@abp/toastr@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.1.tgz#2cb0898d48bad1cb8cb5e994b55e51d60e5a6b90" + integrity sha512-RPp6J5IWtYW1q27+fFc5UxramldBIbCyEU9aniH9rfkEs4F5SF4RJphqjSKeYMclvT0PheUnR1x26PJbi179MQ== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" toastr "^2.1.4" -"@abp/utils@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.3.tgz#b47f11cb9a0ac963a7f4e5a44360d933e19896fc" - integrity sha512-owTYsROGHfXuHTOFe1uKMAwLbgjzQLKDnmApUy4taYy93rWsu98vFXX6rYJTK7U/X8nZq5y0BtH4covHyfsAxQ== +"@abp/utils@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.1.tgz#f25b383d6d7ba28c1220399397247cdef9704daf" + integrity sha512-Fi8dBDDAjdPE6tsWCP7iNlBb7WpoF8V3wOnoGmeg/ZklEcHDNZymjSa2RG8+6Qc4fSuUfti/Qyyj4CoDHhsOBw== 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 534c364bfe..f677733547 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.1" } } diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Host/wwwroot/libs/abp/core/abp.js b/modules/cms-kit/host/Volo.CmsKit.Web.Host/wwwroot/libs/abp/core/abp.js index 9445e4e7f4..d8b7531660 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/wwwroot/libs/abp/core/abp.js +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Host/wwwroot/libs/abp/core/abp.js @@ -372,7 +372,9 @@ var abp = abp || {}; setTimeout(function () { if (element) { element.classList.remove('abp-block-area-disappearing'); - element.parentElement.removeChild(element); + if (element.parentElement) { + element.parentElement.removeChild(element); + } } }, 250); } 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 e00d374a77..113aec5be6 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.3.tgz#dc6a1bdd583ef5ea0f8a0110753b0869d5f1cb61" - integrity sha512-det7xCtVZK6Dmvr0ENAkYdE+jRW0cVi3BCKZc7c6Hy0VKsKsKlnyz5j/D2rJSAmrap9hyQSWXBJUiho8W92wUQ== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.3" - -"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.3.tgz#65f97d787647e7760bb0c2a5b0f0ff815dc9630a" - integrity sha512-p/Z++QPM7S2lm7obXsZXIarcw0Y88y/Ghy5hyZqdc3uNHL6j8LRlD2qfuRXzl0k9HytXa859UKtSMLSZij1DiA== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.3" - "@abp/bootstrap" "~5.3.3" - "@abp/bootstrap-datepicker" "~5.3.3" - "@abp/datatables.net-bs5" "~5.3.3" - "@abp/font-awesome" "~5.3.3" - "@abp/jquery-form" "~5.3.3" - "@abp/jquery-validation-unobtrusive" "~5.3.3" - "@abp/lodash" "~5.3.3" - "@abp/luxon" "~5.3.3" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.3" - "@abp/select2" "~5.3.3" - "@abp/sweetalert2" "~5.3.3" - "@abp/timeago" "~5.3.3" - "@abp/toastr" "~5.3.3" - -"@abp/aspnetcore.mvc.ui@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.3.tgz#b8beb98bde3e4f0340335014ced7653c7913a621" - integrity sha512-aDQxdfQmlEXIjWGW8wru58imh9cncHAijafvdXlmyfKHM2JfnSSCG/RPMiaoJq/iyDVEggbhx8z4VHODC1eitg== +"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.1.tgz#561522e75e850bfa33243c91b9c37e4791039455" + integrity sha512-oov7mcynMOjeBxD3oBXzSuarwLYxB902O/TMbQsdiU50oJmfgidsaHC7W3lAvfXbuZiok9+zkUW9uaGXS+OuXA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.1" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.1.tgz#5b0afe34c485f8e11ef21b0bce86e231602d8c1b" + integrity sha512-lY8ToScqRSlIHKMMiut+yiXzJG/+B8/ZXS+O9+nNOZ97G6oJZr3TYFuLcR8Rr5tFSZ65dUYivshHAM7HcRYyNA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.1" + "@abp/bootstrap" "~6.0.0-rc.1" + "@abp/bootstrap-datepicker" "~6.0.0-rc.1" + "@abp/datatables.net-bs5" "~6.0.0-rc.1" + "@abp/font-awesome" "~6.0.0-rc.1" + "@abp/jquery-form" "~6.0.0-rc.1" + "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.1" + "@abp/lodash" "~6.0.0-rc.1" + "@abp/luxon" "~6.0.0-rc.1" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.1" + "@abp/select2" "~6.0.0-rc.1" + "@abp/sweetalert2" "~6.0.0-rc.1" + "@abp/timeago" "~6.0.0-rc.1" + "@abp/toastr" "~6.0.0-rc.1" + +"@abp/aspnetcore.mvc.ui@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.1.tgz#cec27a35b336ef8319308ac24995def0f26e00be" + integrity sha512-wH4ar4DHJiMPfe+z6IO1nCCz5L+/1W//Kh+wdtuU2QGmJX4mavAgO+ZXKGeA1QYsUY8NBXWj0Xwoyp9PgbqsyQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,144 +41,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.3.tgz#66bf2be128e6389877ed4465149c1933ca182c71" - integrity sha512-w/gPj4BVzVnmwekWVHKPYkwnhZFFH1XtCtw5LeJVM5bSYQBrvVTvvUPdKiiTDV59OYf2sbsA+PscwcTWAG6t/Q== +"@abp/bootstrap-datepicker@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.1.tgz#33bd5d9e1d6b351eb1e7a278ccd9a79db119e461" + integrity sha512-/y4v/JZ5YXJ2ew0v7//C//ShK3cf7IPd23d2kVb/7vypdR7yquxyoM7nxpnsfJBs5dQLsH8D5tAhFyTJBZUovA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.3.tgz#56335b46bd42fba0a522712fbb6591fb6aeb5b68" - integrity sha512-xOtC690pE+QxZYhhQrpTE1rapEjg9BrJg7e0qvrkt4TLMZ4mIbau6/Qlh6x8uuMASCUUuRTLNUzHijxvOJh7Mg== +"@abp/bootstrap@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.1.tgz#c6f64f1f34870b75da623ed9cee7b3b1159611fc" + integrity sha512-/cAVvgmp/jYTxsuz1RmfNZ7r0X01SKvAB7yjJPvBuEdLj/5ms9HyEa3K4ifnALoShFOKP9yQN1aJtmHN7hepiQ== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" bootstrap "^5.1.3" -"@abp/core@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.3.tgz#b03fc281d650d483c9276591f2adb26ea43dcd1e" - integrity sha512-Pp8U+LjchtSxc9lTRaPNQhb+Eh7X2LVERmZvoWyET0y/st28PJZ4eZ4iyGmV00pEmCpadF5aTWVhJcGH32scdQ== +"@abp/core@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.1.tgz#ec88b3339d854c91e93c342206984daf01b745df" + integrity sha512-V3X4fFm4A13LX47JNpjyxLs9IQ+StISHYMld6srEgCatHx1+dUfLcA4v5uj4IHIrPaRxhX/wv4iDND6FYcGJ2Q== dependencies: - "@abp/utils" "~5.3.3" + "@abp/utils" "~6.0.0-rc.1" -"@abp/datatables.net-bs5@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.3.tgz#e00304fbe7e6d9d33e1082485f7aa07de48fac0c" - integrity sha512-dkbP3PPkMRJqxravYO7NIVww+MQC3FxHP7mPCg/+PG/LttaNJ5L5hoNcb7BMK2K76hBRMdvlSIzvjycb1w1ooA== +"@abp/datatables.net-bs5@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.1.tgz#111c8c04e7d31f1b417602c7dde87d5a49104890" + integrity sha512-r4pxy1FYc06Ju4tYBVXe9HcE9LFDPCQJYP+01fPAAXcIDM7f02nCqdBjUJdv/z0VSejs9Ttn9ZIVSc85Y9JNoA== dependencies: - "@abp/datatables.net" "~5.3.3" + "@abp/datatables.net" "~6.0.0-rc.1" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.3.tgz#6d8eca1034e26708b9adf0d5917aefd5772cbf30" - integrity sha512-1JuXMzHDtrvGRNBYdwEVobiYmhd7VxM432ciARX8hzvSkE0jcgzeTrSlBXfenFMPOIAUJsSOE4YVshtqrY0G4g== +"@abp/datatables.net@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.1.tgz#278762acd0df9c7fd50ef0caef9a9e6c32665e6f" + integrity sha512-NQSKDdpUvsY6JgGHTrTSNAp2ZcMb3L4PwSv9vJVoDSYYF7+f/KFO/bZWlamig+gucX917auRvxzD5bFSL9ub8Q== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" datatables.net "^1.11.4" -"@abp/font-awesome@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.3.tgz#b10a530c9dee28838536746ea2a40342ff2ee3a8" - integrity sha512-c+cvsQ1uolSoyTkM9rZYYM07iiq/Zu8zKOQaDbitQMfPkcfSnC3PG/PTNauSYuwh/SyFfacFXeaDQ5Y/kAGRLw== +"@abp/font-awesome@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.1.tgz#87b89f8923b262a8531cf4702cf318d9fab155b6" + integrity sha512-lxY1ONRR0sW/uLbgY/6KJpaeZ1ueQfARjcTfHdCmnat72Qd2jID/jKGKUW2fmK0SHmAZiBnKWHLFvF+JcB3JPQ== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.3.tgz#94234207aa991e098e49e7d1244dc86d289a48e6" - integrity sha512-TY5c4ODfSidYGWqUR+QMNbxasfSufSg9gLY8lTEaJn2Wd2+o3GlauPxlTeNIRCRsxqb8e5+fBJspq1YbtE8vQg== +"@abp/jquery-form@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.1.tgz#5bb68fbb2ce0c3b9a59a52ab20c4ea971258c3b1" + integrity sha512-RZ6v6ZbF+05gSBLltsjIMWd8a3bE8bKEPGfHgIPBJr2+xl7TGwuBB0GmDYa+2X6ctBN1BvGsNvMtOB41ahSaGA== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.3.tgz#03f776807b60f32d2470c3d3c975ee20f33a993d" - integrity sha512-BNa2oSOfc5CSLW62SLCOinP7ybDDSVjfn0LYdDOdkIpSPnoL/3E1ZmgEzkDCUdTfJ67320kGDtIHCpb+Wbik+Q== +"@abp/jquery-validation-unobtrusive@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.1.tgz#d082de2aa6c2d8bc2a0808b4159d0f5d281afdd2" + integrity sha512-Wv7/W8CXvO5+GFfYVSRXR7MnI5Vv+grDal8onwPTZ8OZS1dsTUnXe5enQMfuyzSBkq/YKTve6vFOOx8sNi0Tfg== dependencies: - "@abp/jquery-validation" "~5.3.3" + "@abp/jquery-validation" "~6.0.0-rc.1" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.3.tgz#a0544428b94966f35d3aebb40c354d3f4485137d" - integrity sha512-GFhrS4pVmbQRI0eiW2aBYmRTB0rR2s3Wj4NIVB69ZHwvy+uADA3M/oMs8Q4wuT+gmPu2GCjPNCc5RPsC173VPA== +"@abp/jquery-validation@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.1.tgz#e30227075f6d7eabe6224faf2e033622ce0fe3b1" + integrity sha512-xdEVHDsPUmZRyQS5qJYs+FurK6rjGH4ARzlDjtZCwiP85pFQ3+dglF+2/KZxzsNWfHwHl3DdoKWufzzT1qYbrg== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.3.tgz#be70aa671129fac192b8f858a973e65018960cbd" - integrity sha512-sUy0aquZPq+HyxChYJMTjUZxaTo5/Aav5JcbMq1RczIFidjOrFHthWnYZveDVSKryaCfX3tXutag1sPakUOTtg== +"@abp/jquery@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.1.tgz#6f486cfc16dd915ccd4fe4a3029fa6359fea49c0" + integrity sha512-WLcF9BHjRPjtz/QVWfrkltA0eYXVfUPrKmodeJ0q3wmndPqmmMyTMFSrsnoos2bSxd1Z/WGqqB3vVEYGUc1E4g== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" jquery "~3.6.0" -"@abp/lodash@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.3.tgz#365684a338ab5d68adffa93207d0035eaa494ef9" - integrity sha512-Lqb2DkmKBPBHNbUd1QeATv8G/qUPamd06bKbe7xHesX3DZtlIwTmimwTpV4tqmJqOLKB67uUtapPYCfKyxs1RQ== +"@abp/lodash@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.1.tgz#5e143be48e1d266356bd726764a89f520c55e8a5" + integrity sha512-lPui/un/eZcUaeJ2r/I9DgtfIVVoASy/e+gj3opCIGv9cgBQwoV9vlAZGCsUwRFy1RO7EUUsJR4jgxWSmj1JFw== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" lodash "^4.17.21" -"@abp/luxon@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.3.tgz#97a60ae64e865d2b1c04107302d4ec50d4e09217" - integrity sha512-/7Lb463HREBFlt17tUFinTpYxfbZ8UIi1+d7Fqp8spJv78qCxvpWmD4iuJJJdCExO00ztZWY9GkCDPrAbfP/dA== +"@abp/luxon@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.1.tgz#a4242d862576b4151912d48fbf81d89862b6a91e" + integrity sha512-O0nbZk1PA7RryFG+J3gKRtuT4+FV4eSkth8GZvhCOKoN8SpDu/92G2cIEzR0l9O1TYlrKAEbUpmsA+d6abSG+w== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.3.tgz#96be03f79be929b1a2cb67acb38e9d6638f04f15" - integrity sha512-hr5qmcVl+Wr6sIS10QerWRTfFvhmhq9e48G9Hx5oQZFjrIkfJRlxla0TYViHR2tRYCeDQGb4gYmN4Fc71mdcPg== +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.1.tgz#738efa17783450971c6f47608cfafc0ef87d8ec6" + integrity sha512-6Q9slGs6A1d1v+lpTfzI8W+QrpTtY0LTKQkRbYYpm31Lf5zQ55QFoinDpV9wnxDPrfh2u5aX/dSYMrHjdzj6Qg== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.3.tgz#bdb8de1fcc5c9964233fdf1d4b88f7b90099f293" - integrity sha512-yk4CDpgksM5pAXMgFnULlgDovBk0oeXRhAA6lpt0TizzJ353WkpcASUblHbWOePzXbJFBBB2cj3XBD9vdWx7Ig== +"@abp/select2@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.1.tgz#d4ba6e71536c56ef2c98c1b3342f15fc286d3c1b" + integrity sha512-j1mebFXYiLOaOqK9FW5FqafTvT6oydEbcKj2Dk4JdgbcwdY+Mf5DPrb4cu61IPR7SzMCfeZX6j6d2LCdnW7o4g== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" select2 "^4.0.13" -"@abp/sweetalert2@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.3.tgz#54a2d45ddbdaa2f7a4485aa5731f2fec65a9c771" - integrity sha512-Lbw6S+xTNMtHeFaMJNbYTMtqznDwRtlN4+f+hRGWbqNIpHuMfTi1jUgdeZTYRjbhY+RTduUJrs8lvvPMKWgrTw== +"@abp/sweetalert2@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.1.tgz#2633ed54227a703dbd81e2db0923d6f402561232" + integrity sha512-JxrLUnsntCoimJTpY+9uQ+CK6VW1sRTv0qhOX7EJTEefvA+YZjSSk0MwyG4KNzF46JSMW1OctXqWihl/UHZzTQ== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.3.tgz#6e13a178d67e635ebe65d01db220d09f1673bafa" - integrity sha512-mBwaioPVnIeMXP6tDG24NZaTCAGvk8cMah8ems3OLWNK+tsPU4Jy8BVHTSmd/7rA69EL0REuSw2GmiCvaCL+RQ== +"@abp/timeago@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.1.tgz#78903b3d523da6985a83a306d6a31d223b244d8b" + integrity sha512-f5AaVRCKXS4+U4axVE6B1gQIo28gmJ5iOsn+tGhH9YANsfybS7in7dN8Nu89oqx10tVyHZ6r5/ESd21aV34VDA== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" timeago "^1.6.7" -"@abp/toastr@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.3.tgz#a3d2d19963fe96da9566a0f320c7f9911901e69a" - integrity sha512-F1FJPQ0nnu/jZY4XpJFS7uFJgpoEl8aOeFkm6kvshK76ABFLvsWHYW88htW5gXIwOf+G/QClZdx39Os+IQaUJw== +"@abp/toastr@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.1.tgz#2cb0898d48bad1cb8cb5e994b55e51d60e5a6b90" + integrity sha512-RPp6J5IWtYW1q27+fFc5UxramldBIbCyEU9aniH9rfkEs4F5SF4RJphqjSKeYMclvT0PheUnR1x26PJbi179MQ== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" toastr "^2.1.4" -"@abp/utils@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.3.tgz#b47f11cb9a0ac963a7f4e5a44360d933e19896fc" - integrity sha512-owTYsROGHfXuHTOFe1uKMAwLbgjzQLKDnmApUy4taYy93rWsu98vFXX6rYJTK7U/X8nZq5y0BtH4covHyfsAxQ== +"@abp/utils@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.1.tgz#f25b383d6d7ba28c1220399397247cdef9704daf" + integrity sha512-Fi8dBDDAjdPE6tsWCP7iNlBb7WpoF8V3wOnoGmeg/ZklEcHDNZymjSa2RG8+6Qc4fSuUfti/Qyyj4CoDHhsOBw== 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 1abce64782..bd6c888e2f 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.3", - "@abp/cms-kit": "5.3.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.1", + "@abp/cms-kit": "6.0.0-rc.1" } } diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/wwwroot/libs/abp/core/abp.js b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/wwwroot/libs/abp/core/abp.js index 9445e4e7f4..d8b7531660 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/wwwroot/libs/abp/core/abp.js +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/wwwroot/libs/abp/core/abp.js @@ -372,7 +372,9 @@ var abp = abp || {}; setTimeout(function () { if (element) { element.classList.remove('abp-block-area-disappearing'); - element.parentElement.removeChild(element); + if (element.parentElement) { + element.parentElement.removeChild(element); + } } }, 250); } 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 9bcabaee28..9d7cfe7b7f 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.3.tgz#dc6a1bdd583ef5ea0f8a0110753b0869d5f1cb61" - integrity sha512-det7xCtVZK6Dmvr0ENAkYdE+jRW0cVi3BCKZc7c6Hy0VKsKsKlnyz5j/D2rJSAmrap9hyQSWXBJUiho8W92wUQ== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.3" - -"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.3.tgz#65f97d787647e7760bb0c2a5b0f0ff815dc9630a" - integrity sha512-p/Z++QPM7S2lm7obXsZXIarcw0Y88y/Ghy5hyZqdc3uNHL6j8LRlD2qfuRXzl0k9HytXa859UKtSMLSZij1DiA== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.3" - "@abp/bootstrap" "~5.3.3" - "@abp/bootstrap-datepicker" "~5.3.3" - "@abp/datatables.net-bs5" "~5.3.3" - "@abp/font-awesome" "~5.3.3" - "@abp/jquery-form" "~5.3.3" - "@abp/jquery-validation-unobtrusive" "~5.3.3" - "@abp/lodash" "~5.3.3" - "@abp/luxon" "~5.3.3" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.3" - "@abp/select2" "~5.3.3" - "@abp/sweetalert2" "~5.3.3" - "@abp/timeago" "~5.3.3" - "@abp/toastr" "~5.3.3" - -"@abp/aspnetcore.mvc.ui@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.3.tgz#b8beb98bde3e4f0340335014ced7653c7913a621" - integrity sha512-aDQxdfQmlEXIjWGW8wru58imh9cncHAijafvdXlmyfKHM2JfnSSCG/RPMiaoJq/iyDVEggbhx8z4VHODC1eitg== +"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.1.tgz#561522e75e850bfa33243c91b9c37e4791039455" + integrity sha512-oov7mcynMOjeBxD3oBXzSuarwLYxB902O/TMbQsdiU50oJmfgidsaHC7W3lAvfXbuZiok9+zkUW9uaGXS+OuXA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.1" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.1.tgz#5b0afe34c485f8e11ef21b0bce86e231602d8c1b" + integrity sha512-lY8ToScqRSlIHKMMiut+yiXzJG/+B8/ZXS+O9+nNOZ97G6oJZr3TYFuLcR8Rr5tFSZ65dUYivshHAM7HcRYyNA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.1" + "@abp/bootstrap" "~6.0.0-rc.1" + "@abp/bootstrap-datepicker" "~6.0.0-rc.1" + "@abp/datatables.net-bs5" "~6.0.0-rc.1" + "@abp/font-awesome" "~6.0.0-rc.1" + "@abp/jquery-form" "~6.0.0-rc.1" + "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.1" + "@abp/lodash" "~6.0.0-rc.1" + "@abp/luxon" "~6.0.0-rc.1" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.1" + "@abp/select2" "~6.0.0-rc.1" + "@abp/sweetalert2" "~6.0.0-rc.1" + "@abp/timeago" "~6.0.0-rc.1" + "@abp/toastr" "~6.0.0-rc.1" + +"@abp/aspnetcore.mvc.ui@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.1.tgz#cec27a35b336ef8319308ac24995def0f26e00be" + integrity sha512-wH4ar4DHJiMPfe+z6IO1nCCz5L+/1W//Kh+wdtuU2QGmJX4mavAgO+ZXKGeA1QYsUY8NBXWj0Xwoyp9PgbqsyQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,243 +41,243 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.3.tgz#66bf2be128e6389877ed4465149c1933ca182c71" - integrity sha512-w/gPj4BVzVnmwekWVHKPYkwnhZFFH1XtCtw5LeJVM5bSYQBrvVTvvUPdKiiTDV59OYf2sbsA+PscwcTWAG6t/Q== +"@abp/bootstrap-datepicker@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.1.tgz#33bd5d9e1d6b351eb1e7a278ccd9a79db119e461" + integrity sha512-/y4v/JZ5YXJ2ew0v7//C//ShK3cf7IPd23d2kVb/7vypdR7yquxyoM7nxpnsfJBs5dQLsH8D5tAhFyTJBZUovA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.3.tgz#56335b46bd42fba0a522712fbb6591fb6aeb5b68" - integrity sha512-xOtC690pE+QxZYhhQrpTE1rapEjg9BrJg7e0qvrkt4TLMZ4mIbau6/Qlh6x8uuMASCUUuRTLNUzHijxvOJh7Mg== +"@abp/bootstrap@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.1.tgz#c6f64f1f34870b75da623ed9cee7b3b1159611fc" + integrity sha512-/cAVvgmp/jYTxsuz1RmfNZ7r0X01SKvAB7yjJPvBuEdLj/5ms9HyEa3K4ifnALoShFOKP9yQN1aJtmHN7hepiQ== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" bootstrap "^5.1.3" -"@abp/clipboard@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-5.3.3.tgz#62c3c12f1ff503091924f672f71a50e2e5d0b47c" - integrity sha512-FRJPM9/P3WPuK4Id1KVfmpkOB3MrlrYp/beNqZtjqQuG8WDjVgnHrDnsPYfzeLdK5n6bEvtGWwtHwiaBOXhWZg== +"@abp/clipboard@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-6.0.0-rc.1.tgz#3dc6808637f116a07f11c6e727f55ce9bd4b64de" + integrity sha512-u/OPfgXRmrrjkbJrzKB1YSW8rTqUWIPRVx1VAT7RdT5UMzX4DOupd7SRJFr6u7OZFP1p7umUtl6k4wY1lAv6rw== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" clipboard "^2.0.8" -"@abp/cms-kit.admin@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/cms-kit.admin/-/cms-kit.admin-5.3.3.tgz#c5890565c470d12293d319565600f02440b8ef1f" - integrity sha512-Z54dxAbDpdDWq+ZOkmlrG42L5nfurca5O6gZy0cutHg68f2KjA7Pvu93FACtCOUz9Ou5t9zLL4SWBf7uKQj6qw== +"@abp/cms-kit.admin@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/cms-kit.admin/-/cms-kit.admin-6.0.0-rc.1.tgz#82817dedeb57ffb52cb397f1309c3bf34a79068c" + integrity sha512-m1W/ZpXbEzJQ7KxTgyO+wDM4rTfWXOfXIyKdYsRHued+IfX6Zq+OWJaxtK6fK2NgzsFvJ5r/i7+2JKcoks1tMA== dependencies: - "@abp/codemirror" "~5.3.3" - "@abp/jstree" "~5.3.3" - "@abp/slugify" "~5.3.3" - "@abp/tui-editor" "~5.3.3" - "@abp/uppy" "~5.3.3" + "@abp/codemirror" "~6.0.0-rc.1" + "@abp/jstree" "~6.0.0-rc.1" + "@abp/slugify" "~6.0.0-rc.1" + "@abp/tui-editor" "~6.0.0-rc.1" + "@abp/uppy" "~6.0.0-rc.1" -"@abp/cms-kit.public@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/cms-kit.public/-/cms-kit.public-5.3.3.tgz#031cb6f6067c0da2d77d865ad9f85b3ca5447777" - integrity sha512-oA0E3wE0TiLYIyp/CdpoitrYvw5MxBZ8MMjEzikuLadwOqlnWYu70UpvOAAcwwFLPSo9j85IQ1AKgCA43sE1CA== +"@abp/cms-kit.public@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/cms-kit.public/-/cms-kit.public-6.0.0-rc.1.tgz#64bc358ff618ce17266502da084c02bc166c43df" + integrity sha512-ZQ7Z1cabllEs/sCn+cc0Gq3hU/PQiZlKymulxNmxjv3ARfkAjsV7g+utFx14xxztF0Z442IT5urLasdX3N+/Jw== dependencies: - "@abp/highlight.js" "~5.3.3" - "@abp/star-rating-svg" "~5.3.3" + "@abp/highlight.js" "~6.0.0-rc.1" + "@abp/star-rating-svg" "~6.0.0-rc.1" -"@abp/cms-kit@5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/cms-kit/-/cms-kit-5.3.3.tgz#1117e61d0318a980e0e993cd14e060bd268ac76f" - integrity sha512-fD2CU0TGiAZqs76h3ebE27F/OkHvktmCFA0HwrzO3GwXuwC/fRVS1/HDn2q6Zop4wzknVpIrbe9jfT29P9+HTQ== +"@abp/cms-kit@6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/cms-kit/-/cms-kit-6.0.0-rc.1.tgz#bf5cd14a6ad83e2751d5168bd4b97b979e356a4c" + integrity sha512-9RK6TheRRtLc9FS3uR1TJNHr9iV/t8Tiy91klSrCIPwUamMQlOQYt9VZzDqZ+gkXTXoDnE3OesTUzNf0ftyOuQ== dependencies: - "@abp/cms-kit.admin" "~5.3.3" - "@abp/cms-kit.public" "~5.3.3" + "@abp/cms-kit.admin" "~6.0.0-rc.1" + "@abp/cms-kit.public" "~6.0.0-rc.1" -"@abp/codemirror@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-5.3.3.tgz#ca79c3d791327f2a73f332099e3ea03ef008f17c" - integrity sha512-doywv1NE3NvsvMBG8RTdxGdFqyDeRIc0PaaHw9+vI8nJ2We/lNkDldpA2CVInrglzc6KKiPiYNSKtCcbw6jwZQ== +"@abp/codemirror@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-6.0.0-rc.1.tgz#a0c43d60c8ba25882a5e8c8f9e104e3c149b1d79" + integrity sha512-R/wYHEi+2m8SHZTla9yyThTqtPisnBhconBf57qtbv9mfjENLyYbq6dg+8tWvNguN15zrLrRgfdLKxzL/0oSyw== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" codemirror "^5.65.1" -"@abp/core@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.3.tgz#b03fc281d650d483c9276591f2adb26ea43dcd1e" - integrity sha512-Pp8U+LjchtSxc9lTRaPNQhb+Eh7X2LVERmZvoWyET0y/st28PJZ4eZ4iyGmV00pEmCpadF5aTWVhJcGH32scdQ== +"@abp/core@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.1.tgz#ec88b3339d854c91e93c342206984daf01b745df" + integrity sha512-V3X4fFm4A13LX47JNpjyxLs9IQ+StISHYMld6srEgCatHx1+dUfLcA4v5uj4IHIrPaRxhX/wv4iDND6FYcGJ2Q== dependencies: - "@abp/utils" "~5.3.3" + "@abp/utils" "~6.0.0-rc.1" -"@abp/datatables.net-bs5@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.3.tgz#e00304fbe7e6d9d33e1082485f7aa07de48fac0c" - integrity sha512-dkbP3PPkMRJqxravYO7NIVww+MQC3FxHP7mPCg/+PG/LttaNJ5L5hoNcb7BMK2K76hBRMdvlSIzvjycb1w1ooA== +"@abp/datatables.net-bs5@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.1.tgz#111c8c04e7d31f1b417602c7dde87d5a49104890" + integrity sha512-r4pxy1FYc06Ju4tYBVXe9HcE9LFDPCQJYP+01fPAAXcIDM7f02nCqdBjUJdv/z0VSejs9Ttn9ZIVSc85Y9JNoA== dependencies: - "@abp/datatables.net" "~5.3.3" + "@abp/datatables.net" "~6.0.0-rc.1" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.3.tgz#6d8eca1034e26708b9adf0d5917aefd5772cbf30" - integrity sha512-1JuXMzHDtrvGRNBYdwEVobiYmhd7VxM432ciARX8hzvSkE0jcgzeTrSlBXfenFMPOIAUJsSOE4YVshtqrY0G4g== +"@abp/datatables.net@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.1.tgz#278762acd0df9c7fd50ef0caef9a9e6c32665e6f" + integrity sha512-NQSKDdpUvsY6JgGHTrTSNAp2ZcMb3L4PwSv9vJVoDSYYF7+f/KFO/bZWlamig+gucX917auRvxzD5bFSL9ub8Q== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" datatables.net "^1.11.4" -"@abp/font-awesome@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.3.tgz#b10a530c9dee28838536746ea2a40342ff2ee3a8" - integrity sha512-c+cvsQ1uolSoyTkM9rZYYM07iiq/Zu8zKOQaDbitQMfPkcfSnC3PG/PTNauSYuwh/SyFfacFXeaDQ5Y/kAGRLw== +"@abp/font-awesome@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.1.tgz#87b89f8923b262a8531cf4702cf318d9fab155b6" + integrity sha512-lxY1ONRR0sW/uLbgY/6KJpaeZ1ueQfARjcTfHdCmnat72Qd2jID/jKGKUW2fmK0SHmAZiBnKWHLFvF+JcB3JPQ== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/highlight.js@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-5.3.3.tgz#1875fcbb2ea96b7234b5a2c6f490b6583d6bf1c9" - integrity sha512-/X18KAojiGsyuBeAxihNJ3QyfiTkcHAqbFbJRGcNRiFVJCwPJcWRksFSOG5lMhLr/kfa7esRAlKxsZhcbYm5UA== +"@abp/highlight.js@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-6.0.0-rc.1.tgz#a8383f8724e6de1d6d0557a725451f667ab08c9c" + integrity sha512-dSkVZHpHM4Bhdi26fyoSzw8DiMoGqe7e6KmxuMVGTvr+rb1bnPWhUOeUSqXNQttS1ln6JX9L/6TEw+EssJ/a/w== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" "@highlightjs/cdn-assets" "~11.4.0" -"@abp/jquery-form@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.3.tgz#94234207aa991e098e49e7d1244dc86d289a48e6" - integrity sha512-TY5c4ODfSidYGWqUR+QMNbxasfSufSg9gLY8lTEaJn2Wd2+o3GlauPxlTeNIRCRsxqb8e5+fBJspq1YbtE8vQg== +"@abp/jquery-form@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.1.tgz#5bb68fbb2ce0c3b9a59a52ab20c4ea971258c3b1" + integrity sha512-RZ6v6ZbF+05gSBLltsjIMWd8a3bE8bKEPGfHgIPBJr2+xl7TGwuBB0GmDYa+2X6ctBN1BvGsNvMtOB41ahSaGA== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.3.tgz#03f776807b60f32d2470c3d3c975ee20f33a993d" - integrity sha512-BNa2oSOfc5CSLW62SLCOinP7ybDDSVjfn0LYdDOdkIpSPnoL/3E1ZmgEzkDCUdTfJ67320kGDtIHCpb+Wbik+Q== +"@abp/jquery-validation-unobtrusive@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.1.tgz#d082de2aa6c2d8bc2a0808b4159d0f5d281afdd2" + integrity sha512-Wv7/W8CXvO5+GFfYVSRXR7MnI5Vv+grDal8onwPTZ8OZS1dsTUnXe5enQMfuyzSBkq/YKTve6vFOOx8sNi0Tfg== dependencies: - "@abp/jquery-validation" "~5.3.3" + "@abp/jquery-validation" "~6.0.0-rc.1" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.3.tgz#a0544428b94966f35d3aebb40c354d3f4485137d" - integrity sha512-GFhrS4pVmbQRI0eiW2aBYmRTB0rR2s3Wj4NIVB69ZHwvy+uADA3M/oMs8Q4wuT+gmPu2GCjPNCc5RPsC173VPA== +"@abp/jquery-validation@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.1.tgz#e30227075f6d7eabe6224faf2e033622ce0fe3b1" + integrity sha512-xdEVHDsPUmZRyQS5qJYs+FurK6rjGH4ARzlDjtZCwiP85pFQ3+dglF+2/KZxzsNWfHwHl3DdoKWufzzT1qYbrg== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.3.tgz#be70aa671129fac192b8f858a973e65018960cbd" - integrity sha512-sUy0aquZPq+HyxChYJMTjUZxaTo5/Aav5JcbMq1RczIFidjOrFHthWnYZveDVSKryaCfX3tXutag1sPakUOTtg== +"@abp/jquery@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.1.tgz#6f486cfc16dd915ccd4fe4a3029fa6359fea49c0" + integrity sha512-WLcF9BHjRPjtz/QVWfrkltA0eYXVfUPrKmodeJ0q3wmndPqmmMyTMFSrsnoos2bSxd1Z/WGqqB3vVEYGUc1E4g== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" jquery "~3.6.0" -"@abp/jstree@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jstree/-/jstree-5.3.3.tgz#0328b1bcb19216cbaff1e4a45d1c90745895fea8" - integrity sha512-LFrbKqAWBl2c1BcF5063JLU6WPdad4j0nDkgegDTVJlWc7+qU3aJxUSMUSLNUC+iSyOyswCy9mtoxNovzMJYwQ== +"@abp/jstree@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jstree/-/jstree-6.0.0-rc.1.tgz#1bbc3ac4c2a38488656611bbc04be61e7fa8af13" + integrity sha512-S0cKA4qeIaJQrKFLXavc+xmT0I88wlWInInrpF9AzrJKY2cRdtl8jOCnsnQDzBzRXOTgyCvoOE5/p1F/p6m+ng== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" jstree "^3.3.12" -"@abp/lodash@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.3.tgz#365684a338ab5d68adffa93207d0035eaa494ef9" - integrity sha512-Lqb2DkmKBPBHNbUd1QeATv8G/qUPamd06bKbe7xHesX3DZtlIwTmimwTpV4tqmJqOLKB67uUtapPYCfKyxs1RQ== +"@abp/lodash@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.1.tgz#5e143be48e1d266356bd726764a89f520c55e8a5" + integrity sha512-lPui/un/eZcUaeJ2r/I9DgtfIVVoASy/e+gj3opCIGv9cgBQwoV9vlAZGCsUwRFy1RO7EUUsJR4jgxWSmj1JFw== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" lodash "^4.17.21" -"@abp/luxon@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.3.tgz#97a60ae64e865d2b1c04107302d4ec50d4e09217" - integrity sha512-/7Lb463HREBFlt17tUFinTpYxfbZ8UIi1+d7Fqp8spJv78qCxvpWmD4iuJJJdCExO00ztZWY9GkCDPrAbfP/dA== +"@abp/luxon@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.1.tgz#a4242d862576b4151912d48fbf81d89862b6a91e" + integrity sha512-O0nbZk1PA7RryFG+J3gKRtuT4+FV4eSkth8GZvhCOKoN8SpDu/92G2cIEzR0l9O1TYlrKAEbUpmsA+d6abSG+w== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.3.tgz#96be03f79be929b1a2cb67acb38e9d6638f04f15" - integrity sha512-hr5qmcVl+Wr6sIS10QerWRTfFvhmhq9e48G9Hx5oQZFjrIkfJRlxla0TYViHR2tRYCeDQGb4gYmN4Fc71mdcPg== +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.1.tgz#738efa17783450971c6f47608cfafc0ef87d8ec6" + integrity sha512-6Q9slGs6A1d1v+lpTfzI8W+QrpTtY0LTKQkRbYYpm31Lf5zQ55QFoinDpV9wnxDPrfh2u5aX/dSYMrHjdzj6Qg== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/prismjs@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-5.3.3.tgz#eccea1469cb4dfc15b87704d267bb36ad6f25758" - integrity sha512-XC0jQa9LqcuqpciDKSbc0wRo4sOK9sebX6eZBlbOnGIoHhNNbiwG0Vt60MHQ5DmaOz7k5jWP0gOISQMJ5GJfTw== +"@abp/prismjs@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-6.0.0-rc.1.tgz#1c1afcf0533c54989d1eaf0d94a0a71f61213d70" + integrity sha512-rDkIdCEdiHw9ervlfrRyoMB0eiDGSbjM0PG+M7ePXoatDiFdDsTz/XYR3ygvdk1/8h7GM2KkNjrx8OLzWMlblQ== dependencies: - "@abp/clipboard" "~5.3.3" - "@abp/core" "~5.3.3" + "@abp/clipboard" "~6.0.0-rc.1" + "@abp/core" "~6.0.0-rc.1" prismjs "^1.26.0" -"@abp/select2@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.3.tgz#bdb8de1fcc5c9964233fdf1d4b88f7b90099f293" - integrity sha512-yk4CDpgksM5pAXMgFnULlgDovBk0oeXRhAA6lpt0TizzJ353WkpcASUblHbWOePzXbJFBBB2cj3XBD9vdWx7Ig== +"@abp/select2@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.1.tgz#d4ba6e71536c56ef2c98c1b3342f15fc286d3c1b" + integrity sha512-j1mebFXYiLOaOqK9FW5FqafTvT6oydEbcKj2Dk4JdgbcwdY+Mf5DPrb4cu61IPR7SzMCfeZX6j6d2LCdnW7o4g== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" select2 "^4.0.13" -"@abp/slugify@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/slugify/-/slugify-5.3.3.tgz#0bd92e63607704c383f4eb411523060705331307" - integrity sha512-H51TFSEnhsElwJCyN6KPJ9OGZsQUswGwCB6PXNrdotf/4HQek1RpgYRGytIsI13H+E6XPW7SJVZM/29i+wtgZg== +"@abp/slugify@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/slugify/-/slugify-6.0.0-rc.1.tgz#ddf5b8bc821e3b9c3de73f23dfda9b38f4478d84" + integrity sha512-YajzbsI8J0+ykFbLKHU5cDZs1CTMEBeiNlOolSTAySJKQf/45D+u42NfS9A6Zj+6sJwexudEwG9W6BMfxZUXjw== dependencies: slugify "^1.6.5" -"@abp/star-rating-svg@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/star-rating-svg/-/star-rating-svg-5.3.3.tgz#9b14dbda8157c8ce6f61e208b358b0d274c9d138" - integrity sha512-riKvT106NONKeMdh3j5qmk9HdbpD/4Q2puQZIMnZEguU3YSqRFs21xusk1i47HwGKOzdfdrhGM+6Mdil6brsxQ== +"@abp/star-rating-svg@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/star-rating-svg/-/star-rating-svg-6.0.0-rc.1.tgz#39e4dc96cfae67ce2b970ef7234e741d3bb5ea6b" + integrity sha512-Smmas87Z/CGCsix6o9O29yyBzKjYydzEbV0r8aCKK291fkyBkO1d+1+zslqxDz71TvJbN4V5IPwvuw9sWBySHA== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" star-rating-svg "^3.5.0" -"@abp/sweetalert2@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.3.tgz#54a2d45ddbdaa2f7a4485aa5731f2fec65a9c771" - integrity sha512-Lbw6S+xTNMtHeFaMJNbYTMtqznDwRtlN4+f+hRGWbqNIpHuMfTi1jUgdeZTYRjbhY+RTduUJrs8lvvPMKWgrTw== +"@abp/sweetalert2@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.1.tgz#2633ed54227a703dbd81e2db0923d6f402561232" + integrity sha512-JxrLUnsntCoimJTpY+9uQ+CK6VW1sRTv0qhOX7EJTEefvA+YZjSSk0MwyG4KNzF46JSMW1OctXqWihl/UHZzTQ== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.3.tgz#6e13a178d67e635ebe65d01db220d09f1673bafa" - integrity sha512-mBwaioPVnIeMXP6tDG24NZaTCAGvk8cMah8ems3OLWNK+tsPU4Jy8BVHTSmd/7rA69EL0REuSw2GmiCvaCL+RQ== +"@abp/timeago@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.1.tgz#78903b3d523da6985a83a306d6a31d223b244d8b" + integrity sha512-f5AaVRCKXS4+U4axVE6B1gQIo28gmJ5iOsn+tGhH9YANsfybS7in7dN8Nu89oqx10tVyHZ6r5/ESd21aV34VDA== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" timeago "^1.6.7" -"@abp/toastr@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.3.tgz#a3d2d19963fe96da9566a0f320c7f9911901e69a" - integrity sha512-F1FJPQ0nnu/jZY4XpJFS7uFJgpoEl8aOeFkm6kvshK76ABFLvsWHYW88htW5gXIwOf+G/QClZdx39Os+IQaUJw== +"@abp/toastr@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.1.tgz#2cb0898d48bad1cb8cb5e994b55e51d60e5a6b90" + integrity sha512-RPp6J5IWtYW1q27+fFc5UxramldBIbCyEU9aniH9rfkEs4F5SF4RJphqjSKeYMclvT0PheUnR1x26PJbi179MQ== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" toastr "^2.1.4" -"@abp/tui-editor@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-5.3.3.tgz#2c9f09fb8cf1dd98656d425f4f94896e9e3297ce" - integrity sha512-gXumOvfQc4D2e2fEG/nSja4sHwDARwnp2K41M7eSdaB/ENR0GT1SRfK24SdpnYSuzPnuhNR/GMY1c3jOJFNCRg== +"@abp/tui-editor@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-6.0.0-rc.1.tgz#1d3a3cd51ee9a15019813c3d854fe51dd27021f1" + integrity sha512-3dwvKJfbgJXOhaS2hXED+pm1ZEyy3tsq4KaqCkFsowRbrKvNQcaRUi3eSdrV4FCQmmtphS9+K+/c85SsIcPUIQ== dependencies: - "@abp/jquery" "~5.3.3" - "@abp/prismjs" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" + "@abp/prismjs" "~6.0.0-rc.1" -"@abp/uppy@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/uppy/-/uppy-5.3.3.tgz#28b606d4d2612b85e07413b0d233dc91f2650840" - integrity sha512-fiuUEnmVK3cEcKDDSTu58Tl2bcNkI/ZgUc9HFvGOvXnvBOK9YRWS9cGs83o33x6Nl5zMXOgfyO88qMPKIW//8Q== +"@abp/uppy@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/uppy/-/uppy-6.0.0-rc.1.tgz#094e27d30cf1b8ac929529cc36c5c8896630d008" + integrity sha512-YmcQ1YgMRnK9rqak+6O3jO+PhXOAKh/EKCizQ2p0Zwt+QT9JaNVZ1S2pNv/+ffYVRccdAKkXjMk7MyxXkWZMag== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" uppy "^1.16.1" -"@abp/utils@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.3.tgz#b47f11cb9a0ac963a7f4e5a44360d933e19896fc" - integrity sha512-owTYsROGHfXuHTOFe1uKMAwLbgjzQLKDnmApUy4taYy93rWsu98vFXX6rYJTK7U/X8nZq5y0BtH4covHyfsAxQ== +"@abp/utils@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.1.tgz#f25b383d6d7ba28c1220399397247cdef9704daf" + integrity sha512-Fi8dBDDAjdPE6tsWCP7iNlBb7WpoF8V3wOnoGmeg/ZklEcHDNZymjSa2RG8+6Qc4fSuUfti/Qyyj4CoDHhsOBw== dependencies: just-compare "^1.3.0" diff --git a/modules/docs/app/VoloDocs.Web/package.json b/modules/docs/app/VoloDocs.Web/package.json index d3c5da0d9a..dfdc303de2 100644 --- a/modules/docs/app/VoloDocs.Web/package.json +++ b/modules/docs/app/VoloDocs.Web/package.json @@ -3,7 +3,7 @@ "name": "volo.docstestapp", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.3", - "@abp/docs": "^5.3.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.1", + "@abp/docs": "^6.0.0-rc.1" } } diff --git a/modules/docs/app/VoloDocs.Web/wwwroot/libs/abp/core/abp.js b/modules/docs/app/VoloDocs.Web/wwwroot/libs/abp/core/abp.js index 9445e4e7f4..d8b7531660 100644 --- a/modules/docs/app/VoloDocs.Web/wwwroot/libs/abp/core/abp.js +++ b/modules/docs/app/VoloDocs.Web/wwwroot/libs/abp/core/abp.js @@ -372,7 +372,9 @@ var abp = abp || {}; setTimeout(function () { if (element) { element.classList.remove('abp-block-area-disappearing'); - element.parentElement.removeChild(element); + if (element.parentElement) { + element.parentElement.removeChild(element); + } } }, 250); } diff --git a/modules/docs/app/VoloDocs.Web/yarn.lock b/modules/docs/app/VoloDocs.Web/yarn.lock index 0618fd9a3c..b25f56a1c0 100644 --- a/modules/docs/app/VoloDocs.Web/yarn.lock +++ b/modules/docs/app/VoloDocs.Web/yarn.lock @@ -2,45 +2,45 @@ # yarn lockfile v1 -"@abp/anchor-js@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/anchor-js/-/anchor-js-5.3.3.tgz#5c0c8de8c2e9afc3dbf5b800b9cc32bff734a6b8" - integrity sha512-ILs6UWexBjueqmJ0B+Mh5DB6Pf/0EjbtpJB1VNyyrIpQ2yT39cqBNUDyLZYWY/Xnxu5G/b42Jpl0thd5YKUJuA== +"@abp/anchor-js@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/anchor-js/-/anchor-js-6.0.0-rc.1.tgz#242fa38fc22c7aca7233841b2b7a6e12a2503c67" + integrity sha512-ZXN5h4vf/OpV7x9hJt4sjnBD48OEKDcmhyVH2ydlE2E2AGiMMrrqyVdeyvY22YF+nmRYBODdcZCqmWx2SLakbA== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" anchor-js "^4.3.1" -"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.3.tgz#dc6a1bdd583ef5ea0f8a0110753b0869d5f1cb61" - integrity sha512-det7xCtVZK6Dmvr0ENAkYdE+jRW0cVi3BCKZc7c6Hy0VKsKsKlnyz5j/D2rJSAmrap9hyQSWXBJUiho8W92wUQ== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.3" - -"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.3.tgz#65f97d787647e7760bb0c2a5b0f0ff815dc9630a" - integrity sha512-p/Z++QPM7S2lm7obXsZXIarcw0Y88y/Ghy5hyZqdc3uNHL6j8LRlD2qfuRXzl0k9HytXa859UKtSMLSZij1DiA== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.3" - "@abp/bootstrap" "~5.3.3" - "@abp/bootstrap-datepicker" "~5.3.3" - "@abp/datatables.net-bs5" "~5.3.3" - "@abp/font-awesome" "~5.3.3" - "@abp/jquery-form" "~5.3.3" - "@abp/jquery-validation-unobtrusive" "~5.3.3" - "@abp/lodash" "~5.3.3" - "@abp/luxon" "~5.3.3" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.3" - "@abp/select2" "~5.3.3" - "@abp/sweetalert2" "~5.3.3" - "@abp/timeago" "~5.3.3" - "@abp/toastr" "~5.3.3" - -"@abp/aspnetcore.mvc.ui@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.3.tgz#b8beb98bde3e4f0340335014ced7653c7913a621" - integrity sha512-aDQxdfQmlEXIjWGW8wru58imh9cncHAijafvdXlmyfKHM2JfnSSCG/RPMiaoJq/iyDVEggbhx8z4VHODC1eitg== +"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.1.tgz#561522e75e850bfa33243c91b9c37e4791039455" + integrity sha512-oov7mcynMOjeBxD3oBXzSuarwLYxB902O/TMbQsdiU50oJmfgidsaHC7W3lAvfXbuZiok9+zkUW9uaGXS+OuXA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.1" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.1.tgz#5b0afe34c485f8e11ef21b0bce86e231602d8c1b" + integrity sha512-lY8ToScqRSlIHKMMiut+yiXzJG/+B8/ZXS+O9+nNOZ97G6oJZr3TYFuLcR8Rr5tFSZ65dUYivshHAM7HcRYyNA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.1" + "@abp/bootstrap" "~6.0.0-rc.1" + "@abp/bootstrap-datepicker" "~6.0.0-rc.1" + "@abp/datatables.net-bs5" "~6.0.0-rc.1" + "@abp/font-awesome" "~6.0.0-rc.1" + "@abp/jquery-form" "~6.0.0-rc.1" + "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.1" + "@abp/lodash" "~6.0.0-rc.1" + "@abp/luxon" "~6.0.0-rc.1" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.1" + "@abp/select2" "~6.0.0-rc.1" + "@abp/sweetalert2" "~6.0.0-rc.1" + "@abp/timeago" "~6.0.0-rc.1" + "@abp/toastr" "~6.0.0-rc.1" + +"@abp/aspnetcore.mvc.ui@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.1.tgz#cec27a35b336ef8319308ac24995def0f26e00be" + integrity sha512-wH4ar4DHJiMPfe+z6IO1nCCz5L+/1W//Kh+wdtuU2QGmJX4mavAgO+ZXKGeA1QYsUY8NBXWj0Xwoyp9PgbqsyQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -49,180 +49,180 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.3.tgz#66bf2be128e6389877ed4465149c1933ca182c71" - integrity sha512-w/gPj4BVzVnmwekWVHKPYkwnhZFFH1XtCtw5LeJVM5bSYQBrvVTvvUPdKiiTDV59OYf2sbsA+PscwcTWAG6t/Q== +"@abp/bootstrap-datepicker@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.1.tgz#33bd5d9e1d6b351eb1e7a278ccd9a79db119e461" + integrity sha512-/y4v/JZ5YXJ2ew0v7//C//ShK3cf7IPd23d2kVb/7vypdR7yquxyoM7nxpnsfJBs5dQLsH8D5tAhFyTJBZUovA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.3.tgz#56335b46bd42fba0a522712fbb6591fb6aeb5b68" - integrity sha512-xOtC690pE+QxZYhhQrpTE1rapEjg9BrJg7e0qvrkt4TLMZ4mIbau6/Qlh6x8uuMASCUUuRTLNUzHijxvOJh7Mg== +"@abp/bootstrap@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.1.tgz#c6f64f1f34870b75da623ed9cee7b3b1159611fc" + integrity sha512-/cAVvgmp/jYTxsuz1RmfNZ7r0X01SKvAB7yjJPvBuEdLj/5ms9HyEa3K4ifnALoShFOKP9yQN1aJtmHN7hepiQ== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" bootstrap "^5.1.3" -"@abp/clipboard@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-5.3.3.tgz#62c3c12f1ff503091924f672f71a50e2e5d0b47c" - integrity sha512-FRJPM9/P3WPuK4Id1KVfmpkOB3MrlrYp/beNqZtjqQuG8WDjVgnHrDnsPYfzeLdK5n6bEvtGWwtHwiaBOXhWZg== +"@abp/clipboard@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-6.0.0-rc.1.tgz#3dc6808637f116a07f11c6e727f55ce9bd4b64de" + integrity sha512-u/OPfgXRmrrjkbJrzKB1YSW8rTqUWIPRVx1VAT7RdT5UMzX4DOupd7SRJFr6u7OZFP1p7umUtl6k4wY1lAv6rw== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" clipboard "^2.0.8" -"@abp/core@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.3.tgz#b03fc281d650d483c9276591f2adb26ea43dcd1e" - integrity sha512-Pp8U+LjchtSxc9lTRaPNQhb+Eh7X2LVERmZvoWyET0y/st28PJZ4eZ4iyGmV00pEmCpadF5aTWVhJcGH32scdQ== +"@abp/core@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.1.tgz#ec88b3339d854c91e93c342206984daf01b745df" + integrity sha512-V3X4fFm4A13LX47JNpjyxLs9IQ+StISHYMld6srEgCatHx1+dUfLcA4v5uj4IHIrPaRxhX/wv4iDND6FYcGJ2Q== dependencies: - "@abp/utils" "~5.3.3" + "@abp/utils" "~6.0.0-rc.1" -"@abp/datatables.net-bs5@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.3.tgz#e00304fbe7e6d9d33e1082485f7aa07de48fac0c" - integrity sha512-dkbP3PPkMRJqxravYO7NIVww+MQC3FxHP7mPCg/+PG/LttaNJ5L5hoNcb7BMK2K76hBRMdvlSIzvjycb1w1ooA== +"@abp/datatables.net-bs5@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.1.tgz#111c8c04e7d31f1b417602c7dde87d5a49104890" + integrity sha512-r4pxy1FYc06Ju4tYBVXe9HcE9LFDPCQJYP+01fPAAXcIDM7f02nCqdBjUJdv/z0VSejs9Ttn9ZIVSc85Y9JNoA== dependencies: - "@abp/datatables.net" "~5.3.3" + "@abp/datatables.net" "~6.0.0-rc.1" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.3.tgz#6d8eca1034e26708b9adf0d5917aefd5772cbf30" - integrity sha512-1JuXMzHDtrvGRNBYdwEVobiYmhd7VxM432ciARX8hzvSkE0jcgzeTrSlBXfenFMPOIAUJsSOE4YVshtqrY0G4g== +"@abp/datatables.net@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.1.tgz#278762acd0df9c7fd50ef0caef9a9e6c32665e6f" + integrity sha512-NQSKDdpUvsY6JgGHTrTSNAp2ZcMb3L4PwSv9vJVoDSYYF7+f/KFO/bZWlamig+gucX917auRvxzD5bFSL9ub8Q== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" datatables.net "^1.11.4" -"@abp/docs@^5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/docs/-/docs-5.3.3.tgz#6792dd211c430ccbca02674f8d248490553340e6" - integrity sha512-pR+3JXg+kvr6wKOT2xVJq4sZlfUXWVY9OalFXWyMjglySEVlsN2U+zpIrRmZDiab0xT6NXVSJ15uMkyoRpZCTg== +"@abp/docs@^6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/docs/-/docs-6.0.0-rc.1.tgz#efebc35dc9b414b443518136991974a2630e8b9d" + integrity sha512-YRDKf1BmgJ2VvHsUJxDc/hxQHBiJnZkSGMYXE/7ytiH2V8/tiTQ9WwcmmIa69JV3jyYkiaDHc+lbR3VZRTLKpw== dependencies: - "@abp/anchor-js" "~5.3.3" - "@abp/clipboard" "~5.3.3" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.3" - "@abp/popper.js" "~5.3.3" - "@abp/prismjs" "~5.3.3" + "@abp/anchor-js" "~6.0.0-rc.1" + "@abp/clipboard" "~6.0.0-rc.1" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.1" + "@abp/popper.js" "~6.0.0-rc.1" + "@abp/prismjs" "~6.0.0-rc.1" -"@abp/font-awesome@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.3.tgz#b10a530c9dee28838536746ea2a40342ff2ee3a8" - integrity sha512-c+cvsQ1uolSoyTkM9rZYYM07iiq/Zu8zKOQaDbitQMfPkcfSnC3PG/PTNauSYuwh/SyFfacFXeaDQ5Y/kAGRLw== +"@abp/font-awesome@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.1.tgz#87b89f8923b262a8531cf4702cf318d9fab155b6" + integrity sha512-lxY1ONRR0sW/uLbgY/6KJpaeZ1ueQfARjcTfHdCmnat72Qd2jID/jKGKUW2fmK0SHmAZiBnKWHLFvF+JcB3JPQ== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.3.tgz#94234207aa991e098e49e7d1244dc86d289a48e6" - integrity sha512-TY5c4ODfSidYGWqUR+QMNbxasfSufSg9gLY8lTEaJn2Wd2+o3GlauPxlTeNIRCRsxqb8e5+fBJspq1YbtE8vQg== +"@abp/jquery-form@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.1.tgz#5bb68fbb2ce0c3b9a59a52ab20c4ea971258c3b1" + integrity sha512-RZ6v6ZbF+05gSBLltsjIMWd8a3bE8bKEPGfHgIPBJr2+xl7TGwuBB0GmDYa+2X6ctBN1BvGsNvMtOB41ahSaGA== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.3.tgz#03f776807b60f32d2470c3d3c975ee20f33a993d" - integrity sha512-BNa2oSOfc5CSLW62SLCOinP7ybDDSVjfn0LYdDOdkIpSPnoL/3E1ZmgEzkDCUdTfJ67320kGDtIHCpb+Wbik+Q== +"@abp/jquery-validation-unobtrusive@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.1.tgz#d082de2aa6c2d8bc2a0808b4159d0f5d281afdd2" + integrity sha512-Wv7/W8CXvO5+GFfYVSRXR7MnI5Vv+grDal8onwPTZ8OZS1dsTUnXe5enQMfuyzSBkq/YKTve6vFOOx8sNi0Tfg== dependencies: - "@abp/jquery-validation" "~5.3.3" + "@abp/jquery-validation" "~6.0.0-rc.1" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.3.tgz#a0544428b94966f35d3aebb40c354d3f4485137d" - integrity sha512-GFhrS4pVmbQRI0eiW2aBYmRTB0rR2s3Wj4NIVB69ZHwvy+uADA3M/oMs8Q4wuT+gmPu2GCjPNCc5RPsC173VPA== +"@abp/jquery-validation@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.1.tgz#e30227075f6d7eabe6224faf2e033622ce0fe3b1" + integrity sha512-xdEVHDsPUmZRyQS5qJYs+FurK6rjGH4ARzlDjtZCwiP85pFQ3+dglF+2/KZxzsNWfHwHl3DdoKWufzzT1qYbrg== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.3.tgz#be70aa671129fac192b8f858a973e65018960cbd" - integrity sha512-sUy0aquZPq+HyxChYJMTjUZxaTo5/Aav5JcbMq1RczIFidjOrFHthWnYZveDVSKryaCfX3tXutag1sPakUOTtg== +"@abp/jquery@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.1.tgz#6f486cfc16dd915ccd4fe4a3029fa6359fea49c0" + integrity sha512-WLcF9BHjRPjtz/QVWfrkltA0eYXVfUPrKmodeJ0q3wmndPqmmMyTMFSrsnoos2bSxd1Z/WGqqB3vVEYGUc1E4g== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" jquery "~3.6.0" -"@abp/lodash@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.3.tgz#365684a338ab5d68adffa93207d0035eaa494ef9" - integrity sha512-Lqb2DkmKBPBHNbUd1QeATv8G/qUPamd06bKbe7xHesX3DZtlIwTmimwTpV4tqmJqOLKB67uUtapPYCfKyxs1RQ== +"@abp/lodash@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.1.tgz#5e143be48e1d266356bd726764a89f520c55e8a5" + integrity sha512-lPui/un/eZcUaeJ2r/I9DgtfIVVoASy/e+gj3opCIGv9cgBQwoV9vlAZGCsUwRFy1RO7EUUsJR4jgxWSmj1JFw== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" lodash "^4.17.21" -"@abp/luxon@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.3.tgz#97a60ae64e865d2b1c04107302d4ec50d4e09217" - integrity sha512-/7Lb463HREBFlt17tUFinTpYxfbZ8UIi1+d7Fqp8spJv78qCxvpWmD4iuJJJdCExO00ztZWY9GkCDPrAbfP/dA== +"@abp/luxon@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.1.tgz#a4242d862576b4151912d48fbf81d89862b6a91e" + integrity sha512-O0nbZk1PA7RryFG+J3gKRtuT4+FV4eSkth8GZvhCOKoN8SpDu/92G2cIEzR0l9O1TYlrKAEbUpmsA+d6abSG+w== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.3.tgz#96be03f79be929b1a2cb67acb38e9d6638f04f15" - integrity sha512-hr5qmcVl+Wr6sIS10QerWRTfFvhmhq9e48G9Hx5oQZFjrIkfJRlxla0TYViHR2tRYCeDQGb4gYmN4Fc71mdcPg== +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.1.tgz#738efa17783450971c6f47608cfafc0ef87d8ec6" + integrity sha512-6Q9slGs6A1d1v+lpTfzI8W+QrpTtY0LTKQkRbYYpm31Lf5zQ55QFoinDpV9wnxDPrfh2u5aX/dSYMrHjdzj6Qg== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/popper.js@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/popper.js/-/popper.js-5.3.3.tgz#4cdb30008a8f1d8381c28f190ace82d5fdd5d517" - integrity sha512-h/gFCnbQWyJVkPU9MrUjuwzmXog9rU7XF08qqiFObbE1QCa527iOglgZGMZoKB5+x3hBNIYGol7/8B/3J3mgyw== +"@abp/popper.js@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/popper.js/-/popper.js-6.0.0-rc.1.tgz#b77d6f09856c97873e7caba5e3ba5b31df1c59a2" + integrity sha512-QgXi+VxdV8gsRi9V7i5erU5yRyYjr4XDlKx0eLRdBpCtb2TI1FLwSOSg6WNJsLeIfHvZE+95pAE400z3ZjqzoQ== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" "@popperjs/core" "^2.11.2" -"@abp/prismjs@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-5.3.3.tgz#eccea1469cb4dfc15b87704d267bb36ad6f25758" - integrity sha512-XC0jQa9LqcuqpciDKSbc0wRo4sOK9sebX6eZBlbOnGIoHhNNbiwG0Vt60MHQ5DmaOz7k5jWP0gOISQMJ5GJfTw== +"@abp/prismjs@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-6.0.0-rc.1.tgz#1c1afcf0533c54989d1eaf0d94a0a71f61213d70" + integrity sha512-rDkIdCEdiHw9ervlfrRyoMB0eiDGSbjM0PG+M7ePXoatDiFdDsTz/XYR3ygvdk1/8h7GM2KkNjrx8OLzWMlblQ== dependencies: - "@abp/clipboard" "~5.3.3" - "@abp/core" "~5.3.3" + "@abp/clipboard" "~6.0.0-rc.1" + "@abp/core" "~6.0.0-rc.1" prismjs "^1.26.0" -"@abp/select2@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.3.tgz#bdb8de1fcc5c9964233fdf1d4b88f7b90099f293" - integrity sha512-yk4CDpgksM5pAXMgFnULlgDovBk0oeXRhAA6lpt0TizzJ353WkpcASUblHbWOePzXbJFBBB2cj3XBD9vdWx7Ig== +"@abp/select2@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.1.tgz#d4ba6e71536c56ef2c98c1b3342f15fc286d3c1b" + integrity sha512-j1mebFXYiLOaOqK9FW5FqafTvT6oydEbcKj2Dk4JdgbcwdY+Mf5DPrb4cu61IPR7SzMCfeZX6j6d2LCdnW7o4g== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" select2 "^4.0.13" -"@abp/sweetalert2@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.3.tgz#54a2d45ddbdaa2f7a4485aa5731f2fec65a9c771" - integrity sha512-Lbw6S+xTNMtHeFaMJNbYTMtqznDwRtlN4+f+hRGWbqNIpHuMfTi1jUgdeZTYRjbhY+RTduUJrs8lvvPMKWgrTw== +"@abp/sweetalert2@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.1.tgz#2633ed54227a703dbd81e2db0923d6f402561232" + integrity sha512-JxrLUnsntCoimJTpY+9uQ+CK6VW1sRTv0qhOX7EJTEefvA+YZjSSk0MwyG4KNzF46JSMW1OctXqWihl/UHZzTQ== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.3.tgz#6e13a178d67e635ebe65d01db220d09f1673bafa" - integrity sha512-mBwaioPVnIeMXP6tDG24NZaTCAGvk8cMah8ems3OLWNK+tsPU4Jy8BVHTSmd/7rA69EL0REuSw2GmiCvaCL+RQ== +"@abp/timeago@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.1.tgz#78903b3d523da6985a83a306d6a31d223b244d8b" + integrity sha512-f5AaVRCKXS4+U4axVE6B1gQIo28gmJ5iOsn+tGhH9YANsfybS7in7dN8Nu89oqx10tVyHZ6r5/ESd21aV34VDA== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" timeago "^1.6.7" -"@abp/toastr@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.3.tgz#a3d2d19963fe96da9566a0f320c7f9911901e69a" - integrity sha512-F1FJPQ0nnu/jZY4XpJFS7uFJgpoEl8aOeFkm6kvshK76ABFLvsWHYW88htW5gXIwOf+G/QClZdx39Os+IQaUJw== +"@abp/toastr@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.1.tgz#2cb0898d48bad1cb8cb5e994b55e51d60e5a6b90" + integrity sha512-RPp6J5IWtYW1q27+fFc5UxramldBIbCyEU9aniH9rfkEs4F5SF4RJphqjSKeYMclvT0PheUnR1x26PJbi179MQ== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" toastr "^2.1.4" -"@abp/utils@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.3.tgz#b47f11cb9a0ac963a7f4e5a44360d933e19896fc" - integrity sha512-owTYsROGHfXuHTOFe1uKMAwLbgjzQLKDnmApUy4taYy93rWsu98vFXX6rYJTK7U/X8nZq5y0BtH4covHyfsAxQ== +"@abp/utils@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.1.tgz#f25b383d6d7ba28c1220399397247cdef9704daf" + integrity sha512-Fi8dBDDAjdPE6tsWCP7iNlBb7WpoF8V3wOnoGmeg/ZklEcHDNZymjSa2RG8+6Qc4fSuUfti/Qyyj4CoDHhsOBw== dependencies: just-compare "^1.3.0" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/AbpFeatureManagementBlazorModule.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/AbpFeatureManagementBlazorModule.cs index 8bfee863b1..87882015fc 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/AbpFeatureManagementBlazorModule.cs +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/AbpFeatureManagementBlazorModule.cs @@ -1,15 +1,24 @@ using Volo.Abp.AspNetCore.Components.Web.Theming; +using Volo.Abp.FeatureManagement.Blazor.Settings; using Volo.Abp.Features; using Volo.Abp.Modularity; +using Volo.Abp.SettingManagement.Blazor; namespace Volo.Abp.FeatureManagement.Blazor; [DependsOn( typeof(AbpAspNetCoreComponentsWebThemingModule), typeof(AbpFeatureManagementApplicationContractsModule), - typeof(AbpFeaturesModule) + typeof(AbpFeaturesModule), + typeof(AbpSettingManagementBlazorModule) )] public class AbpFeatureManagementBlazorModule : AbpModule { - + public override void ConfigureServices(ServiceConfigurationContext context) + { + Configure(options => + { + options.Contributors.Add(new FeatureSettingManagementComponentContributor()); + }); + } } diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureSettingGroup/FeatureSettingManagementComponent.razor b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureSettingGroup/FeatureSettingManagementComponent.razor new file mode 100644 index 0000000000..341d405e4e --- /dev/null +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureSettingGroup/FeatureSettingManagementComponent.razor @@ -0,0 +1,12 @@ +@inherits Volo.Abp.AspNetCore.Components.AbpComponentBase + +@if (Settings != null && Settings.HasManageHostFeaturesPermission) +{ +
+ +
+ + +} \ No newline at end of file diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureSettingGroup/FeatureSettingManagementComponent.razor.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureSettingGroup/FeatureSettingManagementComponent.razor.cs new file mode 100644 index 0000000000..09b31b9609 --- /dev/null +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureSettingGroup/FeatureSettingManagementComponent.razor.cs @@ -0,0 +1,40 @@ +using System.Threading.Tasks; +using Microsoft.AspNetCore.Components; +using Microsoft.Extensions.Localization; +using Volo.Abp.AspNetCore.Components; +using Volo.Abp.Authorization.Permissions; +using Volo.Abp.FeatureManagement.Localization; +using Volo.Abp.Features; + +namespace Volo.Abp.FeatureManagement.Blazor.Components.FeatureSettingGroup; + +public partial class FeatureSettingManagementComponent : AbpComponentBase +{ + [Inject] + protected IStringLocalizer L { get; set; } + + [Inject] + protected PermissionChecker PermissionChecker { get; set; } + + protected FeatureManagementModal FeatureManagementModal; + + protected FeatureSettingViewModel Settings; + + protected async override Task OnInitializedAsync() + { + Settings = new FeatureSettingViewModel + { + HasManageHostFeaturesPermission = await PermissionChecker.IsGrantedAsync(FeatureManagementPermissions.ManageHostFeatures) + }; + } + + protected virtual async Task OnManageHostFeaturesClicked() + { + await FeatureManagementModal.OpenAsync(TenantFeatureValueProvider.ProviderName); + } +} + +public class FeatureSettingViewModel +{ + public bool HasManageHostFeaturesPermission { get; set; } +} \ No newline at end of file diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Settings/FeatureSettingManagementComponentContributor.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Settings/FeatureSettingManagementComponentContributor.cs new file mode 100644 index 0000000000..caeb17de26 --- /dev/null +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Settings/FeatureSettingManagementComponentContributor.cs @@ -0,0 +1,41 @@ +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Localization; +using Volo.Abp.FeatureManagement.Blazor.Components.FeatureSettingGroup; +using Volo.Abp.FeatureManagement.Localization; +using Volo.Abp.SettingManagement.Blazor; + +namespace Volo.Abp.FeatureManagement.Blazor.Settings; + +public class FeatureSettingManagementComponentContributor: ISettingComponentContributor +{ + public virtual async Task ConfigureAsync(SettingComponentCreationContext context) + { + if (!await CheckPermissionsInternalAsync(context)) + { + return; + } + + var l = context.ServiceProvider.GetRequiredService>(); + context.Groups.Add( + new SettingComponentGroup( + "Volo.Abp.Feature", + l["Permission:FeatureManagement"], + typeof(FeatureSettingManagementComponent) + ) + ); + } + + public virtual async Task CheckPermissionsAsync(SettingComponentCreationContext context) + { + return await CheckPermissionsInternalAsync(context); + } + + protected virtual async Task CheckPermissionsInternalAsync(SettingComponentCreationContext context) + { + var authorizationService = context.ServiceProvider.GetRequiredService(); + + return await authorizationService.IsGrantedAsync(FeatureManagementPermissions.ManageHostFeatures); + } +} diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Volo.Abp.FeatureManagement.Blazor.csproj b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Volo.Abp.FeatureManagement.Blazor.csproj index 22dab36cff..49d7ffd6c6 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Volo.Abp.FeatureManagement.Blazor.csproj +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Volo.Abp.FeatureManagement.Blazor.csproj @@ -14,6 +14,7 @@ + diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/ar.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/ar.json index 5fff0f6d8a..c482493f88 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/ar.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/ar.json @@ -3,6 +3,7 @@ "texts": { "Features": "المميزات", "NoFeatureFoundMessage": "لا توجد أي ميزة متاحة.", + "ManageHostFeatures": "إدارة ميزات المضيف", "Permission:FeatureManagement": "إدارة الميزات", "Permission:FeatureManagement.ManageHostFeatures": "إدارة ميزات المضيف", "Volo.Abp.FeatureManagement:InvalidFeatureValue": "{0} قيمة الميزة غير صالحة!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/cs.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/cs.json index 36bc77b789..2e8b78a947 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/cs.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/cs.json @@ -3,6 +3,7 @@ "texts": { "Features": "Funkce", "NoFeatureFoundMessage": "Nejsou zde dostupné žádné funkce.", + "ManageHostFeatures": "Správa funkcí hostitele", "Permission:FeatureManagement": "Správa funkcí", "Permission:FeatureManagement.ManageHostFeatures": "Správa funkcí hostitele", "Volo.Abp.FeatureManagement:InvalidFeatureValue": "Hodnota funkce {0} není platná!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/de-DE.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/de-DE.json index af3a7601af..0c7d1a40eb 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/de-DE.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/de-DE.json @@ -3,6 +3,7 @@ "texts": { "Features": "Features", "NoFeatureFoundMessage": "Es ist kein Feature verfügbar.", + "ManageHostFeatures": "Host-Features verwalten", "Permission:FeatureManagement": "Feature-Verwaltung", "Permission:FeatureManagement.ManageHostFeatures": "Host-Features verwalten", "Volo.Abp.FeatureManagement:InvalidFeatureValue": "{0} Feature-Wert ist ungültig!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/el.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/el.json index 6e5529f2cd..744b94a2c5 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/el.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/el.json @@ -3,6 +3,7 @@ "texts": { "Features": "Χαρακτηριστικά", "NoFeatureFoundMessage": "Δεν διατίθεται καποιο χαρακτηριστικο.", + "ManageHostFeatures": "Διαχείριση δυνατοτήτων του Οικοδεσπότη", "Permission:FeatureManagement": "Διαχείριση χαρακτηριστικών", "Permission:FeatureManagement.ManageHostFeatures": "Διαχείριση Χαρακτηριστικών Εξυπηρετήτη", "Volo.Abp.FeatureManagement:InvalidFeatureValue" : "Η τιμή χαρακτηριστικού {0} δεν ειναι έγκυρη!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/en-GB.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/en-GB.json index 09b4b306b7..0c61bfbbb5 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/en-GB.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/en-GB.json @@ -3,6 +3,7 @@ "texts": { "Features": "Features", "NoFeatureFoundMessage": "There isn't any available feature.", + "ManageHostFeatures": "Manage Host features", "Permission:FeatureManagement": "Feature management", "Permission:FeatureManagement.ManageHostFeatures": "Manage Host features", "Volo.Abp.FeatureManagement:InvalidFeatureValue": "{0} feature value is not valid!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/en.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/en.json index c5194de6c7..8033d2c6a0 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/en.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/en.json @@ -3,6 +3,7 @@ "texts": { "Features": "Features", "NoFeatureFoundMessage": "There isn't any available feature.", + "ManageHostFeatures": "Manage Host features", "Permission:FeatureManagement": "Feature management", "Permission:FeatureManagement.ManageHostFeatures": "Manage Host features", "Volo.Abp.FeatureManagement:InvalidFeatureValue" : "{0} feature value is not valid!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/es.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/es.json index 74e51eb9d4..7f4ae2055c 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/es.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/es.json @@ -3,6 +3,7 @@ "texts": { "Features": "Características", "NoFeatureFoundMessage": "No hay ninguna característica disponible.", + "ManageHostFeatures": "Administrar funciones de host", "Permission:FeatureManagement": "Gestión de características", "Permission:FeatureManagement.ManageHostFeatures": "Gestionar características del Host", "Volo.Abp.FeatureManagement:InvalidFeatureValue": "{0} valor de característica no es valido!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/fa.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/fa.json index af7a5ff5a0..fd1af964fa 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/fa.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/fa.json @@ -3,6 +3,7 @@ "texts": { "Features": "ویژگی ها", "NoFeatureFoundMessage": "هیچ ویژگی ای در دسترس نمی باشد.", + "ManageHostFeatures": "مدیریت ویژگی های میزبان", "Permission:FeatureManagement": "مدیریت ویژگی ها", "Permission:FeatureManagement.ManageHostFeatures": "مدیریت ویژگی های میزبان", "Volo.Abp.FeatureManagement:InvalidFeatureValue": "{0} مقدار ویژگی صحیح نمی باشد!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/fi.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/fi.json index 73c352c5b2..43c3ede121 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/fi.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/fi.json @@ -3,6 +3,7 @@ "texts": { "Features": "ominaisuudet", "NoFeatureFoundMessage": "Ei ole mitään käytettävissä olevaa ominaisuutta.", + "ManageHostFeatures": "Hallinnoi isäntäominaisuuksia", "Permission:FeatureManagement": "Ominaisuuden hallinta", "Permission:FeatureManagement.ManageHostFeatures": "Hallinnoi isäntäominaisuuksia", "Volo.Abp.FeatureManagement:InvalidFeatureValue": "Ominaisuuden {0} arvo ei kelpaa!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/fr.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/fr.json index 5983edf8a3..44a6a59a14 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/fr.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/fr.json @@ -3,6 +3,7 @@ "texts": { "Features": "Fonctionnalités", "NoFeatureFoundMessage": "Il n'y a aucune fonctionnalité disponible.", + "ManageHostFeatures": "Gérer les fonctionnalités de l’hôte", "Permission:FeatureManagement": "Gestion des fonctionnalités", "Permission:FeatureManagement.ManageHostFeatures": "Gérer les fonctionnalités de l'hôte", "Volo.Abp.FeatureManagement:InvalidFeatureValue": "La valeur de la fonctionnalité {0} n'est pas valide!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/hi.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/hi.json index 51fe35a788..303b2ff84d 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/hi.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/hi.json @@ -3,6 +3,7 @@ "texts": { "Features": "विशेषताएं", "NoFeatureFoundMessage": "कोई भी उपलब्ध सुविधा नहीं है।", + "ManageHostFeatures": "होस्ट सुविधाएँ प्रबंधित करें", "Permission:FeatureManagement": "सुविधा प्रबंधन", "Permission:FeatureManagement.ManageHostFeatures": "होस्ट सुविधाएँ प्रबंधित करें", "Volo.Abp.FeatureManagement:InvalidFeatureValue": "{0} सुविधा मान मान्य नहीं है!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/hu.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/hu.json index a7e1b8378e..db82d25610 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/hu.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/hu.json @@ -3,6 +3,7 @@ "texts": { "Features": "Funkciók", "NoFeatureFoundMessage": "Nincs elérhető funkció.", + "ManageHostFeatures": "Host funkciók kezelése", "Permission:FeatureManagement": "Funkciókezelés", "Permission:FeatureManagement.ManageHostFeatures": "Host funkciók kezelése", "Volo.Abp.FeatureManagement:InvalidFeatureValue" : "A (z) {0} szolgáltatás értéke érvénytelen!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/is.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/is.json index e245bf5a54..1aac3eb952 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/is.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/is.json @@ -3,6 +3,7 @@ "texts": { "Features": "Eiginleikar", "NoFeatureFoundMessage": "Enginn eiginleiki í boði.", + "ManageHostFeatures": "Stjórna Gestgjafa Eiginleikum", "Permission:FeatureManagement": "Eiginleika stjórnun", "Permission:FeatureManagement.ManageHostFeatures": "Stjórna Gestgjafa Eiginleikum", "Volo.Abp.FeatureManagement:InvalidFeatureValue": "eiginleikagildið {0} er ekki gilt" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/it.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/it.json index ba77671388..ee08666365 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/it.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/it.json @@ -3,6 +3,7 @@ "texts": { "Features": "Funzionalità", "NoFeatureFoundMessage": "Non ci sono funzioni disponibili.", + "ManageHostFeatures": "Gestisci le funzionalità dell'host", "Permission:FeatureManagement": "Gestione funzionalità", "Permission:FeatureManagement.ManageHostFeatures": "Gestisci le funzionalità dell'host", "Volo.Abp.FeatureManagement:InvalidFeatureValue": "Il valore dell'elemento {0} non è valido!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/nl.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/nl.json index c34ae5cc93..f34188e0a6 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/nl.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/nl.json @@ -3,6 +3,7 @@ "texts": { "Features": "Functies", "NoFeatureFoundMessage": "Er is geen functie beschikbaar.", + "ManageHostFeatures": "Beheer host functies", "Permission:FeatureManagement": "Functiebeheer", "Permission:FeatureManagement.ManageHostFeatures": "Beheer host functies", "Volo.Abp.FeatureManagement:InvalidFeatureValue": "{0} functie-waarde is niet geldig!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/pl-PL.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/pl-PL.json index 6eff64c1b0..5be57e6198 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/pl-PL.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/pl-PL.json @@ -3,6 +3,7 @@ "texts": { "Features": "Funkcje", "NoFeatureFoundMessage": "Brak dostępnej funkcji.", + "ManageHostFeatures": "Zarządzaj funkcjami hosta", "Permission:FeatureManagement": "Zarządzanie funkcjami", "Permission:FeatureManagement.ManageHostFeatures": "Zarządzaj funkcjami hosta", "Volo.Abp.FeatureManagement:InvalidFeatureValue": "{0} wartość funkcji jest nieprawidłowa!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/pt-BR.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/pt-BR.json index a50ec6d471..570b9a40d5 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/pt-BR.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/pt-BR.json @@ -3,6 +3,7 @@ "texts": { "Features": "Funcionalidades", "NoFeatureFoundMessage": "Não há nenhuma funcionalidade disponivel.", + "ManageHostFeatures": "Gerenciar recursos do Host", "Permission:FeatureManagement": "Gerenciamento de recursos", "Permission:FeatureManagement.ManageHostFeatures": "Gerenciar recursos do Host", "Volo.Abp.FeatureManagement:InvalidFeatureValue": "O valor do recurso {0} não é válido!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/ro-RO.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/ro-RO.json index 824d789291..8e42f19123 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/ro-RO.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/ro-RO.json @@ -3,6 +3,7 @@ "texts": { "Features": "Caracteristici", "NoFeatureFoundMessage": "Nu există nicio caracteristică disponibilă.", + "ManageHostFeatures": "Administraţi caracteristicile de host", "Permission:FeatureManagement": "Administrare caracteristici", "Permission:FeatureManagement.ManageHostFeatures": "Gestionare caracteristici gazdă", "Volo.Abp.FeatureManagement:InvalidFeatureValue" : "Valoarea {0} a caracteristicii nu este validă!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/ru.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/ru.json index bdcb53005d..e72a87388a 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/ru.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/ru.json @@ -3,6 +3,7 @@ "texts": { "Features": "Функциональные возможности", "NoFeatureFoundMessage": "Нет доступных функциональных возможностей.", + "ManageHostFeatures": "Управление функциями хоста", "Permission:FeatureManagement": "Управление функциями", "Permission:FeatureManagement.ManageHostFeatures": "Управление функциями хоста", "Volo.Abp.FeatureManagement:InvalidFeatureValue": "Недопустимое значение функции {0}!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/sk.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/sk.json index 817d1ba801..fe7772a5b1 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/sk.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/sk.json @@ -3,6 +3,7 @@ "texts": { "Features": "Funkcie", "NoFeatureFoundMessage": "Nie je k dispozícii žiadna funkcia.", + "ManageHostFeatures": "Spravovať funkcie poskytovateľa", "Permission:FeatureManagement": "Správa funkcií", "Permission:FeatureManagement.ManageHostFeatures": "Správa funkcií poskytovateľa", "Volo.Abp.FeatureManagement:InvalidFeatureValue": "Hodnota funkcie {0} nie je platná!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/sl.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/sl.json index 2cec7a09c0..29987fa094 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/sl.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/sl.json @@ -3,6 +3,7 @@ "texts": { "Features": "Funkcionalnosti", "NoFeatureFoundMessage": "Na voljo ni nobene funkcionalnosti.", + "ManageHostFeatures": "Upravljajte funkcije gostitelja", "Permission:FeatureManagement": "Upravljanje funkcij", "Permission:FeatureManagement.ManageHostFeatures": "Upravljajte funkcije gostitelja", "Volo.Abp.FeatureManagement:InvalidFeatureValue": "Vrednost funkcije {0} ni veljavna!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/tr.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/tr.json index 421b66824d..7f7ca999e6 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/tr.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/tr.json @@ -3,6 +3,7 @@ "texts": { "Features": "Özellikler", "NoFeatureFoundMessage": "Hiç özellik yok.", + "ManageHostFeatures": "Host özelliklerini yönetin", "Permission:FeatureManagement": "Özellik yönetimi", "Permission:FeatureManagement.ManageHostFeatures": "Host özelliklerini düzenle", "Volo.Abp.FeatureManagement:InvalidFeatureValue" : "{0} özellik değeri geçerli değil!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/vi.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/vi.json index a87f6f719d..36195a8ce4 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/vi.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/vi.json @@ -3,6 +3,7 @@ "texts": { "Features": "Tính năng", "NoFeatureFoundMessage": "Không có bất kỳ tính năng khả dụng nào.", + "ManageHostFeatures": "Quản lý các tính năng của Máy chủ lưu trữ", "Permission:FeatureManagement": "Quản lý tính năng", "Permission:FeatureManagement.ManageHostFeatures": "Quản lý các tính năng của Máy chủ lưu trữ", "Volo.Abp.FeatureManagement:InvalidFeatureValue": "Giá trị tính năng {0} không hợp lệ!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/zh-Hans.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/zh-Hans.json index 473f581b34..41ac0eb5b5 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/zh-Hans.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/zh-Hans.json @@ -3,6 +3,7 @@ "texts": { "Features": "功能", "NoFeatureFoundMessage": "没有可用的功能.", + "ManageHostFeatures": "管理Host特性", "Permission:FeatureManagement": "特性管理", "Permission:FeatureManagement.ManageHostFeatures": "管理Host特性", "Volo.Abp.FeatureManagement:InvalidFeatureValue" : "{0}功能的值无效!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/zh-Hant.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/zh-Hant.json index dc84e7c104..41f625352f 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/zh-Hant.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/zh-Hant.json @@ -3,6 +3,7 @@ "texts": { "Features": "功能", "NoFeatureFoundMessage": "沒有可用的功能.", + "ManageHostFeatures": "管理Host功能", "Permission:FeatureManagement": "功能管理", "Permission:FeatureManagement.ManageHostFeatures": "管理Host功能", "Volo.Abp.FeatureManagement:InvalidFeatureValue" : "{0}功能的值無效!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/AbpFeatureManagementWebModule.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/AbpFeatureManagementWebModule.cs index 752e966ef2..78959e7d22 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/AbpFeatureManagementWebModule.cs +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/AbpFeatureManagementWebModule.cs @@ -3,15 +3,19 @@ using Microsoft.Extensions.DependencyInjection; using Volo.Abp.AspNetCore.Mvc.Localization; using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared; using Volo.Abp.FeatureManagement.Localization; +using Volo.Abp.FeatureManagement.Settings; using Volo.Abp.Http.ProxyScripting.Generators.JQuery; using Volo.Abp.Modularity; +using Volo.Abp.SettingManagement.Web; +using Volo.Abp.SettingManagement.Web.Pages.SettingManagement; using Volo.Abp.VirtualFileSystem; namespace Volo.Abp.FeatureManagement; [DependsOn( typeof(AbpFeatureManagementApplicationContractsModule), - typeof(AbpAspNetCoreMvcUiThemeSharedModule) + typeof(AbpAspNetCoreMvcUiThemeSharedModule), + typeof(AbpSettingManagementWebModule) )] public class AbpFeatureManagementWebModule : AbpModule { @@ -44,5 +48,10 @@ public class AbpFeatureManagementWebModule : AbpModule { options.DisableModule(FeatureManagementRemoteServiceConsts.ModuleName); }); + + Configure(options => + { + options.Contributors.Add(new FeatureSettingManagementPageContributor()); + }); } } diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/Components/FeatureSettingGroup/Default.cshtml b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/Components/FeatureSettingGroup/Default.cshtml new file mode 100644 index 0000000000..0af011ee8b --- /dev/null +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/Components/FeatureSettingGroup/Default.cshtml @@ -0,0 +1,13 @@ +@inject IHtmlLocalizer L +@using Microsoft.AspNetCore.Mvc.Localization +@using Volo.Abp.FeatureManagement.Localization +@model Volo.Abp.FeatureManagement.Pages.FeatureManagement.Components.FeatureSettingGroup.FeatureSettingGroupViewComponent.FeatureSettingViewModel + + + +
+ @if (Model.HasManageHostFeaturesPermission) + { + + } + \ No newline at end of file diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/Components/FeatureSettingGroup/Default.js b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/Components/FeatureSettingGroup/Default.js new file mode 100644 index 0000000000..3e6842928e --- /dev/null +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/Components/FeatureSettingGroup/Default.js @@ -0,0 +1,16 @@ +(function($){ + + $(function(){ + var _featuresModal = new abp.ModalManager( + abp.appPath + 'FeatureManagement/FeatureManagementModal' + ); + + $("#ManageHostFeatures").click(function (e) { + e.preventDefault(); + _featuresModal.open({ + providerName: 'T' + }); + }); + }) + +})(jQuery); \ No newline at end of file diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/Components/FeatureSettingGroup/FeatureSettingGroupViewComponent.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/Components/FeatureSettingGroup/FeatureSettingGroupViewComponent.cs new file mode 100644 index 0000000000..fc6aee9c55 --- /dev/null +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/Components/FeatureSettingGroup/FeatureSettingGroupViewComponent.cs @@ -0,0 +1,31 @@ +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using Volo.Abp.AspNetCore.Mvc; +using Volo.Abp.Authorization.Permissions; +using Volo.Abp.Features; + +namespace Volo.Abp.FeatureManagement.Pages.FeatureManagement.Components.FeatureSettingGroup; + +public class FeatureSettingGroupViewComponent: AbpViewComponent +{ + protected IPermissionChecker PermissionChecker { get; } + + public FeatureSettingGroupViewComponent(IPermissionChecker permissionChecker) + { + PermissionChecker = permissionChecker; + } + + public virtual async Task InvokeAsync() + { + var model = new FeatureSettingViewModel + { + HasManageHostFeaturesPermission = await PermissionChecker.IsGrantedAsync(FeatureManagementPermissions.ManageHostFeatures) + }; + return View("~/Pages/FeatureManagement/Components/FeatureSettingGroup/Default.cshtml", model); + } + + public class FeatureSettingViewModel + { + public bool HasManageHostFeaturesPermission { get; set; } + } +} \ No newline at end of file diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Settings/FeatureSettingManagementPageContributor.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Settings/FeatureSettingManagementPageContributor.cs new file mode 100644 index 0000000000..259c440166 --- /dev/null +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Settings/FeatureSettingManagementPageContributor.cs @@ -0,0 +1,29 @@ +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Localization; +using Volo.Abp.FeatureManagement.Localization; +using Volo.Abp.FeatureManagement.Pages.FeatureManagement.Components.FeatureSettingGroup; +using Volo.Abp.SettingManagement.Web.Pages.SettingManagement; + +namespace Volo.Abp.FeatureManagement.Settings; + +public class FeatureSettingManagementPageContributor : SettingPageContributorBase +{ + public FeatureSettingManagementPageContributor() + { + RequiredPermissions(FeatureManagementPermissions.ManageHostFeatures); + } + + public override Task ConfigureAsync(SettingPageCreationContext context) + { + var l = context.ServiceProvider.GetRequiredService>(); + context.Groups.Add( + new SettingPageGroup( + "Volo.Abp.FeatureManagement", + l["Permission:FeatureManagement"], + typeof(FeatureSettingGroupViewComponent) + ) + ); + return Task.CompletedTask; + } +} \ No newline at end of file diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Volo.Abp.FeatureManagement.Web.csproj b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Volo.Abp.FeatureManagement.Web.csproj index e5c8b3ba52..f9e1bdb16e 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Volo.Abp.FeatureManagement.Web.csproj +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Volo.Abp.FeatureManagement.Web.csproj @@ -33,6 +33,7 @@ + diff --git a/modules/openiddict/app/OpenIddict.Demo.Server/package.json b/modules/openiddict/app/OpenIddict.Demo.Server/package.json index 55344897d5..e0cb825774 100644 --- a/modules/openiddict/app/OpenIddict.Demo.Server/package.json +++ b/modules/openiddict/app/OpenIddict.Demo.Server/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~5.2.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "~6.0.0-rc.1" } } diff --git a/modules/openiddict/app/angular/package.json b/modules/openiddict/app/angular/package.json index 1fa0dfc73c..4a342ee840 100644 --- a/modules/openiddict/app/angular/package.json +++ b/modules/openiddict/app/angular/package.json @@ -12,14 +12,14 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~5.2.0-rc.2", - "@abp/ng.components": "~5.2.0-rc.2", - "@abp/ng.core": "~5.2.0-rc.2", - "@abp/ng.identity": "~5.2.0-rc.2", - "@abp/ng.setting-management": "~5.2.0-rc.2", - "@abp/ng.tenant-management": "~5.2.0-rc.2", - "@abp/ng.theme.basic": "~5.2.0-rc.2", - "@abp/ng.theme.shared": "~5.2.0-rc.2", + "@abp/ng.account": "~6.0.0-rc.1", + "@abp/ng.components": "~6.0.0-rc.1", + "@abp/ng.core": "~6.0.0-rc.1", + "@abp/ng.identity": "~6.0.0-rc.1", + "@abp/ng.setting-management": "~6.0.0-rc.1", + "@abp/ng.tenant-management": "~6.0.0-rc.1", + "@abp/ng.theme.basic": "~6.0.0-rc.1", + "@abp/ng.theme.shared": "~6.0.0-rc.1", "@angular/animations": "~13.1.1", "@angular/common": "~13.1.1", "@angular/compiler": "~13.1.1", @@ -34,7 +34,7 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@abp/ng.schematics": "~5.2.0-rc.2", + "@abp/ng.schematics": "~6.0.0-rc.1", "@angular-devkit/build-angular": "~13.1.2", "@angular-eslint/builder": "~13.0.1", "@angular-eslint/eslint-plugin": "~13.0.1", 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 3861e9ec5f..5e66e3d5c5 100644 --- a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json +++ b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json @@ -3,6 +3,6 @@ "name": "demo-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.1" } } diff --git a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/wwwroot/libs/abp/core/abp.js b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/wwwroot/libs/abp/core/abp.js index 9445e4e7f4..d8b7531660 100644 --- a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/wwwroot/libs/abp/core/abp.js +++ b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/wwwroot/libs/abp/core/abp.js @@ -372,7 +372,9 @@ var abp = abp || {}; setTimeout(function () { if (element) { element.classList.remove('abp-block-area-disappearing'); - element.parentElement.removeChild(element); + if (element.parentElement) { + element.parentElement.removeChild(element); + } } }, 250); } 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 95455e841f..24112c54a3 100644 --- a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock +++ b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.3.tgz#dc6a1bdd583ef5ea0f8a0110753b0869d5f1cb61" - integrity sha512-det7xCtVZK6Dmvr0ENAkYdE+jRW0cVi3BCKZc7c6Hy0VKsKsKlnyz5j/D2rJSAmrap9hyQSWXBJUiho8W92wUQ== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.3" - -"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.3.tgz#65f97d787647e7760bb0c2a5b0f0ff815dc9630a" - integrity sha512-p/Z++QPM7S2lm7obXsZXIarcw0Y88y/Ghy5hyZqdc3uNHL6j8LRlD2qfuRXzl0k9HytXa859UKtSMLSZij1DiA== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.3" - "@abp/bootstrap" "~5.3.3" - "@abp/bootstrap-datepicker" "~5.3.3" - "@abp/datatables.net-bs5" "~5.3.3" - "@abp/font-awesome" "~5.3.3" - "@abp/jquery-form" "~5.3.3" - "@abp/jquery-validation-unobtrusive" "~5.3.3" - "@abp/lodash" "~5.3.3" - "@abp/luxon" "~5.3.3" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.3" - "@abp/select2" "~5.3.3" - "@abp/sweetalert2" "~5.3.3" - "@abp/timeago" "~5.3.3" - "@abp/toastr" "~5.3.3" - -"@abp/aspnetcore.mvc.ui@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.3.tgz#b8beb98bde3e4f0340335014ced7653c7913a621" - integrity sha512-aDQxdfQmlEXIjWGW8wru58imh9cncHAijafvdXlmyfKHM2JfnSSCG/RPMiaoJq/iyDVEggbhx8z4VHODC1eitg== +"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.1.tgz#561522e75e850bfa33243c91b9c37e4791039455" + integrity sha512-oov7mcynMOjeBxD3oBXzSuarwLYxB902O/TMbQsdiU50oJmfgidsaHC7W3lAvfXbuZiok9+zkUW9uaGXS+OuXA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.1" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.1.tgz#5b0afe34c485f8e11ef21b0bce86e231602d8c1b" + integrity sha512-lY8ToScqRSlIHKMMiut+yiXzJG/+B8/ZXS+O9+nNOZ97G6oJZr3TYFuLcR8Rr5tFSZ65dUYivshHAM7HcRYyNA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.1" + "@abp/bootstrap" "~6.0.0-rc.1" + "@abp/bootstrap-datepicker" "~6.0.0-rc.1" + "@abp/datatables.net-bs5" "~6.0.0-rc.1" + "@abp/font-awesome" "~6.0.0-rc.1" + "@abp/jquery-form" "~6.0.0-rc.1" + "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.1" + "@abp/lodash" "~6.0.0-rc.1" + "@abp/luxon" "~6.0.0-rc.1" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.1" + "@abp/select2" "~6.0.0-rc.1" + "@abp/sweetalert2" "~6.0.0-rc.1" + "@abp/timeago" "~6.0.0-rc.1" + "@abp/toastr" "~6.0.0-rc.1" + +"@abp/aspnetcore.mvc.ui@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.1.tgz#cec27a35b336ef8319308ac24995def0f26e00be" + integrity sha512-wH4ar4DHJiMPfe+z6IO1nCCz5L+/1W//Kh+wdtuU2QGmJX4mavAgO+ZXKGeA1QYsUY8NBXWj0Xwoyp9PgbqsyQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,144 +41,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.3.tgz#66bf2be128e6389877ed4465149c1933ca182c71" - integrity sha512-w/gPj4BVzVnmwekWVHKPYkwnhZFFH1XtCtw5LeJVM5bSYQBrvVTvvUPdKiiTDV59OYf2sbsA+PscwcTWAG6t/Q== +"@abp/bootstrap-datepicker@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.1.tgz#33bd5d9e1d6b351eb1e7a278ccd9a79db119e461" + integrity sha512-/y4v/JZ5YXJ2ew0v7//C//ShK3cf7IPd23d2kVb/7vypdR7yquxyoM7nxpnsfJBs5dQLsH8D5tAhFyTJBZUovA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.3.tgz#56335b46bd42fba0a522712fbb6591fb6aeb5b68" - integrity sha512-xOtC690pE+QxZYhhQrpTE1rapEjg9BrJg7e0qvrkt4TLMZ4mIbau6/Qlh6x8uuMASCUUuRTLNUzHijxvOJh7Mg== +"@abp/bootstrap@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.1.tgz#c6f64f1f34870b75da623ed9cee7b3b1159611fc" + integrity sha512-/cAVvgmp/jYTxsuz1RmfNZ7r0X01SKvAB7yjJPvBuEdLj/5ms9HyEa3K4ifnALoShFOKP9yQN1aJtmHN7hepiQ== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" bootstrap "^5.1.3" -"@abp/core@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.3.tgz#b03fc281d650d483c9276591f2adb26ea43dcd1e" - integrity sha512-Pp8U+LjchtSxc9lTRaPNQhb+Eh7X2LVERmZvoWyET0y/st28PJZ4eZ4iyGmV00pEmCpadF5aTWVhJcGH32scdQ== +"@abp/core@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.1.tgz#ec88b3339d854c91e93c342206984daf01b745df" + integrity sha512-V3X4fFm4A13LX47JNpjyxLs9IQ+StISHYMld6srEgCatHx1+dUfLcA4v5uj4IHIrPaRxhX/wv4iDND6FYcGJ2Q== dependencies: - "@abp/utils" "~5.3.3" + "@abp/utils" "~6.0.0-rc.1" -"@abp/datatables.net-bs5@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.3.tgz#e00304fbe7e6d9d33e1082485f7aa07de48fac0c" - integrity sha512-dkbP3PPkMRJqxravYO7NIVww+MQC3FxHP7mPCg/+PG/LttaNJ5L5hoNcb7BMK2K76hBRMdvlSIzvjycb1w1ooA== +"@abp/datatables.net-bs5@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.1.tgz#111c8c04e7d31f1b417602c7dde87d5a49104890" + integrity sha512-r4pxy1FYc06Ju4tYBVXe9HcE9LFDPCQJYP+01fPAAXcIDM7f02nCqdBjUJdv/z0VSejs9Ttn9ZIVSc85Y9JNoA== dependencies: - "@abp/datatables.net" "~5.3.3" + "@abp/datatables.net" "~6.0.0-rc.1" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.3.tgz#6d8eca1034e26708b9adf0d5917aefd5772cbf30" - integrity sha512-1JuXMzHDtrvGRNBYdwEVobiYmhd7VxM432ciARX8hzvSkE0jcgzeTrSlBXfenFMPOIAUJsSOE4YVshtqrY0G4g== +"@abp/datatables.net@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.1.tgz#278762acd0df9c7fd50ef0caef9a9e6c32665e6f" + integrity sha512-NQSKDdpUvsY6JgGHTrTSNAp2ZcMb3L4PwSv9vJVoDSYYF7+f/KFO/bZWlamig+gucX917auRvxzD5bFSL9ub8Q== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" datatables.net "^1.11.4" -"@abp/font-awesome@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.3.tgz#b10a530c9dee28838536746ea2a40342ff2ee3a8" - integrity sha512-c+cvsQ1uolSoyTkM9rZYYM07iiq/Zu8zKOQaDbitQMfPkcfSnC3PG/PTNauSYuwh/SyFfacFXeaDQ5Y/kAGRLw== +"@abp/font-awesome@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.1.tgz#87b89f8923b262a8531cf4702cf318d9fab155b6" + integrity sha512-lxY1ONRR0sW/uLbgY/6KJpaeZ1ueQfARjcTfHdCmnat72Qd2jID/jKGKUW2fmK0SHmAZiBnKWHLFvF+JcB3JPQ== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.3.tgz#94234207aa991e098e49e7d1244dc86d289a48e6" - integrity sha512-TY5c4ODfSidYGWqUR+QMNbxasfSufSg9gLY8lTEaJn2Wd2+o3GlauPxlTeNIRCRsxqb8e5+fBJspq1YbtE8vQg== +"@abp/jquery-form@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.1.tgz#5bb68fbb2ce0c3b9a59a52ab20c4ea971258c3b1" + integrity sha512-RZ6v6ZbF+05gSBLltsjIMWd8a3bE8bKEPGfHgIPBJr2+xl7TGwuBB0GmDYa+2X6ctBN1BvGsNvMtOB41ahSaGA== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.3.tgz#03f776807b60f32d2470c3d3c975ee20f33a993d" - integrity sha512-BNa2oSOfc5CSLW62SLCOinP7ybDDSVjfn0LYdDOdkIpSPnoL/3E1ZmgEzkDCUdTfJ67320kGDtIHCpb+Wbik+Q== +"@abp/jquery-validation-unobtrusive@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.1.tgz#d082de2aa6c2d8bc2a0808b4159d0f5d281afdd2" + integrity sha512-Wv7/W8CXvO5+GFfYVSRXR7MnI5Vv+grDal8onwPTZ8OZS1dsTUnXe5enQMfuyzSBkq/YKTve6vFOOx8sNi0Tfg== dependencies: - "@abp/jquery-validation" "~5.3.3" + "@abp/jquery-validation" "~6.0.0-rc.1" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.3.tgz#a0544428b94966f35d3aebb40c354d3f4485137d" - integrity sha512-GFhrS4pVmbQRI0eiW2aBYmRTB0rR2s3Wj4NIVB69ZHwvy+uADA3M/oMs8Q4wuT+gmPu2GCjPNCc5RPsC173VPA== +"@abp/jquery-validation@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.1.tgz#e30227075f6d7eabe6224faf2e033622ce0fe3b1" + integrity sha512-xdEVHDsPUmZRyQS5qJYs+FurK6rjGH4ARzlDjtZCwiP85pFQ3+dglF+2/KZxzsNWfHwHl3DdoKWufzzT1qYbrg== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.3.tgz#be70aa671129fac192b8f858a973e65018960cbd" - integrity sha512-sUy0aquZPq+HyxChYJMTjUZxaTo5/Aav5JcbMq1RczIFidjOrFHthWnYZveDVSKryaCfX3tXutag1sPakUOTtg== +"@abp/jquery@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.1.tgz#6f486cfc16dd915ccd4fe4a3029fa6359fea49c0" + integrity sha512-WLcF9BHjRPjtz/QVWfrkltA0eYXVfUPrKmodeJ0q3wmndPqmmMyTMFSrsnoos2bSxd1Z/WGqqB3vVEYGUc1E4g== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" jquery "~3.6.0" -"@abp/lodash@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.3.tgz#365684a338ab5d68adffa93207d0035eaa494ef9" - integrity sha512-Lqb2DkmKBPBHNbUd1QeATv8G/qUPamd06bKbe7xHesX3DZtlIwTmimwTpV4tqmJqOLKB67uUtapPYCfKyxs1RQ== +"@abp/lodash@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.1.tgz#5e143be48e1d266356bd726764a89f520c55e8a5" + integrity sha512-lPui/un/eZcUaeJ2r/I9DgtfIVVoASy/e+gj3opCIGv9cgBQwoV9vlAZGCsUwRFy1RO7EUUsJR4jgxWSmj1JFw== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" lodash "^4.17.21" -"@abp/luxon@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.3.tgz#97a60ae64e865d2b1c04107302d4ec50d4e09217" - integrity sha512-/7Lb463HREBFlt17tUFinTpYxfbZ8UIi1+d7Fqp8spJv78qCxvpWmD4iuJJJdCExO00ztZWY9GkCDPrAbfP/dA== +"@abp/luxon@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.1.tgz#a4242d862576b4151912d48fbf81d89862b6a91e" + integrity sha512-O0nbZk1PA7RryFG+J3gKRtuT4+FV4eSkth8GZvhCOKoN8SpDu/92G2cIEzR0l9O1TYlrKAEbUpmsA+d6abSG+w== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.3.tgz#96be03f79be929b1a2cb67acb38e9d6638f04f15" - integrity sha512-hr5qmcVl+Wr6sIS10QerWRTfFvhmhq9e48G9Hx5oQZFjrIkfJRlxla0TYViHR2tRYCeDQGb4gYmN4Fc71mdcPg== +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.1.tgz#738efa17783450971c6f47608cfafc0ef87d8ec6" + integrity sha512-6Q9slGs6A1d1v+lpTfzI8W+QrpTtY0LTKQkRbYYpm31Lf5zQ55QFoinDpV9wnxDPrfh2u5aX/dSYMrHjdzj6Qg== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.3.tgz#bdb8de1fcc5c9964233fdf1d4b88f7b90099f293" - integrity sha512-yk4CDpgksM5pAXMgFnULlgDovBk0oeXRhAA6lpt0TizzJ353WkpcASUblHbWOePzXbJFBBB2cj3XBD9vdWx7Ig== +"@abp/select2@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.1.tgz#d4ba6e71536c56ef2c98c1b3342f15fc286d3c1b" + integrity sha512-j1mebFXYiLOaOqK9FW5FqafTvT6oydEbcKj2Dk4JdgbcwdY+Mf5DPrb4cu61IPR7SzMCfeZX6j6d2LCdnW7o4g== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" select2 "^4.0.13" -"@abp/sweetalert2@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.3.tgz#54a2d45ddbdaa2f7a4485aa5731f2fec65a9c771" - integrity sha512-Lbw6S+xTNMtHeFaMJNbYTMtqznDwRtlN4+f+hRGWbqNIpHuMfTi1jUgdeZTYRjbhY+RTduUJrs8lvvPMKWgrTw== +"@abp/sweetalert2@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.1.tgz#2633ed54227a703dbd81e2db0923d6f402561232" + integrity sha512-JxrLUnsntCoimJTpY+9uQ+CK6VW1sRTv0qhOX7EJTEefvA+YZjSSk0MwyG4KNzF46JSMW1OctXqWihl/UHZzTQ== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.3.tgz#6e13a178d67e635ebe65d01db220d09f1673bafa" - integrity sha512-mBwaioPVnIeMXP6tDG24NZaTCAGvk8cMah8ems3OLWNK+tsPU4Jy8BVHTSmd/7rA69EL0REuSw2GmiCvaCL+RQ== +"@abp/timeago@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.1.tgz#78903b3d523da6985a83a306d6a31d223b244d8b" + integrity sha512-f5AaVRCKXS4+U4axVE6B1gQIo28gmJ5iOsn+tGhH9YANsfybS7in7dN8Nu89oqx10tVyHZ6r5/ESd21aV34VDA== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" timeago "^1.6.7" -"@abp/toastr@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.3.tgz#a3d2d19963fe96da9566a0f320c7f9911901e69a" - integrity sha512-F1FJPQ0nnu/jZY4XpJFS7uFJgpoEl8aOeFkm6kvshK76ABFLvsWHYW88htW5gXIwOf+G/QClZdx39Os+IQaUJw== +"@abp/toastr@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.1.tgz#2cb0898d48bad1cb8cb5e994b55e51d60e5a6b90" + integrity sha512-RPp6J5IWtYW1q27+fFc5UxramldBIbCyEU9aniH9rfkEs4F5SF4RJphqjSKeYMclvT0PheUnR1x26PJbi179MQ== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" toastr "^2.1.4" -"@abp/utils@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.3.tgz#b47f11cb9a0ac963a7f4e5a44360d933e19896fc" - integrity sha512-owTYsROGHfXuHTOFe1uKMAwLbgjzQLKDnmApUy4taYy93rWsu98vFXX6rYJTK7U/X8nZq5y0BtH4covHyfsAxQ== +"@abp/utils@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.1.tgz#f25b383d6d7ba28c1220399397247cdef9704daf" + integrity sha512-Fi8dBDDAjdPE6tsWCP7iNlBb7WpoF8V3wOnoGmeg/ZklEcHDNZymjSa2RG8+6Qc4fSuUfti/Qyyj4CoDHhsOBw== dependencies: just-compare "^1.3.0" diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs index 0f0e689f2f..6fe3005a98 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs @@ -54,11 +54,6 @@ public partial class TenantManagement protected override ValueTask SetToolbarItemsAsync() { - Toolbar.AddButton(L["ManageHostFeatures"], - async () => await FeatureManagementModal.OpenAsync(FeatureProviderName), - "fa fa-cog", - requiredPolicyName: FeatureManagementPermissions.ManageHostFeatures); - Toolbar.AddButton(L["NewTenant"], OpenCreateModalAsync, IconName.Add, diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/ar.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/ar.json index 134da8c601..267165038c 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/ar.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/ar.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Connection Strings", "DisplayName:DefaultConnectionString": "Default Connection String", "DisplayName:UseSharedDatabase": "استخدام قاعدة البيانات المشتركة", - "ManageHostFeatures": "إدارة ميزات المضيف", "Permission:TenantManagement": "إدارة المستأجر", "Permission:Create": "إنشاء", "Permission:Edit": "تحرير", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/cs.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/cs.json index 754b66d081..001d5d71fb 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/cs.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/cs.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Connection stringy", "DisplayName:DefaultConnectionString": "Výchozí connection string", "DisplayName:UseSharedDatabase": "Použít sdílenou databázi", - "ManageHostFeatures": "Správa funkcí hostitele", "Permission:TenantManagement": "Správa tenantů", "Permission:Create": "Vytvořit", "Permission:Edit": "Upravit", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/de-DE.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/de-DE.json index 16644b17aa..c744619234 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/de-DE.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/de-DE.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Connection Strings", "DisplayName:DefaultConnectionString": "Standard-Connection String", "DisplayName:UseSharedDatabase": "Verwenden Sie die freigegebene Datenbank", - "ManageHostFeatures": "Host-Features verwalten", "Permission:TenantManagement": "Mandantenverwaltung", "Permission:Create": "Erstellen", "Permission:Edit": "Bearbeiten", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/el.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/el.json index 026bcb0b76..bc75c34e03 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/el.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/el.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Συμβολοσειρές σύνδεσης", "DisplayName:DefaultConnectionString": "Προεπιλεγμένη συμβολοσειρά σύνδεσης", "DisplayName:UseSharedDatabase": "Χρησιμοποιήστε την Κοινόχρηστη βάση δεδομένων", - "ManageHostFeatures": "Διαχείριση δυνατοτήτων του Οικοδεσπότη", "Permission:TenantManagement": "Διαχείριση ενοικιαστών", "Permission:Create": "Δημιουργία", "Permission:Edit": "Επεξεργασία", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/en-GB.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/en-GB.json index 4d6075ff74..8b4e4c185b 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/en-GB.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/en-GB.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Connection Strings", "DisplayName:DefaultConnectionString": "Default Connection String", "DisplayName:UseSharedDatabase": "Use the Shared Database", - "ManageHostFeatures": "Manage Host features", "Permission:TenantManagement": "Tenant management", "Permission:Create": "Create", "Permission:Edit": "Edit", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/en.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/en.json index ba4109c392..da222e994d 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/en.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/en.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Connection Strings", "DisplayName:DefaultConnectionString": "Default Connection String", "DisplayName:UseSharedDatabase": "Use the Shared Database", - "ManageHostFeatures": "Manage Host features", "Permission:TenantManagement": "Tenant management", "Permission:Create": "Create", "Permission:Edit": "Edit", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/es.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/es.json index cd18e3c33b..a570c4a84e 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/es.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/es.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Connection Strings", "DisplayName:DefaultConnectionString": "Connection String predeterminado", "DisplayName:UseSharedDatabase": "Usar la base de datos compartida", - "ManageHostFeatures": "Administrar funciones de host", "Permission:TenantManagement": "Gestión de tenants", "Permission:Create": "Crear", "Permission:Edit": "Editar", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/fa.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/fa.json index f0a804c073..c67a9c070b 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/fa.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/fa.json @@ -10,7 +10,6 @@ "ConnectionStrings": "کانکشن استرینگها", "DisplayName:DefaultConnectionString": "کانکشن استرینگ پیش فرض", "DisplayName:UseSharedDatabase": "استفاده از پایگاه داده مشترک", - "ManageHostFeatures": "مدیریت ویژگی های میزبان", "Permission:TenantManagement": "مدیریت تننت", "Permission:Create": "ایجاد", "Permission:Edit": "ویرایش", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/fi.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/fi.json index cae6bf6cac..3bd039ffcf 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/fi.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/fi.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Yhteysjonot", "DisplayName:DefaultConnectionString": "Oletusyhteysmerkkijono", "DisplayName:UseSharedDatabase": "Käytä jaettua tietokantaa", - "ManageHostFeatures": "Hallinnoi isäntäominaisuuksia", "Permission:TenantManagement": "Vuokralaisten hallinta", "Permission:Create": "Luoda", "Permission:Edit": "Muokata", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/fr.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/fr.json index 4aac3eebab..771a1e1fd5 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/fr.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/fr.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Chaînes de connexion", "DisplayName:DefaultConnectionString": "Chaîne de connexion par défaut", "DisplayName:UseSharedDatabase": "Utiliser la base de données partagée", - "ManageHostFeatures": "Gérer les fonctionnalités de l’hôte", "Permission:TenantManagement": "Gestion des locataires", "Permission:Create": "Créer", "Permission:Edit": "Modifier", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/hi.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/hi.json index 1094744a16..45e5de55c0 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/hi.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/hi.json @@ -10,7 +10,6 @@ "ConnectionStrings": "कनेक्शन स्ट्रिंग्स", "DisplayName:DefaultConnectionString": "डिफ़ॉल्ट कनेक्शन स्ट्रिंग", "DisplayName:UseSharedDatabase": "साझा डेटाबेस का उपयोग करें", - "ManageHostFeatures": "होस्ट सुविधाएँ प्रबंधित करें", "Permission:TenantManagement": "किरायेदार प्रबंधन", "Permission:Create": "सृजन करना", "Permission:Edit": "संपादित करें", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/hu.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/hu.json index 60c61c15cf..f4ccb64b0a 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/hu.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/hu.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Kapcsolat beállítás", "DisplayName:DefaultConnectionString": "Alapértelmezettt kapcsolati beállítás", "DisplayName:UseSharedDatabase": "Használjon megosztott adatbázist", - "ManageHostFeatures": "Host funkciók kezelése", "Permission:TenantManagement": "Bérlő menedzsment", "Permission:Create": "Létrehozás", "Permission:Edit": "Szerkesztés", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/is.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/is.json index 25c6a86ca3..ca2a8cb7a9 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/is.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/is.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Tengi strengir", "DisplayName:DefaultConnectionString": "Sjálfgefin tengistrengur", "DisplayName:UseSharedDatabase": "Notaðu samnýttan gagnagrunn", - "ManageHostFeatures": "Stjórna Gestgjafa Eiginleikum", "Permission:TenantManagement": "Tenant umsjá", "Permission:Create": "Búa til", "Permission:Edit": "Breyta", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/it.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/it.json index c80b7974ab..efc7cb2f6b 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/it.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/it.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Stringhe di connessione", "DisplayName:DefaultConnectionString": "Stringa di connessione predefinita", "DisplayName:UseSharedDatabase": "Usa il database condiviso", - "ManageHostFeatures": "Gestisci le funzionalità dell'host", "Permission:TenantManagement": "Gestione Tenant", "Permission:Create": "Crea", "Permission:Edit": "Modifica", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/nl.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/nl.json index d4c45b8aad..1aeb208560 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/nl.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/nl.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Connection Strings", "DisplayName:DefaultConnectionString": "Standaard Connection String", "DisplayName:UseSharedDatabase": "Gebruik de gedeelde database", - "ManageHostFeatures": "Beheer host functies", "Permission:TenantManagement": "Klanten beheer", "Permission:Create": "Maak aan", "Permission:Edit": "Bewerk", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/pl-PL.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/pl-PL.json index c62c67123e..6ec40c7310 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/pl-PL.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/pl-PL.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Connection Strings", "DisplayName:DefaultConnectionString": "Domyślny Connection String", "DisplayName:UseSharedDatabase": "Użyj współdzielonej bazy danych", - "ManageHostFeatures": "Zarządzaj funkcjami hosta", "Permission:TenantManagement": "Zarządzanie tenantami", "Permission:Create": "Utwórz", "Permission:Edit": "Edytuj", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/pt-BR.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/pt-BR.json index 6f43740161..9d0771ed9e 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/pt-BR.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/pt-BR.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Cadeia de Conexão", "DisplayName:DefaultConnectionString": "Cadeia de Conexão Padrão", "DisplayName:UseSharedDatabase": "Use o banco de dados compartilhado", - "ManageHostFeatures": "Gerenciar recursos do Host", "Permission:TenantManagement": "Inquilinos", "Permission:Create": "Criar", "Permission:Edit": "Editar", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/ro-RO.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/ro-RO.json index 70147d9921..18bf9fb74e 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/ro-RO.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/ro-RO.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Connection Strings", "DisplayName:DefaultConnectionString": "Connection String implicit", "DisplayName:UseSharedDatabase": "Folosiţi baza de date partajată", - "ManageHostFeatures": "Administraţi caracteristicile de host", "Permission:TenantManagement": "Administrarea clienţilor", "Permission:Create": "Creează", "Permission:Edit": "Editează", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/ru.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/ru.json index 9e5732bbd7..b737b7ee24 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/ru.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/ru.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Строки подключения", "DisplayName:DefaultConnectionString": "Строка подключения по умолчанию", "DisplayName:UseSharedDatabase": "Использование общей базы данных", - "ManageHostFeatures": "Управление функциями хоста", "Permission:TenantManagement": "Управление арендаторами", "Permission:Create": "Создать", "Permission:Edit": "Редактировать", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/sk.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/sk.json index df3cd3dd13..0689dee0e2 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/sk.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/sk.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Connection stringy", "DisplayName:DefaultConnectionString": "Predvolený connection string", "DisplayName:UseSharedDatabase": "Použiť zdieľanú databázu", - "ManageHostFeatures": "Spravovať funkcie poskytovateľa", "Permission:TenantManagement": "Správa tenantov", "Permission:Create": "Vytvoriť", "Permission:Edit": "Upraviť", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/sl.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/sl.json index b9df388d7c..bc2d857331 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/sl.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/sl.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Connection Strings", "DisplayName:DefaultConnectionString": "Privzeti Connection String", "DisplayName:UseSharedDatabase": "Uporabi skupno bazo", - "ManageHostFeatures": "Upravljajte funkcije gostitelja", "Permission:TenantManagement": "Upravljanje najemnikov", "Permission:Create": "Ustvarjanje", "Permission:Edit": "Urejanje", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/tr.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/tr.json index 25ca3f2407..933f4a4650 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/tr.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/tr.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Bağlantı cümlesi", "DisplayName:DefaultConnectionString": "Varsayılan bağlantı cümlesi", "DisplayName:UseSharedDatabase": "Paylaşılan veritabanını kullan", - "ManageHostFeatures": "Host özelliklerini yönetin", "Permission:TenantManagement": "Müşteri yönetimi", "Permission:Create": "Oluşturma", "Permission:Edit": "Düzenleme", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/vi.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/vi.json index 025ec04eb6..4fafa9cc72 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/vi.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/vi.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Chuỗi kết nối", "DisplayName:DefaultConnectionString": "Chuỗi kết nối mặc định", "DisplayName:UseSharedDatabase": "Sử dụng cơ sở dữ liệu dùng chung", - "ManageHostFeatures": "Quản lý các tính năng của Máy chủ lưu trữ", "Permission:TenantManagement": "Quản lý khách thuê", "Permission:Create": "Tạo", "Permission:Edit": "Sửa", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/zh-Hans.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/zh-Hans.json index 034d4bac81..1e8e98412a 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/zh-Hans.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/zh-Hans.json @@ -10,7 +10,6 @@ "ConnectionStrings": "连接字符串", "DisplayName:DefaultConnectionString": "默认连接字符串", "DisplayName:UseSharedDatabase": "使用共享数据库", - "ManageHostFeatures": "管理Host特性", "Permission:TenantManagement": "租户管理", "Permission:Create": "创建", "Permission:Edit": "编辑", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/zh-Hant.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/zh-Hant.json index 6950a1ca00..200dde595f 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/zh-Hant.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/zh-Hant.json @@ -10,7 +10,6 @@ "ConnectionStrings": "資料庫連線字串", "DisplayName:DefaultConnectionString": "預設資料庫連線字串", "DisplayName:UseSharedDatabase": "使用共用資料庫", - "ManageHostFeatures": "管理Host功能", "Permission:TenantManagement": "租戶管理", "Permission:Create": "新增", "Permission:Edit": "編輯", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebModule.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebModule.cs index 1ac62db5e2..b3a63fb8ae 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebModule.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebModule.cs @@ -69,13 +69,6 @@ public class AbpTenantManagementWebModule : AbpModule options.Configure( toolbar => { - toolbar.AddButton( - LocalizableString.Create("ManageHostFeatures"), - icon: "cog", - name: "ManageHostFeatures", - requiredPolicyName: FeatureManagementPermissions.ManageHostFeatures - ); - toolbar.AddButton( LocalizableString.Create("NewTenant"), icon: "plus", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.js b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.js index e990b8fc37..a9cf094c6c 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.js +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.js @@ -113,12 +113,5 @@ e.preventDefault(); _createModal.open(); }); - - _$wrapper.find('button[name=ManageHostFeatures]').click(function (e) { - e.preventDefault(); - _featuresModal.open({ - providerName: 'T' - }); - }); }); })(); diff --git a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/package.json b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/package.json index e051b732d0..262598948c 100644 --- a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/package.json +++ b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/package.json @@ -3,7 +3,7 @@ "version": "1.0.0", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.3", - "@abp/virtual-file-explorer": "^5.3.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.1", + "@abp/virtual-file-explorer": "^6.0.0-rc.1" } } diff --git a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/wwwroot/libs/abp/core/abp.js b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/wwwroot/libs/abp/core/abp.js index 9445e4e7f4..d8b7531660 100644 --- a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/wwwroot/libs/abp/core/abp.js +++ b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/wwwroot/libs/abp/core/abp.js @@ -372,7 +372,9 @@ var abp = abp || {}; setTimeout(function () { if (element) { element.classList.remove('abp-block-area-disappearing'); - element.parentElement.removeChild(element); + if (element.parentElement) { + element.parentElement.removeChild(element); + } } }, 250); } diff --git a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/yarn.lock b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/yarn.lock index 2200271840..b744c88831 100644 --- a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/yarn.lock +++ b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.3.tgz#dc6a1bdd583ef5ea0f8a0110753b0869d5f1cb61" - integrity sha512-det7xCtVZK6Dmvr0ENAkYdE+jRW0cVi3BCKZc7c6Hy0VKsKsKlnyz5j/D2rJSAmrap9hyQSWXBJUiho8W92wUQ== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.3" - -"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.3.tgz#65f97d787647e7760bb0c2a5b0f0ff815dc9630a" - integrity sha512-p/Z++QPM7S2lm7obXsZXIarcw0Y88y/Ghy5hyZqdc3uNHL6j8LRlD2qfuRXzl0k9HytXa859UKtSMLSZij1DiA== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.3" - "@abp/bootstrap" "~5.3.3" - "@abp/bootstrap-datepicker" "~5.3.3" - "@abp/datatables.net-bs5" "~5.3.3" - "@abp/font-awesome" "~5.3.3" - "@abp/jquery-form" "~5.3.3" - "@abp/jquery-validation-unobtrusive" "~5.3.3" - "@abp/lodash" "~5.3.3" - "@abp/luxon" "~5.3.3" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.3" - "@abp/select2" "~5.3.3" - "@abp/sweetalert2" "~5.3.3" - "@abp/timeago" "~5.3.3" - "@abp/toastr" "~5.3.3" - -"@abp/aspnetcore.mvc.ui@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.3.tgz#b8beb98bde3e4f0340335014ced7653c7913a621" - integrity sha512-aDQxdfQmlEXIjWGW8wru58imh9cncHAijafvdXlmyfKHM2JfnSSCG/RPMiaoJq/iyDVEggbhx8z4VHODC1eitg== +"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.1.tgz#561522e75e850bfa33243c91b9c37e4791039455" + integrity sha512-oov7mcynMOjeBxD3oBXzSuarwLYxB902O/TMbQsdiU50oJmfgidsaHC7W3lAvfXbuZiok9+zkUW9uaGXS+OuXA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.1" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.1.tgz#5b0afe34c485f8e11ef21b0bce86e231602d8c1b" + integrity sha512-lY8ToScqRSlIHKMMiut+yiXzJG/+B8/ZXS+O9+nNOZ97G6oJZr3TYFuLcR8Rr5tFSZ65dUYivshHAM7HcRYyNA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.1" + "@abp/bootstrap" "~6.0.0-rc.1" + "@abp/bootstrap-datepicker" "~6.0.0-rc.1" + "@abp/datatables.net-bs5" "~6.0.0-rc.1" + "@abp/font-awesome" "~6.0.0-rc.1" + "@abp/jquery-form" "~6.0.0-rc.1" + "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.1" + "@abp/lodash" "~6.0.0-rc.1" + "@abp/luxon" "~6.0.0-rc.1" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.1" + "@abp/select2" "~6.0.0-rc.1" + "@abp/sweetalert2" "~6.0.0-rc.1" + "@abp/timeago" "~6.0.0-rc.1" + "@abp/toastr" "~6.0.0-rc.1" + +"@abp/aspnetcore.mvc.ui@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.1.tgz#cec27a35b336ef8319308ac24995def0f26e00be" + integrity sha512-wH4ar4DHJiMPfe+z6IO1nCCz5L+/1W//Kh+wdtuU2QGmJX4mavAgO+ZXKGeA1QYsUY8NBXWj0Xwoyp9PgbqsyQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,171 +41,171 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.3.tgz#66bf2be128e6389877ed4465149c1933ca182c71" - integrity sha512-w/gPj4BVzVnmwekWVHKPYkwnhZFFH1XtCtw5LeJVM5bSYQBrvVTvvUPdKiiTDV59OYf2sbsA+PscwcTWAG6t/Q== +"@abp/bootstrap-datepicker@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.1.tgz#33bd5d9e1d6b351eb1e7a278ccd9a79db119e461" + integrity sha512-/y4v/JZ5YXJ2ew0v7//C//ShK3cf7IPd23d2kVb/7vypdR7yquxyoM7nxpnsfJBs5dQLsH8D5tAhFyTJBZUovA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.3.tgz#56335b46bd42fba0a522712fbb6591fb6aeb5b68" - integrity sha512-xOtC690pE+QxZYhhQrpTE1rapEjg9BrJg7e0qvrkt4TLMZ4mIbau6/Qlh6x8uuMASCUUuRTLNUzHijxvOJh7Mg== +"@abp/bootstrap@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.1.tgz#c6f64f1f34870b75da623ed9cee7b3b1159611fc" + integrity sha512-/cAVvgmp/jYTxsuz1RmfNZ7r0X01SKvAB7yjJPvBuEdLj/5ms9HyEa3K4ifnALoShFOKP9yQN1aJtmHN7hepiQ== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" bootstrap "^5.1.3" -"@abp/clipboard@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-5.3.3.tgz#62c3c12f1ff503091924f672f71a50e2e5d0b47c" - integrity sha512-FRJPM9/P3WPuK4Id1KVfmpkOB3MrlrYp/beNqZtjqQuG8WDjVgnHrDnsPYfzeLdK5n6bEvtGWwtHwiaBOXhWZg== +"@abp/clipboard@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-6.0.0-rc.1.tgz#3dc6808637f116a07f11c6e727f55ce9bd4b64de" + integrity sha512-u/OPfgXRmrrjkbJrzKB1YSW8rTqUWIPRVx1VAT7RdT5UMzX4DOupd7SRJFr6u7OZFP1p7umUtl6k4wY1lAv6rw== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" clipboard "^2.0.8" -"@abp/core@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.3.tgz#b03fc281d650d483c9276591f2adb26ea43dcd1e" - integrity sha512-Pp8U+LjchtSxc9lTRaPNQhb+Eh7X2LVERmZvoWyET0y/st28PJZ4eZ4iyGmV00pEmCpadF5aTWVhJcGH32scdQ== +"@abp/core@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.1.tgz#ec88b3339d854c91e93c342206984daf01b745df" + integrity sha512-V3X4fFm4A13LX47JNpjyxLs9IQ+StISHYMld6srEgCatHx1+dUfLcA4v5uj4IHIrPaRxhX/wv4iDND6FYcGJ2Q== dependencies: - "@abp/utils" "~5.3.3" + "@abp/utils" "~6.0.0-rc.1" -"@abp/datatables.net-bs5@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.3.tgz#e00304fbe7e6d9d33e1082485f7aa07de48fac0c" - integrity sha512-dkbP3PPkMRJqxravYO7NIVww+MQC3FxHP7mPCg/+PG/LttaNJ5L5hoNcb7BMK2K76hBRMdvlSIzvjycb1w1ooA== +"@abp/datatables.net-bs5@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.1.tgz#111c8c04e7d31f1b417602c7dde87d5a49104890" + integrity sha512-r4pxy1FYc06Ju4tYBVXe9HcE9LFDPCQJYP+01fPAAXcIDM7f02nCqdBjUJdv/z0VSejs9Ttn9ZIVSc85Y9JNoA== dependencies: - "@abp/datatables.net" "~5.3.3" + "@abp/datatables.net" "~6.0.0-rc.1" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.3.tgz#6d8eca1034e26708b9adf0d5917aefd5772cbf30" - integrity sha512-1JuXMzHDtrvGRNBYdwEVobiYmhd7VxM432ciARX8hzvSkE0jcgzeTrSlBXfenFMPOIAUJsSOE4YVshtqrY0G4g== +"@abp/datatables.net@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.1.tgz#278762acd0df9c7fd50ef0caef9a9e6c32665e6f" + integrity sha512-NQSKDdpUvsY6JgGHTrTSNAp2ZcMb3L4PwSv9vJVoDSYYF7+f/KFO/bZWlamig+gucX917auRvxzD5bFSL9ub8Q== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" datatables.net "^1.11.4" -"@abp/font-awesome@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.3.tgz#b10a530c9dee28838536746ea2a40342ff2ee3a8" - integrity sha512-c+cvsQ1uolSoyTkM9rZYYM07iiq/Zu8zKOQaDbitQMfPkcfSnC3PG/PTNauSYuwh/SyFfacFXeaDQ5Y/kAGRLw== +"@abp/font-awesome@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.1.tgz#87b89f8923b262a8531cf4702cf318d9fab155b6" + integrity sha512-lxY1ONRR0sW/uLbgY/6KJpaeZ1ueQfARjcTfHdCmnat72Qd2jID/jKGKUW2fmK0SHmAZiBnKWHLFvF+JcB3JPQ== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.3.tgz#94234207aa991e098e49e7d1244dc86d289a48e6" - integrity sha512-TY5c4ODfSidYGWqUR+QMNbxasfSufSg9gLY8lTEaJn2Wd2+o3GlauPxlTeNIRCRsxqb8e5+fBJspq1YbtE8vQg== +"@abp/jquery-form@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.1.tgz#5bb68fbb2ce0c3b9a59a52ab20c4ea971258c3b1" + integrity sha512-RZ6v6ZbF+05gSBLltsjIMWd8a3bE8bKEPGfHgIPBJr2+xl7TGwuBB0GmDYa+2X6ctBN1BvGsNvMtOB41ahSaGA== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.3.tgz#03f776807b60f32d2470c3d3c975ee20f33a993d" - integrity sha512-BNa2oSOfc5CSLW62SLCOinP7ybDDSVjfn0LYdDOdkIpSPnoL/3E1ZmgEzkDCUdTfJ67320kGDtIHCpb+Wbik+Q== +"@abp/jquery-validation-unobtrusive@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.1.tgz#d082de2aa6c2d8bc2a0808b4159d0f5d281afdd2" + integrity sha512-Wv7/W8CXvO5+GFfYVSRXR7MnI5Vv+grDal8onwPTZ8OZS1dsTUnXe5enQMfuyzSBkq/YKTve6vFOOx8sNi0Tfg== dependencies: - "@abp/jquery-validation" "~5.3.3" + "@abp/jquery-validation" "~6.0.0-rc.1" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.3.tgz#a0544428b94966f35d3aebb40c354d3f4485137d" - integrity sha512-GFhrS4pVmbQRI0eiW2aBYmRTB0rR2s3Wj4NIVB69ZHwvy+uADA3M/oMs8Q4wuT+gmPu2GCjPNCc5RPsC173VPA== +"@abp/jquery-validation@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.1.tgz#e30227075f6d7eabe6224faf2e033622ce0fe3b1" + integrity sha512-xdEVHDsPUmZRyQS5qJYs+FurK6rjGH4ARzlDjtZCwiP85pFQ3+dglF+2/KZxzsNWfHwHl3DdoKWufzzT1qYbrg== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.3.tgz#be70aa671129fac192b8f858a973e65018960cbd" - integrity sha512-sUy0aquZPq+HyxChYJMTjUZxaTo5/Aav5JcbMq1RczIFidjOrFHthWnYZveDVSKryaCfX3tXutag1sPakUOTtg== +"@abp/jquery@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.1.tgz#6f486cfc16dd915ccd4fe4a3029fa6359fea49c0" + integrity sha512-WLcF9BHjRPjtz/QVWfrkltA0eYXVfUPrKmodeJ0q3wmndPqmmMyTMFSrsnoos2bSxd1Z/WGqqB3vVEYGUc1E4g== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" jquery "~3.6.0" -"@abp/lodash@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.3.tgz#365684a338ab5d68adffa93207d0035eaa494ef9" - integrity sha512-Lqb2DkmKBPBHNbUd1QeATv8G/qUPamd06bKbe7xHesX3DZtlIwTmimwTpV4tqmJqOLKB67uUtapPYCfKyxs1RQ== +"@abp/lodash@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.1.tgz#5e143be48e1d266356bd726764a89f520c55e8a5" + integrity sha512-lPui/un/eZcUaeJ2r/I9DgtfIVVoASy/e+gj3opCIGv9cgBQwoV9vlAZGCsUwRFy1RO7EUUsJR4jgxWSmj1JFw== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" lodash "^4.17.21" -"@abp/luxon@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.3.tgz#97a60ae64e865d2b1c04107302d4ec50d4e09217" - integrity sha512-/7Lb463HREBFlt17tUFinTpYxfbZ8UIi1+d7Fqp8spJv78qCxvpWmD4iuJJJdCExO00ztZWY9GkCDPrAbfP/dA== +"@abp/luxon@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.1.tgz#a4242d862576b4151912d48fbf81d89862b6a91e" + integrity sha512-O0nbZk1PA7RryFG+J3gKRtuT4+FV4eSkth8GZvhCOKoN8SpDu/92G2cIEzR0l9O1TYlrKAEbUpmsA+d6abSG+w== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.3.tgz#96be03f79be929b1a2cb67acb38e9d6638f04f15" - integrity sha512-hr5qmcVl+Wr6sIS10QerWRTfFvhmhq9e48G9Hx5oQZFjrIkfJRlxla0TYViHR2tRYCeDQGb4gYmN4Fc71mdcPg== +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.1.tgz#738efa17783450971c6f47608cfafc0ef87d8ec6" + integrity sha512-6Q9slGs6A1d1v+lpTfzI8W+QrpTtY0LTKQkRbYYpm31Lf5zQ55QFoinDpV9wnxDPrfh2u5aX/dSYMrHjdzj6Qg== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/prismjs@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-5.3.3.tgz#eccea1469cb4dfc15b87704d267bb36ad6f25758" - integrity sha512-XC0jQa9LqcuqpciDKSbc0wRo4sOK9sebX6eZBlbOnGIoHhNNbiwG0Vt60MHQ5DmaOz7k5jWP0gOISQMJ5GJfTw== +"@abp/prismjs@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-6.0.0-rc.1.tgz#1c1afcf0533c54989d1eaf0d94a0a71f61213d70" + integrity sha512-rDkIdCEdiHw9ervlfrRyoMB0eiDGSbjM0PG+M7ePXoatDiFdDsTz/XYR3ygvdk1/8h7GM2KkNjrx8OLzWMlblQ== dependencies: - "@abp/clipboard" "~5.3.3" - "@abp/core" "~5.3.3" + "@abp/clipboard" "~6.0.0-rc.1" + "@abp/core" "~6.0.0-rc.1" prismjs "^1.26.0" -"@abp/select2@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.3.tgz#bdb8de1fcc5c9964233fdf1d4b88f7b90099f293" - integrity sha512-yk4CDpgksM5pAXMgFnULlgDovBk0oeXRhAA6lpt0TizzJ353WkpcASUblHbWOePzXbJFBBB2cj3XBD9vdWx7Ig== +"@abp/select2@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.1.tgz#d4ba6e71536c56ef2c98c1b3342f15fc286d3c1b" + integrity sha512-j1mebFXYiLOaOqK9FW5FqafTvT6oydEbcKj2Dk4JdgbcwdY+Mf5DPrb4cu61IPR7SzMCfeZX6j6d2LCdnW7o4g== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" select2 "^4.0.13" -"@abp/sweetalert2@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.3.tgz#54a2d45ddbdaa2f7a4485aa5731f2fec65a9c771" - integrity sha512-Lbw6S+xTNMtHeFaMJNbYTMtqznDwRtlN4+f+hRGWbqNIpHuMfTi1jUgdeZTYRjbhY+RTduUJrs8lvvPMKWgrTw== +"@abp/sweetalert2@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.1.tgz#2633ed54227a703dbd81e2db0923d6f402561232" + integrity sha512-JxrLUnsntCoimJTpY+9uQ+CK6VW1sRTv0qhOX7EJTEefvA+YZjSSk0MwyG4KNzF46JSMW1OctXqWihl/UHZzTQ== dependencies: - "@abp/core" "~5.3.3" + "@abp/core" "~6.0.0-rc.1" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.3.tgz#6e13a178d67e635ebe65d01db220d09f1673bafa" - integrity sha512-mBwaioPVnIeMXP6tDG24NZaTCAGvk8cMah8ems3OLWNK+tsPU4Jy8BVHTSmd/7rA69EL0REuSw2GmiCvaCL+RQ== +"@abp/timeago@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.1.tgz#78903b3d523da6985a83a306d6a31d223b244d8b" + integrity sha512-f5AaVRCKXS4+U4axVE6B1gQIo28gmJ5iOsn+tGhH9YANsfybS7in7dN8Nu89oqx10tVyHZ6r5/ESd21aV34VDA== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" timeago "^1.6.7" -"@abp/toastr@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.3.tgz#a3d2d19963fe96da9566a0f320c7f9911901e69a" - integrity sha512-F1FJPQ0nnu/jZY4XpJFS7uFJgpoEl8aOeFkm6kvshK76ABFLvsWHYW88htW5gXIwOf+G/QClZdx39Os+IQaUJw== +"@abp/toastr@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.1.tgz#2cb0898d48bad1cb8cb5e994b55e51d60e5a6b90" + integrity sha512-RPp6J5IWtYW1q27+fFc5UxramldBIbCyEU9aniH9rfkEs4F5SF4RJphqjSKeYMclvT0PheUnR1x26PJbi179MQ== dependencies: - "@abp/jquery" "~5.3.3" + "@abp/jquery" "~6.0.0-rc.1" toastr "^2.1.4" -"@abp/utils@~5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.3.tgz#b47f11cb9a0ac963a7f4e5a44360d933e19896fc" - integrity sha512-owTYsROGHfXuHTOFe1uKMAwLbgjzQLKDnmApUy4taYy93rWsu98vFXX6rYJTK7U/X8nZq5y0BtH4covHyfsAxQ== +"@abp/utils@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.1.tgz#f25b383d6d7ba28c1220399397247cdef9704daf" + integrity sha512-Fi8dBDDAjdPE6tsWCP7iNlBb7WpoF8V3wOnoGmeg/ZklEcHDNZymjSa2RG8+6Qc4fSuUfti/Qyyj4CoDHhsOBw== dependencies: just-compare "^1.3.0" -"@abp/virtual-file-explorer@^5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@abp/virtual-file-explorer/-/virtual-file-explorer-5.3.3.tgz#c83619a4651af943ac720e6c3a74d1dd5f05d9ac" - integrity sha512-nDnxzcSaEXuJ6jdLuM4VzkJE0w2h8p8AcskambQx0uYGe9+JqKOyu7rXre6le1A7T0f0j+mWQ8aidkyhDuoAkA== +"@abp/virtual-file-explorer@^6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/virtual-file-explorer/-/virtual-file-explorer-6.0.0-rc.1.tgz#82185af45c12fd25453d0926f8f89a43d01fdfbc" + integrity sha512-P6CHOlUwvdCAdKUJiJX3SZeIaz8sat+VuBZfR2ITKFc7hJ+/XuZ5LyCWnulPOqjmpqSibyq2tili3OBgC9hlEQ== dependencies: - "@abp/clipboard" "~5.3.3" - "@abp/prismjs" "~5.3.3" + "@abp/clipboard" "~6.0.0-rc.1" + "@abp/prismjs" "~6.0.0-rc.1" "@fortawesome/fontawesome-free@^5.15.4": version "5.15.4" diff --git a/npm/lerna.json b/npm/lerna.json index adc2ff5ac1..64c792f8e5 100644 --- a/npm/lerna.json +++ b/npm/lerna.json @@ -1,5 +1,5 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "packages": [ "packs/*" ], diff --git a/npm/ng-packs/lerna.version.json b/npm/ng-packs/lerna.version.json index fc0832ff37..c189ec5f73 100644 --- a/npm/ng-packs/lerna.version.json +++ b/npm/ng-packs/lerna.version.json @@ -1,5 +1,5 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "packages": [ "packages/*" ], diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index 1798f45594..aa558afada 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -38,7 +38,7 @@ }, "private": true, "devDependencies": { - "@abp/utils": "~5.3.3", + "@abp/utils": "~6.0.0-rc.1", "@angular-devkit/build-angular": "13.3.5", "@angular-devkit/build-ng-packagr": "^0.1002.0", "@angular-devkit/schematics-cli": "~12.2.0", @@ -57,17 +57,17 @@ "@angular/platform-browser": "13.3.6", "@angular/platform-browser-dynamic": "13.3.6", "@angular/router": "13.3.6", - "@abp/ng.account": "~5.3.3", - "@abp/ng.account.core": "~5.3.3", - "@abp/ng.core": "~5.3.3", - "@abp/ng.feature-management": "~5.3.3", - "@abp/ng.identity": "~5.3.3", - "@abp/ng.permission-management": "~5.3.3", - "@abp/ng.schematics": "~5.3.3", - "@abp/ng.setting-management": "~5.3.3", - "@abp/ng.tenant-management": "~5.3.3", - "@abp/ng.theme.basic": "~5.3.3", - "@abp/ng.theme.shared": "~5.3.3", + "@abp/ng.account": "~6.0.0-rc.1", + "@abp/ng.account.core": "~6.0.0-rc.1", + "@abp/ng.core": "~6.0.0-rc.1", + "@abp/ng.feature-management": "~6.0.0-rc.1", + "@abp/ng.identity": "~6.0.0-rc.1", + "@abp/ng.permission-management": "~6.0.0-rc.1", + "@abp/ng.schematics": "~6.0.0-rc.1", + "@abp/ng.setting-management": "~6.0.0-rc.1", + "@abp/ng.tenant-management": "~6.0.0-rc.1", + "@abp/ng.theme.basic": "~6.0.0-rc.1", + "@abp/ng.theme.shared": "~6.0.0-rc.1", "@fortawesome/fontawesome-free": "^5.15.4", "@ng-bootstrap/ng-bootstrap": "~12.0.0-beta.4", "@ngneat/spectator": "^10.0.0", diff --git a/npm/ng-packs/packages/account-core/package.json b/npm/ng-packs/packages/account-core/package.json index 0ebfbb0b55..fe918c327d 100644 --- a/npm/ng-packs/packages/account-core/package.json +++ b/npm/ng-packs/packages/account-core/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.account.core", - "version": "5.3.3", + "version": "6.0.0-rc.1", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "peerDependencies": { - "@abp/ng.core": "~5.3.3", - "@abp/ng.theme.shared": "~5.3.3", + "@abp/ng.core": "~6.0.0-rc.1", + "@abp/ng.theme.shared": "~6.0.0-rc.1", "@angular/common": ">=12.0.0", "@angular/core": ">=12.0.0" }, diff --git a/npm/ng-packs/packages/account/package.json b/npm/ng-packs/packages/account/package.json index f528c541b5..a5408c4a25 100644 --- a/npm/ng-packs/packages/account/package.json +++ b/npm/ng-packs/packages/account/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.account", - "version": "5.3.3", + "version": "6.0.0-rc.1", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.account.core": "~5.3.3", - "@abp/ng.theme.shared": "~5.3.3", + "@abp/ng.account.core": "~6.0.0-rc.1", + "@abp/ng.theme.shared": "~6.0.0-rc.1", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/components/package.json b/npm/ng-packs/packages/components/package.json index d62faa06d4..cde60867d8 100644 --- a/npm/ng-packs/packages/components/package.json +++ b/npm/ng-packs/packages/components/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.components", - "version": "5.3.3", + "version": "6.0.0-rc.1", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "peerDependencies": { - "@abp/ng.core": ">=5.3.3", - "@abp/ng.theme.shared": ">=5.3.3", + "@abp/ng.core": ">=6.0.0-rc.1", + "@abp/ng.theme.shared": ">=6.0.0-rc.1", "@ng-bootstrap/ng-bootstrap": ">=10.0.0" }, "dependencies": { diff --git a/npm/ng-packs/packages/core/package.json b/npm/ng-packs/packages/core/package.json index f82669b12f..980c3de2c3 100644 --- a/npm/ng-packs/packages/core/package.json +++ b/npm/ng-packs/packages/core/package.json @@ -1,13 +1,13 @@ { "name": "@abp/ng.core", - "version": "5.3.3", + "version": "6.0.0-rc.1", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/utils": "~5.3.3", + "@abp/utils": "~6.0.0-rc.1", "angular-oauth2-oidc": "^13.0.1", "just-clone": "^3.2.1", "just-compare": "^1.4.0", diff --git a/npm/ng-packs/packages/feature-management/package.json b/npm/ng-packs/packages/feature-management/package.json index aa5dcc822f..bdfd8deab0 100644 --- a/npm/ng-packs/packages/feature-management/package.json +++ b/npm/ng-packs/packages/feature-management/package.json @@ -1,13 +1,13 @@ { "name": "@abp/ng.feature-management", - "version": "5.3.3", + "version": "6.0.0-rc.1", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.theme.shared": "~5.3.3", + "@abp/ng.theme.shared": "~6.0.0-rc.1", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/identity/package.json b/npm/ng-packs/packages/identity/package.json index ee0e610e33..a742f6ff71 100644 --- a/npm/ng-packs/packages/identity/package.json +++ b/npm/ng-packs/packages/identity/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.identity", - "version": "5.3.3", + "version": "6.0.0-rc.1", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.permission-management": "~5.3.3", - "@abp/ng.theme.shared": "~5.3.3", + "@abp/ng.permission-management": "~6.0.0-rc.1", + "@abp/ng.theme.shared": "~6.0.0-rc.1", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/permission-management/package.json b/npm/ng-packs/packages/permission-management/package.json index ee8a3aed8d..2a3196dae9 100644 --- a/npm/ng-packs/packages/permission-management/package.json +++ b/npm/ng-packs/packages/permission-management/package.json @@ -1,13 +1,13 @@ { "name": "@abp/ng.permission-management", - "version": "5.3.3", + "version": "6.0.0-rc.1", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.theme.shared": "~5.3.3", + "@abp/ng.theme.shared": "~6.0.0-rc.1", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/schematics/package.json b/npm/ng-packs/packages/schematics/package.json index c7ec460ffe..5fb9c679f5 100644 --- a/npm/ng-packs/packages/schematics/package.json +++ b/npm/ng-packs/packages/schematics/package.json @@ -1,6 +1,6 @@ { "name": "@abp/ng.schematics", - "version": "5.3.3", + "version": "6.0.0-rc.1", "description": "Schematics that works with ABP Backend", "keywords": [ "schematics" diff --git a/npm/ng-packs/packages/setting-management/package.json b/npm/ng-packs/packages/setting-management/package.json index f051b7e297..bfca6b3d88 100644 --- a/npm/ng-packs/packages/setting-management/package.json +++ b/npm/ng-packs/packages/setting-management/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.setting-management", - "version": "5.3.3", + "version": "6.0.0-rc.1", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.components": "~5.3.3", - "@abp/ng.theme.shared": "~5.3.3", + "@abp/ng.components": "~6.0.0-rc.1", + "@abp/ng.theme.shared": "~6.0.0-rc.1", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/tenant-management/package.json b/npm/ng-packs/packages/tenant-management/package.json index ede0dce957..e79ee42c84 100644 --- a/npm/ng-packs/packages/tenant-management/package.json +++ b/npm/ng-packs/packages/tenant-management/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.tenant-management", - "version": "5.3.3", + "version": "6.0.0-rc.1", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.feature-management": "~5.3.3", - "@abp/ng.theme.shared": "~5.3.3", + "@abp/ng.feature-management": "~6.0.0-rc.1", + "@abp/ng.theme.shared": "~6.0.0-rc.1", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/theme-basic/package.json b/npm/ng-packs/packages/theme-basic/package.json index 9b01eb5ed3..7e3ae18d7b 100644 --- a/npm/ng-packs/packages/theme-basic/package.json +++ b/npm/ng-packs/packages/theme-basic/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.theme.basic", - "version": "5.3.3", + "version": "6.0.0-rc.1", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.account.core": "~5.3.3", - "@abp/ng.theme.shared": "~5.3.3", + "@abp/ng.account.core": "~6.0.0-rc.1", + "@abp/ng.theme.shared": "~6.0.0-rc.1", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/theme-shared/package.json b/npm/ng-packs/packages/theme-shared/package.json index 825c9cb339..f8e650ba6c 100644 --- a/npm/ng-packs/packages/theme-shared/package.json +++ b/npm/ng-packs/packages/theme-shared/package.json @@ -1,13 +1,13 @@ { "name": "@abp/ng.theme.shared", - "version": "5.3.3", + "version": "6.0.0-rc.1", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.core": "~5.3.3", + "@abp/ng.core": "~6.0.0-rc.1", "@fortawesome/fontawesome-free": "^5.15.4", "@ng-bootstrap/ng-bootstrap": "~12.0.0-beta.4", "@ngx-validate/core": "^0.1.2", diff --git a/npm/packs/anchor-js/package.json b/npm/packs/anchor-js/package.json index dffd75f01c..bfd1d9ab7f 100644 --- a/npm/packs/anchor-js/package.json +++ b/npm/packs/anchor-js/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/anchor-js", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~5.3.3", + "@abp/core": "~6.0.0-rc.1", "anchor-js": "^4.3.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/aspnetcore.components.server.basictheme/package.json b/npm/packs/aspnetcore.components.server.basictheme/package.json index fe0a682fd1..664b832a54 100644 --- a/npm/packs/aspnetcore.components.server.basictheme/package.json +++ b/npm/packs/aspnetcore.components.server.basictheme/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/aspnetcore.components.server.basictheme", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/aspnetcore.components.server.theming": "~5.3.3" + "@abp/aspnetcore.components.server.theming": "~6.0.0-rc.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/aspnetcore.components.server.theming/package.json b/npm/packs/aspnetcore.components.server.theming/package.json index b5acb5f662..fc365dc136 100644 --- a/npm/packs/aspnetcore.components.server.theming/package.json +++ b/npm/packs/aspnetcore.components.server.theming/package.json @@ -1,12 +1,12 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/aspnetcore.components.server.theming", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/bootstrap": "~5.3.3", - "@abp/font-awesome": "~5.3.3" + "@abp/bootstrap": "~6.0.0-rc.1", + "@abp/font-awesome": "~6.0.0-rc.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json b/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json index 2dce8485d7..2415dc7c70 100644 --- a/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json +++ b/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/aspnetcore.mvc.ui.theme.basic", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.shared": "~5.3.3" + "@abp/aspnetcore.mvc.ui.theme.shared": "~6.0.0-rc.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json index 480cb0b3fc..f3873de4fc 100644 --- a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json +++ b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/aspnetcore.mvc.ui.theme.shared", "repository": { "type": "git", @@ -10,20 +10,20 @@ "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui": "~5.3.3", - "@abp/bootstrap": "~5.3.3", - "@abp/bootstrap-datepicker": "~5.3.3", - "@abp/datatables.net-bs5": "~5.3.3", - "@abp/font-awesome": "~5.3.3", - "@abp/jquery-form": "~5.3.3", - "@abp/jquery-validation-unobtrusive": "~5.3.3", - "@abp/lodash": "~5.3.3", - "@abp/luxon": "~5.3.3", - "@abp/malihu-custom-scrollbar-plugin": "~5.3.3", - "@abp/select2": "~5.3.3", - "@abp/sweetalert2": "~5.3.3", - "@abp/timeago": "~5.3.3", - "@abp/toastr": "~5.3.3" + "@abp/aspnetcore.mvc.ui": "~6.0.0-rc.1", + "@abp/bootstrap": "~6.0.0-rc.1", + "@abp/bootstrap-datepicker": "~6.0.0-rc.1", + "@abp/datatables.net-bs5": "~6.0.0-rc.1", + "@abp/font-awesome": "~6.0.0-rc.1", + "@abp/jquery-form": "~6.0.0-rc.1", + "@abp/jquery-validation-unobtrusive": "~6.0.0-rc.1", + "@abp/lodash": "~6.0.0-rc.1", + "@abp/luxon": "~6.0.0-rc.1", + "@abp/malihu-custom-scrollbar-plugin": "~6.0.0-rc.1", + "@abp/select2": "~6.0.0-rc.1", + "@abp/sweetalert2": "~6.0.0-rc.1", + "@abp/timeago": "~6.0.0-rc.1", + "@abp/toastr": "~6.0.0-rc.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/aspnetcore.mvc.ui/package-lock.json b/npm/packs/aspnetcore.mvc.ui/package-lock.json index 0f185e72ce..02635b023a 100644 --- a/npm/packs/aspnetcore.mvc.ui/package-lock.json +++ b/npm/packs/aspnetcore.mvc.ui/package-lock.json @@ -1,6 +1,6 @@ { "name": "@abp/aspnetcore.mvc.ui", - "version": "5.3.3", + "version": "6.0.0-rc.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/npm/packs/aspnetcore.mvc.ui/package.json b/npm/packs/aspnetcore.mvc.ui/package.json index 7cee754cd4..ea6bd0718a 100644 --- a/npm/packs/aspnetcore.mvc.ui/package.json +++ b/npm/packs/aspnetcore.mvc.ui/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/aspnetcore.mvc.ui", "repository": { "type": "git", diff --git a/npm/packs/blogging/package.json b/npm/packs/blogging/package.json index b24d4a05a2..9c008cceae 100644 --- a/npm/packs/blogging/package.json +++ b/npm/packs/blogging/package.json @@ -1,14 +1,14 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/blogging", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.shared": "~5.3.3", - "@abp/owl.carousel": "~5.3.3", - "@abp/prismjs": "~5.3.3", - "@abp/tui-editor": "~5.3.3" + "@abp/aspnetcore.mvc.ui.theme.shared": "~6.0.0-rc.1", + "@abp/owl.carousel": "~6.0.0-rc.1", + "@abp/prismjs": "~6.0.0-rc.1", + "@abp/tui-editor": "~6.0.0-rc.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/bootstrap-datepicker/package.json b/npm/packs/bootstrap-datepicker/package.json index 94c1856632..2e09bb4a47 100644 --- a/npm/packs/bootstrap-datepicker/package.json +++ b/npm/packs/bootstrap-datepicker/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/bootstrap-datepicker", "repository": { "type": "git", diff --git a/npm/packs/bootstrap/package.json b/npm/packs/bootstrap/package.json index 114ebf5db5..cb6d67c717 100644 --- a/npm/packs/bootstrap/package.json +++ b/npm/packs/bootstrap/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/bootstrap", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~5.3.3", + "@abp/core": "~6.0.0-rc.1", "bootstrap": "^5.1.3" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/chart.js/package.json b/npm/packs/chart.js/package.json index eb09f1b427..18fa110ff9 100644 --- a/npm/packs/chart.js/package.json +++ b/npm/packs/chart.js/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/chart.js", "publishConfig": { "access": "public" diff --git a/npm/packs/clipboard/package.json b/npm/packs/clipboard/package.json index e3722da71f..a0518da63d 100644 --- a/npm/packs/clipboard/package.json +++ b/npm/packs/clipboard/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/clipboard", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~5.3.3", + "@abp/core": "~6.0.0-rc.1", "clipboard": "^2.0.8" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/cms-kit.admin/package.json b/npm/packs/cms-kit.admin/package.json index 43bd6d1447..eddacf0cb5 100644 --- a/npm/packs/cms-kit.admin/package.json +++ b/npm/packs/cms-kit.admin/package.json @@ -1,15 +1,15 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/cms-kit.admin", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/codemirror": "~5.3.3", - "@abp/jstree": "~5.3.3", - "@abp/slugify": "~5.3.3", - "@abp/tui-editor": "~5.3.3", - "@abp/uppy": "~5.3.3" + "@abp/codemirror": "~6.0.0-rc.1", + "@abp/jstree": "~6.0.0-rc.1", + "@abp/slugify": "~6.0.0-rc.1", + "@abp/tui-editor": "~6.0.0-rc.1", + "@abp/uppy": "~6.0.0-rc.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/cms-kit.public/package.json b/npm/packs/cms-kit.public/package.json index df18c56c54..1146659067 100644 --- a/npm/packs/cms-kit.public/package.json +++ b/npm/packs/cms-kit.public/package.json @@ -1,12 +1,12 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/cms-kit.public", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/highlight.js": "~5.3.3", - "@abp/star-rating-svg": "~5.3.3" + "@abp/highlight.js": "~6.0.0-rc.1", + "@abp/star-rating-svg": "~6.0.0-rc.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/cms-kit/package.json b/npm/packs/cms-kit/package.json index cf294e0880..9ffe1dbe02 100644 --- a/npm/packs/cms-kit/package.json +++ b/npm/packs/cms-kit/package.json @@ -1,12 +1,12 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/cms-kit", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/cms-kit.admin": "~5.3.3", - "@abp/cms-kit.public": "~5.3.3" + "@abp/cms-kit.admin": "~6.0.0-rc.1", + "@abp/cms-kit.public": "~6.0.0-rc.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/codemirror/package.json b/npm/packs/codemirror/package.json index 34d31a7aa9..710cc7d44e 100644 --- a/npm/packs/codemirror/package.json +++ b/npm/packs/codemirror/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/codemirror", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~5.3.3", + "@abp/core": "~6.0.0-rc.1", "codemirror": "^5.65.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/core/package.json b/npm/packs/core/package.json index 01b04e0cb8..1dd7919564 100644 --- a/npm/packs/core/package.json +++ b/npm/packs/core/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/core", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/utils": "~5.3.3" + "@abp/utils": "~6.0.0-rc.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/cropperjs/package.json b/npm/packs/cropperjs/package.json index 8db8df9a43..c8a7c1eedf 100644 --- a/npm/packs/cropperjs/package.json +++ b/npm/packs/cropperjs/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/cropperjs", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~5.3.3", + "@abp/core": "~6.0.0-rc.1", "cropperjs": "^1.5.12" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/datatables.net-bs4/package.json b/npm/packs/datatables.net-bs4/package.json index 8b50ef0c8f..4b8a84013c 100644 --- a/npm/packs/datatables.net-bs4/package.json +++ b/npm/packs/datatables.net-bs4/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/datatables.net-bs4", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/datatables.net": "~5.3.3", + "@abp/datatables.net": "~6.0.0-rc.1", "datatables.net-bs4": "^1.11.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/datatables.net-bs5/package.json b/npm/packs/datatables.net-bs5/package.json index 13c728cacc..2564261f9a 100644 --- a/npm/packs/datatables.net-bs5/package.json +++ b/npm/packs/datatables.net-bs5/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/datatables.net-bs5", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/datatables.net": "~5.3.3", + "@abp/datatables.net": "~6.0.0-rc.1", "datatables.net-bs5": "^1.11.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/datatables.net/package.json b/npm/packs/datatables.net/package.json index 6e2beba898..adebb54f3d 100644 --- a/npm/packs/datatables.net/package.json +++ b/npm/packs/datatables.net/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/datatables.net", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~5.3.3", + "@abp/jquery": "~6.0.0-rc.1", "datatables.net": "^1.11.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/docs/package.json b/npm/packs/docs/package.json index 62b08eb06b..d510006f50 100644 --- a/npm/packs/docs/package.json +++ b/npm/packs/docs/package.json @@ -1,15 +1,15 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/docs", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/anchor-js": "~5.3.3", - "@abp/clipboard": "~5.3.3", - "@abp/malihu-custom-scrollbar-plugin": "~5.3.3", - "@abp/popper.js": "~5.3.3", - "@abp/prismjs": "~5.3.3" + "@abp/anchor-js": "~6.0.0-rc.1", + "@abp/clipboard": "~6.0.0-rc.1", + "@abp/malihu-custom-scrollbar-plugin": "~6.0.0-rc.1", + "@abp/popper.js": "~6.0.0-rc.1", + "@abp/prismjs": "~6.0.0-rc.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/flag-icon-css/package.json b/npm/packs/flag-icon-css/package.json index 0335336794..2f61082155 100644 --- a/npm/packs/flag-icon-css/package.json +++ b/npm/packs/flag-icon-css/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/flag-icon-css", "publishConfig": { "access": "public" diff --git a/npm/packs/font-awesome/package.json b/npm/packs/font-awesome/package.json index fcbe50cd67..a7d397b700 100644 --- a/npm/packs/font-awesome/package.json +++ b/npm/packs/font-awesome/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/font-awesome", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~5.3.3", + "@abp/core": "~6.0.0-rc.1", "@fortawesome/fontawesome-free": "^5.15.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/highlight.js/package.json b/npm/packs/highlight.js/package.json index d01ba44299..d9a2d65ca8 100644 --- a/npm/packs/highlight.js/package.json +++ b/npm/packs/highlight.js/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/highlight.js", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~5.3.3", + "@abp/core": "~6.0.0-rc.1", "@highlightjs/cdn-assets": "~11.4.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/jquery-form/package.json b/npm/packs/jquery-form/package.json index 79c31c5258..cae9ae53d0 100644 --- a/npm/packs/jquery-form/package.json +++ b/npm/packs/jquery-form/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/jquery-form", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~5.3.3", + "@abp/jquery": "~6.0.0-rc.1", "jquery-form": "^4.3.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/jquery-validation-unobtrusive/package.json b/npm/packs/jquery-validation-unobtrusive/package.json index fd062c3bdd..973b792bfa 100644 --- a/npm/packs/jquery-validation-unobtrusive/package.json +++ b/npm/packs/jquery-validation-unobtrusive/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/jquery-validation-unobtrusive", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery-validation": "~5.3.3", + "@abp/jquery-validation": "~6.0.0-rc.1", "jquery-validation-unobtrusive": "^3.2.12" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/jquery-validation/package.json b/npm/packs/jquery-validation/package.json index 431e33c965..bafac9ffeb 100644 --- a/npm/packs/jquery-validation/package.json +++ b/npm/packs/jquery-validation/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/jquery-validation", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~5.3.3", + "@abp/jquery": "~6.0.0-rc.1", "jquery-validation": "^1.19.3" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/jquery/package.json b/npm/packs/jquery/package.json index 0235b146fe..0f482011d4 100644 --- a/npm/packs/jquery/package.json +++ b/npm/packs/jquery/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/jquery", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~5.3.3", + "@abp/core": "~6.0.0-rc.1", "jquery": "~3.6.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/jstree/package.json b/npm/packs/jstree/package.json index 1a0cf850ca..9cf5309147 100644 --- a/npm/packs/jstree/package.json +++ b/npm/packs/jstree/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/jstree", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "~5.3.3", + "@abp/jquery": "~6.0.0-rc.1", "jstree": "^3.3.12" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/lodash/package.json b/npm/packs/lodash/package.json index f662fdc435..cf96b1a3d7 100644 --- a/npm/packs/lodash/package.json +++ b/npm/packs/lodash/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/lodash", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~5.3.3", + "@abp/core": "~6.0.0-rc.1", "lodash": "^4.17.21" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/luxon/package.json b/npm/packs/luxon/package.json index fdff4d4f10..e953d76243 100644 --- a/npm/packs/luxon/package.json +++ b/npm/packs/luxon/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/luxon", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~5.3.3", + "@abp/core": "~6.0.0-rc.1", "luxon": "^2.3.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/malihu-custom-scrollbar-plugin/package.json b/npm/packs/malihu-custom-scrollbar-plugin/package.json index 21795b0183..8b4010f34e 100644 --- a/npm/packs/malihu-custom-scrollbar-plugin/package.json +++ b/npm/packs/malihu-custom-scrollbar-plugin/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/malihu-custom-scrollbar-plugin", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~5.3.3", + "@abp/core": "~6.0.0-rc.1", "malihu-custom-scrollbar-plugin": "^3.1.5" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/markdown-it/package.json b/npm/packs/markdown-it/package.json index 160b6dbc8c..9cff8f9754 100644 --- a/npm/packs/markdown-it/package.json +++ b/npm/packs/markdown-it/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/markdown-it", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~5.3.3", + "@abp/core": "~6.0.0-rc.1", "markdown-it": "^12.3.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/owl.carousel/package.json b/npm/packs/owl.carousel/package.json index bff1ca0e92..96e5c9bd9b 100644 --- a/npm/packs/owl.carousel/package.json +++ b/npm/packs/owl.carousel/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/owl.carousel", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~5.3.3", + "@abp/core": "~6.0.0-rc.1", "owl.carousel": "^2.3.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/popper.js/package.json b/npm/packs/popper.js/package.json index 7d276c50f3..028b4d58ed 100644 --- a/npm/packs/popper.js/package.json +++ b/npm/packs/popper.js/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/popper.js", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~5.3.3", + "@abp/core": "~6.0.0-rc.1", "@popperjs/core": "^2.11.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/prismjs/package.json b/npm/packs/prismjs/package.json index 50cb5f72bc..5b8540e2f8 100644 --- a/npm/packs/prismjs/package.json +++ b/npm/packs/prismjs/package.json @@ -1,12 +1,12 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/prismjs", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/clipboard": "~5.3.3", - "@abp/core": "~5.3.3", + "@abp/clipboard": "~6.0.0-rc.1", + "@abp/core": "~6.0.0-rc.1", "prismjs": "^1.26.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/select2/package.json b/npm/packs/select2/package.json index deb5b6837f..8ca2d465db 100644 --- a/npm/packs/select2/package.json +++ b/npm/packs/select2/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/select2", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~5.3.3", + "@abp/core": "~6.0.0-rc.1", "select2": "^4.0.13" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/signalr/package.json b/npm/packs/signalr/package.json index 3de0512203..deec8c4b77 100644 --- a/npm/packs/signalr/package.json +++ b/npm/packs/signalr/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/signalr", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~5.3.3", + "@abp/core": "~6.0.0-rc.1", "@microsoft/signalr": "~6.0.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/slugify/package.json b/npm/packs/slugify/package.json index 5e3c7693a1..2788188c52 100644 --- a/npm/packs/slugify/package.json +++ b/npm/packs/slugify/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/slugify", "publishConfig": { "access": "public" diff --git a/npm/packs/star-rating-svg/package.json b/npm/packs/star-rating-svg/package.json index c2467e72fe..dcaa8c4a15 100644 --- a/npm/packs/star-rating-svg/package.json +++ b/npm/packs/star-rating-svg/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/star-rating-svg", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "~5.3.3", + "@abp/jquery": "~6.0.0-rc.1", "star-rating-svg": "^3.5.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/sweetalert2/package.json b/npm/packs/sweetalert2/package.json index fccf68a900..b20243291f 100644 --- a/npm/packs/sweetalert2/package.json +++ b/npm/packs/sweetalert2/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/sweetalert2", "publishConfig": { "access": "public" @@ -10,7 +10,7 @@ "directory": "npm/packs/sweetalert2" }, "dependencies": { - "@abp/core": "~5.3.3", + "@abp/core": "~6.0.0-rc.1", "sweetalert2": "^11.3.6" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/timeago/package.json b/npm/packs/timeago/package.json index 4338fce963..1ebe533058 100644 --- a/npm/packs/timeago/package.json +++ b/npm/packs/timeago/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/timeago", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~5.3.3", + "@abp/jquery": "~6.0.0-rc.1", "timeago": "^1.6.7" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/toastr/package.json b/npm/packs/toastr/package.json index 637b90440a..c8793bdbd7 100644 --- a/npm/packs/toastr/package.json +++ b/npm/packs/toastr/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/toastr", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~5.3.3", + "@abp/jquery": "~6.0.0-rc.1", "toastr": "^2.1.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/tui-editor/package.json b/npm/packs/tui-editor/package.json index 3c1fb38d02..c6f007ec32 100644 --- a/npm/packs/tui-editor/package.json +++ b/npm/packs/tui-editor/package.json @@ -1,12 +1,12 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/tui-editor", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "~5.3.3", - "@abp/prismjs": "~5.3.3" + "@abp/jquery": "~6.0.0-rc.1", + "@abp/prismjs": "~6.0.0-rc.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/uppy/package.json b/npm/packs/uppy/package.json index a1d87027cd..6a9df41f95 100644 --- a/npm/packs/uppy/package.json +++ b/npm/packs/uppy/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/uppy", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~5.3.3", + "@abp/core": "~6.0.0-rc.1", "uppy": "^1.16.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/utils/package.json b/npm/packs/utils/package.json index 7719548588..68ab12fa89 100644 --- a/npm/packs/utils/package.json +++ b/npm/packs/utils/package.json @@ -1,6 +1,6 @@ { "name": "@abp/utils", - "version": "5.3.3", + "version": "6.0.0-rc.1", "scripts": { "prepublishOnly": "yarn install --ignore-scripts && node prepublish.js", "ng": "ng", diff --git a/npm/packs/vee-validate/package.json b/npm/packs/vee-validate/package.json index fe08c38595..47d9ebdfb9 100644 --- a/npm/packs/vee-validate/package.json +++ b/npm/packs/vee-validate/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/vee-validate", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/vue": "~5.3.3", + "@abp/vue": "~6.0.0-rc.1", "vee-validate": "~3.4.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/virtual-file-explorer/package.json b/npm/packs/virtual-file-explorer/package.json index 72599b591d..fa2923cd7c 100644 --- a/npm/packs/virtual-file-explorer/package.json +++ b/npm/packs/virtual-file-explorer/package.json @@ -1,12 +1,12 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/virtual-file-explorer", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/clipboard": "~5.3.3", - "@abp/prismjs": "~5.3.3" + "@abp/clipboard": "~6.0.0-rc.1", + "@abp/prismjs": "~6.0.0-rc.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/vue/package.json b/npm/packs/vue/package.json index c9fa28e7ba..1aaec722a4 100644 --- a/npm/packs/vue/package.json +++ b/npm/packs/vue/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.3", + "version": "6.0.0-rc.1", "name": "@abp/vue", "publishConfig": { "access": "public" diff --git a/nupkg/0 b/nupkg/0 new file mode 100644 index 0000000000..cf175e3b0b Binary files /dev/null and b/nupkg/0 differ diff --git a/templates/app-nolayers/angular/package.json b/templates/app-nolayers/angular/package.json index bbf74f6761..965aa26499 100644 --- a/templates/app-nolayers/angular/package.json +++ b/templates/app-nolayers/angular/package.json @@ -12,13 +12,13 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~5.3.3", - "@abp/ng.components": "~5.3.3", - "@abp/ng.core": "~5.3.3", - "@abp/ng.identity": "~5.3.3", - "@abp/ng.setting-management": "~5.3.3", - "@abp/ng.tenant-management": "~5.3.3", - "@abp/ng.theme.shared": "~5.3.3", + "@abp/ng.account": "~6.0.0-rc.1", + "@abp/ng.components": "~6.0.0-rc.1", + "@abp/ng.core": "~6.0.0-rc.1", + "@abp/ng.identity": "~6.0.0-rc.1", + "@abp/ng.setting-management": "~6.0.0-rc.1", + "@abp/ng.tenant-management": "~6.0.0-rc.1", + "@abp/ng.theme.shared": "~6.0.0-rc.1", "@abp/ng.theme.lepton-x": "~1.0.0-rc.1", "@angular/animations": "~13.1.1", "@angular/common": "~13.1.1", @@ -35,7 +35,7 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@abp/ng.schematics": "~5.3.3", + "@abp/ng.schematics": "~6.0.0-rc.1", "@angular-devkit/build-angular": "~13.1.2", "@angular-eslint/builder": "~13.0.1", "@angular-eslint/eslint-plugin": "~13.0.1", diff --git a/templates/app/angular/package.json b/templates/app/angular/package.json index 1020b00571..5bc08b1acb 100644 --- a/templates/app/angular/package.json +++ b/templates/app/angular/package.json @@ -12,13 +12,13 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~5.3.3", - "@abp/ng.components": "~5.3.3", - "@abp/ng.core": "~5.3.3", - "@abp/ng.identity": "~5.3.3", - "@abp/ng.setting-management": "~5.3.3", - "@abp/ng.tenant-management": "~5.3.3", - "@abp/ng.theme.shared": "~5.3.3", + "@abp/ng.account": "~6.0.0-rc.1", + "@abp/ng.components": "~6.0.0-rc.1", + "@abp/ng.core": "~6.0.0-rc.1", + "@abp/ng.identity": "~6.0.0-rc.1", + "@abp/ng.setting-management": "~6.0.0-rc.1", + "@abp/ng.tenant-management": "~6.0.0-rc.1", + "@abp/ng.theme.shared": "~6.0.0-rc.1", "@abp/ng.theme.lepton-x": "~1.0.0-rc.1", "@angular/animations": "~13.3.3", "@angular/common": "~13.3.3", @@ -35,7 +35,7 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@abp/ng.schematics": "~5.3.3", + "@abp/ng.schematics": "~6.0.0-rc.1", "@angular-devkit/build-angular": "~13.3.3", "@angular-eslint/builder": "~13.2.1", "@angular-eslint/eslint-plugin": "~13.2.1", diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyProjectNameAuthServerModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyProjectNameAuthServerModule.cs index 9a6e49e32a..57d4d22992 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyProjectNameAuthServerModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyProjectNameAuthServerModule.cs @@ -196,7 +196,8 @@ public class MyProjectNameAuthServerModule : AbpModule app.UseRouting(); app.UseCors(); app.UseAuthentication(); - + app.UseAbpOpenIddictValidation(); + if (MultiTenancyConsts.IsEnabled) { app.UseMultiTenancy(); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/package.json deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj index c456030c2a..1ca867ba78 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj @@ -52,7 +52,7 @@ - +
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs index fb5079b2e9..bc47df706c 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs @@ -11,6 +11,7 @@ using MyCompanyName.MyProjectName.Localization; using MyCompanyName.MyProjectName.MultiTenancy; using MyCompanyName.MyProjectName.Web.Menus; using Microsoft.OpenApi.Models; +using OpenIddict.Validation.AspNetCore; using Volo.Abp; using Volo.Abp.Account.Web; using Volo.Abp.AspNetCore.Mvc; @@ -47,7 +48,7 @@ namespace MyCompanyName.MyProjectName.Web; typeof(AbpAutofacModule), typeof(AbpIdentityWebModule), typeof(AbpSettingManagementWebModule), - typeof(AbpAccountWebModule), + typeof(AbpAccountWebOpenIddictModule), typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule), typeof(AbpTenantManagementWebModule), typeof(AbpAspNetCoreSerilogModule), @@ -68,6 +69,16 @@ public class MyProjectNameWebModule : AbpModule typeof(MyProjectNameWebModule).Assembly ); }); + + PreConfigure(builder => + { + builder.AddValidation(options => + { + options.AddAudiences("MyProjectName"); + options.UseLocalServer(); + options.UseAspNetCore(); + }); + }); } public override void ConfigureServices(ServiceConfigurationContext context) @@ -75,6 +86,7 @@ public class MyProjectNameWebModule : AbpModule var hostingEnvironment = context.Services.GetHostingEnvironment(); var configuration = context.Services.GetConfiguration(); + ConfigureAuthentication(context); ConfigureUrls(configuration); ConfigureBundles(); ConfigureAutoMapper(); @@ -84,6 +96,11 @@ public class MyProjectNameWebModule : AbpModule ConfigureAutoApiControllers(); ConfigureSwaggerServices(context.Services); } + + private void ConfigureAuthentication(ServiceConfigurationContext context) + { + context.Services.ForwardIdentityAuthenticationForBearer(OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme); + } private void ConfigureUrls(IConfiguration configuration) { @@ -106,7 +123,7 @@ public class MyProjectNameWebModule : AbpModule ); }); } - + private void ConfigureAutoMapper() { Configure(options => @@ -130,7 +147,7 @@ public class MyProjectNameWebModule : AbpModule options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}permission-management{0}src{0}Volo.Abp.PermissionManagement.Web", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}feature-management{0}src{0}Volo.Abp.FeatureManagement.Web", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}identity{0}src{0}Volo.Abp.Identity.Web", Path.DirectorySeparatorChar))); - options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}account{0}src{0}Volo.Abp.Account.Web", Path.DirectorySeparatorChar))); + options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}account{0}src{0}Volo.Abp.Account.Web.OpenIddict", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}tenant-management{0}src{0}Volo.Abp.TenantManagement.Web", Path.DirectorySeparatorChar))); // options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}MyCompanyName.MyProjectName.Domain.Shared")); @@ -218,6 +235,7 @@ public class MyProjectNameWebModule : AbpModule app.UseStaticFiles(); app.UseRouting(); app.UseAuthentication(); + app.UseAbpOpenIddictValidation(); if (MultiTenancyConsts.IsEnabled) { diff --git a/templates/module/angular/package.json b/templates/module/angular/package.json index 1018f2f24c..e606d547b0 100644 --- a/templates/module/angular/package.json +++ b/templates/module/angular/package.json @@ -15,14 +15,14 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~5.3.3", - "@abp/ng.components": "~5.3.3", - "@abp/ng.core": "~5.3.3", - "@abp/ng.identity": "~5.3.3", - "@abp/ng.setting-management": "~5.3.3", - "@abp/ng.tenant-management": "~5.3.3", - "@abp/ng.theme.basic": "~5.3.3", - "@abp/ng.theme.shared": "~5.3.3", + "@abp/ng.account": "~6.0.0-rc.1", + "@abp/ng.components": "~6.0.0-rc.1", + "@abp/ng.core": "~6.0.0-rc.1", + "@abp/ng.identity": "~6.0.0-rc.1", + "@abp/ng.setting-management": "~6.0.0-rc.1", + "@abp/ng.tenant-management": "~6.0.0-rc.1", + "@abp/ng.theme.basic": "~6.0.0-rc.1", + "@abp/ng.theme.shared": "~6.0.0-rc.1", "@angular/animations": "~13.3.3", "@angular/common": "~13.3.3", "@angular/compiler": "~13.3.3", @@ -37,7 +37,7 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@abp/ng.schematics": "~5.3.3", + "@abp/ng.schematics": "~6.0.0-rc.1", "@angular-devkit/build-angular": "~13.3.3", "@angular-eslint/builder": "~13.2.1", "@angular-eslint/eslint-plugin": "~13.2.1", diff --git a/templates/module/angular/projects/my-project-name/package.json b/templates/module/angular/projects/my-project-name/package.json index 945dcec55b..7eedfe88ad 100644 --- a/templates/module/angular/projects/my-project-name/package.json +++ b/templates/module/angular/projects/my-project-name/package.json @@ -4,8 +4,8 @@ "peerDependencies": { "@angular/common": ">=9", "@angular/core": ">=9", - "@abp/ng.core": ">=5.3.3", - "@abp/ng.theme.shared": ">=5.3.3" + "@abp/ng.core": ">=6.0.0-rc.1", + "@abp/ng.theme.shared": ">=6.0.0-rc.1" }, "dependencies": { "tslib": "^2.1.0" diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json index cddb128fd5..ea318fd183 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json @@ -3,6 +3,6 @@ "name": "my-app-authserver", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.1" } } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json index 25b2156f2f..37dd94844f 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.3", - "@abp/aspnetcore.components.server.basictheme": "^5.3.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.1", + "@abp/aspnetcore.components.server.basictheme": "^6.0.0-rc.1" } } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json index 534c364bfe..f677733547 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.1" } } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json index 534c364bfe..f677733547 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.1" } }