|
@@ -89,7 +89,7 @@ export function mergeDataOrFn (
|
|
|
typeof parentVal === 'function' ? parentVal.call(this) : parentVal
|
|
typeof parentVal === 'function' ? parentVal.call(this) : parentVal
|
|
|
)
|
|
)
|
|
|
}
|
|
}
|
|
|
- } else if (parentVal || childVal) {
|
|
|
|
|
|
|
+ } else {
|
|
|
return function mergedInstanceDataFn () {
|
|
return function mergedInstanceDataFn () {
|
|
|
// instance merge
|
|
// instance merge
|
|
|
const instanceData = typeof childVal === 'function'
|
|
const instanceData = typeof childVal === 'function'
|
|
@@ -123,7 +123,7 @@ strats.data = function (
|
|
|
|
|
|
|
|
return parentVal
|
|
return parentVal
|
|
|
}
|
|
}
|
|
|
- return mergeDataOrFn.call(this, parentVal, childVal)
|
|
|
|
|
|
|
+ return mergeDataOrFn(parentVal, childVal)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
return mergeDataOrFn(parentVal, childVal, vm)
|
|
return mergeDataOrFn(parentVal, childVal, vm)
|