From 6f49eebe968f552e34ace7a1242c8451095b4184 Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Fri, 10 Dec 2021 14:10:36 +0300 Subject: [PATCH 1/3] Update Abp-5_0-Angular.md --- docs/en/Migration-Guides/Abp-5_0-Angular.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/en/Migration-Guides/Abp-5_0-Angular.md b/docs/en/Migration-Guides/Abp-5_0-Angular.md index 2a24f77b65..8099c8acd4 100644 --- a/docs/en/Migration-Guides/Abp-5_0-Angular.md +++ b/docs/en/Migration-Guides/Abp-5_0-Angular.md @@ -20,6 +20,8 @@ See the overall list of breaking changes: The new ABP Angular UI is based on Angular v12. We started to compile Angular UI packages with the Ivy compilation. Therefore, **new packages only work with Angular v12**. If you are still on the older version of Angular v12, you have to update to Angular v12. The update is usually very easy. See [Angular Update Guide](https://update.angular.io/?l=2&v=11.0-12.0) for further information. +> **ABP Angular UI is not yet compatible with Angular v13 due to some issues.** + ## Bootstrap 5 ABP 5.0 now works with Bootstrap 5. For details, please refer to the official [migration guide](https://getbootstrap.com/docs/5.0/migration/) provided by Bootstrap. From 25c7db1703b1d1553d3f4576667079c021c3a034 Mon Sep 17 00:00:00 2001 From: Bunyamin Coskuner Date: Fri, 10 Dec 2021 14:49:13 +0300 Subject: [PATCH 2/3] fix: wrong message in modal component --- .../theme-shared/src/lib/components/modal/modal.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts index 175e5f4aff..6c1027c66f 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts @@ -175,8 +175,8 @@ export class ModalComponent implements OnInit, OnDestroy, DismissableModal { this.isConfirmationOpen = true; this.confirmationService .warn( - 'AbpAccount::AreYouSureYouWantToCancelEditingWarningMessage', - 'AbpAccount::AreYouSure', + 'AbpUi::AreYouSureYouWantToCancelEditingWarningMessage', + 'AbpUi::AreYouSure', { dismissible: false }, ) .subscribe((status: Confirmation.Status) => { From 95b198bb966bdb2b183d28d0e8c8d195e884db5a Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Mon, 13 Dec 2021 10:15:55 +0800 Subject: [PATCH 3/3] Update document --- docs/en/Modules/Docs.md | 10 +++++----- docs/en/UI/AspNetCore/Tag-Helpers/Index.md | 2 +- docs/zh-Hans/Modules/Docs.md | 8 ++++---- docs/zh-Hans/UI/AspNetCore/Tag-Helpers/Index.md | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/en/Modules/Docs.md b/docs/en/Modules/Docs.md index f848789176..9653b12618 100644 --- a/docs/en/Modules/Docs.md +++ b/docs/en/Modules/Docs.md @@ -171,7 +171,7 @@ An ABP module must declare `[DependsOn]` attribute if it has a dependency upon a ##### 3.2.2- Adding NPM Package -Open `package.json` and add `@abp/docs": "^2.9.0` as shown below: +Open `package.json` and add `@abp/docs": "^5.0.0` as shown below: ```json { @@ -179,8 +179,8 @@ Open `package.json` and add `@abp/docs": "^2.9.0` as shown below: "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^2.9.0", - "@abp/docs": "^2.9.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "^5.0.0", + "@abp/docs": "^5.0.0" } } ``` @@ -356,12 +356,12 @@ You can use [ABP Framework](https://github.com/abpframework/abp/) GitHub documen - MainWebsiteUrl: `/` -- LatestVersionBranchName: `master` +- LatestVersionBranchName: `dev` For `SQL` databases, you can use the below `T-SQL` command to insert the specified sample into your `DocsProjects` table: ```mssql -INSERT [dbo].[DocsProjects] ([Id], [Name], [ShortName], [Format], [DefaultDocumentName], [NavigationDocumentName], [MinimumVersion], [DocumentStoreType], [ExtraProperties], [MainWebsiteUrl], [LatestVersionBranchName], [ParametersDocumentName]) VALUES (N'12f21123-e08e-4f15-bedb-ae0b2d939658', N'ABP framework (GitHub)', N'abp', N'md', N'Index', N'docs-nav.json', NULL, N'GitHub', N'{"GitHubRootUrl":"https://github.com/abpframework/abp/tree/{version}/docs","GitHubAccessToken":"***","GitHubUserAgent":""}', N'/', N'master', N'') +INSERT [dbo].[DocsProjects] ([Id], [Name], [ShortName], [Format], [DefaultDocumentName], [NavigationDocumentName], [MinimumVersion], [DocumentStoreType], [ExtraProperties], [MainWebsiteUrl], [LatestVersionBranchName], [ParametersDocumentName]) VALUES (N'12f21123-e08e-4f15-bedb-ae0b2d939658', N'ABP framework (GitHub)', N'abp', N'md', N'Index', N'docs-nav.json', NULL, N'GitHub', N'{"GitHubRootUrl":"https://github.com/abpframework/abp/tree/{version}/docs","GitHubAccessToken":"***","GitHubUserAgent":""}', N'/', N'dev', N'') ``` Be aware that `GitHubAccessToken` is masked. It's a private token and you must get your own token and replace the `***` string. diff --git a/docs/en/UI/AspNetCore/Tag-Helpers/Index.md b/docs/en/UI/AspNetCore/Tag-Helpers/Index.md index 5b16d9ccdc..741781cf30 100644 --- a/docs/en/UI/AspNetCore/Tag-Helpers/Index.md +++ b/docs/en/UI/AspNetCore/Tag-Helpers/Index.md @@ -4,7 +4,7 @@ ABP Framework defines a set of **tag helper components** to simply the user inte ## Bootstrap Component Wrappers -Most of the tag helpers are [Bootstrap](https://getbootstrap.com/) (v4+) wrappers. Coding bootstrap is not so easy, not so type-safe and contains too much repetitive HTML tags. ABP Tag Helpers makes it **easier** and **type safe**. +Most of the tag helpers are [Bootstrap](https://getbootstrap.com/) (v5+) wrappers. Coding bootstrap is not so easy, not so type-safe and contains too much repetitive HTML tags. ABP Tag Helpers makes it **easier** and **type safe**. We don't aim to wrap bootstrap components 100%. Writing **native bootstrap style code** is still possible (actually, tag helpers generates native bootstrap code in the end), but we suggest to use the tag helpers wherever possible. diff --git a/docs/zh-Hans/Modules/Docs.md b/docs/zh-Hans/Modules/Docs.md index 7b651fd821..96a4937e53 100644 --- a/docs/zh-Hans/Modules/Docs.md +++ b/docs/zh-Hans/Modules/Docs.md @@ -178,8 +178,8 @@ ABP框架的[文档](docs.abp.io)也是使用的此模块. "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^2.9.0", - "@abp/docs": "^2.9.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "^5.0.0", + "@abp/docs": "^5.0.0" } } ``` @@ -355,12 +355,12 @@ There are no projects yet! - MainWebsiteUrl: `/` -- LatestVersionBranchName: `master` +- LatestVersionBranchName: `dev` 对于 `SQL` 数据库,你可以使用下面的 `T-SQL` 命令将指定的示例插入到 `DocsProjects` 表中: ```mssql -INSERT [dbo].[DocsProjects] ([Id], [Name], [ShortName], [Format], [DefaultDocumentName], [NavigationDocumentName], [MinimumVersion], [DocumentStoreType], [ExtraProperties], [MainWebsiteUrl], [LatestVersionBranchName], [ParametersDocumentName]) VALUES (N'12f21123-e08e-4f15-bedb-ae0b2d939658', N'ABP framework (GitHub)', N'abp', N'md', N'Index', N'docs-nav.json', NULL, N'GitHub', N'{"GitHubRootUrl":"https://github.com/abpframework/abp/tree/{version}/docs","GitHubAccessToken":"***","GitHubUserAgent":""}', N'/', N'master', N'') +INSERT [dbo].[DocsProjects] ([Id], [Name], [ShortName], [Format], [DefaultDocumentName], [NavigationDocumentName], [MinimumVersion], [DocumentStoreType], [ExtraProperties], [MainWebsiteUrl], [LatestVersionBranchName], [ParametersDocumentName]) VALUES (N'12f21123-e08e-4f15-bedb-ae0b2d939658', N'ABP framework (GitHub)', N'abp', N'md', N'Index', N'docs-nav.json', NULL, N'GitHub', N'{"GitHubRootUrl":"https://github.com/abpframework/abp/tree/{version}/docs","GitHubAccessToken":"***","GitHubUserAgent":""}', N'/', N'dev', N'') ``` 请注意,`GitHubAccessToken` 被屏蔽了.它是一个私人令牌,你必须获得自己的令牌并替换 `***` 字符串. diff --git a/docs/zh-Hans/UI/AspNetCore/Tag-Helpers/Index.md b/docs/zh-Hans/UI/AspNetCore/Tag-Helpers/Index.md index 628a63bfa7..296d2e210f 100644 --- a/docs/zh-Hans/UI/AspNetCore/Tag-Helpers/Index.md +++ b/docs/zh-Hans/UI/AspNetCore/Tag-Helpers/Index.md @@ -4,7 +4,7 @@ ABP框架定义了一组**标签助手组件**. 简化开发ASP.NET Core (MVC / ## bootstrap 组件包装 -大多数标签助手是[Bootstrap](https://getbootstrap.com/) (v4+)的包装. 编写bootstrap代码并不是那么简单,其中包含太多的重复HTML标签并且也没有类型安全. ABP标签助手使其 **简单** 并且 **类型安全**. +大多数标签助手是[Bootstrap](https://getbootstrap.com/) (v5+)的包装. 编写bootstrap代码并不是那么简单,其中包含太多的重复HTML标签并且也没有类型安全. ABP标签助手使其 **简单** 并且 **类型安全**. 我们的目标并不是100%的包装bootstrap组件. 仍然可以编写 **原生bootstrap代码** (实际上标签助手生成的也是原生的bootstrap代码), 但我们建议尽量使用标签助手.