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

Tree: get prop from data if not specified in `props`

pull/7229/head
Leopoldthecoder 2017-09-26 14:05:41 +08:00 committed by 杨奕
parent 2fae006ba1
commit 9e67ec3506
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/docs/en-US/tree.md
View File

@ -878,7 +878,7 @@ Only one node among the same level can be expanded at one time.
| --------- | ---------------------------------------- | ------ | --------------- | ------- | | --------- | ---------------------------------------- | ------ | --------------- | ------- |
| label | specify which key of node object is used as the node's label | string, function(data, node) | — | — | | label | specify which key of node object is used as the node's label | string, function(data, node) | — | — |
| children | specify which node object is used as the node's subtree | string, function(data, node) | — | — | | children | specify which node object is used as the node's subtree | string, function(data, node) | — | — |
| disabled | specify which node's checkbox disabled | boolean, function(data, node) | — | — | | disabled | specify which key of node object represents if node's checkbox is disabled | boolean, function(data, node) | — | — |
### Method ### Method
`Tree` has the following method, which returns the currently selected array of nodes. `Tree` has the following method, which returns the currently selected array of nodes.

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

@ -877,7 +877,7 @@
| -------- | ----------------- | ------ | ---- | ---- | | -------- | ----------------- | ------ | ---- | ---- |
| label | 指定节点标签为节点对象的某个属性值 | string, function(data, node) | — | — | | label | 指定节点标签为节点对象的某个属性值 | string, function(data, node) | — | — |
| children | 指定子树为节点对象的某个属性值 | string, function(data, node) | — | — | | children | 指定子树为节点对象的某个属性值 | string, function(data, node) | — | — |
| disabled | 指定节点选择框是否禁用 | boolean, function(data, node) | — | — | | disabled | 指定节点选择框是否禁用为节点对象的某个属性值 | boolean, function(data, node) | — | — |
### 方法 ### 方法
`Tree` 拥有如下方法，返回目前被选中的节点数组： `Tree` 拥有如下方法，返回目前被选中的节点数组：

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

@ -68,7 +68,8 @@ const getPropertyFromData = function(node, prop) {
} else if (typeof config === 'string') { } else if (typeof config === 'string') {
return data[config]; return data[config];
} else if (typeof config === 'undefined') { } else if (typeof config === 'undefined') {
return ''; const dataProp = data[prop];
return dataProp === undefined ? '' : dataProp;
} }
}; };