|
|
|
|
@ -48,7 +48,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
function remove(arr, item) { |
|
|
|
|
if (arr.length) { |
|
|
|
|
if (arr && arr.length) { |
|
|
|
|
var _index = arr.indexOf(item); |
|
|
|
|
if (_index > -1) { |
|
|
|
|
return arr.splice(_index, 1); |
|
|
|
|
@ -437,9 +437,87 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
|
|
|
|
return ob; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
function notify(model, key, dep) { |
|
|
|
|
dep.notify(); |
|
|
|
|
//触发a.*绑定的依赖
|
|
|
|
|
_.each(model.__ob__._deps, function (dep) { |
|
|
|
|
dep.notify(); |
|
|
|
|
}); |
|
|
|
|
//触发a.**绑定的依赖
|
|
|
|
|
var parent = model.__ob__, |
|
|
|
|
root = model.__ob__, |
|
|
|
|
route = key; |
|
|
|
|
while (parent) { |
|
|
|
|
_.each(parent._scopeDeps, function (dep) { |
|
|
|
|
dep.notify(); |
|
|
|
|
}); |
|
|
|
|
if (parent.parentKey != null) { |
|
|
|
|
route = parent.parentKey + '.' + route; |
|
|
|
|
} |
|
|
|
|
root = parent; |
|
|
|
|
parent = parent.parent; |
|
|
|
|
} |
|
|
|
|
for (var _key2 in root._globalDeps) { |
|
|
|
|
var reg = new RegExp(_key2); |
|
|
|
|
if (reg.test(route)) { |
|
|
|
|
root._globalDeps[_key2].notify(); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
function defineReactive(obj, observer, shallow) { |
|
|
|
|
var props = {}; |
|
|
|
|
var model = void 0; |
|
|
|
|
if (typeof Proxy === 'function') { |
|
|
|
|
var deps = {}, |
|
|
|
|
childObs = {}, |
|
|
|
|
cache = {}; |
|
|
|
|
_.each(obj, function (val, key) { |
|
|
|
|
if (key in $$skipArray) { |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
cache[key] = val; |
|
|
|
|
var dep = deps[key] = observer && observer['__dep' + key] || new Dep(); |
|
|
|
|
observer && (observer['__dep' + key] = dep); |
|
|
|
|
childObs[key] = !shallow && observe(val, observer, key); |
|
|
|
|
}); |
|
|
|
|
return model = new Proxy(props, { |
|
|
|
|
has: function has(target, key) { |
|
|
|
|
return key in obj; |
|
|
|
|
}, |
|
|
|
|
get: function get(target, key) { |
|
|
|
|
if (key in $$skipArray) { |
|
|
|
|
return target[key]; |
|
|
|
|
} |
|
|
|
|
var value = cache[key]; |
|
|
|
|
if (Dep.target) { |
|
|
|
|
deps[key].depend(); |
|
|
|
|
if (childObs[key]) { |
|
|
|
|
childObs[key].dep.depend(); |
|
|
|
|
if (_.isArray(value)) { |
|
|
|
|
dependArray(value); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
return value; |
|
|
|
|
}, |
|
|
|
|
set: function set(target, key, newVal) { |
|
|
|
|
if (key in $$skipArray) { |
|
|
|
|
return target[key] = newVal; |
|
|
|
|
} |
|
|
|
|
var value = cache[key], |
|
|
|
|
dep = deps[key]; |
|
|
|
|
if (newVal === value || newVal !== newVal && value !== value) { |
|
|
|
|
return newVal; |
|
|
|
|
} |
|
|
|
|
cache[key] = newVal; |
|
|
|
|
childObs[key] = !shallow && observe(newVal, observer, key); |
|
|
|
|
obj[key] = childObs[key] ? childObs[key].model : newVal; |
|
|
|
|
notify(model, key, dep); |
|
|
|
|
return obj[key]; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
_.each(obj, function (val, key) { |
|
|
|
|
if (key in $$skipArray) { |
|
|
|
|
return; |
|
|
|
|
@ -471,31 +549,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
|
|
|
|
val = newVal; |
|
|
|
|
childOb = !shallow && observe(newVal, observer, key); |
|
|
|
|
obj[key] = childOb ? childOb.model : newVal; |
|
|
|
|
dep.notify(); |
|
|
|
|
//触发a.*绑定的依赖
|
|
|
|
|
_.each(model.__ob__._deps, function (dep) { |
|
|
|
|
dep.notify(); |
|
|
|
|
}); |
|
|
|
|
//触发a.**绑定的依赖
|
|
|
|
|
var parent = model.__ob__, |
|
|
|
|
root = model.__ob__, |
|
|
|
|
route = key; |
|
|
|
|
while (parent) { |
|
|
|
|
_.each(parent._scopeDeps, function (dep) { |
|
|
|
|
dep.notify(); |
|
|
|
|
}); |
|
|
|
|
if (parent.parentKey != null) { |
|
|
|
|
route = parent.parentKey + '.' + route; |
|
|
|
|
} |
|
|
|
|
root = parent; |
|
|
|
|
parent = parent.parent; |
|
|
|
|
} |
|
|
|
|
for (var _key2 in root._globalDeps) { |
|
|
|
|
var reg = new RegExp(_key2); |
|
|
|
|
if (reg.test(route)) { |
|
|
|
|
root._globalDeps[_key2].notify(); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
notify(model, key, dep); |
|
|
|
|
} |
|
|
|
|
}; |
|
|
|
|
}); |
|
|
|
|
@ -820,6 +874,10 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
|
|
|
|
|
|
|
|
|
var computedWatcherOptions = { lazy: true }; |
|
|
|
|
|
|
|
|
|
function initState(vm, state) { |
|
|
|
|
vm.$$state = observe(state).model; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
function initComputed(vm, computed) { |
|
|
|
|
var watchers = vm._computedWatchers = {}; |
|
|
|
|
|
|
|
|
|
@ -834,11 +892,21 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
function defineComputed(target, computed) { |
|
|
|
|
function defineComputed(vm, computed) { |
|
|
|
|
var props = {}; |
|
|
|
|
if (typeof Proxy === 'function') { |
|
|
|
|
return vm.$$computed = new Proxy(props, { |
|
|
|
|
has: function has(target, key) { |
|
|
|
|
return key in computed; |
|
|
|
|
}, |
|
|
|
|
get: function get(target, key) { |
|
|
|
|
return createComputedGetter(vm, key)(); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
var shouldCache = true; |
|
|
|
|
for (var key in computed) { |
|
|
|
|
if (!(key in target)) { |
|
|
|
|
if (!(key in vm)) { |
|
|
|
|
var sharedPropertyDefinition = { |
|
|
|
|
enumerable: true, |
|
|
|
|
configurable: true, |
|
|
|
|
@ -847,7 +915,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
|
|
|
|
}; |
|
|
|
|
var userDef = computed[key]; |
|
|
|
|
if (typeof userDef === 'function') { |
|
|
|
|
sharedPropertyDefinition.get = createComputedGetter(target, key); |
|
|
|
|
sharedPropertyDefinition.get = createComputedGetter(vm, key); |
|
|
|
|
sharedPropertyDefinition.set = noop; |
|
|
|
|
} else { |
|
|
|
|
sharedPropertyDefinition.get = userDef.get ? shouldCache && userDef.cache !== false ? createComputedGetter(key) : userDef.get : noop; |
|
|
|
|
@ -857,7 +925,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
|
|
|
|
props[key] = sharedPropertyDefinition; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
target.$$computed = createViewModel$1({}, props); |
|
|
|
|
vm.$$computed = createViewModel$1({}, props); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
function createComputedGetter(vm, key) { |
|
|
|
|
@ -881,11 +949,76 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
function defineProps(vm, keys) { |
|
|
|
|
var props = {}; |
|
|
|
|
if (typeof Proxy === 'function') { |
|
|
|
|
return vm.model = new Proxy(props, { |
|
|
|
|
has: function has(target, key) { |
|
|
|
|
return keys.indexOf(key) > -1; |
|
|
|
|
}, |
|
|
|
|
get: function get(target, key) { |
|
|
|
|
if (key in $$skipArray) { |
|
|
|
|
return props[key]; |
|
|
|
|
} |
|
|
|
|
if (vm.$$computed && key in vm.$$computed) { |
|
|
|
|
return vm.$$computed[key]; |
|
|
|
|
} |
|
|
|
|
if (vm.$$state && key in vm.$$state) { |
|
|
|
|
return vm.$$state[key]; |
|
|
|
|
} |
|
|
|
|
return vm.$$model[key]; |
|
|
|
|
}, |
|
|
|
|
set: function set(target, key, val) { |
|
|
|
|
if (key in $$skipArray) { |
|
|
|
|
return props[key] = val; |
|
|
|
|
} |
|
|
|
|
if (vm.$$state && key in vm.$$state) { |
|
|
|
|
return vm.$$state[key] = val; |
|
|
|
|
} |
|
|
|
|
if (vm.$$model && key in vm.$$model) { |
|
|
|
|
return vm.$$model[key] = val; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
var _loop = function _loop(i, len) { |
|
|
|
|
var key = keys[i]; |
|
|
|
|
if (!(key in $$skipArray)) { |
|
|
|
|
props[key] = { |
|
|
|
|
enumerable: true, |
|
|
|
|
configurable: true, |
|
|
|
|
get: function get() { |
|
|
|
|
if (vm.$$computed && key in vm.$$computed) { |
|
|
|
|
return vm.$$computed[key]; |
|
|
|
|
} |
|
|
|
|
if (vm.$$state && key in vm.$$state) { |
|
|
|
|
return vm.$$state[key]; |
|
|
|
|
} |
|
|
|
|
return vm.$$model[key]; |
|
|
|
|
}, |
|
|
|
|
set: function set(val) { |
|
|
|
|
if (vm.$$state && key in vm.$$state) { |
|
|
|
|
return vm.$$state[key] = val; |
|
|
|
|
} |
|
|
|
|
if (vm.$$model && key in vm.$$model) { |
|
|
|
|
return vm.$$model[key] = val; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}; |
|
|
|
|
} |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
for (var i = 0, len = keys.length; i < len; i++) { |
|
|
|
|
_loop(i, len); |
|
|
|
|
} |
|
|
|
|
vm.model = createViewModel$1({}, props); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
var VM = function () { |
|
|
|
|
function VM(model) { |
|
|
|
|
_classCallCheck(this, VM); |
|
|
|
|
|
|
|
|
|
var vm = this; |
|
|
|
|
if (model instanceof Observer || model instanceof VM) { |
|
|
|
|
model = model.model; |
|
|
|
|
} |
|
|
|
|
@ -894,33 +1027,11 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
|
|
|
|
} else { |
|
|
|
|
this.options = model || {}; |
|
|
|
|
} |
|
|
|
|
var keys = _.keys(this.$$model).concat(_.keys(this.computed)); |
|
|
|
|
var props = {}; |
|
|
|
|
|
|
|
|
|
var _loop = function _loop(i, len) { |
|
|
|
|
var key = keys[i]; |
|
|
|
|
if (!(key in $$skipArray)) { |
|
|
|
|
props[key] = { |
|
|
|
|
enumerable: true, |
|
|
|
|
configurable: true, |
|
|
|
|
get: function get() { |
|
|
|
|
return key in vm.$$computed ? vm.$$computed[key] : vm.$$model[key]; |
|
|
|
|
}, |
|
|
|
|
set: function set(val) { |
|
|
|
|
if (!vm.$$model || !(key in vm.$$model)) { |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
return vm.$$model[key] = val; |
|
|
|
|
} |
|
|
|
|
}; |
|
|
|
|
} |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
for (var i = 0, len = keys.length; i < len; i++) { |
|
|
|
|
_loop(i, len); |
|
|
|
|
} |
|
|
|
|
this.model = createViewModel$1({}, props); |
|
|
|
|
var state = this.state && this.state(); |
|
|
|
|
var keys = _.keys(this.$$model).concat(_.keys(state)).concat(_.keys(this.computed)); |
|
|
|
|
defineProps(this, keys); |
|
|
|
|
this.$$model && (this.model.__ob__ = this.$$model.__ob__); |
|
|
|
|
state && initState(this, state); |
|
|
|
|
initComputed(this, this.computed); |
|
|
|
|
initMethods(this, this.actions); |
|
|
|
|
this._init(); |
|
|
|
|
@ -989,6 +1100,24 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
|
|
|
|
var fns = exps.slice(); |
|
|
|
|
var complete = false, |
|
|
|
|
running = false; |
|
|
|
|
var callback = function callback(index) { |
|
|
|
|
if (complete === true) { |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
fns[index] = true; |
|
|
|
|
if (runBinaryFunction(fns)) { |
|
|
|
|
complete = true; |
|
|
|
|
cb(); |
|
|
|
|
} |
|
|
|
|
if (!running) { |
|
|
|
|
running = true; |
|
|
|
|
nextTick(function () { |
|
|
|
|
complete = false; |
|
|
|
|
running = false; |
|
|
|
|
fns = exps.slice(); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
}; |
|
|
|
|
_.each(exps, function (exp, i) { |
|
|
|
|
if (_.has(operators, exp)) { |
|
|
|
|
return; |
|
|
|
|
@ -1014,7 +1143,9 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
|
|
|
|
var w = new Watcher(model, function () { |
|
|
|
|
dep.depend(); |
|
|
|
|
return NaN; |
|
|
|
|
}, cb); |
|
|
|
|
}, function () { |
|
|
|
|
callback(i); |
|
|
|
|
}); |
|
|
|
|
watchers.push(function unwatchFn() { |
|
|
|
|
w.teardown(); |
|
|
|
|
v.__ob__._scopeDeps && remove(v.__ob__._scopeDeps, dep); |
|
|
|
|
@ -1043,7 +1174,9 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
|
|
|
|
var _w = new Watcher(model, function () { |
|
|
|
|
_dep.depend(); |
|
|
|
|
return NaN; |
|
|
|
|
}, cb); |
|
|
|
|
}, function () { |
|
|
|
|
callback(i); |
|
|
|
|
}); |
|
|
|
|
watchers.push(function unwatchFn() { |
|
|
|
|
_w.teardown(); |
|
|
|
|
root._globalDeps && delete root._globalDeps[regStr]; |
|
|
|
|
@ -1051,22 +1184,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
var watcher = new Watcher(model, exp, function () { |
|
|
|
|
if (complete === true) { |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
fns[i] = true; |
|
|
|
|
if (runBinaryFunction(fns)) { |
|
|
|
|
complete = true; |
|
|
|
|
cb(); |
|
|
|
|
} |
|
|
|
|
if (!running) { |
|
|
|
|
running = true; |
|
|
|
|
nextTick(function () { |
|
|
|
|
complete = false; |
|
|
|
|
running = false; |
|
|
|
|
fns = exps.slice(); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
callback(i); |
|
|
|
|
}, options); |
|
|
|
|
watchers.push(function unwatchFn() { |
|
|
|
|
watcher.teardown(); |
|
|
|
|
|
guy
7 years ago