-
Notifications
You must be signed in to change notification settings - Fork 3.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(module:cascader): fix columns not dropped (#3037)
* fix(module:cascader): fix columns not dropped fix: multi fixes fix: fix bugs to pass tests chore: get test specs back fix: rollup fix: try to fix rollup by locking version test: add aborting searching test fix: lint chore: try to adopt prettier chore: remove @Private * fix: fix types in utils * fix: remove redefined interfaces * fix: fix cascacder folded when quiting searching mode * fix: set timer to null * fix: fix cannot be reset & column not drop for leaf node close #3034
- Loading branch information
Wendell
authored and
simplejason
committed
Mar 21, 2019
1 parent
01b3465
commit 72a9e67
Showing
9 changed files
with
769 additions
and
570 deletions.
There are no files selected for viewing
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,59 @@ | ||
export type NzCascaderExpandTrigger = 'click' | 'hover'; | ||
export type NzCascaderTriggerType = 'click' | 'hover'; | ||
export type NzCascaderSize = 'small' | 'large' | 'default'; | ||
|
||
export type NzCascaderFilter = ( | ||
searchValue: string, | ||
path: CascaderOption[] | ||
) => boolean; | ||
|
||
export type NzCascaderSorter = ( | ||
a: CascaderOption[], | ||
b: CascaderOption[], | ||
inputValue: string | ||
) => number; | ||
|
||
export interface CascaderOption { | ||
value?: any; // tslint:disable-line:no-any | ||
label?: string; | ||
title?: string; | ||
disabled?: boolean; | ||
loading?: boolean; | ||
isLeaf?: boolean; | ||
parent?: CascaderOption; | ||
children?: CascaderOption[]; | ||
|
||
[key: string]: any; // tslint:disable-line:no-any | ||
} | ||
|
||
export interface CascaderSearchOption extends CascaderOption { | ||
path: CascaderOption[]; | ||
} | ||
|
||
export interface NzShowSearchOptions { | ||
filter?: NzCascaderFilter; | ||
sorter?: NzCascaderSorter; | ||
} | ||
|
||
export function isShowSearchObject( | ||
options: NzShowSearchOptions | boolean | ||
): options is NzShowSearchOptions { | ||
return typeof options !== 'boolean'; | ||
} | ||
|
||
/** | ||
* To avoid circular dependency, provide an interface of `NzCascaderComponent` | ||
* for `NzCascaderService`. | ||
*/ | ||
export interface NzCascaderComponentAsSource { | ||
inputValue: string; | ||
nzShowSearch: NzShowSearchOptions | boolean; | ||
nzLabelProperty: string; | ||
nzValueProperty: string; | ||
nzChangeOnSelect: boolean; | ||
|
||
nzChangeOn?(option: CascaderOption, level: number): boolean; | ||
|
||
// tslint:disable-next-line:no-any | ||
nzLoadData?(node: CascaderOption, index?: number): PromiseLike<any>; | ||
} |
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,5 +1,9 @@ | ||
<ng-container *ngIf="highlightText"><span [innerHTML]="renderHighlightString(getOptionLabel())"></span></ng-container> | ||
<ng-container *ngIf="highlightText"> | ||
<span [innerHTML]="renderHighlightString(getOptionLabel())"></span> | ||
</ng-container> | ||
<ng-container *ngIf="!highlightText">{{ getOptionLabel() }}</ng-container> | ||
<span *ngIf="!option.isLeaf || option.children && option.children.length || option.loading" class="ant-cascader-menu-item-expand-icon"> | ||
<span | ||
*ngIf="!option.isLeaf || option.children && option.children.length || option.loading" | ||
class="ant-cascader-menu-item-expand-icon"> | ||
<i nz-icon [type]="option.loading ? 'loading' : 'right'"></i> | ||
</span> | ||
</span> |
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,9 @@ | ||
import { CascaderOption } from './nz-cascader-definitions'; | ||
|
||
export function isChildOption(o: CascaderOption): boolean { | ||
return o.isLeaf || !o.children || !o.children.length; | ||
} | ||
|
||
export function isParentOption(o: CascaderOption): boolean { | ||
return !!o.children && !!o.children.length && !o.isLeaf; | ||
} |
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.