diff --git a/changelog.md b/changelog.md
index 78c07f643..043dae7b7 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,6 @@
# 更新日志
2.0(2021-12)
+- BI.point支持widget添加埋点
- childContext废弃，替换成provide
- 支持BI.useContext获取上下文环境
- BI.Msg.alert支持message传json格式
diff --git a/dist/fix/fix.compact.js b/dist/fix/fix.compact.js
index 35a642878..88148367c 100644
--- a/dist/fix/fix.compact.js
+++ b/dist/fix/fix.compact.js
@@ -99,23 +99,13 @@
}
}
- // _.each(["populate", "addItems", "prependItems"], function (name) {
- // var old = BI.Loader.prototype[name];
- // BI.Loader.prototype[name] = function () {
- // BI.Widget.pushContext(this);
- // try {
- // var result = old.apply(this, arguments);
- // } catch (e) {
- // console.error(e);
- // }
- // BI.Widget.popContext();
- // return result;
- // };
- // });
-
function createStore () {
var needPop = false;
- if (_global.Fix && this._store) {
+ var workerMode = BI.Providers.getProvider("bi.provider.system").getWorkerMode();
+ if (workerMode && this._worker) {
+ return;
+ }
+ if (this._store) {
var store = findStore(this.options.context || this._parent || this.options.element || this._context);
if (store) {
pushTarget(store);
@@ -151,7 +141,11 @@
var __initWatch = BI.Widget.prototype.__initWatch;
BI.Widget.prototype.__initWatch = function () {
__initWatch.apply(this, arguments);
- if (_global.Fix && this._store) {
+ var workerMode = BI.Providers.getProvider("bi.provider.system").getWorkerMode();
+ if (workerMode && this._worker) {
+ return;
+ }
+ if (this._store) {
initWatch(this, this.watch);
}
};
diff --git a/dist/fix/fix.js b/dist/fix/fix.js
index 54ae610ef..e16bdf99f 100644
--- a/dist/fix/fix.js
+++ b/dist/fix/fix.js
@@ -90,12 +90,13 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
}
}
- var bailRE = /[^\w.$]/;
+ // const bailRE = /[^\w.$]/
function parsePath(path) {
- if (bailRE.test(path)) {
- return;
- }
+ // 正常表达式比较慢，能不要的就不要了
+ // if (bailRE.test(path)) {
+ // return
+ // }
var segments = path.split('.');
return function (obj) {
for (var i = 0; i < segments.length; i++) {
@@ -975,7 +976,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
options = options || {};
options.user = true;
var exps = void 0;
- if (_.isFunction(expOrFn) || !(exps = expOrFn.match(/[a-zA-Z0-9_.*]+|[|][|]|[&][&]|[(]|[)]/g)) || exps.length === 1 && !/\*/.test(expOrFn)) {
+ if (_.isFunction(expOrFn) || !(exps = expOrFn.match(/[a-zA-Z0-9_.*]+|[|][|]|[&][&]|[(]|[)]/g)) || exps.length === 1 && expOrFn.indexOf("*") < 0) {
var watcher = new Watcher(model, expOrFn, cb, options);
if (options.immediate) {
cb(watcher.value);
@@ -1016,45 +1017,96 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
if (_.has(operators, exp)) {
return;
}
- //a.**或a.*形式
- if (/^[1-9a-zA-Z.]+(\*\*$|\*$)/.test(exp) || exp === "**") {
- var isGlobal = /\*\*$/.test(exp);
- if (isGlobal) {
- //a.**的形式
- exp = exp.replace(".**", "");
- } else {
- //a.*的形式
- exp = exp.replace(".*", "");
+ if (exp.indexOf("*") >= 0) {
+ //a.**或a.*形式
+ if (/^[1-9a-zA-Z.]+(\*\*$|\*$)/.test(exp) || exp === "**" || exp === "*") {
+ var isGlobal = exp.indexOf("**") >= 0;
+ if (isGlobal) {
+ //a.**的形式
+ exp = exp.replace(".**", "");
+ } else {
+ //a.*的形式
+ exp = exp.replace(".*", "");
+ }
+ var getter = exp === "**" || exp === "*" ? function (m) {
+ 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);
+ }
+ var _w = new Watcher(model, function () {
+ _dep.depend();
+ return NaN;
+ }, function (newValue, oldValue, attrs) {
+ callback(i, newValue, oldValue, _.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;
}
- var getter = exp === "**" ? function (m) {
- 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);
+ // **.a.**的情况，场景：a.b.c, 如果用b.**监听, a被重新赋值b上的_scopeDes就不存在了
+ if (/^(\*\*\.)+[1-9a-zA-Z]+(\.\*\*$)/.test(exp)) {
+ //先获取到能获取到的对象
+ var _paths = exp.split(".");
+ var _currentModel = model[_paths[1]];
+ exp = _paths[1] + ".**";
+ //补全路径
+ var _parent = _currentModel.__ob__.parent,
+ _root = _currentModel.__ob__;
+ while (_parent) {
+ exp = '*.' + exp;
+ _root = _parent;
+ _parent = _parent.parent;
+ }
+ var _regStr = routeToRegExp(exp);
+ var _dep2 = new Dep();
+ _root._globalDeps || (_root._globalDeps = {});
+ if (_.isArray(_root._globalDeps[_regStr])) {
+ _root._globalDeps[_regStr].push(_dep2);
+ } else {
+ _root._globalDeps[_regStr] = [_dep2];
+ }
+
+ var _w2 = new Watcher(_currentModel, function () {
+ _dep2.depend();
+ return NaN;
+ }, function (newValue, oldValue, attrs) {
+ callback(i, newValue, oldValue, _.extend({ index: i }, attrs));
+ }, options);
+ watchers.push(function unwatchFn() {
+ if (_root._globalDeps) {
+ remove(_root._globalDeps[_regStr], _dep2);
+
+ if (_root._globalDeps[_regStr].length === 0) {
+ delete _root._globalDeps[_regStr];
+ _w2.teardown();
+ }
+ }
+ });
+ return;
}
- var w = new Watcher(model, function () {
- dep.depend();
- return NaN;
- }, function (newValue, oldValue, attrs) {
- callback(i, newValue, oldValue, _.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就不存在了
- if (/^(\*\*\.)+[1-9a-zA-Z]+(\.\*\*$)/.test(exp)) {
+ // 再有结尾有*的就不支持了
+ if (exp[exp.length - 1] === "*") {
+ throw new Error('not support');
+ }
+ //其他含有*的情况，如*.a,*.*.a,a.*.a
+ var currentModel = model;
//先获取到能获取到的对象
var paths = exp.split(".");
- var currentModel = model[paths[1]];
- exp = paths[1] + ".**";
+ for (var _i = 0, len = paths.length; _i < len; _i++) {
+ if (paths[_i] === "*") {
+ break;
+ }
+ currentModel = model[paths[_i]];
+ }
+ exp = exp.substr(exp.indexOf("*"));
//补全路径
var parent = currentModel.__ob__.parent,
root = currentModel.__ob__;
@@ -1064,77 +1116,26 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
parent = parent.parent;
}
var regStr = routeToRegExp(exp);
- var _dep = new Dep();
+ var dep = new Dep();
root._globalDeps || (root._globalDeps = {});
if (_.isArray(root._globalDeps[regStr])) {
- root._globalDeps[regStr].push(_dep);
+ root._globalDeps[regStr].push(dep);
} else {
- root._globalDeps[regStr] = [_dep];
+ root._globalDeps[regStr] = [dep];
}
- var _w = new Watcher(currentModel, function () {
- _dep.depend();
+ var w = new Watcher(currentModel, function () {
+ dep.depend();
return NaN;
}, function (newValue, oldValue, attrs) {
callback(i, newValue, oldValue, _.extend({ index: i }, attrs));
}, options);
watchers.push(function unwatchFn() {
if (root._globalDeps) {
- remove(root._globalDeps[regStr], _dep);
-
+ remove(root._globalDeps[regStr], dep);
if (root._globalDeps[regStr].length === 0) {
delete root._globalDeps[regStr];
- _w.teardown();
- }
- }
- });
- return;
- }
- if (/\*\*$|\*$/.test(exp)) {
- throw new Error('not support');
- }
- //其他含有*的情况，如*.a,*.*.a,a.*.a
- if (/\*/.test(exp)) {
- var _currentModel = model;
- //先获取到能获取到的对象
- var _paths = exp.split(".");
- for (var _i = 0, len = _paths.length; _i < len; _i++) {
- if (_paths[_i] === "*") {
- break;
- }
- _currentModel = model[_paths[_i]];
- }
- exp = exp.substr(exp.indexOf("*"));
- //补全路径
- var _parent = _currentModel.__ob__.parent,
- _root = _currentModel.__ob__;
- while (_parent) {
- exp = '*.' + exp;
- _root = _parent;
- _parent = _parent.parent;
- }
- var _regStr = routeToRegExp(exp);
- var _dep2 = new Dep();
- _root._globalDeps || (_root._globalDeps = {});
- if (_.isArray(_root._globalDeps[_regStr])) {
- _root._globalDeps[_regStr].push(_dep2);
- } else {
- _root._globalDeps[_regStr] = [_dep2];
- }
-
- var _w2 = new Watcher(_currentModel, function () {
- _dep2.depend();
- return NaN;
- }, function (newValue, oldValue, attrs) {
- callback(i, newValue, oldValue, _.extend({ index: i }, attrs));
- }, options);
- watchers.push(function unwatchFn() {
- if (_root._globalDeps) {
- remove(_root._globalDeps[_regStr], _dep2);
-
- if (_root._globalDeps[_regStr].length === 0) {
- delete _root._globalDeps[_regStr];
- _w2.teardown();
+ w.teardown();
}
}
});
diff --git a/dist/fix/fix.proxy.js b/dist/fix/fix.proxy.js
index 513db8d93..33e475d16 100644
--- a/dist/fix/fix.proxy.js
+++ b/dist/fix/fix.proxy.js
@@ -1,2035 +1,2463 @@
(function (global, factory) {
- typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
- typeof define === 'function' && define.amd ? define(['exports'], factory) :
- (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.Fix = {}));
+ typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
+ typeof define === 'function' && define.amd ? define(['exports'], factory) :
+ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.Fix = {}));
}(this, (function (exports) { 'use strict';
- function _typeof(obj) {
- "@babel/helpers - typeof";
-
- if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
- _typeof = function (obj) {
- return typeof obj;
+ function _typeof(obj) {
+ "@babel/helpers - typeof";
+
+ if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
+ _typeof = function (obj) {
+ return typeof obj;
+ };
+ } else {
+ _typeof = function (obj) {
+ return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
+ };
+ }
+
+ return _typeof(obj);
+ }
+
+ function _classCallCheck(instance, Constructor) {
+ if (!(instance instanceof Constructor)) {
+ throw new TypeError("Cannot call a class as a function");
+ }
+ }
+
+ function _defineProperties(target, props) {
+ for (var i = 0; i < props.length; i++) {
+ var descriptor = props[i];
+ descriptor.enumerable = descriptor.enumerable || false;
+ descriptor.configurable = true;
+ if ("value" in descriptor) descriptor.writable = true;
+ Object.defineProperty(target, descriptor.key, descriptor);
+ }
+ }
+
+ function _createClass(Constructor, protoProps, staticProps) {
+ if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+ if (staticProps) _defineProperties(Constructor, staticProps);
+ return Constructor;
+ }
+
+ function _defineProperty(obj, key, value) {
+ if (key in obj) {
+ Object.defineProperty(obj, key, {
+ value: value,
+ enumerable: true,
+ configurable: true,
+ writable: true
+ });
+ } else {
+ obj[key] = value;
+ }
+
+ return obj;
+ }
+
+ function _slicedToArray(arr, i) {
+ return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
+ }
+
+ function _toConsumableArray(arr) {
+ return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
+ }
+
+ function _arrayWithoutHoles(arr) {
+ if (Array.isArray(arr)) return _arrayLikeToArray(arr);
+ }
+
+ function _arrayWithHoles(arr) {
+ if (Array.isArray(arr)) return arr;
+ }
+
+ function _iterableToArray(iter) {
+ if (typeof Symbol !== "undefined" && Symbol.iterator in Object(iter)) return Array.from(iter);
+ }
+
+ function _iterableToArrayLimit(arr, i) {
+ if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return;
+ var _arr = [];
+ var _n = true;
+ var _d = false;
+ var _e = undefined;
+
+ try {
+ for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) {
+ _arr.push(_s.value);
+
+ if (i && _arr.length === i) break;
+ }
+ } catch (err) {
+ _d = true;
+ _e = err;
+ } finally {
+ try {
+ if (!_n && _i["return"] != null) _i["return"]();
+ } finally {
+ if (_d) throw _e;
+ }
+ }
+
+ return _arr;
+ }
+
+ function _unsupportedIterableToArray(o, minLen) {
+ if (!o) return;
+ if (typeof o === "string") return _arrayLikeToArray(o, minLen);
+ var n = Object.prototype.toString.call(o).slice(8, -1);
+ if (n === "Object" && o.constructor) n = o.constructor.name;
+ if (n === "Map" || n === "Set") return Array.from(o);
+ if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
+ }
+
+ function _arrayLikeToArray(arr, len) {
+ if (len == null || len > arr.length) len = arr.length;
+
+ for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
+
+ return arr2;
+ }
+
+ function _nonIterableSpread() {
+ throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+ }
+
+ function _nonIterableRest() {
+ throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+ }
+
+ function _createForOfIteratorHelper(o, allowArrayLike) {
+ var it;
+
+ if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) {
+ if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") {
+ if (it) o = it;
+ var i = 0;
+
+ var F = function () {};
+
+ return {
+ s: F,
+ n: function () {
+ if (i >= o.length) return {
+ done: true
};
- } else {
- _typeof = function (obj) {
- return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
+ return {
+ done: false,
+ value: o[i++]
};
- }
-
- return _typeof(obj);
- }
-
- function _classCallCheck(instance, Constructor) {
- if (!(instance instanceof Constructor)) {
- throw new TypeError("Cannot call a class as a function");
- }
- }
-
- function _defineProperties(target, props) {
- for (var i = 0; i < props.length; i++) {
- var descriptor = props[i];
- descriptor.enumerable = descriptor.enumerable || false;
- descriptor.configurable = true;
- if ("value" in descriptor) descriptor.writable = true;
- Object.defineProperty(target, descriptor.key, descriptor);
- }
- }
-
- function _createClass(Constructor, protoProps, staticProps) {
- if (protoProps) _defineProperties(Constructor.prototype, protoProps);
- if (staticProps) _defineProperties(Constructor, staticProps);
- return Constructor;
- }
-
- function _defineProperty(obj, key, value) {
- if (key in obj) {
- Object.defineProperty(obj, key, {
- value: value,
- enumerable: true,
- configurable: true,
- writable: true
- });
- } else {
- obj[key] = value;
- }
-
- return obj;
- }
-
- var EMPTY_OBJ = Object.freeze({});
- Object.freeze([]);
- var extend = Object.assign;
- var hasOwnProperty = Object.prototype.hasOwnProperty;
-
- var hasOwn = function hasOwn(val, key) {
- return hasOwnProperty.call(val, key);
+ },
+ e: function (e) {
+ throw e;
+ },
+ f: F
+ };
+ }
+
+ throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+ }
+
+ var normalCompletion = true,
+ didErr = false,
+ err;
+ return {
+ s: function () {
+ it = o[Symbol.iterator]();
+ },
+ n: function () {
+ var step = it.next();
+ normalCompletion = step.done;
+ return step;
+ },
+ e: function (e) {
+ didErr = true;
+ err = e;
+ },
+ f: function () {
+ try {
+ if (!normalCompletion && it.return != null) it.return();
+ } finally {
+ if (didErr) throw err;
+ }
+ }
};
-
- var isArray = Array.isArray;
-
- var isMap$1 = function isMap(val) {
- return toTypeString$1(val) === "[object Map]";
+ }
+
+ /**
+ * Make a map and return a function for checking if a key
+ * is in that map.
+ * IMPORTANT: all calls of this function must be prefixed with
+ * \/\*#\_\_PURE\_\_\*\/
+ * So that rollup can tree-shake them if necessary.
+ */
+ function makeMap(str, expectsLowerCase) {
+ var map = Object.create(null);
+ var list = str.split(',');
+
+ for (var i = 0; i < list.length; i++) {
+ map[list[i]] = true;
+ }
+
+ return expectsLowerCase ? function (val) {
+ return !!map[val.toLowerCase()];
+ } : function (val) {
+ return !!map[val];
};
+ }
- var isFunction = function isFunction(val) {
- return typeof val === "function";
- };
+ Object.freeze({});
+ Object.freeze([]);
+ var extend = Object.assign;
+ var hasOwnProperty = Object.prototype.hasOwnProperty;
- var isString = function isString(val) {
- return typeof val === "string";
- };
+ var hasOwn = function hasOwn(val, key) {
+ return hasOwnProperty.call(val, key);
+ };
- var isSymbol = function isSymbol(val) {
- return _typeof(val) === "symbol";
- };
+ var isArray = Array.isArray;
- var isObject = function isObject(val) {
- return val !== null && _typeof(val) === "object";
- };
+ var isMap$1 = function isMap(val) {
+ return toTypeString$1(val) === '[object Map]';
+ };
- var objectToString$1 = Object.prototype.toString;
+ var isFunction = function isFunction(val) {
+ return typeof val === 'function';
+ };
- var toTypeString$1 = function toTypeString(value) {
- return objectToString$1.call(value);
- };
+ var isString = function isString(val) {
+ return typeof val === 'string';
+ };
- var toRawType = function toRawType(value) {
- return (// extract "RawType" from strings like "[object RawType]"
- toTypeString$1(value).slice(8, -1)
- );
- };
+ var isSymbol = function isSymbol(val) {
+ return _typeof(val) === 'symbol';
+ };
- var isIntegerKey = function isIntegerKey(key) {
- return isString(key) && key !== "NaN" && key[0] !== "-" && "".concat(parseInt(key, 10)) === key;
- };
+ var isObject = function isObject(val) {
+ return val !== null && _typeof(val) === 'object';
+ };
- var cacheStringFunction = function cacheStringFunction(fn) {
- var cache = Object.create(null);
- return function (str) {
- var hit = cache[str];
- return hit || (cache[str] = fn(str));
- };
- };
- /**
- * @private
- */
+ var objectToString$1 = Object.prototype.toString;
+ var toTypeString$1 = function toTypeString(value) {
+ return objectToString$1.call(value);
+ };
- var capitalize = cacheStringFunction(function (str) {
- return str.charAt(0).toUpperCase() + str.slice(1);
- }); // compare whether a value has changed, accounting for NaN.
+ var toRawType = function toRawType(value) {
+ // extract "RawType" from strings like "[object RawType]"
+ return toTypeString$1(value).slice(8, -1);
+ };
- var hasChanged$1 = function hasChanged(value, oldValue) {
- return value !== oldValue && (value === value || oldValue === oldValue);
- };
+ var isIntegerKey = function isIntegerKey(key) {
+ return isString(key) && key !== 'NaN' && key[0] !== '-' && '' + parseInt(key, 10) === key;
+ };
- var targetMap = new WeakMap();
- var effectStack = [];
- var activeEffect;
- var ITERATE_KEY = Symbol("iterate");
- var MAP_KEY_ITERATE_KEY = Symbol("Map key iterate");
+ var cacheStringFunction = function cacheStringFunction(fn) {
+ var cache = Object.create(null);
+ return function (str) {
+ var hit = cache[str];
+ return hit || (cache[str] = fn(str));
+ };
+ };
+ /**
+ * @private
+ */
- function isEffect(fn) {
- return fn && fn._isEffect === true;
- }
- function effect(fn) {
- var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : EMPTY_OBJ;
+ var capitalize = cacheStringFunction(function (str) {
+ return str.charAt(0).toUpperCase() + str.slice(1);
+ }); // compare whether a value has changed, accounting for NaN.
- if (isEffect(fn)) {
- fn = fn.raw;
- }
+ var hasChanged$1 = function hasChanged(value, oldValue) {
+ return !Object.is(value, oldValue);
+ };
- var effect = createReactiveEffect(fn, options);
+ var activeEffectScope;
- if (!options.lazy) {
- effect();
- }
+ function recordEffectScope(effect, scope) {
+ scope = scope || activeEffectScope;
- return effect;
+ if (scope && scope.active) {
+ scope.effects.push(effect);
}
+ }
- function stop(effect) {
- if (effect.active) {
- cleanup(effect);
+ var createDep = function createDep(effects) {
+ var dep = new Set(effects);
+ dep.w = 0;
+ dep.n = 0;
+ return dep;
+ };
- if (effect.options.onStop) {
- effect.options.onStop();
- }
+ var wasTracked = function wasTracked(dep) {
+ return (dep.w & trackOpBit) > 0;
+ };
- effect.active = false;
- }
- }
-
- var uid$1 = 0;
+ var newTracked = function newTracked(dep) {
+ return (dep.n & trackOpBit) > 0;
+ };
- function createReactiveEffect(fn, options) {
- var effect = function reactiveEffect() {
- if (!effect.active) {
- return options.scheduler ? undefined : fn();
- }
-
- if (!effectStack.includes(effect)) {
- cleanup(effect);
-
- try {
- enableTracking();
- effectStack.push(effect);
- activeEffect = effect;
- return fn();
- } finally {
- effectStack.pop();
- resetTracking();
- activeEffect = effectStack[effectStack.length - 1];
- }
- }
- };
+ var initDepMarkers = function initDepMarkers(_ref) {
+ var deps = _ref.deps;
- effect.id = uid$1++;
- effect.allowRecurse = !!options.allowRecurse;
- effect._isEffect = true;
- effect.active = true;
- effect.raw = fn;
- effect.deps = [];
- effect.options = options;
- return effect;
+ if (deps.length) {
+ for (var i = 0; i < deps.length; i++) {
+ deps[i].w |= trackOpBit; // set was tracked
+ }
}
+ };
- function cleanup(effect) {
- var deps = effect.deps;
+ var finalizeDepMarkers = function finalizeDepMarkers(effect) {
+ var deps = effect.deps;
- if (deps.length) {
- for (var i = 0; i < deps.length; i++) {
- deps[i].delete(effect);
- }
+ if (deps.length) {
+ var ptr = 0;
- deps.length = 0;
- }
- }
+ for (var i = 0; i < deps.length; i++) {
+ var dep = deps[i];
- var shouldTrack = true;
- var trackStack = [];
+ if (wasTracked(dep) && !newTracked(dep)) {
+ dep.delete(effect);
+ } else {
+ deps[ptr++] = dep;
+ } // clear bits
- function pauseTracking() {
- trackStack.push(shouldTrack);
- shouldTrack = false;
- }
- function enableTracking() {
- trackStack.push(shouldTrack);
- shouldTrack = true;
- }
+ dep.w &= ~trackOpBit;
+ dep.n &= ~trackOpBit;
+ }
- function resetTracking() {
- var last = trackStack.pop();
- shouldTrack = last === undefined ? true : last;
+ deps.length = ptr;
}
+ };
- function track(target, type, key) {
- if (!shouldTrack || activeEffect === undefined) {
- return;
- }
+ var targetMap = new WeakMap(); // The number of effects currently being tracked recursively.
- var depsMap = targetMap.get(target);
+ var effectTrackDepth = 0;
+ var trackOpBit = 1;
+ /**
+ * The bitwise track markers support at most 30 levels of recursion.
+ * This value is chosen to enable modern JS engines to use a SMI on all platforms.
+ * When recursion depth is greater, fall back to using a full cleanup.
+ */
- if (!depsMap) {
- targetMap.set(target, depsMap = new Map());
- }
+ var maxMarkerBits = 30;
+ var effectStack = [];
+ var activeEffect;
+ var ITERATE_KEY = Symbol('iterate');
+ var MAP_KEY_ITERATE_KEY = Symbol('Map key iterate');
- var dep = depsMap.get(key);
+ var ReactiveEffect = /*#__PURE__*/function () {
+ function ReactiveEffect(fn) {
+ var scheduler = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+ var scope = arguments.length > 2 ? arguments[2] : undefined;
- if (!dep) {
- depsMap.set(key, dep = new Set());
- }
+ _classCallCheck(this, ReactiveEffect);
- if (!dep.has(activeEffect)) {
- dep.add(activeEffect);
- activeEffect.deps.push(dep);
-
- if (activeEffect.options.onTrack) {
- activeEffect.options.onTrack({
- effect: activeEffect,
- target: target,
- type: type,
- key: key
- });
- }
- }
+ this.fn = fn;
+ this.scheduler = scheduler;
+ this.active = true;
+ this.deps = [];
+ recordEffectScope(this, scope);
}
- function trigger(target, type, key, newValue, oldValue, oldTarget) {
- var depsMap = targetMap.get(target);
-
- if (!depsMap) {
- // never been tracked
- return;
- }
-
- var effects = new Set();
-
- var add = function add(effectsToAdd) {
- if (effectsToAdd) {
- effectsToAdd.forEach(function (effect) {
- if (effect !== activeEffect || effect.allowRecurse) {
- effects.add(effect);
- }
- });
- }
- };
-
- if (type === "clear"
- /* CLEAR */
- ) {
- // collection being cleared
- // trigger all effects for target
- depsMap.forEach(add);
- } else if (key === "length" && isArray(target)) {
- depsMap.forEach(function (dep, key) {
- if (key === "length" || key >= newValue) {
- add(dep);
- }
- });
- } else {
- // schedule runs for SET | ADD | DELETE
- if (key !== void 0) {
- add(depsMap.get(key));
- } // also run for iteration key on ADD | DELETE | Map.SET
-
-
- switch (type) {
- case "add"
- /* ADD */
- :
- if (!isArray(target)) {
- add(depsMap.get(ITERATE_KEY));
-
- if (isMap$1(target)) {
- add(depsMap.get(MAP_KEY_ITERATE_KEY));
- }
- } else if (isIntegerKey(key)) {
- // new index added to array -> length changes
- add(depsMap.get("length"));
- }
-
- break;
-
- case "delete"
- /* DELETE */
- :
- if (!isArray(target)) {
- add(depsMap.get(ITERATE_KEY));
-
- if (isMap$1(target)) {
- add(depsMap.get(MAP_KEY_ITERATE_KEY));
- }
- }
-
- break;
-
- case "set"
- /* SET */
- :
- if (isMap$1(target)) {
- add(depsMap.get(ITERATE_KEY));
- }
-
- break;
- }
+ _createClass(ReactiveEffect, [{
+ key: "run",
+ value: function run() {
+ if (!this.active) {
+ return this.fn();
}
- var run = function run(effect) {
- if (effect.options.onTrigger) {
- effect.options.onTrigger({
- effect: effect,
- target: target,
- key: key,
- type: type,
- newValue: newValue,
- oldValue: oldValue,
- oldTarget: oldTarget
- });
- }
+ if (!effectStack.includes(this)) {
+ try {
+ effectStack.push(activeEffect = this);
+ enableTracking();
+ trackOpBit = 1 << ++effectTrackDepth;
- if (effect.options.scheduler) {
- effect.options.scheduler(effect);
+ if (effectTrackDepth <= maxMarkerBits) {
+ initDepMarkers(this);
} else {
- effect();
+ cleanupEffect(this);
}
- };
-
- effects.forEach(run);
- }
-
- var builtInSymbols = new Set(Object.getOwnPropertyNames(Symbol).map(function (key) {
- return Symbol[key];
- }).filter(isSymbol));
- var get = /* #__PURE__*/createGetter();
- var shallowGet = /* #__PURE__*/createGetter(false, true);
- var readonlyGet = /* #__PURE__*/createGetter(true);
- var shallowReadonlyGet = /* #__PURE__*/createGetter(true, true);
- var arrayInstrumentations = {};
- ["includes", "indexOf", "lastIndexOf"].forEach(function (key) {
- var method = Array.prototype[key];
-
- arrayInstrumentations[key] = function () {
- var arr = toRaw(this);
-
- for (var i = 0, l = this.length; i < l; i++) {
- track(arr, "get"
- /* GET */
- , "".concat(i));
- } // we run the method using the original args first (which may be reactive)
-
- for (var _len = arguments.length, args = new Array(_len), _key2 = 0; _key2 < _len; _key2++) {
- args[_key2] = arguments[_key2];
+ return this.fn();
+ } finally {
+ if (effectTrackDepth <= maxMarkerBits) {
+ finalizeDepMarkers(this);
}
- var res = method.apply(arr, args);
-
- if (res === -1 || res === false) {
- // if that didn't work, run it again using raw values.
- return method.apply(arr, args.map(toRaw));
- } else {
- return res;
- }
- };
- });
- ["push", "pop", "shift", "unshift", "splice"].forEach(function (key) {
- var method = Array.prototype[key];
-
- arrayInstrumentations[key] = function () {
- pauseTracking();
-
- for (var _len2 = arguments.length, args = new Array(_len2), _key3 = 0; _key3 < _len2; _key3++) {
- args[_key3] = arguments[_key3];
- }
-
- var res = method.apply(this, args);
+ trackOpBit = 1 << --effectTrackDepth;
resetTracking();
- return res;
- };
- });
-
- function createGetter() {
- var isReadonly = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
- var shallow = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
- return function get(target, key, receiver) {
- if (key === "__v_isReactive"
- /* IS_REACTIVE */
- ) {
- return !isReadonly;
- } else if (key === "__v_isReadonly"
- /* IS_READONLY */
- ) {
- return isReadonly;
- } else if (key === "__v_raw"
- /* RAW */
- && receiver === (isReadonly ? readonlyMap : reactiveMap).get(target)) {
- return target;
- }
+ effectStack.pop();
+ var n = effectStack.length;
+ activeEffect = n > 0 ? effectStack[n - 1] : undefined;
+ }
+ }
+ }
+ }, {
+ key: "stop",
+ value: function stop() {
+ if (this.active) {
+ cleanupEffect(this);
- var targetIsArray = isArray(target);
+ if (this.onStop) {
+ this.onStop();
+ }
- if (targetIsArray && hasOwn(arrayInstrumentations, key)) {
- return Reflect.get(arrayInstrumentations, key, receiver);
- }
+ this.active = false;
+ }
+ }
+ }]);
- var res = Reflect.get(target, key, receiver);
+ return ReactiveEffect;
+ }();
- if (isSymbol(key) ? builtInSymbols.has(key) : key === "__proto__" || key === "__v_isRef") {
- return res;
- }
+ function cleanupEffect(effect) {
+ var deps = effect.deps;
- if (!isReadonly) {
- track(target, "get"
- /* GET */
- , key);
- }
+ if (deps.length) {
+ for (var i = 0; i < deps.length; i++) {
+ deps[i].delete(effect);
+ }
- if (shallow) {
- return res;
- }
+ deps.length = 0;
+ }
+ }
- if (isRef(res)) {
- // ref unwrapping - does not apply for Array + integer key.
- var shouldUnwrap = !targetIsArray || !isIntegerKey(key);
- return shouldUnwrap ? res.value : res;
- }
+ function effect(fn, options) {
+ if (fn.effect) {
+ fn = fn.effect.fn;
+ }
- if (isObject(res)) {
- // Convert returned value into a proxy as well. we do the isObject check
- // here to avoid invalid value warning. Also need to lazy access readonly
- // and reactive here to avoid circular dependency.
- return isReadonly ? readonly(res) : reactive(res);
- }
+ var _effect = new ReactiveEffect(fn);
- return res;
- };
+ if (options) {
+ extend(_effect, options);
+ if (options.scope) recordEffectScope(_effect, options.scope);
}
- var set$1 = /* #__PURE__*/createSetter();
- var shallowSet = /* #__PURE__*/createSetter(true);
+ if (!options || !options.lazy) {
+ _effect.run();
+ }
- function createSetter() {
- var shallow = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
- return function set(target, key, value, receiver) {
- var oldValue = target[key];
+ var runner = _effect.run.bind(_effect);
- if (!shallow) {
- value = toRaw(value);
+ runner.effect = _effect;
+ return runner;
+ }
- if (!isArray(target) && isRef(oldValue) && !isRef(value)) {
- oldValue.value = value;
- return true;
- }
- }
+ function stop(runner) {
+ runner.effect.stop();
+ }
- var hadKey = isArray(target) && isIntegerKey(key) ? Number(key) < target.length : hasOwn(target, key);
- var result = Reflect.set(target, key, value, receiver); // don't trigger if target is something up in the prototype chain of original
-
- if (target === toRaw(receiver)) {
- if (!hadKey) {
- trigger(target, "add"
- /* ADD */
- , key, value);
- } else if (hasChanged$1(value, oldValue) || key === "length") {
- trigger(target, "set"
- /* SET */
- , key, value, oldValue);
- }
- }
+ var shouldTrack = true;
+ var trackStack = [];
- return result;
- };
- }
+ function pauseTracking() {
+ trackStack.push(shouldTrack);
+ shouldTrack = false;
+ }
- function deleteProperty(target, key) {
- var hadKey = hasOwn(target, key);
- var oldValue = target[key];
- var result = Reflect.deleteProperty(target, key);
+ function enableTracking() {
+ trackStack.push(shouldTrack);
+ shouldTrack = true;
+ }
- if (result && hadKey) {
- trigger(target, "delete"
- /* DELETE */
- , key, undefined, oldValue);
- }
+ function resetTracking() {
+ var last = trackStack.pop();
+ shouldTrack = last === undefined ? true : last;
+ }
- return result;
+ function track(target, type, key) {
+ if (!isTracking()) {
+ return;
}
- function has$1(target, key) {
- var result = Reflect.has(target, key);
-
- if (!isSymbol(key) || !builtInSymbols.has(key)) {
- track(target, "has"
- /* HAS */
- , key);
- }
+ var depsMap = targetMap.get(target);
- return result;
+ if (!depsMap) {
+ targetMap.set(target, depsMap = new Map());
}
- function ownKeys(target) {
- track(target, "iterate"
- /* ITERATE */
- , isArray(target) ? "length" : ITERATE_KEY);
- return Reflect.ownKeys(target);
- }
-
- var mutableHandlers = {
- get: get,
- set: set$1,
- deleteProperty: deleteProperty,
- has: has$1,
- ownKeys: ownKeys
- };
- var readonlyHandlers = {
- get: readonlyGet,
- set: function set(target, key) {
- {
- console.warn("Set operation on key \"".concat(String(key), "\" failed: target is readonly."), target);
- }
- return true;
- },
- deleteProperty: function deleteProperty(target, key) {
- {
- console.warn("Delete operation on key \"".concat(String(key), "\" failed: target is readonly."), target);
- }
- return true;
- }
- };
- extend({}, mutableHandlers, {
- get: shallowGet,
- set: shallowSet
- }); // Props handlers are special in the sense that it should not unwrap top-level
- // refs (in order to allow refs to be explicitly passed down), but should
- // retain the reactivity of the normal readonly object.
-
- extend({}, readonlyHandlers, {
- get: shallowReadonlyGet
- });
-
- var toReactive = function toReactive(value) {
- return isObject(value) ? reactive(value) : value;
- };
+ var dep = depsMap.get(key);
- var toReadonly = function toReadonly(value) {
- return isObject(value) ? readonly(value) : value;
- };
-
- var toShallow = function toShallow(value) {
- return value;
- };
+ if (!dep) {
+ depsMap.set(key, dep = createDep());
+ }
- var getProto = function getProto(v) {
- return Reflect.getPrototypeOf(v);
+ var eventInfo = {
+ effect: activeEffect,
+ target: target,
+ type: type,
+ key: key
};
+ trackEffects(dep, eventInfo);
+ }
- function get$1(target, key) {
- var isReadonly = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
- var isShallow = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
- // #1772: readonly(reactive(Map)) should return readonly + reactive version
- // of the value
- target = target["__v_raw"
- /* RAW */
- ];
- var rawTarget = toRaw(target);
- var rawKey = toRaw(key);
-
- if (key !== rawKey) {
- !isReadonly && track(rawTarget, "get"
- /* GET */
- , key);
- }
-
- !isReadonly && track(rawTarget, "get"
- /* GET */
- , rawKey);
+ function isTracking() {
+ return shouldTrack && activeEffect !== undefined;
+ }
- var _getProto = getProto(rawTarget),
- has = _getProto.has;
+ function trackEffects(dep, debuggerEventExtraInfo) {
+ var shouldTrack = false;
- var wrap = isReadonly ? toReadonly : isShallow ? toShallow : toReactive;
+ if (effectTrackDepth <= maxMarkerBits) {
+ if (!newTracked(dep)) {
+ dep.n |= trackOpBit; // set newly tracked
- if (has.call(rawTarget, key)) {
- return wrap(target.get(key));
- } else if (has.call(rawTarget, rawKey)) {
- return wrap(target.get(rawKey));
- }
+ shouldTrack = !wasTracked(dep);
+ }
+ } else {
+ // Full cleanup mode.
+ shouldTrack = !dep.has(activeEffect);
}
- function has$1$1(key) {
- var isReadonly = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
- var target = this["__v_raw"
- /* RAW */
- ];
- var rawTarget = toRaw(target);
- var rawKey = toRaw(key);
-
- if (key !== rawKey) {
- !isReadonly && track(rawTarget, "has"
- /* HAS */
- , key);
- }
+ if (shouldTrack) {
+ dep.add(activeEffect);
+ activeEffect.deps.push(dep);
- !isReadonly && track(rawTarget, "has"
- /* HAS */
- , rawKey);
- return key === rawKey ? target.has(key) : target.has(key) || target.has(rawKey);
+ if (activeEffect.onTrack) {
+ activeEffect.onTrack(Object.assign({
+ effect: activeEffect
+ }, debuggerEventExtraInfo));
+ }
}
+ }
+
+ function trigger(target, type, key, newValue, oldValue, oldTarget) {
+ var depsMap = targetMap.get(target);
- function size(target) {
- var isReadonly = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
- target = target["__v_raw"
- /* RAW */
- ];
- !isReadonly && track(toRaw(target), "iterate"
- /* ITERATE */
- , ITERATE_KEY);
- return Reflect.get(target, "size", target);
+ if (!depsMap) {
+ // never been tracked
+ return;
}
- function add(value) {
- value = toRaw(value);
- var target = toRaw(this);
- var proto = getProto(target);
- var hadKey = proto.has.call(target, value);
- var result = target.add(value);
+ var deps = [];
- if (!hadKey) {
- trigger(target, "add"
- /* ADD */
- , value, value);
+ if (type === "clear"
+ /* CLEAR */
+ ) {
+ // collection being cleared
+ // trigger all effects for target
+ deps = _toConsumableArray(depsMap.values());
+ } else if (key === 'length' && isArray(target)) {
+ depsMap.forEach(function (dep, key) {
+ if (key === 'length' || key >= newValue) {
+ deps.push(dep);
}
+ });
+ } else {
+ // schedule runs for SET | ADD | DELETE
+ if (key !== void 0) {
+ deps.push(depsMap.get(key));
+ } // also run for iteration key on ADD | DELETE | Map.SET
- return result;
- }
- function set$1$1(key, value) {
- value = toRaw(value);
- var target = toRaw(this);
-
- var _getProto2 = getProto(target),
- has = _getProto2.has,
- get = _getProto2.get;
+ switch (type) {
+ case "add"
+ /* ADD */
+ :
+ if (!isArray(target)) {
+ deps.push(depsMap.get(ITERATE_KEY));
- var hadKey = has.call(target, key);
+ if (isMap$1(target)) {
+ deps.push(depsMap.get(MAP_KEY_ITERATE_KEY));
+ }
+ } else if (isIntegerKey(key)) {
+ // new index added to array -> length changes
+ deps.push(depsMap.get('length'));
+ }
- if (!hadKey) {
- key = toRaw(key);
- hadKey = has.call(target, key);
- } else {
- checkIdentityKeys(target, has, key);
- }
+ break;
- var oldValue = get.call(target, key);
- var result = target.set(key, value);
+ case "delete"
+ /* DELETE */
+ :
+ if (!isArray(target)) {
+ deps.push(depsMap.get(ITERATE_KEY));
- if (!hadKey) {
- trigger(target, "add"
- /* ADD */
- , key, value);
- } else if (hasChanged$1(value, oldValue) || key === "length") {
- trigger(target, "set"
- /* SET */
- , key, value, oldValue);
- }
+ if (isMap$1(target)) {
+ deps.push(depsMap.get(MAP_KEY_ITERATE_KEY));
+ }
+ }
- return result;
- }
+ break;
- function deleteEntry(key) {
- var target = toRaw(this);
+ case "set"
+ /* SET */
+ :
+ if (isMap$1(target)) {
+ deps.push(depsMap.get(ITERATE_KEY));
+ }
- var _getProto3 = getProto(target),
- has = _getProto3.has,
- get = _getProto3.get;
+ break;
+ }
+ }
- var hadKey = has.call(target, key);
+ var eventInfo = {
+ target: target,
+ type: type,
+ key: key,
+ newValue: newValue,
+ oldValue: oldValue,
+ oldTarget: oldTarget
+ };
- if (!hadKey) {
- key = toRaw(key);
- hadKey = has.call(target, key);
+ if (deps.length === 1) {
+ if (deps[0]) {
+ {
+ triggerEffects(deps[0], eventInfo);
+ }
+ }
+ } else {
+ var effects = [];
+
+ var _iterator = _createForOfIteratorHelper(deps),
+ _step;
+
+ try {
+ for (_iterator.s(); !(_step = _iterator.n()).done;) {
+ var dep = _step.value;
+
+ if (dep) {
+ effects.push.apply(effects, _toConsumableArray(dep));
+ }
+ }
+ } catch (err) {
+ _iterator.e(err);
+ } finally {
+ _iterator.f();
+ }
+
+ {
+ triggerEffects(createDep(effects), eventInfo);
+ }
+ }
+ }
+
+ function triggerEffects(dep, debuggerEventExtraInfo) {
+ // spread into array for stabilization
+ var _iterator2 = _createForOfIteratorHelper(isArray(dep) ? dep : _toConsumableArray(dep)),
+ _step2;
+
+ try {
+ for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+ var _effect2 = _step2.value;
+
+ if (_effect2 !== activeEffect || _effect2.allowRecurse) {
+ if (_effect2.onTrigger) {
+ _effect2.onTrigger(extend({
+ effect: _effect2
+ }, debuggerEventExtraInfo));
+ }
+
+ if (_effect2.scheduler) {
+ _effect2.scheduler();
+ } else {
+ _effect2.run();
+ }
+ }
+ }
+ } catch (err) {
+ _iterator2.e(err);
+ } finally {
+ _iterator2.f();
+ }
+ }
+
+ var isNonTrackableKeys = /*#__PURE__*/makeMap("__proto__,__v_isRef,__isVue");
+ var builtInSymbols = new Set(Object.getOwnPropertyNames(Symbol).map(function (key) {
+ return Symbol[key];
+ }).filter(isSymbol));
+ var get = /*#__PURE__*/createGetter();
+ var readonlyGet = /*#__PURE__*/createGetter(true);
+ var arrayInstrumentations = /*#__PURE__*/createArrayInstrumentations();
+
+ function createArrayInstrumentations() {
+ var instrumentations = {};
+ ['includes', 'indexOf', 'lastIndexOf'].forEach(function (key) {
+ instrumentations[key] = function () {
+ var arr = toRaw(this);
+
+ for (var i = 0, l = this.length; i < l; i++) {
+ track(arr, "get"
+ /* GET */
+ , i + '');
+ } // we run the method using the original args first (which may be reactive)
+
+
+ for (var _len2 = arguments.length, args = new Array(_len2), _key3 = 0; _key3 < _len2; _key3++) {
+ args[_key3] = arguments[_key3];
+ }
+
+ var res = arr[key].apply(arr, args);
+
+ if (res === -1 || res === false) {
+ // if that didn't work, run it again using raw values.
+ return arr[key].apply(arr, _toConsumableArray(args.map(toRaw)));
} else {
- checkIdentityKeys(target, has, key);
+ return res;
}
+ };
+ });
+ ['push', 'pop', 'shift', 'unshift', 'splice'].forEach(function (key) {
+ instrumentations[key] = function () {
+ pauseTracking();
- var oldValue = get ? get.call(target, key) : undefined; // forward the operation before queueing reactions
-
- var result = target.delete(key);
-
- if (hadKey) {
- trigger(target, "delete"
- /* DELETE */
- , key, undefined, oldValue);
+ for (var _len3 = arguments.length, args = new Array(_len3), _key4 = 0; _key4 < _len3; _key4++) {
+ args[_key4] = arguments[_key4];
}
- return result;
- }
+ var res = toRaw(this)[key].apply(this, args);
+ resetTracking();
+ return res;
+ };
+ });
+ return instrumentations;
+ }
+
+ function createGetter() {
+ var isReadonly = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+ var shallow = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+ return function get(target, key, receiver) {
+ if (key === "__v_isReactive"
+ /* IS_REACTIVE */
+ ) {
+ return !isReadonly;
+ } else if (key === "__v_isReadonly"
+ /* IS_READONLY */
+ ) {
+ return isReadonly;
+ } else if (key === "__v_raw"
+ /* RAW */
+ && receiver === (isReadonly ? shallow ? shallowReadonlyMap : readonlyMap : shallow ? shallowReactiveMap : reactiveMap).get(target)) {
+ return target;
+ }
+
+ var targetIsArray = isArray(target);
+
+ if (!isReadonly && targetIsArray && hasOwn(arrayInstrumentations, key)) {
+ return Reflect.get(arrayInstrumentations, key, receiver);
+ }
+
+ var res = Reflect.get(target, key, receiver);
+
+ if (isSymbol(key) ? builtInSymbols.has(key) : isNonTrackableKeys(key)) {
+ return res;
+ }
+
+ if (!isReadonly) {
+ track(target, "get"
+ /* GET */
+ , key);
+ }
+
+ if (shallow) {
+ return res;
+ }
+
+ if (isRef(res)) {
+ // ref unwrapping - does not apply for Array + integer key.
+ var shouldUnwrap = !targetIsArray || !isIntegerKey(key);
+ return shouldUnwrap ? res.value : res;
+ }
+
+ if (isObject(res)) {
+ // Convert returned value into a proxy as well. we do the isObject check
+ // here to avoid invalid value warning. Also need to lazy access readonly
+ // and reactive here to avoid circular dependency.
+ return isReadonly ? readonly(res) : reactive(res);
+ }
+
+ return res;
+ };
+ }
+
+ var set$1 = /*#__PURE__*/createSetter();
- function clear() {
- var target = toRaw(this);
- var hadItems = target.size !== 0;
- var oldTarget = isMap$1(target) ? new Map(target) : new Set(target); // forward the operation before queueing reactions
+ function createSetter() {
+ var shallow = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+ return function set(target, key, value, receiver) {
+ var oldValue = target[key];
- var result = target.clear();
+ if (!shallow && !isReadonly(value)) {
+ value = toRaw(value);
+ oldValue = toRaw(oldValue);
- if (hadItems) {
- trigger(target, "clear"
- /* CLEAR */
- , undefined, undefined, oldTarget);
+ if (!isArray(target) && isRef(oldValue) && !isRef(value)) {
+ oldValue.value = value;
+ return true;
}
+ }
- return result;
- }
-
- function createForEach(isReadonly, isShallow) {
- return function forEach(callback, thisArg) {
- var observed = this;
- var target = observed["__v_raw"
- /* RAW */
- ];
- var rawTarget = toRaw(target);
- var wrap = isReadonly ? toReadonly : isShallow ? toShallow : toReactive;
- !isReadonly && track(rawTarget, "iterate"
- /* ITERATE */
- , ITERATE_KEY);
- return target.forEach(function (value, key) {
- return (// important: make sure the callback is
- // 1. invoked with the reactive map as `this` and 3rd arg
- // 2. the value received should be a corresponding reactive/readonly.
- callback.call(thisArg, wrap(value), wrap(key), observed)
- );
- });
- };
- }
+ var hadKey = isArray(target) && isIntegerKey(key) ? Number(key) < target.length : hasOwn(target, key);
+ var result = Reflect.set(target, key, value, receiver); // don't trigger if target is something up in the prototype chain of original
- function createIterableMethod(method, isReadonly, isShallow) {
- return function () {
- var target = this["__v_raw"
- /* RAW */
- ];
- var rawTarget = toRaw(target);
- var targetIsMap = isMap$1(rawTarget);
- var isPair = method === "entries" || method === Symbol.iterator && targetIsMap;
- var isKeyOnly = method === "keys" && targetIsMap;
- var innerIterator = target[method].apply(target, arguments);
- var wrap = isReadonly ? toReadonly : isShallow ? toShallow : toReactive;
- !isReadonly && track(rawTarget, "iterate"
- /* ITERATE */
- , isKeyOnly ? MAP_KEY_ITERATE_KEY : ITERATE_KEY); // return a wrapped iterator which returns observed versions of the
- // values emitted from the real iterator
-
- return _defineProperty({
- // iterator protocol
- next: function next() {
- var _innerIterator$next = innerIterator.next(),
- value = _innerIterator$next.value,
- done = _innerIterator$next.done;
-
- return done ? {
- value: value,
- done: done
- } : {
- value: isPair ? [wrap(value[0]), wrap(value[1])] : wrap(value),
- done: done
- };
- }
- }, Symbol.iterator, function () {
- return this;
- });
- };
- }
-
- function createReadonlyMethod(type) {
- return function () {
- {
- var key = (arguments.length <= 0 ? undefined : arguments[0]) ? "on key \"".concat(arguments.length <= 0 ? undefined : arguments[0], "\" ") : "";
- console.warn("".concat(capitalize(type), " operation ").concat(key, "failed: target is readonly."), toRaw(this));
- }
- return type === "delete"
- /* DELETE */
- ? false : this;
- };
- }
+ if (target === toRaw(receiver)) {
+ if (!hadKey) {
+ trigger(target, "add"
+ /* ADD */
+ , key, value);
+ } else if (hasChanged$1(value, oldValue)) {
+ trigger(target, "set"
+ /* SET */
+ , key, value, oldValue);
+ }
+ }
- var mutableInstrumentations = {
- get: function get(key) {
- return get$1(this, key);
- },
+ return result;
+ };
+ }
+
+ function deleteProperty(target, key) {
+ var hadKey = hasOwn(target, key);
+ var oldValue = target[key];
+ var result = Reflect.deleteProperty(target, key);
+
+ if (result && hadKey) {
+ trigger(target, "delete"
+ /* DELETE */
+ , key, undefined, oldValue);
+ }
+
+ return result;
+ }
+
+ function has$1(target, key) {
+ var result = Reflect.has(target, key);
+
+ if (!isSymbol(key) || !builtInSymbols.has(key)) {
+ track(target, "has"
+ /* HAS */
+ , key);
+ }
+
+ return result;
+ }
+
+ function ownKeys(target) {
+ track(target, "iterate"
+ /* ITERATE */
+ , isArray(target) ? 'length' : ITERATE_KEY);
+ return Reflect.ownKeys(target);
+ }
+
+ var mutableHandlers = {
+ get: get,
+ set: set$1,
+ deleteProperty: deleteProperty,
+ has: has$1,
+ ownKeys: ownKeys
+ };
+ var readonlyHandlers = {
+ get: readonlyGet,
+ set: function set(target, key) {
+ {
+ console.warn("Set operation on key \"".concat(String(key), "\" failed: target is readonly."), target);
+ }
+ return true;
+ },
+ deleteProperty: function deleteProperty(target, key) {
+ {
+ console.warn("Delete operation on key \"".concat(String(key), "\" failed: target is readonly."), target);
+ }
+ return true;
+ }
+ };
+
+ var toShallow = function toShallow(value) {
+ return value;
+ };
+
+ var getProto = function getProto(v) {
+ return Reflect.getPrototypeOf(v);
+ };
+
+ function get$1(target, key) {
+ var isReadonly = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+ var isShallow = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+ // #1772: readonly(reactive(Map)) should return readonly + reactive version
+ // of the value
+ target = target["__v_raw"
+ /* RAW */
+ ];
+ var rawTarget = toRaw(target);
+ var rawKey = toRaw(key);
+
+ if (key !== rawKey) {
+ !isReadonly && track(rawTarget, "get"
+ /* GET */
+ , key);
+ }
+
+ !isReadonly && track(rawTarget, "get"
+ /* GET */
+ , rawKey);
+
+ var _getProto = getProto(rawTarget),
+ has = _getProto.has;
+
+ var wrap = isShallow ? toShallow : isReadonly ? toReadonly : toReactive;
+
+ if (has.call(rawTarget, key)) {
+ return wrap(target.get(key));
+ } else if (has.call(rawTarget, rawKey)) {
+ return wrap(target.get(rawKey));
+ } else if (target !== rawTarget) {
+ // #3602 readonly(reactive(Map))
+ // ensure that the nested reactive `Map` can do tracking for itself
+ target.get(key);
+ }
+ }
+
+ function has$1$1(key) {
+ var isReadonly = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+ var target = this["__v_raw"
+ /* RAW */
+ ];
+ var rawTarget = toRaw(target);
+ var rawKey = toRaw(key);
+
+ if (key !== rawKey) {
+ !isReadonly && track(rawTarget, "has"
+ /* HAS */
+ , key);
+ }
+
+ !isReadonly && track(rawTarget, "has"
+ /* HAS */
+ , rawKey);
+ return key === rawKey ? target.has(key) : target.has(key) || target.has(rawKey);
+ }
+
+ function size(target) {
+ var isReadonly = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+ target = target["__v_raw"
+ /* RAW */
+ ];
+ !isReadonly && track(toRaw(target), "iterate"
+ /* ITERATE */
+ , ITERATE_KEY);
+ return Reflect.get(target, 'size', target);
+ }
+
+ function add(value) {
+ value = toRaw(value);
+ var target = toRaw(this);
+ var proto = getProto(target);
+ var hadKey = proto.has.call(target, value);
+
+ if (!hadKey) {
+ target.add(value);
+ trigger(target, "add"
+ /* ADD */
+ , value, value);
+ }
+
+ return this;
+ }
+
+ function set$1$1(key, value) {
+ value = toRaw(value);
+ var target = toRaw(this);
+
+ var _getProto2 = getProto(target),
+ has = _getProto2.has,
+ get = _getProto2.get;
+
+ var hadKey = has.call(target, key);
+
+ if (!hadKey) {
+ key = toRaw(key);
+ hadKey = has.call(target, key);
+ } else {
+ checkIdentityKeys(target, has, key);
+ }
+
+ var oldValue = get.call(target, key);
+ target.set(key, value);
+
+ if (!hadKey) {
+ trigger(target, "add"
+ /* ADD */
+ , key, value);
+ } else if (hasChanged$1(value, oldValue)) {
+ trigger(target, "set"
+ /* SET */
+ , key, value, oldValue);
+ }
+
+ return this;
+ }
+
+ function deleteEntry(key) {
+ var target = toRaw(this);
+
+ var _getProto3 = getProto(target),
+ has = _getProto3.has,
+ get = _getProto3.get;
+
+ var hadKey = has.call(target, key);
+
+ if (!hadKey) {
+ key = toRaw(key);
+ hadKey = has.call(target, key);
+ } else {
+ checkIdentityKeys(target, has, key);
+ }
+
+ var oldValue = get ? get.call(target, key) : undefined; // forward the operation before queueing reactions
+
+ var result = target.delete(key);
+
+ if (hadKey) {
+ trigger(target, "delete"
+ /* DELETE */
+ , key, undefined, oldValue);
+ }
+
+ return result;
+ }
+
+ function clear() {
+ var target = toRaw(this);
+ var hadItems = target.size !== 0;
+ var oldTarget = isMap$1(target) ? new Map(target) : new Set(target); // forward the operation before queueing reactions
+
+ var result = target.clear();
+
+ if (hadItems) {
+ trigger(target, "clear"
+ /* CLEAR */
+ , undefined, undefined, oldTarget);
+ }
+
+ return result;
+ }
- get size() {
- return size(this);
- },
+ function createForEach(isReadonly, isShallow) {
+ return function forEach(callback, thisArg) {
+ var observed = this;
+ var target = observed["__v_raw"
+ /* RAW */
+ ];
+ var rawTarget = toRaw(target);
+ var wrap = isShallow ? toShallow : isReadonly ? toReadonly : toReactive;
+ !isReadonly && track(rawTarget, "iterate"
+ /* ITERATE */
+ , ITERATE_KEY);
+ return target.forEach(function (value, key) {
+ // important: make sure the callback is
+ // 1. invoked with the reactive map as `this` and 3rd arg
+ // 2. the value received should be a corresponding reactive/readonly.
+ return callback.call(thisArg, wrap(value), wrap(key), observed);
+ });
+ };
+ }
+
+ function createIterableMethod(method, isReadonly, isShallow) {
+ return function () {
+ var target = this["__v_raw"
+ /* RAW */
+ ];
+ var rawTarget = toRaw(target);
+ var targetIsMap = isMap$1(rawTarget);
+ var isPair = method === 'entries' || method === Symbol.iterator && targetIsMap;
+ var isKeyOnly = method === 'keys' && targetIsMap;
+ var innerIterator = target[method].apply(target, arguments);
+ var wrap = isShallow ? toShallow : isReadonly ? toReadonly : toReactive;
+ !isReadonly && track(rawTarget, "iterate"
+ /* ITERATE */
+ , isKeyOnly ? MAP_KEY_ITERATE_KEY : ITERATE_KEY); // return a wrapped iterator which returns observed versions of the
+ // values emitted from the real iterator
+
+ return _defineProperty({
+ // iterator protocol
+ next: function next() {
+ var _innerIterator$next = innerIterator.next(),
+ value = _innerIterator$next.value,
+ done = _innerIterator$next.done;
+
+ return done ? {
+ value: value,
+ done: done
+ } : {
+ value: isPair ? [wrap(value[0]), wrap(value[1])] : wrap(value),
+ done: done
+ };
+ }
+ }, Symbol.iterator, function () {
+ return this;
+ });
+ };
+ }
+
+ function createReadonlyMethod(type) {
+ return function () {
+ {
+ var key = (arguments.length <= 0 ? undefined : arguments[0]) ? "on key \"".concat(arguments.length <= 0 ? undefined : arguments[0], "\" ") : "";
+ console.warn("".concat(capitalize(type), " operation ").concat(key, "failed: target is readonly."), toRaw(this));
+ }
+ return type === "delete"
+ /* DELETE */
+ ? false : this;
+ };
+ }
- has: has$1$1,
- add: add,
- set: set$1$1,
- delete: deleteEntry,
- clear: clear,
- forEach: createForEach(false, false)
+ function createInstrumentations() {
+ var mutableInstrumentations = {
+ get: function get(key) {
+ return get$1(this, key);
+ },
+
+ get size() {
+ return size(this);
+ },
+
+ has: has$1$1,
+ add: add,
+ set: set$1$1,
+ delete: deleteEntry,
+ clear: clear,
+ forEach: createForEach(false, false)
};
var shallowInstrumentations = {
- get: function get(key) {
- return get$1(this, key, false, true);
- },
-
- get size() {
- return size(this);
- },
-
- has: has$1$1,
- add: add,
- set: set$1$1,
- delete: deleteEntry,
- clear: clear,
- forEach: createForEach(false, true)
+ get: function get(key) {
+ return get$1(this, key, false, true);
+ },
+
+ get size() {
+ return size(this);
+ },
+
+ has: has$1$1,
+ add: add,
+ set: set$1$1,
+ delete: deleteEntry,
+ clear: clear,
+ forEach: createForEach(false, true)
};
var readonlyInstrumentations = {
- get: function get(key) {
- return get$1(this, key, true);
- },
-
- get size() {
- return size(this, true);
- },
-
- has: function has(key) {
- return has$1$1.call(this, key, true);
- },
- add: createReadonlyMethod("add"
- /* ADD */
- ),
- set: createReadonlyMethod("set"
- /* SET */
- ),
- delete: createReadonlyMethod("delete"
- /* DELETE */
- ),
- clear: createReadonlyMethod("clear"
- /* CLEAR */
- ),
- forEach: createForEach(true, false)
+ get: function get(key) {
+ return get$1(this, key, true);
+ },
+
+ get size() {
+ return size(this, true);
+ },
+
+ has: function has(key) {
+ return has$1$1.call(this, key, true);
+ },
+ add: createReadonlyMethod("add"
+ /* ADD */
+ ),
+ set: createReadonlyMethod("set"
+ /* SET */
+ ),
+ delete: createReadonlyMethod("delete"
+ /* DELETE */
+ ),
+ clear: createReadonlyMethod("clear"
+ /* CLEAR */
+ ),
+ forEach: createForEach(true, false)
+ };
+ var shallowReadonlyInstrumentations = {
+ get: function get(key) {
+ return get$1(this, key, true, true);
+ },
+
+ get size() {
+ return size(this, true);
+ },
+
+ has: function has(key) {
+ return has$1$1.call(this, key, true);
+ },
+ add: createReadonlyMethod("add"
+ /* ADD */
+ ),
+ set: createReadonlyMethod("set"
+ /* SET */
+ ),
+ delete: createReadonlyMethod("delete"
+ /* DELETE */
+ ),
+ clear: createReadonlyMethod("clear"
+ /* CLEAR */
+ ),
+ forEach: createForEach(true, true)
};
- var iteratorMethods = ["keys", "values", "entries", Symbol.iterator];
+ var iteratorMethods = ['keys', 'values', 'entries', Symbol.iterator];
iteratorMethods.forEach(function (method) {
- mutableInstrumentations[method] = createIterableMethod(method, false, false);
- readonlyInstrumentations[method] = createIterableMethod(method, true, false);
- shallowInstrumentations[method] = createIterableMethod(method, false, true);
+ mutableInstrumentations[method] = createIterableMethod(method, false, false);
+ readonlyInstrumentations[method] = createIterableMethod(method, true, false);
+ shallowInstrumentations[method] = createIterableMethod(method, false, true);
+ shallowReadonlyInstrumentations[method] = createIterableMethod(method, true, true);
});
-
- function createInstrumentationGetter(isReadonly, shallow) {
- var instrumentations = shallow ? shallowInstrumentations : isReadonly ? readonlyInstrumentations : mutableInstrumentations;
- return function (target, key, receiver) {
- if (key === "__v_isReactive"
- /* IS_REACTIVE */
- ) {
- return !isReadonly;
- } else if (key === "__v_isReadonly"
- /* IS_READONLY */
- ) {
- return isReadonly;
- } else if (key === "__v_raw"
- /* RAW */
- ) {
- return target;
- }
-
- return Reflect.get(hasOwn(instrumentations, key) && key in target ? instrumentations : target, key, receiver);
- };
- }
-
- var mutableCollectionHandlers = {
- get: createInstrumentationGetter(false, false)
+ return [mutableInstrumentations, readonlyInstrumentations, shallowInstrumentations, shallowReadonlyInstrumentations];
+ }
+
+ var _createInstrumentatio = /* #__PURE__*/createInstrumentations(),
+ _createInstrumentatio2 = _slicedToArray(_createInstrumentatio, 4),
+ mutableInstrumentations = _createInstrumentatio2[0],
+ readonlyInstrumentations = _createInstrumentatio2[1],
+ shallowInstrumentations = _createInstrumentatio2[2],
+ shallowReadonlyInstrumentations = _createInstrumentatio2[3];
+
+ function createInstrumentationGetter(isReadonly, shallow) {
+ var instrumentations = shallow ? isReadonly ? shallowReadonlyInstrumentations : shallowInstrumentations : isReadonly ? readonlyInstrumentations : mutableInstrumentations;
+ return function (target, key, receiver) {
+ if (key === "__v_isReactive"
+ /* IS_REACTIVE */
+ ) {
+ return !isReadonly;
+ } else if (key === "__v_isReadonly"
+ /* IS_READONLY */
+ ) {
+ return isReadonly;
+ } else if (key === "__v_raw"
+ /* RAW */
+ ) {
+ return target;
+ }
+
+ return Reflect.get(hasOwn(instrumentations, key) && key in target ? instrumentations : target, key, receiver);
};
- var readonlyCollectionHandlers = {
- get: createInstrumentationGetter(true, false)
- };
-
- function checkIdentityKeys(target, has, key) {
- var rawKey = toRaw(key);
-
- if (rawKey !== key && has.call(target, rawKey)) {
- var type = toRawType(target);
- console.warn("Reactive ".concat(type, " contains both the raw and reactive ") + "versions of the same object".concat(type === "Map" ? " as keys" : "", ", ") + "which can lead to inconsistencies. " + "Avoid differentiating between the raw and reactive versions " + "of an object and only use the reactive version if possible.");
- }
+ }
+
+ var mutableCollectionHandlers = {
+ get: /*#__PURE__*/createInstrumentationGetter(false, false)
+ };
+ var readonlyCollectionHandlers = {
+ get: /*#__PURE__*/createInstrumentationGetter(true, false)
+ };
+
+ function checkIdentityKeys(target, has, key) {
+ var rawKey = toRaw(key);
+
+ if (rawKey !== key && has.call(target, rawKey)) {
+ var type = toRawType(target);
+ console.warn("Reactive ".concat(type, " contains both the raw and reactive ") + "versions of the same object".concat(type === "Map" ? " as keys" : "", ", ") + "which can lead to inconsistencies. " + "Avoid differentiating between the raw and reactive versions " + "of an object and only use the reactive version if possible.");
+ }
+ }
+
+ var reactiveMap = new WeakMap();
+ var shallowReactiveMap = new WeakMap();
+ var readonlyMap = new WeakMap();
+ var shallowReadonlyMap = new WeakMap();
+
+ function targetTypeMap(rawType) {
+ switch (rawType) {
+ case 'Object':
+ case 'Array':
+ return 1
+ /* COMMON */
+ ;
+
+ case 'Map':
+ case 'Set':
+ case 'WeakMap':
+ case 'WeakSet':
+ return 2
+ /* COLLECTION */
+ ;
+
+ default:
+ return 0
+ /* INVALID */
+ ;
+ }
+ }
+
+ function getTargetType(value) {
+ return value["__v_skip"
+ /* SKIP */
+ ] || !Object.isExtensible(value) ? 0
+ /* INVALID */
+ : targetTypeMap(toRawType(value));
+ }
+
+ function reactive(target) {
+ // if trying to observe a readonly proxy, return the readonly version.
+ if (target && target["__v_isReadonly"
+ /* IS_READONLY */
+ ]) {
+ return target;
+ }
+
+ return createReactiveObject(target, false, mutableHandlers, mutableCollectionHandlers, reactiveMap);
+ }
+ /**
+ * Creates a readonly copy of the original object. Note the returned copy is not
+ * made reactive, but `readonly` can be called on an already reactive object.
+ */
+
+
+ function readonly(target) {
+ return createReactiveObject(target, true, readonlyHandlers, readonlyCollectionHandlers, readonlyMap);
+ }
+
+ function createReactiveObject(target, isReadonly, baseHandlers, collectionHandlers, proxyMap) {
+ if (!isObject(target)) {
+ {
+ console.warn("value cannot be made reactive: ".concat(String(target)));
+ }
+ return target;
+ } // target is already a Proxy, return it.
+ // exception: calling readonly() on a reactive object
+
+
+ if (target["__v_raw"
+ /* RAW */
+ ] && !(isReadonly && target["__v_isReactive"
+ /* IS_REACTIVE */
+ ])) {
+ return target;
+ } // target already has corresponding Proxy
+
+
+ var existingProxy = proxyMap.get(target);
+
+ if (existingProxy) {
+ return existingProxy;
+ } // only a whitelist of value types can be observed.
+
+
+ var targetType = getTargetType(target);
+
+ if (targetType === 0
+ /* INVALID */
+ ) {
+ return target;
+ }
+
+ var proxy = new Proxy(target, targetType === 2
+ /* COLLECTION */
+ ? collectionHandlers : baseHandlers);
+ proxyMap.set(target, proxy);
+ return proxy;
+ }
+
+ function isReactive(value) {
+ if (isReadonly(value)) {
+ return isReactive(value["__v_raw"
+ /* RAW */
+ ]);
+ }
+
+ return !!(value && value["__v_isReactive"
+ /* IS_REACTIVE */
+ ]);
+ }
+
+ function isReadonly(value) {
+ return !!(value && value["__v_isReadonly"
+ /* IS_READONLY */
+ ]);
+ }
+
+ function toRaw(observed) {
+ var raw = observed && observed["__v_raw"
+ /* RAW */
+ ];
+ return raw ? toRaw(raw) : observed;
+ }
+
+ var toReactive = function toReactive(value) {
+ return isObject(value) ? reactive(value) : value;
+ };
+
+ var toReadonly = function toReadonly(value) {
+ return isObject(value) ? readonly(value) : value;
+ };
+
+ function trackRefValue(ref) {
+ if (isTracking()) {
+ ref = toRaw(ref);
+
+ if (!ref.dep) {
+ ref.dep = createDep();
+ }
+
+ {
+ trackEffects(ref.dep, {
+ target: ref,
+ type: "get"
+ /* GET */
+ ,
+ key: 'value'
+ });
+ }
+ }
+ }
+
+ function triggerRefValue(ref, newVal) {
+ ref = toRaw(ref);
+
+ if (ref.dep) {
+ {
+ triggerEffects(ref.dep, {
+ target: ref,
+ type: "set"
+ /* SET */
+ ,
+ key: 'value',
+ newValue: newVal
+ });
+ }
}
+ }
- var reactiveMap = new WeakMap();
- var readonlyMap = new WeakMap();
+ function isRef(r) {
+ return Boolean(r && r.__v_isRef === true);
+ }
- function targetTypeMap(rawType) {
- switch (rawType) {
- case "Object":
- case "Array":
- return 1;
+ var ComputedRefImpl = /*#__PURE__*/function () {
+ function ComputedRefImpl(getter, _setter, isReadonly) {
+ var _this2 = this;
- case "Map":
- case "Set":
- case "WeakMap":
- case "WeakSet":
- return 2;
+ _classCallCheck(this, ComputedRefImpl);
- default:
- return 0;
+ this._setter = _setter;
+ this.dep = undefined;
+ this._dirty = true;
+ this.__v_isRef = true;
+ this.effect = new ReactiveEffect(getter, function () {
+ if (!_this2._dirty) {
+ _this2._dirty = true;
+ triggerRefValue(_this2);
}
- }
-
- function getTargetType(value) {
- return value["__v_skip"
- /* SKIP */
- ] || !Object.isExtensible(value) ? 0
- /* INVALID */
- : targetTypeMap(toRawType(value));
- }
+ });
+ this["__v_isReadonly"
+ /* IS_READONLY */
+ ] = isReadonly;
+ }
+
+ _createClass(ComputedRefImpl, [{
+ key: "value",
+ get: function get() {
+ // the computed ref may get wrapped by other proxies e.g. readonly() #3376
+ var self = toRaw(this);
+ trackRefValue(self);
+
+ if (self._dirty) {
+ self._dirty = false;
+ self._value = self.effect.run();
+ }
+
+ return self._value;
+ },
+ set: function set(newValue) {
+ this._setter(newValue);
+ }
+ }]);
+
+ return ComputedRefImpl;
+ }();
+
+ function computed(getterOrOptions, debugOptions) {
+ var getter;
+ var setter;
+ var onlyGetter = isFunction(getterOrOptions);
+
+ if (onlyGetter) {
+ getter = getterOrOptions;
+
+ setter = function setter() {
+ console.warn('Write operation failed: computed value is readonly');
+ };
+ } else {
+ getter = getterOrOptions.get;
+ setter = getterOrOptions.set;
+ }
+
+ var cRef = new ComputedRefImpl(getter, setter, onlyGetter || !setter);
+
+ if (debugOptions) {
+ cRef.effect.onTrack = debugOptions.onTrack;
+ cRef.effect.onTrigger = debugOptions.onTrigger;
+ }
+
+ return cRef;
+ }
+
+ function noop() {}
+ function isNative(Ctor) {
+ return typeof Ctor === "function" && /native code/.test(Ctor.toString());
+ }
+ var isIE = function isIE() {
+ if (typeof navigator === "undefined") {
+ return false;
+ }
+
+ return /(msie|trident)/i.test(navigator.userAgent.toLowerCase());
+ };
+ var getIEVersion = function getIEVersion() {
+ var version = 0;
+
+ if (typeof navigator === "undefined") {
+ return false;
+ }
+
+ var agent = navigator.userAgent.toLowerCase();
+ var v1 = agent.match(/(?:msie\s([\w.]+))/);
+ var v2 = agent.match(/(?:trident.*rv:([\w.]+))/);
+
+ if (v1 && v2 && v1[1] && v2[1]) {
+ version = Math.max(v1[1] * 1, v2[1] * 1);
+ } else if (v1 && v1[1]) {
+ version = v1[1] * 1;
+ } else if (v2 && v2[1]) {
+ version = v2[1] * 1;
+ } else {
+ version = 0;
+ }
+
+ return version;
+ };
+ isIE() && getIEVersion() < 9;
+ var _toString = Object.prototype.toString;
+ function isPlainObject(obj) {
+ return _toString.call(obj) === "[object Object]";
+ }
+
+ function parsePath(path) {
+ // if (bailRE.test(path)) {
+ // return;
+ // }
+ var segments = path.length > 0 ? path.split(".") : [];
+ return function (obj) {
+ for (var i = 0; i < segments.length; i++) {
+ if (!obj) return;
+ obj = obj[segments[i]];
+ }
- function reactive(target) {
- // if trying to observe a readonly proxy, return the readonly version.
- if (target && target["__v_isReadonly"
- /* IS_READONLY */
- ]) {
- return target;
+ return obj;
+ };
+ }
+ var nextTick = function () {
+ var callbacks = [];
+ var pending = false;
+ var timerFunc;
+
+ function nextTickHandler() {
+ pending = false;
+ var copies = callbacks.slice(0);
+ callbacks.length = 0;
+
+ for (var i = 0; i < copies.length; i++) {
+ copies[i]();
+ }
+ } // An asynchronous deferring mechanism.
+ // In pre 2.4, we used to use microtasks (Promise/MutationObserver)
+ // but microtasks actually has too high a priority and fires in between
+ // supposedly sequential events (e.g. #4521, #6690) or even between
+ // bubbling of the same event (#6566). Technically setImmediate should be
+ // the ideal choice, but it's not available everywhere; and the only polyfill
+ // that consistently queues the callback after all DOM events triggered in the
+ // same loop is by using MessageChannel.
+
+ /* istanbul ignore if */
+
+
+ if (typeof setImmediate !== "undefined" && isNative(setImmediate)) {
+ timerFunc = function timerFunc() {
+ setImmediate(nextTickHandler);
+ };
+ } else if (typeof MessageChannel !== "undefined" && (isNative(MessageChannel) || // PhantomJS
+ MessageChannel.toString() === "[object MessageChannelConstructor]")) {
+ var channel = new MessageChannel();
+ var port = channel.port2;
+ channel.port1.onmessage = nextTickHandler;
+
+ timerFunc = function timerFunc() {
+ port.postMessage(1);
+ };
+ } else if (typeof Promise !== "undefined" && isNative(Promise)) {
+ /* istanbul ignore next */
+ // use microtask in non-DOM environments, e.g. Weex
+ var p = Promise.resolve();
+
+ timerFunc = function timerFunc() {
+ p.then(nextTickHandler);
+ };
+ } else {
+ // fallback to setTimeout
+ timerFunc = function timerFunc() {
+ setTimeout(nextTickHandler, 0);
+ };
+ }
+
+ return function queueNextTick(cb, ctx) {
+ var _resolve;
+
+ callbacks.push(function () {
+ if (cb) {
+ try {
+ cb.call(ctx);
+ } catch (e) {
+ console.error(e);
+ }
+ } else if (_resolve) {
+ _resolve(ctx);
}
+ });
- return createReactiveObject(target, false, mutableHandlers, mutableCollectionHandlers);
- } // Return a reactive-copy of the original object, where only the root level
-
- function readonly(target) {
- return createReactiveObject(target, true, readonlyHandlers, readonlyCollectionHandlers);
- } // Return a reactive-copy of the original object, where only the root level
-
- function createReactiveObject(target, isReadonly, baseHandlers, collectionHandlers) {
- if (!isObject(target)) {
- {
- console.warn("value cannot be made reactive: ".concat(String(target)));
- }
- return target;
- } // target is already a Proxy, return it.
- // exception: calling readonly() on a reactive object
-
-
- if (target["__v_raw"
- /* RAW */
- ] && !(isReadonly && target["__v_isReactive"
- /* IS_REACTIVE */
- ])) {
- return target;
- } // target already has corresponding Proxy
-
-
- var proxyMap = isReadonly ? readonlyMap : reactiveMap;
- var existingProxy = proxyMap.get(target);
-
- if (existingProxy) {
- return existingProxy;
- } // only a whitelist of value types can be observed.
+ if (!pending) {
+ pending = true;
+ timerFunc();
+ } // $flow-disable-line
- var targetType = getTargetType(target);
-
- if (targetType === 0
- /* INVALID */
- ) {
- return target;
- }
-
- var proxy = new Proxy(target, targetType === 2
- /* COLLECTION */
- ? collectionHandlers : baseHandlers);
- proxyMap.set(target, proxy);
- return proxy;
- }
+ if (!cb && typeof Promise !== "undefined") {
+ return new Promise(function (resolve) {
+ _resolve = resolve;
+ });
+ }
+ };
+ }();
+
+ var mixinInjection = {};
+ function getMixins(type) {
+ return mixinInjection[type];
+ }
+ function mixin(xtype, cls) {
+ mixinInjection[xtype] = _.cloneDeep(cls);
+ }
+
+ var queue = [];
+ var activatedChildren = [];
+ var has = {};
+ var waiting = false;
+ var flushing = false;
+ var index = 0;
+
+ function resetSchedulerState() {
+ index = queue.length = activatedChildren.length = 0;
+ has = {};
+ waiting = flushing = false;
+ }
+
+ function flushSchedulerQueue() {
+ flushing = true;
+ var watcher;
+ var id;
+ var options; // Sort queue before flush.
+ // This ensures that:
+ // 1. Components are updated from parent to child. (because parent is always
+ // created before the child)
+ // 2. A component's user watchers are run before its render watcher (because
+ // user watchers are created before the render watcher)
+ // 3. If a component is destroyed during a parent component's watcher run,
+ // its watchers can be skipped.
+
+ queue.sort(function (a, b) {
+ return a.id - b.id;
+ }); // do not cache length because more watchers might be pushed
+ // as we run existing watchers
+
+ for (index = 0; index < queue.length; index++) {
+ watcher = queue[index].watcher;
+ options = queue[index].options;
+ id = watcher.id;
+ has[id] = null;
+ watcher(options);
+ }
+
+ resetSchedulerState();
+ }
+
+ function queueWatcher(watcher, options) {
+ var id = watcher.id;
+
+ if (has[id] == null) {
+ has[id] = true;
+
+ if (!flushing) {
+ queue.push({
+ watcher: watcher,
+ options: options
+ });
+ } else {
+ // if already flushing, splice the watcher based on its id
+ // if already past its id, it will be run next immediately.
+ var i = queue.length - 1;
- function isReactive(value) {
- if (isReadonly(value)) {
- return isReactive(value["__v_raw"
- /* RAW */
- ]);
+ while (i > index && queue[i].watcher.id > watcher.id) {
+ i--;
}
- return !!(value && value["__v_isReactive"
- /* IS_REACTIVE */
- ]);
- }
+ queue.splice(i + 1, 0, {
+ watcher: watcher,
+ options: options
+ });
+ } // queue the flush
- function isReadonly(value) {
- return !!(value && value["__v_isReadonly"
- /* IS_READONLY */
- ]);
- }
- function toRaw(observed) {
- return observed && toRaw(observed["__v_raw"
- /* RAW */
- ]) || observed;
+ if (!waiting) {
+ waiting = true;
+ nextTick(flushSchedulerQueue);
+ }
}
+ }
- function isRef(r) {
- return Boolean(r && r.__v_isRef === true);
+ function innerWatch(source, cb, options) {
+ if (!_.isFunction(cb)) {
+ console.warn("`watch(fn, options?)` signature has been moved to a separate API. " + "Use `watchEffect(fn, options?)` instead. `watch` now only " + "supports `watch(source, cb, options?) signature.");
}
- var ComputedRefImpl = /*#__PURE__*/function () {
- function ComputedRefImpl(getter, _setter, isReadonly) {
- var _this2 = this;
+ return doWatch(source, cb, options);
+ }
+ var INITIAL_WATCHER_VALUE = {};
+ var objectToString = Object.prototype.toString;
- _classCallCheck(this, ComputedRefImpl);
+ var toTypeString = function toTypeString(value) {
+ return objectToString.call(value);
+ };
- this._setter = _setter;
- this._dirty = true;
- this.__v_isRef = true;
- this.effect = effect(getter, {
- lazy: true,
- scheduler: function scheduler() {
- if (!_this2._dirty) {
- _this2._dirty = true;
- trigger(toRaw(_this2), "set"
- /* SET */
- , "value");
- }
- }
- });
- this["__v_isReadonly"
- /* IS_READONLY */
- ] = isReadonly;
- }
+ var isMap = function isMap(val) {
+ return toTypeString(val) === "[object Map]";
+ };
- _createClass(ComputedRefImpl, [{
- key: "value",
- get: function get() {
- if (this._dirty) {
- this._value = this.effect();
- this._dirty = false;
- }
-
- track(toRaw(this), "get"
- /* GET */
- , "value");
- return this._value;
- },
- set: function set(newValue) {
- this._setter(newValue);
- }
- }]);
+ var isSet = function isSet(val) {
+ return toTypeString(val) === "[object Set]";
+ };
- return ComputedRefImpl;
- }();
+ var hasChanged = function hasChanged(value, oldValue) {
+ return value !== oldValue && (value === value || oldValue === oldValue);
+ };
- function computed(getterOrOptions) {
- var getter;
- var setter;
+ var uid = 0;
- if (isFunction(getterOrOptions)) {
- getter = getterOrOptions;
+ function doWatch(source, cb, options, instance) {
+ options = options || {};
+ var _options = options,
+ immediate = _options.immediate,
+ deep = _options.deep,
+ sync = _options.sync,
+ onTrack = _options.onTrack,
+ onTrigger = _options.onTrigger;
- setter = function setter() {
- console.warn("Write operation failed: computed value is readonly");
- };
- } else {
- getter = getterOrOptions.get;
- setter = getterOrOptions.set;
- }
+ if (!cb) {
+ if (immediate !== undefined) {
+ console.warn("watch() \"immediate\" option is only respected when using the " + "watch(source, callback, options?) signature.");
+ }
- return new ComputedRefImpl(getter, setter, isFunction(getterOrOptions) || !getterOrOptions.set);
+ if (deep !== undefined) {
+ console.warn("watch() \"deep\" option is only respected when using the " + "watch(source, callback, options?) signature.");
+ }
}
- function noop() {}
- function isNative(Ctor) {
- return typeof Ctor === "function" && /native code/.test(Ctor.toString());
- }
- var isIE = function isIE() {
- if (typeof navigator === "undefined") {
- return false;
- }
-
- return /(msie|trident)/i.test(navigator.userAgent.toLowerCase());
+ var warnInvalidSource = function warnInvalidSource(s) {
+ console.warn("Invalid watch source: ", s, "A watch source can only be a getter/effect function, a ref, " + "a reactive object, or an array of these types.");
};
- var getIEVersion = function getIEVersion() {
- var version = 0;
- if (typeof navigator === "undefined") {
- return false;
- }
-
- var agent = navigator.userAgent.toLowerCase();
- var v1 = agent.match(/(?:msie\s([\w.]+))/);
- var v2 = agent.match(/(?:trident.*rv:([\w.]+))/);
-
- if (v1 && v2 && v1[1] && v2[1]) {
- version = Math.max(v1[1] * 1, v2[1] * 1);
- } else if (v1 && v1[1]) {
- version = v1[1] * 1;
- } else if (v2 && v2[1]) {
- version = v2[1] * 1;
- } else {
- version = 0;
- }
-
- return version;
- };
- isIE() && getIEVersion() < 9;
- var _toString = Object.prototype.toString;
- function isPlainObject(obj) {
- return _toString.call(obj) === "[object Object]";
- }
- var bailRE = /[^\w.$]/;
- function parsePath(path) {
- if (bailRE.test(path)) {
- return;
- }
-
- var segments = path.split(".");
- return function (obj) {
- for (var i = 0; i < segments.length; i++) {
- if (!obj) return;
- obj = obj[segments[i]];
- }
-
- return obj;
+ var getter;
+ var forceTrigger = false;
+
+ if (isRef(source)) {
+ getter = function getter() {
+ return source.value;
+ };
+
+ forceTrigger = !!source._shallow;
+ } else if (isReactive(source)) {
+ getter = function getter() {
+ return source;
+ };
+
+ deep = true;
+ } else if (_.isArray(source)) {
+ getter = function getter() {
+ return source.map(function (s) {
+ if (isRef(s)) {
+ return s.value;
+ } else if (isReactive(s)) {
+ return traverse(s);
+ } else if (_.isFunction(s)) {
+ return s.call(instance);
+ } else {
+ warnInvalidSource(s);
+ }
+ });
+ };
+ } else if (_.isFunction(source)) {
+ if (cb) {
+ // getter with cb
+ getter = function getter() {
+ return source.call(instance);
};
- }
- var nextTick = function () {
- var callbacks = [];
- var pending = false;
- var timerFunc;
-
- function nextTickHandler() {
- pending = false;
- var copies = callbacks.slice(0);
- callbacks.length = 0;
-
- for (var i = 0; i < copies.length; i++) {
- copies[i]();
- }
- } // An asynchronous deferring mechanism.
- // In pre 2.4, we used to use microtasks (Promise/MutationObserver)
- // but microtasks actually has too high a priority and fires in between
- // supposedly sequential events (e.g. #4521, #6690) or even between
- // bubbling of the same event (#6566). Technically setImmediate should be
- // the ideal choice, but it's not available everywhere; and the only polyfill
- // that consistently queues the callback after all DOM events triggered in the
- // same loop is by using MessageChannel.
-
- /* istanbul ignore if */
-
-
- if (typeof setImmediate !== "undefined" && isNative(setImmediate)) {
- timerFunc = function timerFunc() {
- setImmediate(nextTickHandler);
- };
- } else if (typeof MessageChannel !== "undefined" && (isNative(MessageChannel) || // PhantomJS
- MessageChannel.toString() === "[object MessageChannelConstructor]")) {
- var channel = new MessageChannel();
- var port = channel.port2;
- channel.port1.onmessage = nextTickHandler;
-
- timerFunc = function timerFunc() {
- port.postMessage(1);
- };
- } else if (typeof Promise !== "undefined" && isNative(Promise)) {
- /* istanbul ignore next */
- // use microtask in non-DOM environments, e.g. Weex
- var p = Promise.resolve();
-
- timerFunc = function timerFunc() {
- p.then(nextTickHandler);
- };
- } else {
- // fallback to setTimeout
- timerFunc = function timerFunc() {
- setTimeout(nextTickHandler, 0);
- };
- }
-
- return function queueNextTick(cb, ctx) {
- var _resolve;
-
- callbacks.push(function () {
- if (cb) {
- try {
- cb.call(ctx);
- } catch (e) {
- console.error(e);
- }
- } else if (_resolve) {
- _resolve(ctx);
- }
- });
-
- if (!pending) {
- pending = true;
- timerFunc();
- } // $flow-disable-line
+ } else {
+ // no cb -> simple effect
+ getter = function getter() {
+ if (instance && instance.isUnmounted) {
+ return;
+ }
+ if (cleanup) {
+ cleanup();
+ }
- if (!cb && typeof Promise !== "undefined") {
- return new Promise(function (resolve) {
- _resolve = resolve;
- });
- }
+ return source.call(instance, onInvalidate);
};
- }();
-
- var mixinInjection = {};
- function getMixins(type) {
- return mixinInjection[type];
- }
- function mixin(xtype, cls) {
- mixinInjection[xtype] = _.cloneDeep(cls);
- }
-
- var queue = [];
- var activatedChildren = [];
- var has = {};
- var waiting = false;
- var flushing = false;
- var index = 0;
-
- function resetSchedulerState() {
- index = queue.length = activatedChildren.length = 0;
- has = {};
- waiting = flushing = false;
- }
-
- function flushSchedulerQueue() {
- flushing = true;
- var watcher;
- var id;
- var options; // Sort queue before flush.
- // This ensures that:
- // 1. Components are updated from parent to child. (because parent is always
- // created before the child)
- // 2. A component's user watchers are run before its render watcher (because
- // user watchers are created before the render watcher)
- // 3. If a component is destroyed during a parent component's watcher run,
- // its watchers can be skipped.
-
- queue.sort(function (a, b) {
- return a.id - b.id;
- }); // do not cache length because more watchers might be pushed
- // as we run existing watchers
-
- for (index = 0; index < queue.length; index++) {
- watcher = queue[index].watcher;
- options = queue[index].options;
- id = watcher.id;
- has[id] = null;
- watcher(options);
- }
+ }
+ } else {
+ getter = function getter() {};
- resetSchedulerState();
+ warnInvalidSource(source);
}
- function queueWatcher(watcher, options) {
- var id = watcher.id;
-
- if (has[id] == null) {
- has[id] = true;
-
- if (!flushing) {
- queue.push({
- watcher: watcher,
- options: options
- });
- } else {
- // if already flushing, splice the watcher based on its id
- // if already past its id, it will be run next immediately.
- var i = queue.length - 1;
-
- while (i > index && queue[i].watcher.id > watcher.id) {
- i--;
- }
-
- queue.splice(i + 1, 0, {
- watcher: watcher,
- options: options
- });
- } // queue the flush
+ if (cb && deep) {
+ var baseGetter = getter;
-
- if (!waiting) {
- waiting = true;
- nextTick(flushSchedulerQueue);
- }
- }
+ getter = function getter() {
+ return traverse(baseGetter());
+ };
}
- function innerWatch(source, cb, options) {
- if (!_.isFunction(cb)) {
- console.warn("`watch(fn, options?)` signature has been moved to a separate API. " + "Use `watchEffect(fn, options?)` instead. `watch` now only " + "supports `watch(source, cb, options?) signature.");
- }
+ var cleanup;
- return doWatch(source, cb, options);
- }
- var INITIAL_WATCHER_VALUE = {};
- var objectToString = Object.prototype.toString;
-
- var toTypeString = function toTypeString(value) {
- return objectToString.call(value);
+ var onInvalidate = function onInvalidate(fn) {
+ cleanup = runner.options.onStop = function () {
+ fn.call(instance);
+ };
};
- var isMap = function isMap(val) {
- return toTypeString(val) === "[object Map]";
+ var oldValue = _.isArray(source) ? [] : INITIAL_WATCHER_VALUE;
+
+ var job = function job() {
+ // 这里去掉的原因是，新增属性没有生效也会触发变化监听
+ // if (!runner.active) {
+ // return;
+ // }
+ if (cb) {
+ // watch(source, cb)
+ var newValue = runner();
+
+ if (deep || forceTrigger || hasChanged(newValue, oldValue)) {
+ // cleanup before running cb again
+ if (cleanup) {
+ cleanup();
+ }
+
+ cb.apply(instance, [newValue, // pass undefined as the old value when it's changed for the first time
+ oldValue === INITIAL_WATCHER_VALUE ? undefined : oldValue, onInvalidate]);
+ oldValue = newValue;
+ }
+ } else {
+ // watchEffect
+ runner();
+ }
+ }; // important: mark the job as a watcher callback so that scheduler knows
+ // it is allowed to self-trigger (#1727)
+
+
+ job.allowRecurse = !!cb;
+ job.id = ++uid;
+ var scheduler;
+
+ if (sync === true) {
+ scheduler = job;
+ } else {
+ scheduler = function scheduler() {
+ return queueWatcher(job);
+ };
+ }
+
+ var runner = effect(function () {
+ try {
+ return getter();
+ } catch (e) {// 吞掉异常
+ }
+ }, {
+ lazy: true,
+ onTrack: onTrack,
+ onTrigger: onTrigger,
+ scheduler: scheduler
+ }); // initial run
+
+ if (cb) {
+ if (immediate) {
+ job();
+ } else {
+ oldValue = runner();
+ }
+ } else {
+ runner();
+ }
+
+ return function () {
+ stop(runner);
};
+ }
- var isSet = function isSet(val) {
- return toTypeString(val) === "[object Set]";
- };
+ function traverse(value) {
+ var seen = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : new Set();
- var hasChanged = function hasChanged(value, oldValue) {
- return value !== oldValue && (value === value || oldValue === oldValue);
- };
+ if (!_.isObject(value) || seen.has(value)) {
+ return value;
+ }
- var uid = 0;
+ seen.add(value);
- function doWatch(source, cb, options, instance) {
- options = options || {};
- var _options = options,
- immediate = _options.immediate,
- deep = _options.deep,
- sync = _options.sync,
- onTrack = _options.onTrack,
- onTrigger = _options.onTrigger;
+ if (isRef(value)) {
+ traverse(value.value, seen);
+ } else if (_.isArray(value)) {
+ for (var i = 0; i < value.length; i++) {
+ traverse(value[i], seen);
+ }
+ } else if (isSet(value) || isMap(value)) {
+ value.forEach(function (v) {
+ traverse(v, seen);
+ });
+ } else {
+ for (var key in value) {
+ traverse(value[key], seen);
+ }
+ }
- if (!cb) {
- if (immediate !== undefined) {
- console.warn("watch() \"immediate\" option is only respected when using the " + "watch(source, callback, options?) signature.");
- }
+ return value;
+ }
- if (deep !== undefined) {
- console.warn("watch() \"deep\" option is only respected when using the " + "watch(source, callback, options?) signature.");
- }
- }
+ var falsy;
+ var operators = {
+ "||": falsy,
+ "&&": falsy,
+ "(": falsy,
+ ")": falsy
+ };
- var warnInvalidSource = function warnInvalidSource(s) {
- console.warn("Invalid watch source: ", s, "A watch source can only be a getter/effect function, a ref, " + "a reactive object, or an array of these types.");
- };
+ function runBinaryFunction(binarys) {
+ var expr = "";
- var getter;
- var forceTrigger = false;
+ for (var i = 0, len = binarys.length; i < len; i++) {
+ if (_.isBoolean(binarys[i]) || _.has(operators, binarys[i])) {
+ expr += binarys[i];
+ } else {
+ expr += "false";
+ }
+ }
- if (isRef(source)) {
- getter = function getter() {
- return source.value;
- };
+ return new Function("return " + expr)();
+ }
- forceTrigger = !!source._shallow;
- } else if (isReactive(source)) {
- getter = function getter() {
- return source;
- };
+ function watchExp(model, getter) {
+ var result = getter.call(model, model);
- deep = true;
- } else if (_.isArray(source)) {
- getter = function getter() {
- return source.map(function (s) {
- if (isRef(s)) {
- return s.value;
- } else if (isReactive(s)) {
- return traverse(s);
- } else if (_.isFunction(s)) {
- return s.call(instance);
- } else {
- warnInvalidSource(s);
- }
- });
- };
- } else if (_.isFunction(source)) {
- if (cb) {
- // getter with cb
- getter = function getter() {
- return source.call(instance);
- };
- } else {
- // no cb -> simple effect
- getter = function getter() {
- if (instance && instance.isUnmounted) {
- return;
- }
-
- if (cleanup) {
- cleanup();
- }
-
- return source.call(instance, onInvalidate);
- };
- }
- } else {
- getter = function getter() {};
+ if (_.isArray(result)) {
+ return result.concat();
+ }
- warnInvalidSource(source);
- }
+ return result;
+ }
- if (cb && deep) {
- var baseGetter = getter;
+ function watch(model, expOrFn, cb, options) {
+ if (isPlainObject(cb)) {
+ options = cb;
+ cb = cb.handler;
+ }
- getter = function getter() {
- return traverse(baseGetter());
- };
- }
+ if (typeof cb === "string") {
+ cb = model[cb];
+ }
- var cleanup;
+ options = options || {};
+ options.user = true;
+ var exps;
- var onInvalidate = function onInvalidate(fn) {
- cleanup = runner.options.onStop = function () {
- fn.call(instance);
- };
- };
+ if (_.isFunction(expOrFn)) {
+ var watcher = innerWatch(expOrFn, cb, options);
+ return function unwatchFn() {
+ watcher();
+ };
+ }
- var oldValue = _.isArray(source) ? [] : INITIAL_WATCHER_VALUE;
+ if (!(exps = expOrFn.match(/[a-zA-Z0-9_.*]+|[|][|]|[&][&]|[(]|[)]/g)) || exps.length === 1 && !/\*/.test(expOrFn)) {
+ var paths = expOrFn.split(".");
+ var prePaths = paths.slice(0, paths.length - 1);
+ var preGetter = parsePath(prePaths.join("."));
+ var v = preGetter.call(model, model);
+ var getter = parsePath(paths[paths.length - 1]);
- var job = function job() {
- if (!runner.active) {
- return;
- }
+ var _watcher = innerWatch(function () {
+ return watchExp(v, getter);
+ }, cb, options);
- if (cb) {
- // watch(source, cb)
- var newValue = runner();
+ return function unwatchFn() {
+ _watcher();
+ };
+ }
- if (deep || forceTrigger || hasChanged(newValue, oldValue)) {
- // cleanup before running cb again
- if (cleanup) {
- cleanup();
- }
+ var watchers = [];
+ var fns = exps.slice();
+ var complete = false,
+ running = false;
- cb.apply(instance, [newValue, // pass undefined as the old value when it's changed for the first time
- oldValue === INITIAL_WATCHER_VALUE ? undefined : oldValue, onInvalidate]);
- oldValue = newValue;
- }
- } else {
- // watchEffect
- runner();
- }
- }; // important: mark the job as a watcher callback so that scheduler knows
- // it is allowed to self-trigger (#1727)
+ var callback = function callback(index, newValue, oldValue, attrs) {
+ if (complete === true) {
+ return;
+ }
+ fns[index] = true;
- job.allowRecurse = !!cb;
- job.id = ++uid;
- var scheduler;
+ if (runBinaryFunction(fns)) {
+ complete = true;
+ cb(newValue, oldValue, attrs);
+ }
- if (sync === true) {
- scheduler = job;
- } else {
- scheduler = function scheduler() {
- return queueWatcher(job);
- };
+ if (options && options.sync) {
+ complete = false;
+ running = false;
+ fns = exps.slice();
+ } else {
+ if (!running) {
+ running = true;
+ nextTick(function () {
+ complete = false;
+ running = false;
+ fns = exps.slice();
+ });
}
+ }
+ };
- var runner = effect(getter, {
- lazy: true,
- onTrack: onTrack,
- onTrigger: onTrigger,
- scheduler: scheduler
- }); // initial run
-
- if (cb) {
- if (immediate) {
- job();
+ _.each(exps, function (exp, i) {
+ if (_.has(operators, exp)) {
+ return;
+ }
+
+ if (exp.indexOf("*") >= 0) {
+ // eslint-disable-next-line no-inner-declarations
+ var travers = function travers(root, deps, parent, key, res) {
+ if (deps.length === _paths.length) {
+ root !== undefined && res.push({
+ parent: parent,
+ k: key
+ });
+ return;
+ }
+
+ if (root) {
+ if (_paths[deps.length] === "*") {
+ // 遍历所有节点
+ for (var k in root) {
+ travers(root[k], deps.concat([k]), root, k, res);
+ }
} else {
- oldValue = runner();
+ var nextKey = _paths[deps.length];
+ travers(root[nextKey], deps.concat([nextKey]), root, nextKey, res);
}
- } else {
- runner();
- }
-
- return function () {
- stop(runner);
+ }
};
- }
-
- function traverse(value) {
- var seen = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : new Set();
- if (!_.isObject(value) || seen.has(value)) {
- return value;
- }
+ //a.**形式
+ if (/^[1-9a-zA-Z.]+\*\*$/.test(exp) || exp === "**") {
+ exp = exp.replace(".**", "");
- seen.add(value);
+ var _paths2 = exp.split(".");
- if (isRef(value)) {
- traverse(value.value, seen);
- } else if (_.isArray(value)) {
- for (var i = 0; i < value.length; i++) {
- traverse(value[i], seen);
- }
- } else if (isSet(value) || isMap(value)) {
- value.forEach(function (v) {
- traverse(v, seen);
- });
- } else {
- for (var key in value) {
- traverse(value[key], seen);
- }
- }
+ var _prePaths2 = _paths2.slice(0, _paths2.length - 1);
- return value;
- }
+ var _preGetter = parsePath(_prePaths2.join("."));
- var falsy;
- var operators = {
- "||": falsy,
- "&&": falsy,
- "(": falsy,
- ")": falsy
- };
+ var _v2 = _preGetter.call(model, model);
- function runBinaryFunction(binarys) {
- var expr = "";
+ var _getter = exp === "**" ? function (m) {
+ return m;
+ } : parsePath(_paths2[_paths2.length - 1]);
- for (var i = 0, len = binarys.length; i < len; i++) {
- if (_.isBoolean(binarys[i]) || _.has(operators, binarys[i])) {
- expr += binarys[i];
- } else {
- expr += "false";
+ watchers.push(innerWatch(function () {
+ return watchExp(_v2, _getter);
+ }, function (newValue, oldValue) {
+ // a.** 在a变化的时候不会触发change
+ if (oldValue !== newValue) {
+ return;
}
- }
- return new Function("return " + expr)();
- }
-
- function watchExp(model, exp) {
- var getter = parsePath(exp);
- var result = getter.call(model, model);
-
- if (_.isArray(result)) {
- return result.concat();
+ callback(i, NaN, NaN, _.extend({
+ index: i
+ }));
+ }, _.extend({
+ deep: true
+ }, options)));
+ return;
}
- return result;
- }
+ if (/^(\*\*\.)+[1-9a-zA-Z]+(\.\*\*$)/.test(exp)) {
+ throw new Error("not support");
+ } //含有*的情况，如a.*,如*.a,*.*.a,a.*.a
+ //先获取到能获取到的对象
- function watch(model, expOrFn, cb, options) {
- if (isPlainObject(cb)) {
- options = cb;
- cb = cb.handler;
- }
- if (typeof cb === "string") {
- cb = model[cb];
- }
+ var _paths = exp.split(".");
- options = options || {};
- options.user = true;
- var exps;
+ var _prePaths = [];
- if (_.isFunction(expOrFn) || !(exps = expOrFn.match(/[a-zA-Z0-9_.*]+|[|][|]|[&][&]|[(]|[)]/g)) || exps.length === 1 && !/\*/.test(expOrFn)) {
- var watcher = innerWatch(_.isFunction(expOrFn) ? expOrFn : function () {
- return watchExp(model, expOrFn);
- }, cb, options);
- return function unwatchFn() {
- watcher();
- };
+ for (var _i = 0, len = _paths.length; _i < len; _i++) {
+ if (_paths[_i] === "*") {
+ break;
+ }
+
+ _prePaths[_i] = _paths[_i];
}
- var watchers = [];
- var fns = exps.slice();
- var complete = false,
- running = false;
+ var _v;
- var callback = function callback(index, newValue, oldValue, attrs) {
- if (complete === true) {
- return;
- }
+ if (_prePaths.length > 0) {
+ var _getter2 = parsePath(_prePaths.join("."));
- fns[index] = true;
+ _v = _getter2.call(model, model);
+ } else {
+ _v = model;
+ }
- if (runBinaryFunction(fns)) {
- complete = true;
- cb(newValue, oldValue, attrs);
- }
+ _paths = _paths.slice(_prePaths.length);
+ var changes = [];
+ watchers.push(innerWatch(function () {
+ var routes = [];
+ travers(_v, [], _v, null, routes);
- if (options && options.sync) {
- complete = false;
- running = false;
- fns = exps.slice();
- } else {
- if (!running) {
- running = true;
- nextTick(function () {
- complete = false;
- running = false;
- fns = exps.slice();
- });
- }
- }
- };
+ for (var _i2 = 0, _len = routes.length; _i2 < _len; _i2++) {
+ var _routes$_i = routes[_i2],
+ parent = _routes$_i.parent,
+ k = _routes$_i.k;
- _.each(exps, function (exp, i) {
- if (_.has(operators, exp)) {
- return;
- } //a.**形式
-
-
- if (/^[1-9a-zA-Z.]+\*\*$/.test(exp) || exp === "**") {
- exp = exp.replace(".**", "");
- var getter = exp === "**" ? function (m) {
- return m;
- } : parsePath(exp);
- var v = getter.call(model, model);
- watchers.push(innerWatch(v, function (newValue, oldValue) {
- callback(i, newValue, oldValue, _.extend({
- index: i
- }));
- }));
- return;
- }
+ for (var j = 0, l = changes.length; j < l; j++) {
+ var _changes$j = changes[j],
+ target = _changes$j.target,
+ key = _changes$j.key;
- if (/^(\*\*\.)+[1-9a-zA-Z]+(\.\*\*$)/.test(exp)) {
- throw new Error("not support");
- } //含有*的情况，如a.*,如*.a,*.*.a,a.*.a
-
-
- if (/\*/.test(exp)) {
- // eslint-disable-next-line no-inner-declarations
- var travers = function travers(root, deps, parent, key, res) {
- if (deps.length === paths.length) {
- root !== undefined && res.push({
- parent: parent,
- k: key
- });
- return;
- }
-
- if (root) {
- if (paths[deps.length] === "*") {
- // 遍历所有节点
- for (var k in root) {
- travers(root[k], deps.concat([k]), root, k, res);
- }
- } else {
- var nextKey = paths[deps.length];
- travers(root[nextKey], deps.concat([nextKey]), root, nextKey, res);
- }
- }
- };
-
- //先获取到能获取到的对象
- var paths = exp.split(".");
- var prePaths = [];
-
- for (var _i = 0, len = paths.length; _i < len; _i++) {
- if (paths[_i] === "*") {
- break;
- }
-
- prePaths[_i] = paths[_i];
- }
-
- var _v;
-
- if (prePaths.length > 0) {
- var _getter = parsePath(prePaths.join("."));
-
- _v = _getter.call(model, model);
- } else {
- _v = model;
- }
-
- paths = paths.slice(prePaths.length);
- var changes = [];
- watchers.push(innerWatch(function () {
- var routes = [];
- travers(_v, [], _v, null, routes);
-
- for (var _i2 = 0, _len = routes.length; _i2 < _len; _i2++) {
- var _routes$_i = routes[_i2],
- parent = _routes$_i.parent,
- k = _routes$_i.k;
-
- for (var j = 0, l = changes.length; j < l; j++) {
- var _changes$j = changes[j],
- target = _changes$j.target,
- key = _changes$j.key;
-
- if (target === toRaw(parent) && key === k) {
- return true;
- }
- }
- }
- }, function (newValue) {
- changes = [];
-
- if (newValue === true) {
- callback(i, undefined, undefined, _.extend({
- index: i
- }));
- }
- }, {
- deep: true,
- onTrigger: function onTrigger(_ref) {
- var target = _ref.target,
- key = _ref.key;
- changes.push({
- target: target,
- key: key
- });
- }
- }));
- return;
+ if (target === toRaw(parent) && key === k) {
+ return true;
+ }
}
+ }
+ }, function (newValue) {
+ changes = [];
- watchers.push(innerWatch(function () {
- return watchExp(model, exp);
- }, function (newValue, oldValue) {
- callback(i, newValue, oldValue, _.extend({
- index: i
- }));
+ if (newValue === true) {
+ callback(i, NaN, NaN, _.extend({
+ index: i
}));
- });
+ }
+ }, BI.extend({}, options, {
+ deep: true,
+ onTrigger: function onTrigger(_ref) {
+ var target = _ref.target,
+ key = _ref.key;
+ changes.push({
+ target: target,
+ key: key
+ });
+ }
+ })));
+ return;
+ }
+
+ var getter = parsePath(exp);
+ watchers.push(innerWatch(function () {
+ return watchExp(model, getter);
+ }, function (newValue, oldValue) {
+ callback(i, newValue, oldValue, _.extend({
+ index: i
+ }));
+ }, options));
+ });
- return watchers;
- }
+ return watchers;
+ }
- var REACTIVE = true;
+ var REACTIVE = true;
- function initState(vm, state) {
- if (state) {
- vm.$$state = REACTIVE ? reactive(state) : state;
- }
+ function initState(vm, state) {
+ if (state) {
+ vm.$$state = REACTIVE ? reactive(state) : state;
}
+ }
- function initComputed(vm, c) {
- var $$computed = vm.$$computed = {};
+ function initComputed(vm, c) {
+ var $$computed = vm.$$computed = {};
- for (var key in c) {
- $$computed[key] = computed(_.bind(c[key], vm));
- }
+ for (var key in c) {
+ $$computed[key] = computed(_.bind(c[key], vm));
}
+ }
- function initWatch(vm, watch) {
- vm._watchers || (vm._watchers = []);
+ function initWatch(vm, watch) {
+ vm._watchers || (vm._watchers = []);
- for (var key in watch) {
- var handler = watch[key];
+ for (var key in watch) {
+ var handler = watch[key];
- if (_.isArray(handler)) {
- for (var i = 0; i < handler.length; i++) {
- vm._watchers.push(createWatcher(vm, key, handler[i]));
- }
- } else {
- vm._watchers.push(createWatcher(vm, key, handler));
- }
+ if (_.isArray(handler)) {
+ for (var i = 0; i < handler.length; i++) {
+ vm._watchers.push(createWatcher(vm, key, handler[i]));
}
+ } else {
+ vm._watchers.push(createWatcher(vm, key, handler));
+ }
}
+ }
- function createWatcher(vm, keyOrFn, cb, options) {
- if (isPlainObject(cb)) {
- options = cb;
- cb = cb.handler;
- }
-
- if (typeof cb === "string") {
- cb = vm[cb];
- }
-
- return watch(vm.model, keyOrFn, _.bind(cb, vm), options);
+ function createWatcher(vm, keyOrFn, cb, options) {
+ if (isPlainObject(cb)) {
+ options = cb;
+ cb = cb.handler;
}
- function initMethods(vm, methods) {
- for (var key in methods) {
- vm[key] = methods[key] == null ? noop : _.bind(methods[key], vm);
- }
+ if (typeof cb === "string") {
+ cb = vm[cb];
}
- function initMixins(vm, mixins) {
- mixins = (mixins || []).slice(0);
+ return watch(vm.model, keyOrFn, _.bind(cb, vm), options);
+ }
- _.each(mixins.reverse(), function (mixinType) {
- var mixin = getMixins(mixinType);
-
- for (var key in mixin) {
- if (typeof mixin[key] !== "function") continue;
- if (_.has(vm, key)) continue;
- vm[key] = _.bind(mixin[key], vm);
- }
- });
+ function initMethods(vm, methods) {
+ for (var key in methods) {
+ vm[key] = methods[key] == null ? noop : _.bind(methods[key], vm);
}
+ }
- function defineProps(vm) {
- vm.model = new Proxy({}, {
- get: function get(target, key) {
- if (vm.$$computed && key in vm.$$computed) {
- try {
- return vm.$$computed[key].value;
- } catch (e) {// 吞掉异常
- }
-
- return;
- }
+ function initMixins(vm, mixins) {
+ mixins = (mixins || []).slice(0);
- if (vm.$$state && key in vm.$$state) {
- return vm.$$state[key];
- }
+ _.each(mixins.reverse(), function (mixinType) {
+ var mixin = getMixins(mixinType);
- var p = vm._parent;
-
- while (p) {
- if (p.$$context && key in p.$$context) {
- return p.$$context[key];
- }
-
- p = p._parent;
- }
- },
- set: function set(target, key, value) {
- if (vm.$$state && key in vm.$$state) {
- vm.$$state[key] = value;
- return true;
- }
+ for (var key in mixin) {
+ if (typeof mixin[key] !== "function") continue;
+ if (_.has(vm, key)) continue;
+ vm[key] = _.bind(mixin[key], vm);
+ }
+ });
+ }
- var p = vm._parent;
+ function defineProps(vm) {
+ vm.model = new Proxy({}, {
+ get: function get(target, key) {
+ if (vm.$$computed && key in vm.$$computed) {
+ try {
+ return vm.$$computed[key].value;
+ } catch (e) {// 吞掉异常
+ }
- while (p) {
- if (p.$$context && key in p.$$context) {
- p.$$context[key] = value;
- return true;
- }
+ return;
+ }
- p = p._parent;
- }
+ if (vm.$$state && key in vm.$$state) {
+ return vm.$$state[key];
+ }
- return true;
- }
- });
- }
+ var p = vm._parent;
- function defineContext(vm, keys) {
- var props = {};
-
- var _loop = function _loop(i, len) {
- var key = keys[i];
- props[key] = {
- enumerable: true,
- configurable: true,
- get: function get() {
- return vm.model[key];
- },
- set: function set(val) {
- return vm.model[key] = val;
- }
- };
- };
+ while (p) {
+ if (p.$$context && key in p.$$context) {
+ return p.$$context[key];
+ }
- for (var i = 0, len = keys.length; i < len; i++) {
- _loop(i);
+ p = p._parent;
+ }
+ },
+ set: function set(target, key, value) {
+ if (vm.$$state && key in vm.$$state) {
+ vm.$$state[key] = value;
+ return true;
}
- vm.$$context = Object.defineProperties({}, props);
- }
-
- function getInjectValue(vm, key) {
var p = vm._parent;
while (p) {
- if (p.$$context && key in p.$$context) {
- return p.$$context[key];
- }
+ if (p.$$context && key in p.$$context) {
+ p.$$context[key] = value;
+ return true;
+ }
+
+ p = p._parent;
+ }
- p = p._parent;
+ return true;
+ }
+ });
+ }
+
+ function defineContext(vm, keys) {
+ var props = {};
+
+ var _loop = function _loop(i, len) {
+ var key = keys[i];
+ props[key] = {
+ enumerable: true,
+ configurable: true,
+ get: function get() {
+ return vm.model[key];
+ },
+ set: function set(val) {
+ return vm.model[key] = val;
}
+ };
+ };
+
+ for (var i = 0, len = keys.length; i < len; i++) {
+ _loop(i);
}
- function getInjectValues(vm) {
- var inject = vm.inject || [];
- var result = {};
+ vm.$$context = Object.defineProperties({}, props);
+ }
- _.each(inject, function (key) {
- result[key] = getInjectValue(vm, key);
- });
+ function getInjectValue(vm, key) {
+ var p = vm._parent;
+
+ while (p) {
+ if (p.$$context && key in p.$$context) {
+ return p.$$context[key];
+ }
- return result;
+ p = p._parent;
}
+ }
- var Model = /*#__PURE__*/function () {
- function Model() {
- _classCallCheck(this, Model);
- }
+ function getInjectValues(vm) {
+ var inject = vm.inject || [];
+ var result = {};
- _createClass(Model, [{
- key: "_constructor",
- value: function _constructor(options, destroyHandler) {
- this.options = options || {};
- this._parent = Model.target;
- var state = _.isFunction(this.state) ? this.state() : this.state;
- var computed = this.computed;
- var context = this.context;
- var inject = this.inject;
- var childContext = this.childContext;
- var watch = this.watch;
- var actions = this.actions;
-
- _.keys(state).concat(_.keys(computed)).concat(inject || []).concat(context || []);
-
- var mixins = this.mixins;
- defineProps(this);
- childContext && defineContext(this, childContext);
- initMixins(this, mixins);
- this.init();
- initState(this, _.extend(getInjectValues(this), state));
- initComputed(this, computed);
- REACTIVE && initWatch(this, watch);
- initMethods(this, actions);
- this.created && this.created();
- this._destroyHandler = destroyHandler;
- }
- }, {
- key: "_init",
- value: function _init() {}
- }, {
- key: "init",
- value: function init() {
- this._init();
- }
- }, {
- key: "destroy",
- value: function destroy() {
- _.each(this._watchers, function (unwatches) {
- unwatches = _.isArray(unwatches) ? unwatches : [unwatches];
-
- _.each(unwatches, function (unwatch) {
- unwatch();
- });
- });
-
- this._watchers && (this._watchers = []);
- this.destroyed && this.destroyed();
- this.$$computed = null;
- this.$$state = null;
- this._destroyHandler && this._destroyHandler();
- }
- }]);
-
- return Model;
- }();
- function set(target, key, val) {
- if (_.isArray(target)) {
- target.length = Math.max(target.length, key);
- target.splice(key, 1, val);
- return val;
- }
+ _.each(inject, function (key) {
+ result[key] = getInjectValue(vm, key);
+ });
- target[key] = val;
- }
- function del(target, key) {
- if (_.isArray(target)) {
- target.splice(key, 1);
- return;
- }
+ return result;
+ }
+
+ var Model = /*#__PURE__*/function () {
+ function Model() {
+ _classCallCheck(this, Model);
+ }
+
+ _createClass(Model, [{
+ key: "_constructor",
+ value: function _constructor(options, destroyHandler) {
+ this.options = options || {};
+ this._parent = Model.target;
+ var state = _.isFunction(this.state) ? this.state() : this.state;
+ var computed = this.computed;
+ var context = this.context;
+ var inject = this.inject;
+ var childContext = this.childContext;
+ var watch = this.watch;
+ var actions = this.actions;
+
+ _.keys(state).concat(_.keys(computed)).concat(inject || []).concat(context || []);
+
+ var mixins = this.mixins;
+ defineProps(this);
+ childContext && defineContext(this, childContext);
+ initMixins(this, mixins);
+ this.init();
+ initState(this, _.extend(getInjectValues(this), state));
+ initComputed(this, computed);
+ REACTIVE && initWatch(this, watch);
+ initMethods(this, actions);
+ this.created && this.created();
+ this._destroyHandler = destroyHandler;
+ }
+ }, {
+ key: "_init",
+ value: function _init() {}
+ }, {
+ key: "init",
+ value: function init() {
+ this._init();
+ }
+ }, {
+ key: "destroy",
+ value: function destroy() {
+ _.each(this._watchers, function (unwatches) {
+ unwatches = _.isArray(unwatches) ? unwatches : [unwatches];
+
+ _.each(unwatches, function (unwatch) {
+ unwatch();
+ });
+ });
- if (!_.has(target, key)) {
- return;
- }
+ this._watchers && (this._watchers = []);
+ this.destroyed && this.destroyed();
+ this.$$computed = null;
+ this.$$state = null;
+ this._destroyHandler && this._destroyHandler();
+ }
+ }]);
- delete target[key];
+ return Model;
+ }();
+ function set(target, key, val) {
+ if (_.isArray(target)) {
+ target.length = Math.max(target.length, key);
+ target.splice(key, 1, val);
+ return val;
}
- function define(model) {
- return REACTIVE ? reactive(model) : model;
+
+ target[key] = val;
+ }
+ function del(target, key) {
+ if (_.isArray(target)) {
+ target.splice(key, 1);
+ return;
}
- function config(options) {
- options || (options = {});
- if ("reactive" in options) {
- REACTIVE = options.reactive;
- }
+ if (!_.has(target, key)) {
+ return;
}
- function toJSON(model) {
- var result;
+ delete target[key];
+ }
+ function define(model) {
+ return REACTIVE ? reactive(model) : model;
+ }
+ function config(options) {
+ options || (options = {});
+
+ if ("reactive" in options) {
+ REACTIVE = options.reactive;
+ }
+ }
- if (_.isArray(model)) {
- result = [];
+ function toJSON(model) {
+ var result;
- for (var i = 0, len = model.length; i < len; i++) {
- result[i] = toJSON(model[i]);
- }
- } else if (model && isPlainObject(model)) {
- result = {};
+ if (_.isArray(model)) {
+ result = [];
- for (var key in model) {
- result[key] = toJSON(model[key]);
- }
- } else {
- result = model;
- }
+ for (var i = 0, len = model.length; i < len; i++) {
+ result[i] = toJSON(model[i]);
+ }
+ } else if (model && isPlainObject(model)) {
+ result = {};
- return result;
+ for (var key in model) {
+ result[key] = toJSON(model[key]);
+ }
+ } else {
+ result = model;
}
- var version = "3.0";
+ return result;
+ }
+
+ var version = "3.0";
- exports.Model = Model;
- exports.config = config;
- exports.define = define;
- exports.del = del;
- exports.mixin = mixin;
- exports.set = set;
- exports.toJSON = toJSON;
- exports.version = version;
- exports.watch = watch;
+ exports.Model = Model;
+ exports.config = config;
+ exports.define = define;
+ exports.del = del;
+ exports.mixin = mixin;
+ exports.set = set;
+ exports.toJSON = toJSON;
+ exports.version = version;
+ exports.watch = watch;
- Object.defineProperty(exports, '__esModule', { value: true });
+ Object.defineProperty(exports, '__esModule', { value: true });
})));
diff --git a/dist/fix/worker.compact.js b/dist/fix/worker.compact.js
index 63cfbe759..e537706ad 100644
--- a/dist/fix/worker.compact.js
+++ b/dist/fix/worker.compact.js
@@ -1,10 +1,17 @@
;(function () {
var contexts = {};
+ var init = false;
var WORKER;
- BI.useWorker = function (wk) {
- WORKER = wk;
+ var enableWorker = function () {
+ if (init) {
+ return init;
+ }
+ // 开启Worker模式
+ BI.config("bi.provider.system", function (provider) {
+ provider.setWorkerMode(true);
+ });
var _init = BI.Widget.prototype._init;
BI.Widget.prototype._init = function () {
this.$destroyWorker = createWorker.call(this);
@@ -46,7 +53,16 @@
console.error(e);
}
};
+ init = postMessage;
+ return postMessage;
+ };
+ BI.useWorker = function (wk) {
+ if (!_global.Worker || !_global.Proxy) {
+ return;
+ }
+ var postMessage = enableWorker();
+ WORKER = wk;
if (WORKER) {
WORKER.addEventListener("message", function (e) {
var data = e.data;
@@ -72,7 +88,7 @@
name: name,
eventType: "create",
options: options,
- watches: BI.map(this.watch, function (key) {
+ watches: BI.map(this.$watch || this.watch, function (key) {
return key;
})
});
@@ -101,57 +117,7 @@
eventType: "destroy"
});
};
- } else {
- this.store = BI.Models.getModel(modelType, options);
- this.store && (this.store._widget = this);
- if (this.store instanceof Fix.Model) {
- this.model = this.store.model;
- } else {
- this.model = this.store;
- }
- initWatch(this, this.watch);
- return function () {
- this.store && BI.isFunction(this.store.destroy) && this.store.destroy();
- BI.each(this._watchers, function (i, unwatches) {
- unwatches = BI.isArray(unwatches) ? unwatches : [unwatches];
- BI.each(unwatches, function (j, unwatch) {
- unwatch();
- });
- });
- this._watchers && (this._watchers = []);
- if (this.store) {
- this.store._parent && (this.store._parent = null);
- this.store._widget && (this.store._widget = null);
- this.store = null;
- }
- };
- }
-
- }
- }
-
- function initWatch (vm, watch) {
- vm._watchers || (vm._watchers = []);
- for (var key in watch) {
- var handler = watch[key];
- if (BI.isArray(handler)) {
- for (var i = 0; i < handler.length; i++) {
- vm._watchers.push(createWatcher(vm, key, handler[i]));
- }
- } else {
- vm._watchers.push(createWatcher(vm, key, handler));
}
}
}
-
- function createWatcher (vm, keyOrFn, cb, options) {
- if (BI.isPlainObject(cb)) {
- options = cb;
- cb = cb.handler;
- }
- options = options || {};
- return Fix.watch(vm.model, keyOrFn, _.bind(cb, vm), BI.extend(options, {
- store: vm.store
- }));
- }
}());
diff --git a/dist/font/iconfont.eot b/dist/font/iconfont.eot
index 44a04d8c3..60f0cedee 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 c642b62c8..2b3356620 100644
--- a/dist/font/iconfont.svg
+++ b/dist/font/iconfont.svg
@@ -14,6 +14,18 @@
/>
+
+
+
+
+
+
+
+
+
+
+
+
@@ -414,8 +426,6 @@
-
-
@@ -522,8 +532,6 @@
-
-
diff --git a/dist/font/iconfont.ttf b/dist/font/iconfont.ttf
index 6b0173372..fb12a78a7 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 2a7a2de40..8a0afe5b7 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 8dedba1b2..1618fc6c5 100644
Binary files a/dist/font/iconfont.woff2 and b/dist/font/iconfont.woff2 differ
diff --git a/dist/images/1x/background/marker.png b/dist/images/1x/background/marker.png
deleted file mode 100644
index 3929bbb51..000000000
Binary files a/dist/images/1x/background/marker.png and /dev/null differ
diff --git a/dist/images/1x/background/mask.png b/dist/images/1x/background/mask.png
deleted file mode 100644
index b0a4d406f..000000000
Binary files a/dist/images/1x/background/mask.png and /dev/null differ
diff --git a/dist/images/1x/background/wheel.png b/dist/images/1x/background/wheel.png
deleted file mode 100644
index 97b343d98..000000000
Binary files a/dist/images/1x/background/wheel.png and /dev/null differ
diff --git a/dist/images/2x/background/marker.png b/dist/images/2x/background/marker.png
deleted file mode 100644
index 3929bbb51..000000000
Binary files a/dist/images/2x/background/marker.png and /dev/null differ
diff --git a/dist/images/2x/background/mask.png b/dist/images/2x/background/mask.png
deleted file mode 100644
index b0a4d406f..000000000
Binary files a/dist/images/2x/background/mask.png and /dev/null differ
diff --git a/dist/images/2x/background/wheel.png b/dist/images/2x/background/wheel.png
deleted file mode 100644
index 97b343d98..000000000
Binary files a/dist/images/2x/background/wheel.png and /dev/null differ
diff --git a/examples/demo.worker.js b/examples/demo.worker.js
index fecbf994e..dae3c723a 100644
--- a/examples/demo.worker.js
+++ b/examples/demo.worker.js
@@ -1,6 +1,6 @@
if (this.importScripts) {
- importScripts("../dist/fineui_without_jquery_polyfill.js");
- BI.initWorker();
+ importScripts("https://fanruan.design/fineui/fineui_without_jquery_polyfill.js");
+ BI.useInWorker();
}
var Model = BI.inherit(Fix.Model, {
state: function () {
diff --git a/examples/worker.html b/examples/worker.html
index 03cdc5be6..759f0eac4 100644
--- a/examples/worker.html
+++ b/examples/worker.html
@@ -6,7 +6,6 @@
-->
-
diff --git a/package.json b/package.json
index 2a9611156..d4a16ba9c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "fineui",
- "version": "2.0.20211208161231",
+ "version": "2.0.20211213173215",
"description": "fineui",
"main": "dist/fineui.min.js",
"types": "dist/lib/index.d.ts",
diff --git a/src/base/single/button/listitem/icontexticonitem.js b/src/base/single/button/listitem/icontexticonitem.js
index 3cae823de..1624e50e4 100644
--- a/src/base/single/button/listitem/icontexticonitem.js
+++ b/src/base/single/button/listitem/icontexticonitem.js
@@ -44,7 +44,7 @@ BI.IconTextIconItem = BI.inherit(BI.BasicButton, {
var icon1 = BI.createWidget({
type: "bi.icon_label",
cls: o.iconCls1,
- width: o.leftIconWrapperWidth,
+ width: o.leftIconWrapperWidth || o.height,
height: o.height,
iconWidth: o.iconWidth,
iconHeight: o.iconHeight
@@ -60,7 +60,7 @@ BI.IconTextIconItem = BI.inherit(BI.BasicButton, {
el: {
type: "bi.icon_label",
cls: o.iconCls2,
- width: o.rightIconWrapperWidth,
+ width: o.rightIconWrapperWidth || o.height,
height: o.height,
iconWidth: o.iconWidth,
iconHeight: o.iconHeight
diff --git a/src/core/4.widget.js b/src/core/4.widget.js
index 5de5d7c85..5d420df20 100644
--- a/src/core/4.widget.js
+++ b/src/core/4.widget.js
@@ -326,7 +326,9 @@
_initElement: function () {
var self = this;
this.__isMounting = true;
- var render = BI.isFunction(this.options.render) ? this.options.render : this.render;
+ // 当开启worker模式时，可以通过$render来实现另一种效果
+ var workerMode = BI.Providers.getProvider("bi.provider.system").getWorkerMode();
+ var render = BI.isFunction(this.options.render) ? this.options.render : (workerMode ? (this.$render || this.render) : this.render);
var els = render && render.call(this);
els = BI.Plugin.getRender(this.options.type, els);
if (BI.isPlainObject(els)) {
diff --git a/src/core/6.inject.js b/src/core/5.inject.js
similarity index 81%
rename from src/core/6.inject.js
rename to src/core/5.inject.js
index e86c925d8..78417079c 100644
--- a/src/core/6.inject.js
+++ b/src/core/5.inject.js
@@ -92,7 +92,7 @@
};
var configFunctions = {};
- var runConfigFunction = BI.runConfigFunction = function (type) {
+ var runConfigFunction = function (type) {
if (!type || !configFunctions[type]) {
return false;
}
@@ -371,6 +371,103 @@
}
};
+ var kv = {};
+ BI.shortcut = BI.component = BI.shortcut || function (xtype, cls) {
+ if (kv[xtype] != null) {
+ _global.console && console.error("组件： [" + xtype + "] 已经注册过了");
+ }
+ if (cls) {
+ cls["xtype"] = xtype;
+ }
+ kv[xtype] = cls;
+ };
+
+ // 根据配置属性生成widget
+ var createWidget = function (config, context, lazy) {
+ var cls = kv[config.type];
+
+ if (!cls) {
+ throw new Error("组件： [" + config.type + "] 未定义");
+ }
+ var pushed = false;
+ var widget = new cls();
+ widget._context = BI.Widget.context || context;
+ if (!BI.Widget.context && context) {
+ pushed = true;
+ BI.Widget.pushContext(context);
+ }
+ callPoint(widget, config.type);
+ widget._initProps(config);
+ widget._initRoot();
+ widget._constructed();
+ // if (!lazy || config.element || config.root) {
+ widget._lazyConstructor();
+ // }
+ pushed && BI.Widget.popContext();
+ return widget;
+ };
+
+ BI.createWidget = BI.createWidget || function (item, options, context, lazy) {
+ item || (item = {});
+ if (BI.isWidget(options)) {
+ context = options;
+ options = {};
+ } else {
+ options || (options = {});
+ }
+
+ var el, w;
+ if (item.type || options.type) {
+ el = BI.extend({}, options, item);
+ } else if (item.el && (item.el.type || options.type)) {
+ el = BI.extend({}, options, item.el);
+ }
+
+ if (el) {
+ runConfigFunction(el.type);
+ }
+
+ // 先把准备环境准备好
+ BI.init();
+
+ if (BI.isEmpty(item) && BI.isEmpty(options)) {
+ return BI.createWidget({
+ type: "bi.layout"
+ });
+ }
+ if (BI.isWidget(item)) {
+ return item;
+ }
+ if (el) {
+ w = BI.Plugin.getWidget(el.type, el);
+ if (w.type === el.type) {
+ if (BI.Plugin.hasObject(el.type)) {
+ w.listeners = (w.listeners || []).concat([{
+ eventName: BI.Events.MOUNT,
+ action: function () {
+ BI.Plugin.getObject(el.type, this);
+ }
+ }]);
+ }
+ return createWidget(w, context, lazy);
+ }
+ return BI.createWidget(w, options, context, lazy);
+ }
+ if (BI.isWidget(item.el)) {
+ return item.el;
+ }
+ throw new Error("组件：无法根据item创建组件", item);
+ };
+
+ BI._lazyCreateWidget = BI._lazyCreateWidget || function (item, options, context) {
+ return BI.createWidget(item, options, context, true);
+ };
+
+ BI.createElement = BI.createElement || function () {
+ var widget = BI.createWidget.apply(this, arguments);
+ return widget.element;
+ };
+
BI.getResource = BI.getResource || function (type, config) {
if (BI.isNotNull(constantInjection[type])) {
return BI.Constants.getConstant(type);
diff --git a/src/core/5.shortcut.js b/src/core/5.shortcut.js
deleted file mode 100644
index 95e488214..000000000
--- a/src/core/5.shortcut.js
+++ /dev/null
@@ -1,98 +0,0 @@
-(function () {
- var kv = {};
- BI.shortcut = BI.component = BI.shortcut || function (xtype, cls) {
- if (kv[xtype] != null) {
- _global.console && console.error("组件： [" + xtype + "] 已经注册过了");
- }
- if (cls) {
- cls["xtype"] = xtype;
- }
- kv[xtype] = cls;
- };
-
- // 根据配置属性生成widget
- var createWidget = function (config, context, lazy) {
- var cls = kv[config.type];
-
- if (!cls) {
- throw new Error("组件： [" + config.type + "] 未定义");
- }
- var pushed = false;
- var widget = new cls();
- widget._context = BI.Widget.context || context;
- if (!BI.Widget.context && context) {
- pushed = true;
- BI.Widget.pushContext(context);
- }
- widget._initProps(config);
- widget._initRoot();
- widget._constructed();
- // if (!lazy || config.element || config.root) {
- widget._lazyConstructor();
- // }
- pushed && BI.Widget.popContext();
- return widget;
- };
-
- BI.createWidget = BI.createWidget || function (item, options, context, lazy) {
- item || (item = {});
- if (BI.isWidget(options)) {
- context = options;
- options = {};
- } else {
- options || (options = {});
- }
-
- var el, w;
- if (item.type || options.type) {
- el = BI.extend({}, options, item);
- } else if (item.el && (item.el.type || options.type)) {
- el = BI.extend({}, options, item.el);
- }
-
- if (el) {
- BI.runConfigFunction(el.type);
- }
-
- // 先把准备环境准备好
- BI.init();
-
- if (BI.isEmpty(item) && BI.isEmpty(options)) {
- return BI.createWidget({
- type: "bi.layout"
- });
- }
- if (BI.isWidget(item)) {
- return item;
- }
- if (el) {
- w = BI.Plugin.getWidget(el.type, el);
- if (w.type === el.type) {
- if (BI.Plugin.hasObject(el.type)) {
- w.listeners = (w.listeners || []).concat([{
- eventName: BI.Events.MOUNT,
- action: function () {
- BI.Plugin.getObject(el.type, this);
- }
- }]);
- }
- return createWidget(w, context, lazy);
- }
- return BI.createWidget(w, options, context, lazy);
- }
- if (BI.isWidget(item.el)) {
- return item.el;
- }
- throw new Error("组件：无法根据item创建组件", item);
- };
-
- BI._lazyCreateWidget = BI._lazyCreateWidget || function (item, options, context) {
- return BI.createWidget(item, options, context, true);
- };
-
- BI.createElement = BI.createElement || function () {
- var widget = BI.createWidget.apply(this, arguments);
- return widget.element;
- };
-
-})();
diff --git a/src/core/7.plugin.js b/src/core/plugin.js
similarity index 100%
rename from src/core/7.plugin.js
rename to src/core/plugin.js
diff --git a/src/core/8.popper.js b/src/core/popper.js
similarity index 100%
rename from src/core/8.popper.js
rename to src/core/popper.js
diff --git a/src/core/system.js b/src/core/system.js
index 08a872860..59281243c 100644
--- a/src/core/system.js
+++ b/src/core/system.js
@@ -8,6 +8,7 @@
var system = {
dependencies: {},
responsiveMode: false,
+ workerMode: false,
size: { // 尺寸
TOOL_BAR_HEIGHT: 24,
LIST_ITEM_HEIGHT: 24,
@@ -28,6 +29,10 @@
system.responsiveMode = !!mode;
};
+ this.setWorkerMode = function (mode) {
+ system.workerMode = !!mode;
+ };
+
this.addDependency = function (moduleId, minVersion, maxVersion) {
system.dependencies[moduleId] = {
min: minVersion,
@@ -50,6 +55,10 @@
return system.responsiveMode;
},
+ getWorkerMode: function () {
+ return system.workerMode;
+ },
+
getDependencies: function () {
return system.dependencies;
}
diff --git a/src/core/9.worker.js b/src/core/worker.js
similarity index 92%
rename from src/core/9.worker.js
rename to src/core/worker.js
index e23d73c5d..d3ba08ee4 100644
--- a/src/core/9.worker.js
+++ b/src/core/worker.js
@@ -1,6 +1,10 @@
!(function () {
- BI.initWorker = function () {
+ BI.useInWorker = function () {
function createWatcher (model, keyOrFn, cb, options) {
+ if (BI.isPlainObject(cb)) {
+ options = cb;
+ cb = cb.handler;
+ }
options = options || {};
return Fix.watch(model, keyOrFn, cb, BI.extend(options, {
store: model
diff --git a/src/less/base/colorchooser/farbtastic/farbtastic.less b/src/less/base/colorchooser/farbtastic/farbtastic.less
index c5513f1cb..38e719ea6 100644
--- a/src/less/base/colorchooser/farbtastic/farbtastic.less
+++ b/src/less/base/colorchooser/farbtastic/farbtastic.less
@@ -1,9 +1,24 @@
@import "../../../index";
+@import "../../../image";
+
.bi-farbtastic {
& * {
cursor: crosshair;
}
+
& .marker {
margin: -8px 0 0 -8px;
}
+
+ .overlay {
+ background: url("data:image/png;base64,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") no-repeat 50%;
+ }
+
+ .marker {
+ background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAYAAAA7bUf6AAAAK3RFWHRDcmVhdGlvbiBUaW1lAHZyIDE0IGp1bCAyMDA2IDEzOjMxOjIzICswMTAwHvJDZwAAAAd0SU1FB9YHDgsgJYiZ4bUAAAAJcEhZcwAALiIAAC4iAari3ZIAAAAEZ0FNQQAAsY8L/GEFAAAB5ElEQVR42q2Tz0sqURTH72Qq4mASSAoSIfSDdCEI8qJFLXSjLYSQNoGLINrI8/0ZD9q0KnDlKkIMebmP9xZRCEEiLQLBiMiNJDYq/Zg573vpCkM6CdGBD3Pn3OvXe77nDGPfENKwJBHx/CxYAtNAAVfgXJKk7khVCCyCP6ALVKAJXkEdbINxw5tgM4HHPphSFEUql8usXq8zWZZZKBRiPp+PH3sBx2Br4FbiBg+aplGxWKRgMPiMH1+YTKZDq9V64na7G+l0mprNJo7RG/g94IEoQSsUCuRyue6QToIJYAJWMA/Bo2QySZ1Ohws9gZBeZI570Gq1yO/395BKGJg+ZbFYznK5HAmf9vQiKW5iqVQim832Fyn5E+83Y7EYieAdY2Nig7dRqtVqrNfr3YiWGsVltVrtr2f0IrwEZrfbGeqWhQ9GMeFwOPprRS9SAWo4HGZOp/MH1l4DAS6+HolE+u9Xek9kcK+qKqVSKUL/s0hPDhFY83g8j5VKhcQg7nxs80/w0mg0KB6Pa2az+RTpDbDA3sd/lwvk8/l+Z7iS/FHEAor8H9rtNmWzWYpGo+T1eikQCFAmkyFxAy7AJ255aMHYcIID8d1oNBi8hGuwwkYFDq0CPlG3YsTb4B/4BRwjBb4S/wGzT16tu5THiAAAAABJRU5ErkJggg==") no-repeat 50%;
+ }
+
+ .wheel {
+ background: url("data:image/png;base64,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") no-repeat 50%;
+ }
}
diff --git a/src/less/base/foundation/bi.message.less b/src/less/base/foundation/bi.message.less
index e3c482013..1e48abe01 100644
--- a/src/less/base/foundation/bi.message.less
+++ b/src/less/base/foundation/bi.message.less
@@ -1,21 +1,21 @@
@import "../../index";
.bi-message-title {
- font-size: 14px;
+ font-size: @font-size-14;
cursor: pointer;
}
.bi-message-text {
- font-size: 16px;
+ font-size: @font-size-16;
.user-select-enable();
}
.bi-message-content {
- font-size: 16px;
+ font-size: @font-size-16;
}
.bi-message-close {
- font-size: 16px;
+ font-size: @font-size-16;
}
.bi-message-animate {
@@ -30,4 +30,4 @@
.bi-message-leave {
opacity: 0;
transform: translateY(-100%);
-}
\ No newline at end of file
+}
diff --git a/src/less/base/tree/ztree.less b/src/less/base/tree/ztree.less
index 2d30068d9..cbe26d634 100644
--- a/src/less/base/tree/ztree.less
+++ b/src/less/base/tree/ztree.less
@@ -25,6 +25,29 @@
padding: 0 0 0 18px
}
+// 此处不用2倍图，改用css画虚线
+// z-tree的line是一整块子节点区域，所以不能使用background-size: contain
+// 使用1倍图太模糊，这边就使用css自己画了，calc属性支持IE9, IE8反正会走hack, 不影响
+.ztree li ul.line {
+ position: relative;
+ &:before {
+ position: absolute;
+ content: '';
+ border-left: 1px dashed @border-color-dark-gray-line;
+ height: calc(~"100% - 3px");
+ left: 11px;
+ margin-top: 1px;
+ }
+}
+
+.bi-theme-dark {
+ .ztree li ul.line {
+ &:before {
+ border-left: 1px dashed @border-color-dark-gray-line;
+ }
+ }
+}
+
.ztree li a {
padding: 1px 3px 0 0;
margin: 0;
diff --git a/src/less/core/normalize2.less b/src/less/core/normalize2.less
index cb936708d..11c876b5c 100644
--- a/src/less/core/normalize2.less
+++ b/src/less/core/normalize2.less
@@ -1,20 +1,5 @@
@import "../index";
-html,
-body,
-div,
-ul,
-ol,
-li,
-img,
-a,
-span,
-p,
-* {
- margin: 0;
- padding: 0;
-}
-
a {
outline: none;
text-decoration: none;
@@ -48,14 +33,6 @@ textarea {
outline: none;
}
-ul {
- list-style: disc;
-}
-
-li {
- list-style-type: none;
-}
-
i {
//font-style: normal;
-webkit-font-smoothing: antialiased;
diff --git a/src/less/lib/background.less b/src/less/lib/background.less
index 1f291a5fe..a331a88da 100644
--- a/src/less/lib/background.less
+++ b/src/less/lib/background.less
@@ -8,7 +8,3 @@
@background-trans-color-disabled: "background/trans_disable.png";
@background-auto-color-square-normal: "icon/auto_square_normal.png";
@background-auto-color-no-square-normal: "icon/auto_no_square_normal.png";
-
-@background-farbtastic-wheel:"background/wheel.png";
-@background-farbtastic-overlay:"background/mask.png";
-@background-farbtastic-marker:"background/marker.png";
diff --git a/src/less/resource/background.less b/src/less/resource/background.less
index 77225009a..2edd575e8 100644
--- a/src/less/resource/background.less
+++ b/src/less/resource/background.less
@@ -2,18 +2,6 @@
@import "../lib/icon";
@import "../lib/background";
-.bi-farbtastic .wheel {
- .imagePath(@background-farbtastic-wheel);
-}
-
-.bi-farbtastic .overlay {
- .imagePath(@background-farbtastic-overlay);
-}
-
-.bi-farbtastic .marker {
- .imagePath(@background-farbtastic-marker);
-}
-
.bi-display-tree {
& .ztree li span.button.switch.center_open {
.image2xPath(@icon-tree-vertical-line-3);
@@ -40,31 +28,11 @@
}
}
-// 此处不用2倍图，改用css画虚线
-// z-tree的line是一整块子节点区域，所以不能使用background-size: contain
-// 使用1倍图太模糊，这边就使用css自己画了，calc属性支持IE9, IE8反正会走hack, 不影响
-.ztree li ul.line {
- position: relative;
- &:before {
- position: absolute;
- content: '';
- border-left: 1px dashed #D0D4DA;
- height: calc(~"100% - 3px");
- left: 11px;
- margin-top: 1px;
- }
-}
-
.ztree.hack li ul.line {
.imagePath(@icon-tree-vertical-line-1, 0, 1px, repeat-y);
}
.bi-theme-dark {
- .ztree li ul.line {
- &:before {
- border-left: 1px dashed #606479;
- }
- }
.ztree.hack li ul.line {
.imagePath(@icon-tree-vertical-line-1-theme-dark, 0, 1px, repeat-y);
}
@@ -379,4 +347,4 @@
}
}
-.background(wave-loading, @icon-wave-loading);
\ No newline at end of file
+.background(wave-loading, @icon-wave-loading);
diff --git a/src/less/visual.less b/src/less/visual.less
index 9a1bda2b7..fca93b43c 100644
--- a/src/less/visual.less
+++ b/src/less/visual.less
@@ -1,19 +1,19 @@
.text-shadow(none) {
- text-shadow: none;
- -moz-text-shadow: none;
-webkit-text-shadow: none;
+ -moz-text-shadow: none;
+ text-shadow: none;
}
.text-shadow(@x, @y, @blur, @color) when not (@x = none) {
- text-shadow: @arguments;
- -moz-text-shadow: @arguments;
-webkit-text-shadow: @arguments;
+ -moz-text-shadow: @arguments;
+ text-shadow: @arguments;
}
.box-shadow(none) {
- box-shadow: none;
-webkit-box-shadow: none;
-moz-box-shadow: none;
+ box-shadow: none;
}
.box-shadow(@style, @c) when (iscolor(@c)) {
@@ -23,15 +23,15 @@
}
.box-shadow(@x, @y, @blur, @spreed: 0px, @color, @inset: outset) when (iscolor(@color)) and (isnumber(unit(@spreed))){
- box-shadow: @arguments;
-webkit-box-shadow: @arguments;
-moz-box-shadow: @arguments;
+ box-shadow: @arguments;
}
.box-shadows(@shadow1, @shadow2, @shadow3) {
- box-shadow: @shadow1, @shadow2, @shadow3;
-webkit-box-shadow: @shadow1, @shadow2, @shadow3;
-moz-box-shadow: @shadow1, @shadow2, @shadow3;
+ box-shadow: @shadow1, @shadow2, @shadow3;
}
.background-color(@color, @alpha) {
@@ -97,40 +97,40 @@
}
.border-corner-top-radius(@leftTop, @rightTop) {
- -moz-border-radius-topleft: @leftTop;
-webkit-border-top-left-radius: @leftTop;
- -moz-border-radius-topright: @rightTop;
+ -moz-border-radius-topleft: @leftTop;
-webkit-border-top-right-radius: @rightTop;
+ -moz-border-radius-topright: @rightTop;
border-top-left-radius: @leftTop;
border-top-right-radius: @rightTop;
}
.border-corner-bottom-radius(@leftBottom, @rightBottom) {
- -moz-border-radius-bottomleft: @rightBottom;
-webkit-border-bottom-left-radius: @rightBottom;
- -moz-border-radius-bottomright: @leftBottom;
+ -moz-border-radius-bottomleft: @rightBottom;
-webkit-border-bottom-right-radius: @rightBottom;
+ -moz-border-radius-bottomright: @leftBottom;
border-bottom-right-radius: @rightBottom;
border-bottom-left-radius: @leftBottom;
}
.border-corner-left-radius(@leftTop, @leftBottom) {
- -moz-border-radius-topleft: @leftTop;
-webkit-border-top-left-radius: @leftTop;
- -moz-border-radius-bottomleft: @leftBottom;
+ -moz-border-radius-topleft: @leftTop;
-webkit-border-bottom-left-radius: @leftBottom;
+ -moz-border-radius-bottomleft: @leftBottom;
border-top-left-radius: @leftTop;
border-bottom-left-radius: @leftBottom;
}
.border-corner-right-radius(@rightTop, @rightBottom) {
- -moz-border-radius-topright: @rightTop;
-webkit-border-top-right-radius: @rightTop;
- -moz-border-radius-bottomright: @rightBottom;
+ -moz-border-radius-topright: @rightTop;
-webkit-border-bottom-right-radius: @rightBottom;
+ -moz-border-radius-bottomright: @rightBottom;
border-top-right-radius: @rightTop;
border-bottom-right-radius: @rightBottom;
@@ -352,4 +352,4 @@
visibility: hidden;
}
}
-}
\ No newline at end of file
+}
diff --git a/typescript/case/button/icon/iconhalf/icon.half.image.ts b/typescript/case/button/icon/iconhalf/icon.half.image.ts
new file mode 100644
index 000000000..4cd29837e
--- /dev/null
+++ b/typescript/case/button/icon/iconhalf/icon.half.image.ts
@@ -0,0 +1,6 @@
+import { IconButton } from "../../../../base/single/button/buttons/button.icon";
+
+export declare class HalfIconButton extends IconButton {
+ static xtype: string;
+ static EVENT_CHANGE: string;
+}
diff --git a/typescript/case/button/icon/iconhalf/icon.half.ts b/typescript/case/button/icon/iconhalf/icon.half.ts
new file mode 100644
index 000000000..ea32f0beb
--- /dev/null
+++ b/typescript/case/button/icon/iconhalf/icon.half.ts
@@ -0,0 +1,6 @@
+import { BasicButton } from "../../../../base/single/button/button.basic";
+
+export declare class HalfButton extends BasicButton {
+ static xtype: string;
+ static EVENT_CHANGE: string;
+}
diff --git a/webpack/attachments.js b/webpack/attachments.js
index b463f5ee9..a4328bd29 100644
--- a/webpack/attachments.js
+++ b/webpack/attachments.js
@@ -60,7 +60,7 @@ const basicAttachmentMap = {
"src/core/func/**/*.js",
"src/core/2.base.js",
"src/core/3.ob.js",
- "src/core/6.inject.js",
+ "src/core/5.inject.js",
"src/core/utils/*.js",
"i18n/i18n.cn.js",
"_mobile/date.i18n.cn.js",