Browse Source

Merge pull request #12955 from abpframework/auto-merge/rel-5-3/1146

Merge branch dev with rel-5.3
pull/12962/head
maliming 4 years ago
committed by GitHub
parent
commit
3563b34e96
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      docs/en/Startup-Templates/Index.md
  2. 2
      docs/en/Tutorials/Todo/Single-Layer/Index.md
  3. BIN
      docs/en/Tutorials/Todo/Single-Layer/todo-single-layer-ui-initial.png
  4. 50
      docs/en/UI/Angular/Breadcrumb.md
  5. 2
      framework/src/Volo.Abp.AspNetCore.Components.Server/Volo/Abp/AspNetCore/Components/Server/Extensibility/BlazorServerLookupApiRequestService.cs
  6. 4
      modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/Page.cs
  7. 3
      npm/ng-packs/.gitignore
  8. 2
      npm/ng-packs/package.json
  9. 2
      npm/ng-packs/packages/core/src/lib/directives/form-submit.directive.ts
  10. 2
      npm/ng-packs/packages/theme-shared/package.json
  11. 13805
      npm/ng-packs/yarn.lock

1
docs/en/Startup-Templates/Index.md

@ -3,6 +3,7 @@
While you can start with an empty project and add needed packages manually, startup templates make easy and comfortable to start a new solution with the ABP framework. Click the name from the list below to see the documentation of the related startup template:
* [**app**](Application.md): Application template.
* [**app-nolayers**](Application-Single-Layer.md): Application (single layer) template.
* [**module**](Module.md): Module/service template.
* [**console**](Console.md): Console template.
* [**WPF**](WPF.md): WPF template.

2
docs/en/Tutorials/Todo/Single-Layer/Index.md

@ -74,7 +74,7 @@ It is good to run the application before starting the development. The solution
Firstly, run the `TodoApp` project in your favorite IDE (or run the `dotnet run` CLI command on your project directory) to see the server-side HTTP API on [Swagger UI](https://swagger.io/tools/swagger-ui/):
![todo-swagger-ui-initial](../todo-swagger-ui-initial.png)
![todo-swagger-ui-initial](./todo-single-layer-ui-initial.png)
You can explore and test your HTTP API with this UI. If it works, then we can run the Angular client application.

BIN
docs/en/Tutorials/Todo/Single-Layer/todo-single-layer-ui-initial.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 169 KiB

50
docs/en/UI/Angular/Breadcrumb.md

@ -0,0 +1,50 @@
## Breadcrumb Component
ABP provides a component that listens to the angular router's `NavigationEnd`
event and creates inputs for `BreadcrumbItemsComponent`. This component is used in
ABP components with [`PageComponent`](./Page-Component.md).
## Breadcrumb Items Component
`BreadcrumbItemsComponent` is used to display breadcrumb items. It can be useful
when you want to display breadcrumb items in a different way than the default.
### Usage
Example of overriding the default template of `PageComponent`:
```html
<abp-page title="Title">
<abp-page-breadcrumb-container>
<abp-breadcrumb-items [items]="breadCrumbItems"></abp-breadcrumb-items>
</abp-page-breadcrumb-container>
</abp-page>
```
```js
import { Component } from "@angular/core";
import { ABP } from "@abp/ng.core";
@Component({
/* component metadata */
})
export class YourComponent {
breadCrumbItems: ABP.Route[] = [
{
name: "Item 1",
},
{
name: "Item 2",
path: "/path",
},
];
}
```
### Inputs
- items: Partial<ABP.Route>[] : Array of ABP.Route objects. The source code of ABP.Route can be found in [github](https://github.com/abpframework/abp/blob/dev/npm/ng-packs/packages/core/src/lib/models/common.ts#L69).
## See Also
- [Page Component](./Page-Component.md)

2
framework/src/Volo.Abp.AspNetCore.Components.Server/Volo/Abp/AspNetCore/Components/Server/Extensibility/BlazorServerLookupApiRequestService.cs

@ -64,7 +64,7 @@ public class BlazorServerLookupApiRequestService : ILookupApiRequestService, ITr
client.BaseAddress = new Uri(baseUrl);
foreach (var header in HttpContextAccessor.HttpContext.Request.Headers)
{
requestMessage.Headers.Add(header.Key, header.Value.ToArray());
requestMessage.Headers.TryAddWithoutValidation(header.Key, header.Value.ToArray());
}
}
}

4
modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/Page.cs

@ -49,7 +49,9 @@ public class Page : FullAuditedAggregateRoot<Guid>, IMultiTenant
internal virtual void SetSlug(string slug)
{
Slug = Check.NotNullOrEmpty(slug, nameof(slug), PageConsts.MaxSlugLength);
Slug = SlugNormalizer.Normalize(
Check.NotNullOrEmpty(slug, nameof(slug), PageConsts.MaxSlugLength)
);
}
public virtual void SetContent(string content)

3
npm/ng-packs/.gitignore

@ -44,6 +44,9 @@ npm-debug.log
yarn-error.log
testem.log
/typings
yarn.lock
package-lock.json
# System Files
.DS_Store

2
npm/ng-packs/package.json

@ -71,7 +71,7 @@
"@fortawesome/fontawesome-free": "^5.15.4",
"@ng-bootstrap/ng-bootstrap": "~12.0.0-beta.4",
"@ngneat/spectator": "^10.0.0",
"@ngx-validate/core": "^0.1.1",
"@ngx-validate/core": "^0.1.2",
"@nrwl/angular": "13.10.3",
"@nrwl/cli": "13.10.3",
"@nrwl/cypress": "13.10.3",

2
npm/ng-packs/packages/core/src/lib/directives/form-submit.directive.ts

@ -28,7 +28,7 @@ export class FormSubmitDirective implements OnInit {
notValidateOnSubmit: string | boolean;
@Input()
markAsDirtyWhenSubmit = true
markAsDirtyWhenSubmit = true;
@Output() readonly ngSubmit = new EventEmitter();

2
npm/ng-packs/packages/theme-shared/package.json

@ -10,7 +10,7 @@
"@abp/ng.core": "~5.3.0-rc.3",
"@fortawesome/fontawesome-free": "^5.15.4",
"@ng-bootstrap/ng-bootstrap": "~12.0.0-beta.4",
"@ngx-validate/core": "^0.1.1",
"@ngx-validate/core": "^0.1.2",
"@popperjs/core": "~2.11.2",
"@swimlane/ngx-datatable": "^19.0.0",
"bootstrap": "^5.1.1",

13805
npm/ng-packs/yarn.lock

File diff suppressed because it is too large
Loading…
Cancel
Save