Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ng-alain/delon
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 13.5.1
Choose a base ref
...
head repository: ng-alain/delon
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 13.5.2
Choose a head ref
  • 2 commits
  • 8 files changed
  • 1 contributor

Commits on Jul 12, 2022

  1. Copy the full SHA
    aa6c77b View commit details
  2. Copy the full SHA
    586d828 View commit details
2 changes: 1 addition & 1 deletion .github/workflows/deploy-site.yml
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ jobs:
- name: checkout
uses: actions/checkout@master

- uses: borales/actions-yarn@v2.3.0
- uses: borales/actions-yarn@v3.0.0
with:
cmd: install

9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
## [13.5.2](https://github.com/ng-alain/delon/compare/13.5.1...13.5.2) (2022-07-12)


### Bug Fixes

* fix 'null' is not assignable to type 'NzFormControlStatusType' ([#1502](https://github.com/ng-alain/delon/issues/1502)) ([aa6c77b](https://github.com/ng-alain/delon/commit/aa6c77b606b4104dc063f30983a4bc520193fb19))



## [13.5.1](https://github.com/ng-alain/delon/compare/13.5.0...13.5.1) (2022-06-06)


8 changes: 8 additions & 0 deletions docs/changelog.en-US.md
Original file line number Diff line number Diff line change
@@ -14,6 +14,14 @@ NG-ALAIN strictly follows [Semantic Versioning 2.0.0](http://semver.org/lang/zh-

---

## [13.5.2](https://github.com/ng-alain/delon/compare/13.5.1...13.5.2) (2022-07-12)


### Bug Fixes

* fix 'null' is not assignable to type 'NzFormControlStatusType' ([#1502](https://github.com/ng-alain/delon/issues/1502)) ([aa6c77b](https://github.com/ng-alain/delon/commit/aa6c77b606b4104dc063f30983a4bc520193fb19))


## [13.5.1](https://github.com/ng-alain/delon/compare/13.5.0...13.5.1) (2022-06-06)

### Bug Fixes
8 changes: 8 additions & 0 deletions docs/changelog.zh-CN.md
Original file line number Diff line number Diff line change
@@ -14,6 +14,14 @@ NG-ALAIN 严格遵循 [Semantic Versioning 2.0.0](http://semver.org/lang/zh-CN/)

---

## [13.5.2](https://github.com/ng-alain/delon/compare/13.5.1...13.5.2) (2022-07-12)


### Bug Fixes

* fix 'null' is not assignable to type 'NzFormControlStatusType' ([#1502](https://github.com/ng-alain/delon/issues/1502)) ([aa6c77b](https://github.com/ng-alain/delon/commit/aa6c77b606b4104dc063f30983a4bc520193fb19))


## [13.5.1](https://github.com/ng-alain/delon/compare/13.5.0...13.5.1) (2022-06-06)

### Bug Fixes
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "delon",
"version": "13.5.1",
"version": "13.5.2",
"description": "Delon is a set of essential modules for NG-ALAIN.",
"keywords": [
"delon",
@@ -80,7 +80,7 @@
"extend": "^3.0.2",
"file-saver": "^2.0.5",
"ng-github-button": "^13.0.0",
"ng-zorro-antd": "^13.1.1",
"ng-zorro-antd": "^13.3.2",
"ngx-color": "~7.3.3",
"ngx-countdown": "^13.0.0",
"ngx-highlight-js": "^13.0.0",
5 changes: 3 additions & 2 deletions packages/form/src/model/form.property.ts
Original file line number Diff line number Diff line change
@@ -373,16 +373,17 @@ export abstract class FormProperty {

// #endregion

updateFeedback(status: NzFormControlStatusType = null, icon?: string | null): void {
updateFeedback(status: NzFormControlStatusType = '', icon?: string | null): void {
this.ui.feedback = status;
this.ui.feedbackIcon =
icon ||
{
'': '',
error: 'close-circle-fill',
validating: 'loading',
success: 'check-circle-fill',
warning: 'exclamation-circle-fill'
}[status!];
}[status];
this.widget.detectChanges();
}
}
2 changes: 1 addition & 1 deletion packages/form/src/sf.component.ts
Original file line number Diff line number Diff line change
@@ -236,7 +236,7 @@ export class SFComponent implements OnInit, OnChanges, OnDestroy {
* this.sf.updateFeedback('/name');
* ```
*/
updateFeedback(path: string, status: NzFormControlStatusType = null, icon?: string | null): this {
updateFeedback(path: string, status: NzFormControlStatusType = '', icon?: string | null): this {
this.getProperty(path)?.updateFeedback(status, icon);
return this;
}
6 changes: 3 additions & 3 deletions packages/form/src/widgets/mention/mention.widget.spec.ts
Original file line number Diff line number Diff line change
@@ -39,8 +39,8 @@ describe('form: widget: mention', () => {
page
.newSchema(s)
.typeChar('@')
.checkCount('.ant-mention-dropdown-item', DATA.length, true)
.typeEvent('click', '.ant-mention-dropdown-item');
.checkCount('.ant-mentions-dropdown-menu-item', DATA.length, true)
.typeEvent('click', '.ant-mentions-dropdown-menu-item');

expect((s.properties!.a.ui as NzSafeAny).select).toHaveBeenCalled();
}));
@@ -69,6 +69,6 @@ describe('form: widget: mention', () => {
}
}
};
page.newSchema(s).dc(1).typeChar('@').checkElText('.ant-mention-dropdown-item', '1', true);
page.newSchema(s).dc(1).typeChar('@').checkElText('.ant-mentions-dropdown-menu-item', '1', true);
}));
});