|
@@ -111,8 +111,9 @@ function initProps (vm: Component, propsOptions: Object) {
|
|
|
|
|
|
|
|
function initData (vm: Component) {
|
|
function initData (vm: Component) {
|
|
|
let data = vm.$options.data
|
|
let data = vm.$options.data
|
|
|
- // $options.data is guaranteed to be a function after merge
|
|
|
|
|
- data = vm._data = getData(data, vm)
|
|
|
|
|
|
|
+ data = vm._data = typeof data === 'function'
|
|
|
|
|
+ ? getData(data, vm)
|
|
|
|
|
+ : data || {}
|
|
|
if (!isPlainObject(data)) {
|
|
if (!isPlainObject(data)) {
|
|
|
data = {}
|
|
data = {}
|
|
|
process.env.NODE_ENV !== 'production' && warn(
|
|
process.env.NODE_ENV !== 'production' && warn(
|