diff --git a/dist/fix/fix.js b/dist/fix/fix.js
index 9a106ae7a..e87c7e51a 100644
--- a/dist/fix/fix.js
+++ b/dist/fix/fix.js
@@ -919,23 +919,27 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
return m;
} : parsePath(exp);
var v = getter.call(model, model);
- var _dep = new Dep();
- if (isGlobal) {
- (v.__ob__._scopeDeps || (v.__ob__._scopeDeps = [])).push(_dep);
- } else {
- (v.__ob__._deps || (v.__ob__._deps = [])).push(_dep);
+
+ if (v.__ob__) {
+ var _dep = new Dep();
+ if (isGlobal) {
+ (v.__ob__._scopeDeps || (v.__ob__._scopeDeps = [])).push(_dep);
+ } else {
+ (v.__ob__._deps || (v.__ob__._deps = [])).push(_dep);
+ }
+ var _w = new Watcher(model, function () {
+ _dep.depend();
+ return NaN;
+ }, function (newValue, oldValue, attrs) {
+ callback(i, newValue, oldValue, BI._.extend({ index: i }, attrs));
+ }, options);
+ watchers.push(function unwatchFn() {
+ _w.teardown();
+ v.__ob__._scopeDeps && remove(v.__ob__._scopeDeps, _dep);
+ v.__ob__._deps && remove(v.__ob__._deps, _dep);
+ });
}
- var _w = new Watcher(model, function () {
- _dep.depend();
- return NaN;
- }, function (newValue, oldValue, attrs) {
- callback(i, newValue, oldValue, BI._.extend({ index: i }, attrs));
- }, options);
- watchers.push(function unwatchFn() {
- _w.teardown();
- v.__ob__._scopeDeps && remove(v.__ob__._scopeDeps, _dep);
- v.__ob__._deps && remove(v.__ob__._deps, _dep);
- });
+
return;
}
// **.a.**的情况，场景：a.b.c, 如果用b.**监听, a被重新赋值b上的_scopeDes就不存在了
@@ -943,6 +947,11 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
//先获取到能获取到的对象
var _paths = exp.split(".");
var _currentModel = model[_paths[1]];
+
+ if (!_currentModel.__ob__) {
+ return;
+ }
+
exp = _paths[1] + ".**";
//补全路径
var _parent = _currentModel.__ob__.parent,
@@ -993,6 +1002,11 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
}
currentModel = model[paths[_i]];
}
+
+ if (!currentModel.__ob__) {
+ return;
+ }
+
exp = exp.substr(exp.indexOf("*"));
//补全路径
var parent = currentModel.__ob__.parent,
diff --git a/dist/font/iconfont.eot b/dist/font/iconfont.eot
index e43a26d51..224ca0343 100644
Binary files a/dist/font/iconfont.eot and b/dist/font/iconfont.eot differ
diff --git a/dist/font/iconfont.svg b/dist/font/iconfont.svg
index 689b726f8..268b5cb8d 100644
--- a/dist/font/iconfont.svg
+++ b/dist/font/iconfont.svg
@@ -14,6 +14,16 @@
/>
+
+
+
+
+
+
+
+
+
+
@@ -98,17 +108,17 @@
-
+
-
+
-
+
-
+
-
+
@@ -288,7 +298,7 @@
-
+
@@ -808,7 +818,7 @@
-
+
diff --git a/dist/font/iconfont.ttf b/dist/font/iconfont.ttf
index 58295b5ad..743021ccc 100644
Binary files a/dist/font/iconfont.ttf and b/dist/font/iconfont.ttf differ
diff --git a/dist/font/iconfont.woff b/dist/font/iconfont.woff
index ffe943697..ada633840 100644
Binary files a/dist/font/iconfont.woff and b/dist/font/iconfont.woff differ
diff --git a/dist/font/iconfont.woff2 b/dist/font/iconfont.woff2
index 8d389ad7b..2a5f9019d 100644
Binary files a/dist/font/iconfont.woff2 and b/dist/font/iconfont.woff2 differ