Merge remote-tracking branch 'eleme/dev' into carbon

# Conflicts:
#	examples/app.vue
#	examples/docs/en-US/tree.md
#	examples/docs/zh-CN/tree.md
#	examples/versions.json
#	packages/select/src/select.vue
#	packages/theme-default/package.json
This commit is contained in:
Leopoldthecoder
2017-09-29 16:21:29 +08:00
26 changed files with 103 additions and 40 deletions

View File

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