From 1f8aa684c65fbde7f734d5047e9e1744166c6623 Mon Sep 17 00:00:00 2001 From: maliming Date: Mon, 22 Nov 2021 13:38:14 +0800 Subject: [PATCH 01/11] Update TODO tutorial. --- docs/en/Tutorials/Todo/Index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/Tutorials/Todo/Index.md b/docs/en/Tutorials/Todo/Index.md index c252ee0afe..4db981b895 100644 --- a/docs/en/Tutorials/Todo/Index.md +++ b/docs/en/Tutorials/Todo/Index.md @@ -682,7 +682,7 @@ You first need to run the `TodoApp.HttpApi.Host` project since the proxy generat Once you run the `TodoApp.HttpApi.Host` project, open a command-line terminal in the `angular` folder and type the following command: ````bash -abp generate-proxy +abp generate-proxy -t ng ```` If everything goes well, it should generate an output like shown below: From 1443312e36502a8a255966713766feef4f5a6423 Mon Sep 17 00:00:00 2001 From: maliming Date: Mon, 22 Nov 2021 13:56:23 +0800 Subject: [PATCH 02/11] Update Index.md --- docs/en/Tutorials/Todo/Index.md | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/docs/en/Tutorials/Todo/Index.md b/docs/en/Tutorials/Todo/Index.md index 4db981b895..54515397b6 100644 --- a/docs/en/Tutorials/Todo/Index.md +++ b/docs/en/Tutorials/Todo/Index.md @@ -758,17 +758,16 @@ Open the `/angular/src/app/home/home.component.html` file and replace its conten
-
- - + +
+
+ +
+
+
+ +
-
  • From 0468b56d4695ec179eaa49e49cac1307fa10e56f Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Mon, 22 Nov 2021 18:45:20 +0800 Subject: [PATCH 03/11] Update Index.md --- docs/en/Tutorials/Todo/Index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/Tutorials/Todo/Index.md b/docs/en/Tutorials/Todo/Index.md index 54515397b6..ef3a43d798 100644 --- a/docs/en/Tutorials/Todo/Index.md +++ b/docs/en/Tutorials/Todo/Index.md @@ -543,7 +543,7 @@ namespace TodoApp.Blazor.Pages private List TodoItems { get; set; } = new List(); private string NewTodoText { get; set; } - protected async override Task OnInitializedAsync() + protected override async Task OnInitializedAsync() { TodoItems = await TodoAppService.GetListAsync(); } @@ -595,7 +595,7 @@ Open the `Index.razor` file in the `Pages` folder of the *TodoApp.Blazor* projec class="form-inline"> From 8c0f182af987e2ed04aa7154da3c61b1568b87b8 Mon Sep 17 00:00:00 2001 From: Engincan VESKE Date: Mon, 22 Nov 2021 19:13:07 +0300 Subject: [PATCH 04/11] Cms-Kit: Show the lines on the comments --- .../Shared/Components/Commenting/Default.cshtml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Commenting/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Commenting/Default.cshtml index 92d02a7cea..ab4bd69b91 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Commenting/Default.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Commenting/Default.cshtml @@ -57,7 +57,16 @@ Func GetCommentContentArea(Guid id, string text) => @

    - @text + @{ + var lines = text.SplitToLines(); + if (lines.Any()) + { + foreach (var line in lines) + { + @line
    + } + } + }

    ; } From b7bc469b77fa4259fbcbe7ec852a03a06f277628 Mon Sep 17 00:00:00 2001 From: maliming Date: Thu, 25 Nov 2021 09:34:34 +0800 Subject: [PATCH 05/11] Update Index.md --- docs/en/Tutorials/Todo/Index.md | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/docs/en/Tutorials/Todo/Index.md b/docs/en/Tutorials/Todo/Index.md index ef3a43d798..476a5d2175 100644 --- a/docs/en/Tutorials/Todo/Index.md +++ b/docs/en/Tutorials/Todo/Index.md @@ -412,14 +412,16 @@ Open the `Index.cshtml` file in the `Pages` folder of the *TodoApp.Web* project -
    - - + +
    +
    + +
    +
    +
    + +
    -
      @foreach (var todoItem in Model.TodoItems) From 62a27546c06a4a1066756dc84fffc444b3f78c23 Mon Sep 17 00:00:00 2001 From: enisn Date: Thu, 25 Nov 2021 15:08:39 +0300 Subject: [PATCH 06/11] Remove custom css for select2 --- .../Bundling/BasicThemeGlobalStyleContributor.cs | 1 - .../wwwroot/themes/basic/custom/select2-bs5-fix.css | 4 ---- 2 files changed, 5 deletions(-) delete mode 100644 modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/custom/select2-bs5-fix.css diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Bundling/BasicThemeGlobalStyleContributor.cs b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Bundling/BasicThemeGlobalStyleContributor.cs index e5254366d4..bf60b4ccd0 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Bundling/BasicThemeGlobalStyleContributor.cs +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Bundling/BasicThemeGlobalStyleContributor.cs @@ -7,7 +7,6 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling public override void ConfigureBundle(BundleConfigurationContext context) { context.Files.Add("/themes/basic/layout.css"); - context.Files.Add("/themes/basic/custom/select2-bs5-fix.css"); } } } diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/custom/select2-bs5-fix.css b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/custom/select2-bs5-fix.css deleted file mode 100644 index beb981c139..0000000000 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/custom/select2-bs5-fix.css +++ /dev/null @@ -1,4 +0,0 @@ -/*TODO: Remove after BS5 Modal support of select2 */ -span.select2-container.select2-container--default.select2-container--open { - z-index: 1056; /*Just for BS5 Modals*/ -} From 253408ff5bec01649e736e87e301fb097ef06efb Mon Sep 17 00:00:00 2001 From: enisn Date: Thu, 25 Nov 2021 15:08:53 +0300 Subject: [PATCH 07/11] Add parent parameter to dom-initializers --- .../bootstrap/dom-event-handlers.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js index 55c604cf4a..4e83df796a 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js @@ -81,6 +81,7 @@ var itemsPropertyName = $(this).data("autocompleteItemsProperty"); var filterParamName = $(this).data("autocompleteFilterParamName"); var selectedText = $(this).data("autocompleteSelectedItemName"); + var parentSelector = $(this).data("autocompleteParentSelector"); var name = $(this).attr("name"); var selectedTextInputName = name.substring(0, name.length - 1) + "_Text]"; var selectedTextInput = $('', { @@ -119,7 +120,8 @@ }; } }, - width: '100%' + width: '100%', + dropdownParent: parentSelector ? $(parentSelector) : $('body'), }); $select.on('select2:select', function (e) { selectedTextInput.val(e.params.data.text); From 7b070e0296fd00a4b2d31bcd898cb8cd43c87732 Mon Sep 17 00:00:00 2001 From: enisn Date: Thu, 25 Nov 2021 15:09:11 +0300 Subject: [PATCH 08/11] Implement parent selector for CmsKit Menu select2 --- .../Pages/CmsKit/Menus/MenuItems/CreateModal.cshtml | 2 +- .../Pages/CmsKit/Menus/MenuItems/createModal.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/CreateModal.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/CreateModal.cshtml index 37264289b4..bb4083a6b9 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/CreateModal.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/CreateModal.cshtml @@ -13,7 +13,7 @@ }
      - + diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/createModal.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/createModal.js index 41e37a0118..2818f48523 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/createModal.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/createModal.js @@ -33,6 +33,7 @@ $(function () { $pageId.data('autocompleteValueProperty', 'id'); $pageId.data('autocompleteItemsProperty', 'items'); $pageId.data('autocompleteFilterParamName', 'filter'); + $pageId.data('autocompleteParentSelector', '#menu-create-modal'); abp.dom.initializers.initializeAutocompleteSelects($pageId); } From 3aef9d9d99c1fe6c4b143a7e558e74016ce22ab4 Mon Sep 17 00:00:00 2001 From: enisn Date: Thu, 25 Nov 2021 15:25:11 +0300 Subject: [PATCH 09/11] CmsKit - Implement parentSelector to UpdateModal --- .../Pages/CmsKit/Menus/MenuItems/UpdateModal.cshtml | 2 +- .../Pages/CmsKit/Menus/MenuItems/updateModal.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/UpdateModal.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/UpdateModal.cshtml index 81ebc6625d..719b708566 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/UpdateModal.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/UpdateModal.cshtml @@ -13,7 +13,7 @@ } - + diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/updateModal.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/updateModal.js index e219763fc0..d8ded357bb 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/updateModal.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/updateModal.js @@ -34,6 +34,7 @@ $(function () { $pageId.data('autocompleteValueProperty', 'id'); $pageId.data('autocompleteItemsProperty', 'items'); $pageId.data('autocompleteFilterParamName', 'filter'); + $pageId.data('autocompleteParentSelector', '#menu-update-modal'); abp.dom.initializers.initializeAutocompleteSelects($pageId); } From 042b42030f84b9bde702510dc0b6ad73650011d9 Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Thu, 25 Nov 2021 15:46:17 +0300 Subject: [PATCH 10/11] Update List-Service.md --- docs/en/UI/Angular/List-Service.md | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/docs/en/UI/Angular/List-Service.md b/docs/en/UI/Angular/List-Service.md index 03e2b5341a..fc3697bd35 100644 --- a/docs/en/UI/Angular/List-Service.md +++ b/docs/en/UI/Angular/List-Service.md @@ -201,26 +201,3 @@ You may use observables in combination with [AsyncPipe](https://angular.io/guide ``` - -## Breaking Change with ABP v3.0 - -We had to modify the `ListService` to make it work with `ngx-datatable`. Previously, the minimum value for `page` property was `1` and you could use it like this: - -```html - - -``` - -As of v3.0, with ngx-datatable, the `page` property has to be set as `0` for the initial page. Therefore, if you used `ListService` on your tables before and are going to keep `abp-table`, you need to make the following change: - -```html - - -``` - -**Important Note:** The `abp-table` is not removed, but is deprecated and will be removed in the future. Please consider switching to ngx-datatable. From 7e73bdd68d04d9f3e8a4fe41d57bd34278d2afe3 Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 26 Nov 2021 16:59:35 +0800 Subject: [PATCH 11/11] Update Index.md --- docs/en/Tutorials/Todo/Index.md | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/docs/en/Tutorials/Todo/Index.md b/docs/en/Tutorials/Todo/Index.md index 476a5d2175..ea2551d4f5 100644 --- a/docs/en/Tutorials/Todo/Index.md +++ b/docs/en/Tutorials/Todo/Index.md @@ -591,17 +591,16 @@ Open the `Index.razor` file in the `Pages` folder of the *TodoApp.Blazor* projec - - - + +
      +
      + +
      +
      +
      + +
      -
        @foreach (var todoItem in TodoItems)