|
|
@ -10154,15 +10154,13 @@ if (!_global.BI) { |
|
|
|
if (!localeText) { |
|
|
|
if (!localeText) { |
|
|
|
localeText = key; |
|
|
|
localeText = key; |
|
|
|
} |
|
|
|
} |
|
|
|
if (localeText.indexOf("{R1}") > -1) { |
|
|
|
|
|
|
|
var len = arguments.length; |
|
|
|
var len = arguments.length; |
|
|
|
if (len > 1) { |
|
|
|
if (len > 1) { |
|
|
|
|
|
|
|
if (localeText.indexOf("{R1}") > -1) { |
|
|
|
for (var i = 1; i < len; i++) { |
|
|
|
for (var i = 1; i < len; i++) { |
|
|
|
var key = "{R" + i + "}"; |
|
|
|
var key = "{R" + i + "}"; |
|
|
|
localeText = BI.replaceAll(localeText, key, arguments[i] + ""); |
|
|
|
localeText = BI.replaceAll(localeText, key, arguments[i] + ""); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
return localeText; |
|
|
|
|
|
|
|
} else { |
|
|
|
} else { |
|
|
|
var args = Array.prototype.slice.call(arguments); |
|
|
|
var args = Array.prototype.slice.call(arguments); |
|
|
|
var count = 1; |
|
|
|
var count = 1; |
|
|
@ -10170,6 +10168,8 @@ if (!_global.BI) { |
|
|
|
return args[count++] + ""; |
|
|
|
return args[count++] + ""; |
|
|
|
}); |
|
|
|
}); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
return localeText; |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
assert: function (v, is) { |
|
|
|
assert: function (v, is) { |
|
|
@ -34229,7 +34229,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons |
|
|
|
var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {}; |
|
|
|
var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {}; |
|
|
|
|
|
|
|
|
|
|
|
var model = vm; |
|
|
|
var model = vm; |
|
|
|
if (!model.addWatch && model.$vm) { |
|
|
|
if (!model.$watch && model.$vm) { |
|
|
|
model = model.$vm; |
|
|
|
model = model.$vm; |
|
|
|
} |
|
|
|
} |
|
|
|
if (isPlainObject(cb)) { |
|
|
|
if (isPlainObject(cb)) { |
|
|
@ -34243,7 +34243,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons |
|
|
|
options.user = true; |
|
|
|
options.user = true; |
|
|
|
var exps = void 0; |
|
|
|
var exps = void 0; |
|
|
|
if (_$1.isFunction(expOrFn) || !(exps = expOrFn.match(/[a-zA-Z0-9_.*]+|[|][|]|[&][&]|[(]|[)]/g)) || exps.length === 1 && !/\*/.test(expOrFn)) { |
|
|
|
if (_$1.isFunction(expOrFn) || !(exps = expOrFn.match(/[a-zA-Z0-9_.*]+|[|][|]|[&][&]|[(]|[)]/g)) || exps.length === 1 && !/\*/.test(expOrFn)) { |
|
|
|
model.addWatch(expOrFn, cb, options); |
|
|
|
model.$watch(expOrFn, cb, options); |
|
|
|
|
|
|
|
|
|
|
|
return []; |
|
|
|
return []; |
|
|
|
} |
|
|
|
} |
|
|
@ -34298,7 +34298,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons |
|
|
|
|
|
|
|
|
|
|
|
return result; |
|
|
|
return result; |
|
|
|
}; |
|
|
|
}; |
|
|
|
model.addWatch(getter, function (newValue, oldValue, attrs) { |
|
|
|
model.$watch(getter, function (newValue, oldValue, attrs) { |
|
|
|
callback(i, newValue, oldValue, _$1.extend({ index: i }, attrs)); |
|
|
|
callback(i, newValue, oldValue, _$1.extend({ index: i }, attrs)); |
|
|
|
}, _$1.extend(options, { |
|
|
|
}, _$1.extend(options, { |
|
|
|
deep: isGlobal |
|
|
|
deep: isGlobal |
|
|
@ -34342,13 +34342,13 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons |
|
|
|
|
|
|
|
|
|
|
|
return currentModels; |
|
|
|
return currentModels; |
|
|
|
}; |
|
|
|
}; |
|
|
|
model.addWatch(_getter, function (newValue, oldValue, attrs) { |
|
|
|
model.$watch(_getter, function (newValue, oldValue, attrs) { |
|
|
|
callback(i, newValue, oldValue, _$1.extend({ index: i }, attrs)); |
|
|
|
callback(i, newValue, oldValue, _$1.extend({ index: i }, attrs)); |
|
|
|
}, options); |
|
|
|
}, options); |
|
|
|
|
|
|
|
|
|
|
|
return; |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
model.addWatch(exp, function (newValue, oldValue, attrs) { |
|
|
|
model.$watch(exp, function (newValue, oldValue, attrs) { |
|
|
|
callback(i, newValue, oldValue, _$1.extend({ index: i }, attrs)); |
|
|
|
callback(i, newValue, oldValue, _$1.extend({ index: i }, attrs)); |
|
|
|
}, options); |
|
|
|
}, options); |
|
|
|
}); |
|
|
|
}); |
|
|
@ -34480,7 +34480,8 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons |
|
|
|
var allModelInstances = {}; |
|
|
|
var allModelInstances = {}; |
|
|
|
var emptyFn = function emptyFn() {}; |
|
|
|
var emptyFn = function emptyFn() {}; |
|
|
|
|
|
|
|
|
|
|
|
var Watcher = function Watcher(_ref) { |
|
|
|
var Watcher = function () { |
|
|
|
|
|
|
|
function Watcher(_ref) { |
|
|
|
var get = _ref.get, |
|
|
|
var get = _ref.get, |
|
|
|
last = _ref.last, |
|
|
|
last = _ref.last, |
|
|
|
listener = _ref.listener, |
|
|
|
listener = _ref.listener, |
|
|
@ -34499,8 +34500,18 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons |
|
|
|
last: this.last, |
|
|
|
last: this.last, |
|
|
|
listener: this.listener |
|
|
|
listener: this.listener |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 不要去掉,为了兼容IE8,IE8下instance of Constructor如果不绑定函数会出错
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Watcher.prototype.getInstance = function getInstance() { |
|
|
|
|
|
|
|
return this; |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return Watcher; |
|
|
|
|
|
|
|
}(); |
|
|
|
|
|
|
|
|
|
|
|
function initState(vm, state) { |
|
|
|
function initState(vm, state) { |
|
|
|
var watchers = vm._stateWatchers = {}; |
|
|
|
var watchers = vm._stateWatchers = {}; |
|
|
|
for (var key in state) { |
|
|
|
for (var key in state) { |
|
|
@ -34621,7 +34632,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons |
|
|
|
var p = vm._parent; |
|
|
|
var p = vm._parent; |
|
|
|
while (p) { |
|
|
|
while (p) { |
|
|
|
if (p.childContext && p.childContext.indexOf(key) > -1) { |
|
|
|
if (p.childContext && p.childContext.indexOf(key) > -1) { |
|
|
|
p.addWatch(key, function (cur, last, p) { |
|
|
|
p.$watch(key, function (cur, last, p) { |
|
|
|
if (!vm.alive) return; |
|
|
|
if (!vm.alive) return; |
|
|
|
vm.model[key] = cur; |
|
|
|
vm.model[key] = cur; |
|
|
|
vm._contextWatchers[key].last = cloneShadow(cur); // 避免重复调用(可以改成给watch添加一个参数保证下次比较一定相同)
|
|
|
|
vm._contextWatchers[key].last = cloneShadow(cur); // 避免重复调用(可以改成给watch添加一个参数保证下次比较一定相同)
|
|
|
@ -34742,6 +34753,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons |
|
|
|
var watchers = [].concat(vm._watchers); |
|
|
|
var watchers = [].concat(vm._watchers); |
|
|
|
|
|
|
|
|
|
|
|
_$1.each(watchers, function (watcher) { |
|
|
|
_$1.each(watchers, function (watcher) { |
|
|
|
|
|
|
|
if (!watcher) return; |
|
|
|
var cur = watcher.get(); |
|
|
|
var cur = watcher.get(); |
|
|
|
var last = watcher.last; |
|
|
|
var last = watcher.last; |
|
|
|
|
|
|
|
|
|
|
@ -34809,7 +34821,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons |
|
|
|
|
|
|
|
|
|
|
|
Model.prototype._init = function _init() {}; |
|
|
|
Model.prototype._init = function _init() {}; |
|
|
|
|
|
|
|
|
|
|
|
Model.prototype.addWatch = function addWatch(expOrFn, cb, options) { |
|
|
|
Model.prototype.$watch = function $watch(expOrFn, cb, options) { |
|
|
|
var watcher = createWatcher(this, expOrFn, cb, options); |
|
|
|
var watcher = createWatcher(this, expOrFn, cb, options); |
|
|
|
this._watchers.push(watcher); |
|
|
|
this._watchers.push(watcher); |
|
|
|
}; |
|
|
|
}; |
|
|
|