Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(module:cascader): should not change on hover work #1991

Merged
merged 3 commits into from
Aug 19, 2018
Merged

fix(module:cascader): should not change on hover work #1991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5251c7
fix(module:cascader): should not change on hover work
Aug 15, 2018
f1bb61c
fix spec file
Aug 19, 2018
08a2ca9
fix spec file second
Aug 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion components/cascader/nz-cascader.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1072,7 +1072,8 @@ export class NzCascaderComponent implements OnInit, OnDestroy, ControlValueAcces
this.clearDelaySelectTimer();
if (doSelect) {
this.delaySelectTimer = setTimeout(() => {
this.setActiveOption(option, index, true);
// 鼠标滑入只展开，不进行选中操作
this.setActiveOption(option, index);
this.delaySelectTimer = null;
}, 150);
}
Expand Down
18 changes: 5 additions & 13 deletions components/cascader/nz-cascader.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1176,7 +1176,7 @@ describe('cascader', () => {
expect(overlayContainerElement.querySelectorAll('.ant-cascader-menu').length).toBe(0); // 0列
expect(testComponent.cascader.isMenuVisible()).toBe(false);
}));
it('should change on hover work', fakeAsync(() => {
it('should not change on hover work', fakeAsync(() => {
testComponent.nzChangeOnSelect = true;
testComponent.nzExpandTrigger = 'hover';
fixture.detectChanges();
Expand All @@ -1199,9 +1199,7 @@ describe('cascader', () => {
expect(testComponent.cascader.isMenuVisible()).toBe(true);
expect(itemEl1.classList).toContain('ant-cascader-menu-item-active');
expect(overlayContainerElement.querySelectorAll('.ant-cascader-menu').length).toBe(2); // 2列
expect(testComponent.values).toBeDefined();
expect(testComponent.values.length).toBe(1);
expect(testComponent.values[ 0 ]).toBe('zhejiang');
expect(testComponent.values).toBeNull(); // mouseenter does not trigger selection

const itemEl2 = overlayContainerElement.querySelector('.ant-cascader-menu:nth-child(2) .ant-cascader-menu-item:nth-child(1)') as HTMLElement; // 第2列第1个
expect(itemEl1.classList).toContain('ant-cascader-menu-item-active');
Expand All @@ -1215,10 +1213,7 @@ describe('cascader', () => {
expect(itemEl1.classList).toContain('ant-cascader-menu-item-active');
expect(itemEl2.classList).toContain('ant-cascader-menu-item-active');
expect(overlayContainerElement.querySelectorAll('.ant-cascader-menu').length).toBe(3); // 3列
expect(testComponent.values).toBeDefined();
expect(testComponent.values.length).toBe(2);
expect(testComponent.values[ 0 ]).toBe('zhejiang');
expect(testComponent.values[ 1 ]).toBe('hangzhou');
expect(testComponent.values).toBeNull(); // mouseenter does not trigger selection

const itemEl3 = overlayContainerElement.querySelector('.ant-cascader-menu:nth-child(3) .ant-cascader-menu-item:nth-child(1)') as HTMLElement; // 第3列第1个
expect(itemEl1.classList).toContain('ant-cascader-menu-item-active');
Expand All @@ -1229,17 +1224,14 @@ describe('cascader', () => {
tick(200);
fixture.detectChanges();

expect(testComponent.values).toBeDefined();
expect(testComponent.values.length).toBe(2);
expect(testComponent.values[ 0 ]).toBe('zhejiang');
expect(testComponent.values[ 1 ]).toBe('hangzhou');
expect(testComponent.values).toBeNull(); // mouseenter does not trigger selection

itemEl3.click();
fixture.detectChanges();
tick(200);
fixture.detectChanges();

expect(testComponent.values).toBeDefined();
expect(testComponent.values).toBeDefined(); // click trigger selection
expect(testComponent.values.length).toBe(3);
expect(testComponent.values[ 0 ]).toBe('zhejiang');
expect(testComponent.values[ 1 ]).toBe('hangzhou');
Expand Down