From 2444ed890bb460fd071d3f33a4336ed10c0aabfd Mon Sep 17 00:00:00 2001 From: yu tao Date: Tue, 8 Mar 2022 10:38:51 +0800 Subject: [PATCH 1/8] docs: fix typo --- components/modal/doc/index.en-US.md | 2 +- components/modal/doc/index.zh-CN.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/modal/doc/index.en-US.md b/components/modal/doc/index.en-US.md index 3b008fdee4..72507cf2bf 100644 --- a/components/modal/doc/index.en-US.md +++ b/components/modal/doc/index.en-US.md @@ -152,7 +152,7 @@ nzFooter: [{ // Is it disabled disabled?: boolean | ((this: ModalButtonOptions, contentComponentInstance?: object) => boolean); // Callback of clicking - onClick?(this: ModalButtonOptions, contentComponentInstance?: object): void | Promise<void> | any; + onClick?(this: ModalButtonOptions, contentComponentInstance?: object): void | Promise | any; }] ``` diff --git a/components/modal/doc/index.zh-CN.md b/components/modal/doc/index.zh-CN.md index c2010ecc54..9ad858af68 100644 --- a/components/modal/doc/index.zh-CN.md +++ b/components/modal/doc/index.zh-CN.md @@ -153,7 +153,7 @@ nzFooter: [{ // 是否禁用 disabled?: boolean | ((this: ModalButtonOptions, contentComponentInstance?: object) => boolean); // 按钮点击回调 - onClick?(this: ModalButtonOptions, contentComponentInstance?: object): void | Promise<void> | any; + onClick?(this: ModalButtonOptions, contentComponentInstance?: object): void | Promise | any; }] ``` From 1947d0f25757c85757dcabacd5a43385198cdd60 Mon Sep 17 00:00:00 2001 From: yu tao Date: Wed, 9 Mar 2022 16:41:35 +0800 Subject: [PATCH 2/8] docs(module:skeleton): fix typo --- components/skeleton/doc/index.zh-CN.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/skeleton/doc/index.zh-CN.md b/components/skeleton/doc/index.zh-CN.md index 9ff2b64659..4626f33df0 100644 --- a/components/skeleton/doc/index.zh-CN.md +++ b/components/skeleton/doc/index.zh-CN.md @@ -31,7 +31,7 @@ import { NzSkeletonModule } from 'ng-zorro-antd/skeleton'; | `[nzLoading]` | 为 `true` 时，显示占位图。反之则直接展示子组件 | `boolean` | - | | `[nzParagraph]` | 是否显示段落占位图 | `boolean \| NzSkeletonParagraph` | `true` | | `[nzTitle]` | 是否显示标题占位图 | `boolean \| NzSkeletonTitle` | `true` | -| `[nzRound]` | 为 true 时，段落和标题显示圆角 | `boolean` | `false` | +| `[nzRound]` | 为 `true` 时，段落和标题显示圆角 | `boolean` | `false` | ### NzSkeletonAvatar From a84431550b935047a510abcf72cbf24a777db5ad Mon Sep 17 00:00:00 2001 From: YuTao Date: Wed, 9 Mar 2022 17:33:41 +0800 Subject: [PATCH 3/8] docs(module:tooltip): fix typo --- components/tooltip/doc/index.zh-CN.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/tooltip/doc/index.zh-CN.md b/components/tooltip/doc/index.zh-CN.md index 1b6493fe6e..42b0846d26 100644 --- a/components/tooltip/doc/index.zh-CN.md +++ b/components/tooltip/doc/index.zh-CN.md @@ -27,7 +27,7 @@ import { NzToolTipModule } from 'ng-zorro-antd/tooltip'; | `[nzTooltipArrowPointAtCenter]` | 箭头指向锚点的中心 | `boolean` | `false` | | `[nzTooltipTitle]` | 提示文字 | `string \| TemplateRef` | - | | `[nzTooltipTitleContext]` | 提示文字模板上下文 | `object` | - | -| `[nzTooltipTrigger]` | 触发行为，可选 `hover/focus/click`，为 `null` 时不响应光标事件 | `'click' \| 'focus' \| 'hover' \| null` | `'hover'` | +| `[nzTooltipTrigger]` | 触发行为，可选 `hover` \| `focus` \| `click`，为 `null` 时不响应光标事件 | `'click' \| 'focus' \| 'hover' \| null` | `'hover'` | | `[nzTooltipPlacement]` | 气泡框位置 | `'top' \| 'left' \| 'right' \| 'bottom' \| 'topLeft' \| 'topRight' \| 'bottomLeft' \| 'bottomRight' \| 'leftTop' \| 'leftBottom' \| 'rightTop' \| 'rightBottom' \| Array` | `'top'` | | `[nzTooltipColor]` | 背景颜色 | `string` | - | | `[nzTooltipOrigin]` | 气泡框定位元素 | `ElementRef` | - | From 1e3c88543fb465ee0600c1295656ac755af693c2 Mon Sep 17 00:00:00 2001 From: yu tao Date: Thu, 10 Mar 2022 16:21:32 +0800 Subject: [PATCH 4/8] fix(module:cascader): update position when click menu item --- components/cascader/cascader.component.ts | 9 +++++++++ components/core/overlay/overlay-position.ts | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/components/cascader/cascader.component.ts b/components/cascader/cascader.component.ts index 41e4505b37..dc8c43cdc9 100644 --- a/components/cascader/cascader.component.ts +++ b/components/cascader/cascader.component.ts @@ -581,16 +581,25 @@ export class NzCascaderComponent implements NzCascaderComponentAsSource, OnInit, } onOptionClick(option: NzCascaderOption, columnIndex: number, event: Event): void { + // console.log(this.overlay.overlayRef.updatePosition()); + console.log(this.positions); + if (event) { event.preventDefault(); } if (option && option.disabled) { return; } + this.el.focus(); this.inSearchingMode ? this.cascaderService.setSearchOptionSelected(option as NzCascaderSearchOption) : this.cascaderService.setOptionActivated(option, columnIndex, true); + setTimeout(() => { + // 每次点击，等渲染完成（过渡时间），重新定位 + this.positions = [...this.positions]; + this.overlay.overlayRef.updatePosition(); + }, 10); } onClickOutside(event: MouseEvent): void { diff --git a/components/core/overlay/overlay-position.ts b/components/core/overlay/overlay-position.ts index f9c7a9a4fe..4ca5ab08c0 100644 --- a/components/core/overlay/overlay-position.ts +++ b/components/core/overlay/overlay-position.ts @@ -44,7 +44,9 @@ export const DEFAULT_CASCADER_POSITIONS = [ POSITION_MAP.bottomLeft, POSITION_MAP.bottomRight, POSITION_MAP.topLeft, - POSITION_MAP.topRight + POSITION_MAP.topRight, + POSITION_MAP.topCenter, + POSITION_MAP.bottomCenter ]; export const DEFAULT_MENTION_TOP_POSITIONS = [ From c419c30d0ad407d7add34e462062c4ad615b6d65 Mon Sep 17 00:00:00 2001 From: yu tao Date: Thu, 10 Mar 2022 16:35:45 +0800 Subject: [PATCH 5/8] fix(module:cascader): fix typo --- components/cascader/cascader.component.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/components/cascader/cascader.component.ts b/components/cascader/cascader.component.ts index dc8c43cdc9..d5bfd20865 100644 --- a/components/cascader/cascader.component.ts +++ b/components/cascader/cascader.component.ts @@ -581,9 +581,6 @@ export class NzCascaderComponent implements NzCascaderComponentAsSource, OnInit, } onOptionClick(option: NzCascaderOption, columnIndex: number, event: Event): void { - // console.log(this.overlay.overlayRef.updatePosition()); - console.log(this.positions); - if (event) { event.preventDefault(); } @@ -597,7 +594,6 @@ export class NzCascaderComponent implements NzCascaderComponentAsSource, OnInit, : this.cascaderService.setOptionActivated(option, columnIndex, true); setTimeout(() => { // 每次点击，等渲染完成（过渡时间），重新定位 - this.positions = [...this.positions]; this.overlay.overlayRef.updatePosition(); }, 10); } From b955eb88b85c51fd77c732e6da30b46af051d40e Mon Sep 17 00:00:00 2001 From: yu tao Date: Thu, 10 Mar 2022 17:47:47 +0800 Subject: [PATCH 6/8] fix(module:cascader): use function reposition --- components/cascader/cascader.component.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/components/cascader/cascader.component.ts b/components/cascader/cascader.component.ts index d5bfd20865..3cb81c216d 100644 --- a/components/cascader/cascader.component.ts +++ b/components/cascader/cascader.component.ts @@ -592,9 +592,9 @@ export class NzCascaderComponent implements NzCascaderComponentAsSource, OnInit, this.inSearchingMode ? this.cascaderService.setSearchOptionSelected(option as NzCascaderSearchOption) : this.cascaderService.setOptionActivated(option, columnIndex, true); + setTimeout(() => { - // 每次点击，等渲染完成（过渡时间），重新定位 - this.overlay.overlayRef.updatePosition(); + this.reposition(); }, 10); } @@ -716,6 +716,7 @@ export class NzCascaderComponent implements NzCascaderComponentAsSource, OnInit, if (this.overlay && this.overlay.overlayRef && this.menuVisible) { Promise.resolve().then(() => { this.overlay.overlayRef.updatePosition(); + this.cdr.markForCheck(); }); } } From bc0db327aad34865baecb751c941b7429446e3de Mon Sep 17 00:00:00 2001 From: yu tao Date: Thu, 10 Mar 2022 18:26:49 +0800 Subject: [PATCH 7/8] fix(module:cascader): detectChanges before reposition --- components/cascader/cascader.component.ts | 8 ++------ components/cascader/cascader.service.ts | 1 - 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/components/cascader/cascader.component.ts b/components/cascader/cascader.component.ts index 3cb81c216d..595698e422 100644 --- a/components/cascader/cascader.component.ts +++ b/components/cascader/cascader.component.ts @@ -365,10 +365,9 @@ export class NzCascaderComponent implements NzCascaderComponentAsSource, OnInit, // These operations would not mutate data. this.checkChildren(); this.setDisplayLabel(); + this.cdr.detectChanges(); this.reposition(); this.setDropdownStyles(); - - this.cdr.markForCheck(); }); srv.$loading.pipe(takeUntil(this.destroy$)).subscribe(loading => { @@ -589,13 +588,10 @@ export class NzCascaderComponent implements NzCascaderComponentAsSource, OnInit, } this.el.focus(); + console.log(this.inSearchingMode); this.inSearchingMode ? this.cascaderService.setSearchOptionSelected(option as NzCascaderSearchOption) : this.cascaderService.setOptionActivated(option, columnIndex, true); - - setTimeout(() => { - this.reposition(); - }, 10); } onClickOutside(event: MouseEvent): void { diff --git a/components/cascader/cascader.service.ts b/components/cascader/cascader.service.ts index 3dad28c3b6..e89b7812f0 100644 --- a/components/cascader/cascader.service.ts +++ b/components/cascader/cascader.service.ts @@ -173,7 +173,6 @@ export class NzCascaderService implements OnDestroy { if (option.disabled) { return; } - this.activatedOptions[columnIndex] = option; this.trackAncestorActivatedOptions(columnIndex); this.dropBehindActivatedOptions(columnIndex); From edad65d7b0a8f5b60a9e5c45af82d16f0dc82acb Mon Sep 17 00:00:00 2001 From: yu tao Date: Mon, 14 Mar 2022 11:07:58 +0800 Subject: [PATCH 8/8] docs(module:cascader): clean up console --- components/cascader/cascader.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/components/cascader/cascader.component.ts b/components/cascader/cascader.component.ts index 595698e422..b2530d54f2 100644 --- a/components/cascader/cascader.component.ts +++ b/components/cascader/cascader.component.ts @@ -588,7 +588,6 @@ export class NzCascaderComponent implements NzCascaderComponentAsSource, OnInit, } this.el.focus(); - console.log(this.inSearchingMode); this.inSearchingMode ? this.cascaderService.setSearchOptionSelected(option as NzCascaderSearchOption) : this.cascaderService.setOptionActivated(option, columnIndex, true);