github
/
ant-design-vue
mirror of https://github.com/vueComponent/ant-design-vue
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore: fix getProps bug

pull/22/head
tjz 2018-05-06 21:50:05 +08:00
parent 57698010f7
commit 3837493567
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/_util/props-util.js
View File

@ -1,5 +1,10 @@
import isPlainObject from 'lodash/isPlainObject' import isPlainObject from 'lodash/isPlainObject'
function getType (fn) {
const match = fn && fn.toString().match(/^\s*function (\w+)/)
return match ? match[1] : ''
}
const camelizeRE = /-(\w)/g const camelizeRE = /-(\w)/g
const camelize = (str) => { const camelize = (str) => {
return str.replace(camelizeRE, (_, c) => c ? c.toUpperCase() : '') return str.replace(camelizeRE, (_, c) => c ? c.toUpperCase() : '')
@ -67,8 +72,11 @@ const getOptionProps = (instance) => {
const props = (Ctor.options || {}).props || {} const props = (Ctor.options || {}).props || {}
const res = {} const res = {}
for (const [k, v] of Object.entries(props)) { for (const [k, v] of Object.entries(props)) {
if (v.default !== undefined) { const def = v.default
res[k] = typeof v.default === 'function' ? v.default() : v.default if (def !== undefined) {
res[k] = typeof def === 'function' && getType(v.type) !== 'Function'
? def.call(instance)
: def
} }
} }
return { ...res, ...propsData } return { ...res, ...propsData }