Skip to content

Cascader: not focus when outside clicked #11588

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

Merged
Leopoldthecoder merged 1 commit into from
Jun 12, 2018
Merged

Cascader: not focus when outside clicked #11588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 12 additions & 6 deletions packages/cascader/src/main.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<template v-if="showAllLevels">
<template v-for="(label, index) in currentLabels">
{{ label }}
<span v-if="index < currentLabels.length - 1"> {{ separator }} </span>
<span v-if="index < currentLabels.length - 1" :key="index"> {{ separator }} </span>
</template>
</template>
<template v-else>
Expand Down Expand Up @@ -178,7 +178,9 @@ export default {
menuVisible: false,
inputHover: false,
inputValue: '',
flatOptions: null
flatOptions: null,
id: generateId(),
needFocus: true
};
},

Expand Down Expand Up @@ -215,9 +217,6 @@ export default {
},
cascaderDisabled() {
return this.disabled || (this.elForm || {}).disabled;
},
id() {
return generateId();
}
},

Expand Down Expand Up @@ -280,7 +279,11 @@ export default {
hideMenu() {
this.inputValue = '';
this.menu.visible = false;
this.$refs.input.focus();
if (this.needFocus) {
this.$refs.input.focus();
} else {
this.needFocus = true;
}
},
handleActiveItemChange(value) {
this.$nextTick(_ => {
Expand Down Expand Up @@ -387,6 +390,9 @@ export default {
this.handlePick([], true);
},
handleClickoutside() {
if (this.menuVisible) {
this.needFocus = false;
}
this.menuVisible = false;
},
handleClick() {
Expand Down
6 changes: 2 additions & 4 deletions packages/cascader/src/menu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@
changeOnSelect: false,
popperClass: '',
hoverTimer: 0,
clicking: false
clicking: false,
id: generateId()
};
},

Expand Down Expand Up @@ -97,9 +98,6 @@
formatOptions(optionsCopy);
return loadActiveOptions(optionsCopy);
}
},
id() {
return generateId();
}
},

Expand Down
6 changes: 2 additions & 4 deletions packages/dropdown/src/dropdown.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,14 @@
menuItems: null,
menuItemsArray: null,
dropdownElm: null,
focusing: false
focusing: false,
listId: `dropdown-menu-${generateId()}`
};
},

computed: {
dropdownSize() {
return this.size || (this.$ELEMENT || {}).size;
},
listId() {
return `dropdown-menu-${generateId()}`;
}
},

Expand Down