Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'NG-ZORRO:master' into fix/tree-select-search-slow-in-vi…
…rtual-mode
- Loading branch information
Showing
293 changed files
with
6,883 additions
and
1,194 deletions.
There are no files selected for viewing
Validating CODEOWNERS rules …
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
--- | ||
order: 6 | ||
title: | ||
zh-CN: 自定义状态 | ||
en-US: Status | ||
--- | ||
|
||
## zh-CN | ||
|
||
使用 `nzStatus` 为 AutoComplete 添加状态,可选 `error` 或者 `warning`。 | ||
|
||
## en-US | ||
|
||
Add status to AutoComplete with `nzStatus`, which could be `error` or `warning`. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
import { Component, ViewEncapsulation } from '@angular/core'; | ||
|
||
@Component({ | ||
selector: 'nz-demo-auto-complete-status', | ||
encapsulation: ViewEncapsulation.None, | ||
template: ` | ||
<nz-space nzDirection="vertical" style="width: 100%"> | ||
<input *nzSpaceItem nz-input [(ngModel)]="value" [nzAutocomplete]="auto" nzStatus="error" /> | ||
<input *nzSpaceItem nz-input [(ngModel)]="value" [nzAutocomplete]="auto" nzStatus="warning" /> | ||
<nz-autocomplete [nzDataSource]="['12345', '23456', '34567']" #auto></nz-autocomplete> | ||
</nz-space> | ||
` | ||
}) | ||
export class NzDemoAutoCompleteStatusComponent { | ||
value?: string; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,21 @@ | ||
@media screen and (max-width: @screen-md) { | ||
.@{backtop-prefix-cls} { | ||
right: 60px; | ||
|
||
&-rtl { | ||
right: auto; | ||
left: 60px; | ||
} | ||
} | ||
} | ||
|
||
@media screen and (max-width: @screen-xs) { | ||
.@{backtop-prefix-cls} { | ||
right: 20px; | ||
|
||
&-rtl { | ||
right: auto; | ||
left: 20px; | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.