mirrors/element
1
0
Fork 0
mirror of https://github.com/ElemeFE/element.git synced 2025-12-19 12:04:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into carbon

Browse Source 
# Conflicts:
#	packages/date-picker/src/panel/time.vue
This commit is contained in:
Leopoldthecoder
2017-09-14 19:33:49 +08:00
parent e8516d633a 36d4f0a6fc
commit 43ecb8818c
31 changed files with 340 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/tree/src/model/node.js
View File

@@ -118,7 +118,7 @@ export default class Node {
this.expand(null, store.autoExpandParent);
}
if (key && store.currentNodeKey && this.key === store.currentNodeKey) {
if (key && store.currentNodeKey !== undefined && this.key === store.currentNodeKey) {
store.currentNode = this;
}