github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4415 from Leopoldthecoder/dev 

Tree: fix registerNode error when nodeKey is 0
pull/3642/merge
cinwell.li 2017-04-24 15:45:07 +08:00 committed by GitHub
parent 7036276b8a 1c4ff99508
commit 19ae5e8ea3
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -12,6 +12,7 @@
![JS gzip size](http://img.badgesize.io/https://unpkg.com/element-ui/lib/index.js?compression=gzip&label=gzip%20size:%20JS) ![JS gzip size](http://img.badgesize.io/https://unpkg.com/element-ui/lib/index.js?compression=gzip&label=gzip%20size:%20JS)
![CSS gzip size](http://img.badgesize.io/https://unpkg.com/element-ui/lib/theme-default/index.css?compression=gzip&label=gzip%20size:%20CSS) ![CSS gzip size](http://img.badgesize.io/https://unpkg.com/element-ui/lib/theme-default/index.css?compression=gzip&label=gzip%20size:%20CSS)
[![Join the chat at https://gitter.im/ElemeFE/element](https://badges.gitter.im/ElemeFE/element.svg)](https://gitter.im/ElemeFE/element?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Join the chat at https://gitter.im/ElemeFE/element](https://badges.gitter.im/ElemeFE/element.svg)](https://gitter.im/ElemeFE/element?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![Join the chat at https://gitter.im/element-en/Lobby](https://badges.gitter.im/element-en/Lobby.svg)](https://gitter.im/element-en/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![OpenCollective](https://opencollective.com/element/backers/badge.svg)](#backers) [![OpenCollective](https://opencollective.com/element/backers/badge.svg)](#backers)
[![OpenCollective](https://opencollective.com/element/sponsors/badge.svg)](#sponsors) [![OpenCollective](https://opencollective.com/element/sponsors/badge.svg)](#sponsors)

2
examples/docs/zh-CN/tree.md
View File

@ -698,7 +698,7 @@
### 手风琴模式 ### 手风琴模式
每次只打开一个同级树节点展开 对于同一级的节点，每次只能展开一个
::: demo ::: demo
```html ```html

2
packages/tree/src/model/tree-store.js
View File

@ -132,7 +132,7 @@ export default class TreeStore {
if (!key || !node || !node.data) return; if (!key || !node || !node.data) return;
const nodeKey = node.key; const nodeKey = node.key;
if (nodeKey) this.nodesMap[node.key] = node; if (nodeKey !== undefined) this.nodesMap[node.key] = node;
} }
deregisterNode(node) { deregisterNode(node) {

2
packages/upload/src/ajax.js
View File

@ -5,7 +5,7 @@ function getError(action, option, xhr) {
} else if (xhr.responseText) { } else if (xhr.responseText) {
msg = `${xhr.status} ${xhr.responseText}`; msg = `${xhr.status} ${xhr.responseText}`;
} else { } else {
msg = `fail to post ${action} ${xhr.status}'`; msg = `fail to post ${action} ${xhr.status}`;
} }
const err = new Error(msg); const err = new Error(msg);