@tarojs/with-weapp 3.6.4 → 3.6.5-alpha.1

package/dist/with-weapp.js

@@ -22,25 +22,19 @@
   var clone = function clone(obj) {
     return json.parse(stringify(obj));
   };
-
   var isArray = Array.isArray || function (x) {
     return {}.toString.call(x) === '[object Array]';
   };
-
   var objectKeys = Object.keys || function (obj) {
     var has = Object.prototype.hasOwnProperty || function () {
       return true;
     };
-
     var keys = [];
-
     for (var key in obj) {
       if (has.call(obj, key)) keys.push(key);
     }
-
     return keys;
   };
-
   function stringify(obj, opts) {
     if (!opts) opts = {};
     if (typeof opts === 'function') opts = {
@@ -49,11 +43,9 @@
     var space = opts.space || '';
     if (typeof space === 'number') space = Array(space + 1).join(' ');
     var cycles = typeof opts.cycles === 'boolean' ? opts.cycles : false;
-
     var replacer = opts.replacer || function (key, value) {
       return value;
     };
-
     var cmp = opts.cmp && function (f) {
       return function (node) {
         return function (a, b) {
@@ -69,53 +61,41 @@
         };
       };
     }(opts.cmp);
-
     var seen = [];
     return function stringify(parent, key, node, level) {
       var indent = space ? '\n' + new Array(level + 1).join(space) : '';
       var colonSeparator = space ? ': ' : ':';
-
       if (node && node.toJSON && typeof node.toJSON === 'function') {
         node = node.toJSON();
       }
-
       node = replacer.call(parent, key, node);
-
       if (node === undefined) {
         return;
       }
-
       if (_typeof__default["default"](node) !== 'object' || node === null) {
         return json.stringify(node);
       }
-
       if (isArray(node)) {
         var out = [];
-
         for (var i = 0; i < node.length; i++) {
           var item = stringify(node, i, node[i], level + 1) || json.stringify(null);
           out.push(indent + space + item);
         }
-
         return '[' + out.join(',') + indent + ']';
       } else {
         if (seen.indexOf(node) !== -1) {
           if (cycles) return json.stringify('__cycle__');
           throw new TypeError('Converting circular structure to JSON');
         } else seen.push(node);
-
         var keys = objectKeys(node).sort(cmp && cmp(node));
         var _out = [];
-
         for (var _i = 0; _i < keys.length; _i++) {
           var _key = keys[_i];
           var value = stringify(node, _key, node[_key], level + 1);
           if (!value) continue;
           var keyValue = json.stringify(_key) + colonSeparator + value;
-
           _out.push(indent + space + keyValue);
         }
-
         seen.splice(seen.indexOf(node), 1);
         return '{' + _out.join(',') + indent + '}';
       }
@@ -131,29 +111,24 @@
   function diff(current, pre) {
     var result = {};
     syncKeys(current, pre);
-
     _diff(current, pre, '', result);
-
     return result;
   }
-
   function syncKeys(current, pre) {
     if (current === pre) return;
     var rootCurrentType = type(current);
     var rootPreType = type(pre);
-
     if (rootCurrentType == OBJECTTYPE && rootPreType == OBJECTTYPE) {
       // if(Object.keys(current).length >= Object.keys(pre).length){
       for (var key in pre) {
         var currentValue = current[key];
-
         if (currentValue === undefined) {
           current[key] = null;
         } else {
           syncKeys(currentValue, pre[key]);
         }
-      } // }
-
+      }
+      // }
     } else if (rootCurrentType == ARRAYTYPE && rootPreType == ARRAYTYPE) {
       if (current.length >= pre.length) {
         pre.forEach(function (item, index) {
@@ -162,12 +137,10 @@
       }
     }
   }
-
   function _diff(current, pre, path, result) {
     if (current === pre) return;
     var rootCurrentType = type(current);
     var rootPreType = type(pre);
-
     if (rootCurrentType == OBJECTTYPE) {
       if (rootPreType != OBJECTTYPE || Object.keys(current).length < Object.keys(pre).length) {
         setResult(result, path, current);
@@ -177,7 +150,6 @@
           var preValue = pre[key];
           var currentType = type(currentValue);
           var preType = type(preValue);
-
           if (currentType != ARRAYTYPE && currentType != OBJECTTYPE) {
             if (currentValue != pre[key]) {
               setResult(result, (path == '' ? '' : path + '.') + key, currentValue);
@@ -204,7 +176,6 @@
             }
           }
         };
-
         for (var key in current) {
           _loop(key);
         }
@@ -225,21 +196,17 @@
       setResult(result, path, current);
     }
   }
-
   function setResult(result, k, v) {
     if (type(v) != FUNCTIONTYPE) {
       result[k] = v;
     }
   }
-
   function type(obj) {
     return Object.prototype.toString.call(obj);
   }
 
   var _lifecycleMap;
-
   var TaroLifeCycles;
-
   (function (TaroLifeCycles) {
     TaroLifeCycles["WillMount"] = "componentWillMount";
     TaroLifeCycles["DidMount"] = "componentDidMount";
@@ -247,38 +214,27 @@
     TaroLifeCycles["DidHide"] = "componentDidHide";
     TaroLifeCycles["WillUnmount"] = "componentWillUnmount";
   })(TaroLifeCycles || (TaroLifeCycles = {}));
-
   var lifecycleMap = (_lifecycleMap = {}, _defineProperty__default["default"](_lifecycleMap, TaroLifeCycles.WillMount, ['created']), _defineProperty__default["default"](_lifecycleMap, TaroLifeCycles.DidMount, ['attached']), _defineProperty__default["default"](_lifecycleMap, TaroLifeCycles.DidShow, ['onShow']), _defineProperty__default["default"](_lifecycleMap, TaroLifeCycles.DidHide, ['onHide']), _defineProperty__default["default"](_lifecycleMap, TaroLifeCycles.WillUnmount, ['detached', 'onUnload']), _lifecycleMap);
   var lifecycles = new Set(['ready']);
-
   for (var key in lifecycleMap) {
     var lifecycle = lifecycleMap[key];
     lifecycle.forEach(function (l) {
       return lifecycles.add(l);
     });
   }
-
   var uniquePageLifecycle = ['onPullDownRefresh', 'onReachBottom', 'onShareAppMessage', 'onShareTimeline', 'onAddToFavorites', 'onPageScroll', 'onResize', 'onTabItemTap'];
   var appOptions = ['onLaunch', 'onShow', 'onHide', 'onError', 'onPageNotFound', 'onUnhandledRejection', 'onThemeChange'];
 
   /**
    * Simple bind, faster than native
    */
-  function bind(fn
-  /*: Function */
-  , ctx
-  /*: Object */
-  ) {
+  function bind(fn /*: Function */, ctx /*: Object */) {
     if (!fn) return false;
-
     function boundFn(a) {
-      var l
-      /*: number */
-      = arguments.length;
+      var l /*: number */ = arguments.length;
       return l ? l > 1 ? fn.apply(ctx, arguments) : fn.call(ctx, a) : fn.call(ctx);
-    } // record original fn length
-
-
+    }
+    // record original fn length
     boundFn._length = fn.length;
     return boundFn;
   }
@@ -289,40 +245,30 @@
     if (!obj) {
       return defaultValue;
     }
-
     var props, prop;
-
     if (Array.isArray(propsArg)) {
       props = propsArg.slice(0);
     }
-
     if (typeof propsArg === 'string') {
       props = propsArg.replace(/\[(.+?)\]/g, '.$1');
       props = props.split('.');
     }
-
     if (_typeof__default["default"](propsArg) === 'symbol') {
       props = [propsArg];
     }
-
     if (!Array.isArray(props)) {
       throw new Error('props arg must be an array, a string or a symbol');
     }
-
     while (props.length) {
       prop = props.shift();
-
       if (!obj) {
         return defaultValue;
       }
-
       obj = obj[prop];
-
       if (obj === undefined) {
         return defaultValue;
       }
     }
-
     return obj;
   }
   function safeSet(obj, props, value) {
@@ -330,39 +276,30 @@
       props = props.replace(/\[(.+?)\]/g, '.$1');
       props = props.split('.');
     }
-
     if (_typeof__default["default"](props) === 'symbol') {
       props = [props];
     }
-
     var lastProp = props.pop();
-
     if (!lastProp) {
       return false;
     }
-
     var thisProp;
-
     while (thisProp = props.shift()) {
       if (typeof obj[thisProp] === 'undefined') {
         obj[thisProp] = {};
-      } // 直接按路径修改 this.state 可能会导致 nextProps 也被修改
+      }
+      // 直接按路径修改 this.state 可能会导致 nextProps 也被修改
       // 因此按路径寻找时，每一层都复制一遍
-
-
       if (Array.isArray(obj[thisProp])) {
         obj[thisProp] = _toConsumableArray__default["default"](obj[thisProp]);
       } else if (_typeof__default["default"](obj[thisProp]) === 'object') {
         obj[thisProp] = Object.assign({}, obj[thisProp]);
       }
-
       obj = obj[thisProp];
-
       if (!obj || _typeof__default["default"](obj) !== 'object') {
         return false;
       }
     }
-
     obj[lastProp] = value;
     return true;
   }
@@ -374,22 +311,18 @@
     if (typeof behavior === 'string') {
       return report("\u4E0D\u652F\u6301\u4F7F\u7528\u5185\u7F6E Behavior: [".concat(behavior, "]"));
     }
-
     var subBehaviors = behavior.behaviors;
-
     if (subBehaviors === null || subBehaviors === void 0 ? void 0 : subBehaviors.length) {
       subBehaviors.forEach(function (subBehavior) {
         return flattenBehaviors(subBehavior, behaviorMap);
       });
     }
-
     Object.keys(behavior).forEach(function (key) {
       // 不支持的属性
       if (nonsupport.has(key)) {
         var advise = nonsupport.get(key);
         return report(advise);
       }
-
       if (behaviorMap.has(key)) {
         var list = behaviorMap.get(key);
         var value = behavior[key];
@@ -399,15 +332,10 @@
   }
 
   function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_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 s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-
   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 _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 _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf__default["default"](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default["default"](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default["default"](this, result); }; }
-
   function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
   function defineGetter(component, key, getter) {
     Object.defineProperty(component, key, {
       enumerable: true,
@@ -416,71 +344,55 @@
         if (getter === 'props') {
           return component.props;
         }
-
         return Object.assign(Object.assign({}, component.state), component.props);
       }
     });
   }
-
   function isFunction(o) {
     return typeof o === 'function';
   }
-
   function withWeapp(weappConf) {
     var isApp = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-
     if (_typeof__default["default"](weappConf) === 'object' && Object.keys(weappConf).length === 0) {
       report('withWeapp 请传入“App/页面/组件“的配置对象。如果原生写法使用了基类，请将基类组合后的配置对象传入，详情请参考文档。');
     }
-
     return function (ConnectComponent) {
       var _a;
-
       var behaviorMap = new Map([['properties', []], ['data', []], ['methods', []], ['created', []], ['attached', []], ['ready', []], ['detached', []]]);
       var behaviorProperties = {};
-
       if ((_a = weappConf.behaviors) === null || _a === void 0 ? void 0 : _a.length) {
         var behaviors = weappConf.behaviors;
         behaviors.forEach(function (behavior) {
           return flattenBehaviors(behavior, behaviorMap);
         });
         var propertiesList = behaviorMap.get('properties');
-
         if (propertiesList.length) {
           propertiesList.forEach(function (property) {
             Object.assign(behaviorProperties, property);
           });
           Object.keys(behaviorProperties).forEach(function (propName) {
             var propValue = behaviorProperties[propName];
-
             if (!weappConf.properties) {
               weappConf.properties = {};
             }
-
             if (!weappConf.properties.hasOwnProperty(propName)) {
               if (propValue && _typeof__default["default"](propValue) === 'object' && propValue.value) {
                 propValue.value = clone(propValue.value);
               }
-
               weappConf.properties[propName] = propValue;
             }
           });
         }
       }
-
       var BaseComponent = /*#__PURE__*/function (_ConnectComponent) {
         _inherits__default["default"](BaseComponent, _ConnectComponent);
-
         var _super = _createSuper(BaseComponent);
-
         function BaseComponent(props) {
           var _this;
-
           _classCallCheck__default["default"](this, BaseComponent);
-
           _this = _super.call(this, props);
-          _this._observeProps = []; // mixins 可以多次调用生命周期
-
+          _this._observeProps = [];
+          // mixins 可以多次调用生命周期
           _this.willMounts = [];
           _this.didMounts = [];
           _this.didHides = [];
@@ -489,57 +401,44 @@
           _this.eventDestroyList = [];
           _this.current = runtime.getCurrentInstance();
           _this.taroGlobalData = Object.create(null);
-
           _this.safeExecute = function (func) {
             for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
               args[_key - 1] = arguments[_key];
             }
-
             if (isFunction(func)) func.apply(_assertThisInitialized__default["default"](_this), args);
           };
-
           _this.setData = function (obj, callback) {
             var oldState;
-
             if (_this.observers && Object.keys(Object.keys(_this.observers))) {
               oldState = clone(_this.state);
             }
-
             Object.keys(obj).forEach(function (key) {
               safeSet(_this.state, key, obj[key]);
             });
-
             _this.setState(_this.state, function () {
               _this.triggerObservers(_this.state, oldState);
-
               if (callback) {
                 callback.call(_assertThisInitialized__default["default"](_this));
               }
             });
           };
-
           _this.triggerEvent = function (eventName, detail, options) {
             if (options) {
               report('triggerEvent 不支持事件选项。');
-            } // eventName support kebab case
-
-
+            }
+            // eventName support kebab case
             if (eventName.match(/[a-z]+-[a-z]+/g)) {
               eventName = eventName.replace(/-[a-z]/g, function (match) {
                 return match[1].toUpperCase();
               });
             }
-
             var props = _this.props;
             var dataset = {};
-
             for (var key in props) {
               if (!key.startsWith('data-')) continue;
               dataset[key.replace(/^data-/, '')] = props[key];
             }
-
             var func = props["on".concat(eventName[0].toUpperCase()).concat(eventName.slice(1))];
-
             if (isFunction(func)) {
               func.call(_assertThisInitialized__default["default"](_this), {
                 type: eventName,
@@ -555,7 +454,6 @@
               });
             }
           };
-
           _this.hasBehavior = _this.componentMethodsProxy('hasBehavior');
           _this.createSelectorQuery = _this.componentMethodsProxy('createSelectorQuery');
           _this.createIntersectionObserver = _this.componentMethodsProxy('createIntersectionObserver');
@@ -567,21 +465,18 @@
           _this.clearAnimation = _this.componentMethodsProxy('clearAnimation');
           _this.setUpdatePerformanceListener = _this.componentMethodsProxy('setUpdatePerformanceListener');
           _this.state = _this.state || {};
-
           _this.init(weappConf);
-
           defineGetter(_assertThisInitialized__default["default"](_this), 'data', 'state');
           defineGetter(_assertThisInitialized__default["default"](_this), 'properties', 'props');
           return _this;
         }
-
         _createClass__default["default"](BaseComponent, [{
           key: "initProps",
           value: function initProps(props) {
             for (var propKey in props) {
               if (props.hasOwnProperty(propKey)) {
-                var propValue = props[propKey]; // propValue 可能是 null, 构造函数, 对象
-
+                var propValue = props[propKey];
+                // propValue 可能是 null, 构造函数, 对象
                 if (propValue && !isFunction(propValue)) {
                   if (propValue.observer) {
                     this._observeProps.push({
@@ -597,20 +492,16 @@
           key: "init",
           value: function init(options) {
             var _this2 = this;
-
-            var _a, _b, _c; // 处理 Behaviors
-
-
+            var _a, _b, _c;
+            // 处理 Behaviors
             if ((_a = options.behaviors) === null || _a === void 0 ? void 0 : _a.length) {
               var _iterator = _createForOfIteratorHelper(behaviorMap.entries()),
-                  _step;
-
+                _step;
               try {
                 var _loop = function _loop() {
                   var _step$value = _slicedToArray__default["default"](_step.value, 2),
-                      key = _step$value[0],
-                      list = _step$value[1];
-
+                    key = _step$value[0],
+                    list = _step$value[1];
                   switch (key) {
                     case 'created':
                     case 'attached':
@@ -622,7 +513,6 @@
                       break;
                   }
                 };
-
                 for (_iterator.s(); !(_step = _iterator.n()).done;) {
                   _loop();
                 }
@@ -632,71 +522,56 @@
                 _iterator.f();
               }
             }
-
             for (var confKey in options) {
               // 不支持的属性
               if (nonsupport.has(confKey)) {
                 var advise = nonsupport.get(confKey);
                 report(advise);
               }
-
               var confValue = options[confKey];
-
               switch (confKey) {
                 case 'behaviors':
                   break;
-
                 case 'data':
                   {
                     if (isApp) {
                       this[confKey] = confValue;
-
                       if (!appOptions.includes(confKey)) {
                         this.defineProperty(this.taroGlobalData, confKey, this);
                       }
                     } else {
                       this.state = Object.assign(Object.assign({}, confValue), this.state);
                     }
-
                     break;
                   }
-
                 case 'properties':
                   this.initProps(Object.assign(behaviorProperties, confValue));
                   break;
-
                 case 'methods':
                   for (var key in confValue) {
                     var method = confValue[key];
                     this[key] = bind(method, this);
                   }
-
                   break;
-
                 case 'lifetimes':
                   for (var _key2 in confValue) {
                     this.initLifeCycles(_key2, confValue[_key2]);
                   }
-
                   break;
-
                 case 'pageLifetimes':
                   for (var _key3 in confValue) {
                     var cb = confValue[_key3];
-
                     switch (_key3) {
                       case 'show':
                         {
                           this.initLifeCycleListener('show', cb);
                           break;
                         }
-
                       case 'hide':
                         {
                           this.initLifeCycleListener('hide', cb);
                           break;
                         }
-
                       case 'resize':
                         {
                           report('不支持组件所在页面的生命周期 pageLifetimes.resize。');
@@ -704,110 +579,91 @@
                         }
                     }
                   }
-
                   break;
-
                 default:
                   if (lifecycles.has(confKey)) {
                     // 优先使用 lifetimes 中定义的生命周期
                     if ((_b = options.lifetimes) === null || _b === void 0 ? void 0 : _b[confKey]) {
                       break;
                     }
-
                     var lifecycle = options[confKey];
                     this.initLifeCycles(confKey, lifecycle);
                   } else if (isFunction(confValue)) {
                     this[confKey] = bind(confValue, this);
-
                     if (isApp && !appOptions.includes(confKey)) {
                       this.defineProperty(this.taroGlobalData, confKey, this);
-                    } // 原生页面和 Taro 页面中共计只能定义一次的生命周期
-
-
+                    }
+                    // 原生页面和 Taro 页面中共计只能定义一次的生命周期
                     if (uniquePageLifecycle.includes(confKey) && ConnectComponent.prototype[confKey]) {
                       report("\u751F\u547D\u5468\u671F ".concat(confKey, " \u5DF2\u5728\u539F\u751F\u90E8\u5206\u8FDB\u884C\u5B9A\u4E49\uFF0CReact \u90E8\u5206\u7684\u5B9A\u4E49\u5C06\u4E0D\u4F1A\u88AB\u6267\u884C\u3002"));
                     }
                   } else {
                     this[confKey] = confValue;
-
                     if (isApp && !appOptions.includes(confKey)) {
                       this.defineProperty(this.taroGlobalData, confKey, this);
                     }
                   }
-
                   break;
               }
-            } // 处理 Behaviors
-
-
+            }
+            // 处理 Behaviors
             if ((_c = options.behaviors) === null || _c === void 0 ? void 0 : _c.length) {
-              (function () {
-                var behaviorData = {};
-                var methods = {};
-
-                var _iterator2 = _createForOfIteratorHelper(behaviorMap.entries()),
-                    _step2;
-
-                try {
-                  var _loop2 = function _loop2() {
-                    var _step2$value = _slicedToArray__default["default"](_step2.value, 2),
-                        key = _step2$value[0],
-                        list = _step2$value[1];
-
-                    switch (key) {
-                      case 'data':
-                        [].concat(_toConsumableArray__default["default"](list), [_this2.state]).forEach(function (dataObject, index) {
-                          Object.keys(dataObject).forEach(function (dataKey) {
-                            var value = dataObject[dataKey];
-                            var preValue = behaviorData[dataKey];
-
-                            var valueType = _typeof__default["default"](value);
-
-                            var preValueType = _typeof__default["default"](preValue);
-
-                            if (valueType === 'object') {
-                              if (!value) {
-                                behaviorData[dataKey] = value;
-                              } else if (preValueType !== 'object' || !preValueType || Array.isArray(value)) {
-                                behaviorData[dataKey] = index === list.length ? value : clone(value);
-                              } else {
-                                var newVal = Object.assign({}, preValue, value);
-                                behaviorData[dataKey] = index === list.length ? newVal : clone(newVal);
-                              }
-                            } else {
+              var behaviorData = {};
+              var methods = {};
+              var _iterator2 = _createForOfIteratorHelper(behaviorMap.entries()),
+                _step2;
+              try {
+                var _loop2 = function _loop2() {
+                  var _step2$value = _slicedToArray__default["default"](_step2.value, 2),
+                    key = _step2$value[0],
+                    list = _step2$value[1];
+                  switch (key) {
+                    case 'data':
+                      [].concat(_toConsumableArray__default["default"](list), [_this2.state]).forEach(function (dataObject, index) {
+                        Object.keys(dataObject).forEach(function (dataKey) {
+                          var value = dataObject[dataKey];
+                          var preValue = behaviorData[dataKey];
+                          var valueType = _typeof__default["default"](value);
+                          var preValueType = _typeof__default["default"](preValue);
+                          if (valueType === 'object') {
+                            if (!value) {
                               behaviorData[dataKey] = value;
+                            } else if (preValueType !== 'object' || !preValueType || Array.isArray(value)) {
+                              behaviorData[dataKey] = index === list.length ? value : clone(value);
+                            } else {
+                              var newVal = Object.assign({}, preValue, value);
+                              behaviorData[dataKey] = index === list.length ? newVal : clone(newVal);
                             }
-                          });
-                        });
-                        _this2.state = behaviorData;
-                        break;
-
-                      case 'methods':
-                        list.forEach(function (methodsObject) {
-                          Object.assign(methods, methodsObject);
-                        });
-                        Object.keys(methods).forEach(function (methodName) {
-                          if (!_this2[methodName]) {
-                            var _method = methods[methodName];
-                            _this2[methodName] = bind(_method, _this2);
+                          } else {
+                            behaviorData[dataKey] = value;
                           }
                         });
-                        break;
-
-                      default:
-                        break;
-                    }
-                  };
-
-                  for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-                    _loop2();
+                      });
+                      _this2.state = behaviorData;
+                      break;
+                    case 'methods':
+                      list.forEach(function (methodsObject) {
+                        Object.assign(methods, methodsObject);
+                      });
+                      Object.keys(methods).forEach(function (methodName) {
+                        if (!_this2[methodName]) {
+                          var _method = methods[methodName];
+                          _this2[methodName] = bind(_method, _this2);
+                        }
+                      });
+                      break;
+                    default:
+                      break;
                   }
-                } catch (err) {
-                  _iterator2.e(err);
-                } finally {
-                  _iterator2.f();
+                };
+                for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+                  _loop2();
                 }
-              })();
+              } catch (err) {
+                _iterator2.e(err);
+              } finally {
+                _iterator2.f();
+              }
             }
           }
         }, {
@@ -818,17 +674,14 @@
               var advise = nonsupport.get(lifecycleName);
               return report(advise);
             }
-
             if (lifecycleName === 'ready') {
               // 如果组件是延时渲染的，页面 onReady 的事件已经 emit 了，因此使用 componentDidMount + nextTick 模拟
               if (this.current.page.onReady.called) {
                 this.didMounts.push(function () {
                   var _this3 = this;
-
                   for (var _len2 = arguments.length, args = new Array(_len2), _key4 = 0; _key4 < _len2; _key4++) {
                     args[_key4] = arguments[_key4];
                   }
-
                   taro.nextTick(function () {
                     if (isFunction(lifecycle)) {
                       lifecycle.apply(_this3, args);
@@ -841,34 +694,28 @@
             } else {
               for (var lifecycleKey in lifecycleMap) {
                 var cycleNames = lifecycleMap[lifecycleKey];
-
                 if (cycleNames.indexOf(lifecycleName) !== -1) {
                   switch (lifecycleKey) {
                     case TaroLifeCycles.DidHide:
                       this.didHides.push(lifecycle);
                       break;
-
                     case TaroLifeCycles.DidMount:
                       this.didMounts.push(lifecycle);
                       break;
-
                     case TaroLifeCycles.DidShow:
                       this.didShows.push(lifecycle);
                       break;
-
                     case TaroLifeCycles.WillMount:
                       this.willMounts.push(lifecycle);
                       break;
-
                     case TaroLifeCycles.WillUnmount:
                       this.willUnmounts.push(lifecycle);
                       break;
                   }
                 }
               }
-            } // mixins 不会覆盖已经设置的生命周期，加入到 this 是为了形如 this.created() 的调用
-
-
+            }
+            // mixins 不会覆盖已经设置的生命周期，加入到 this 是为了形如 this.created() 的调用
             if (!isFunction(this[lifecycleName])) {
               this[lifecycleName] = lifecycle;
             }
@@ -880,8 +727,8 @@
             var router = this.current.router;
             var lifecycleName = "on".concat(name[0].toUpperCase()).concat(name.slice(1));
             cb = cb.bind(this);
-            (router === null || router === void 0 ? void 0 : router[lifecycleName]) && taro.eventCenter.on(router[lifecycleName], cb); // unMount 时需要取消事件监听
-
+            (router === null || router === void 0 ? void 0 : router[lifecycleName]) && taro.eventCenter.on(router[lifecycleName], cb);
+            // unMount 时需要取消事件监听
             this.eventDestroyList.push(function () {
               return taro.eventCenter.off(router[lifecycleName], cb);
             });
@@ -892,7 +739,6 @@
             for (var _len3 = arguments.length, args = new Array(_len3 > 1 ? _len3 - 1 : 0), _key5 = 1; _key5 < _len3; _key5++) {
               args[_key5 - 1] = arguments[_key5];
             }
-
             for (var i = 0; i < funcs.length; i++) {
               var func = funcs[i];
               this.safeExecute.apply(this, [func].concat(args));
@@ -902,17 +748,15 @@
           key: "triggerPropertiesObservers",
           value: function triggerPropertiesObservers(prevProps, nextProps) {
             var _this4 = this;
-
             this._observeProps.forEach(function (_ref) {
               var key = _ref.name,
-                  observer = _ref.observer;
+                observer = _ref.observer;
               var prop = prevProps === null || prevProps === void 0 ? void 0 : prevProps[key];
-              var nextProp = nextProps[key]; // 小程序是深比较不同之后才 trigger observer
-
+              var nextProp = nextProps[key];
+              // 小程序是深比较不同之后才 trigger observer
               if (!isEqual(prop, nextProp)) {
                 if (typeof observer === 'string') {
                   var ob = _this4[observer];
-
                   if (isFunction(ob)) {
                     ob.call(_this4, nextProp, prop, key);
                   }
@@ -926,45 +770,35 @@
           key: "triggerObservers",
           value: function triggerObservers(current, prev) {
             var observers = this.observers;
-
             if (observers == null) {
               return;
             }
-
             if (Object.keys(observers).length === 0) {
               return;
             }
-
             var result = diff(current, prev);
             var resultKeys = Object.keys(result);
-
             if (resultKeys.length === 0) {
               return;
             }
-
             for (var observerKey in observers) {
               if (/\*\*/.test(observerKey)) {
                 report('数据监听器 observers 不支持使用通配符 **。');
                 continue;
               }
-
               var keys = observerKey.split(',').map(function (k) {
                 return k.trim();
               });
               var isModified = false;
-
               for (var i = 0; i < keys.length; i++) {
                 var key = keys[i];
-
                 for (var j = 0; j < resultKeys.length; j++) {
                   var resultKey = resultKeys[j];
-
                   if (resultKey.startsWith(key) || key.startsWith(resultKey) && key.endsWith(']')) {
                     isModified = true;
                   }
                 }
               }
-
               if (isModified) {
                 observers[observerKey].apply(this, keys.map(function (key) {
                   return safeGet(current, key);
@@ -991,22 +825,19 @@
           value: function privateStopNoop() {
             var e;
             var fn;
-
             if (arguments.length === 2) {
               fn = arguments.length <= 0 ? undefined : arguments[0];
               e = arguments.length <= 1 ? undefined : arguments[1];
             } else if (arguments.length === 1) {
               e = arguments.length <= 0 ? undefined : arguments[0];
             }
-
             if (e.type === 'touchmove') {
               report('catchtouchmove 转换后只能停止回调函数的冒泡，不能阻止滚动穿透。如要阻止滚动穿透，可以手动给编译后的 View 组件加上 catchMove 属性');
             }
-
             e.stopPropagation();
             isFunction(fn) && fn(e);
-          } // ================ React 生命周期 ================
-
+          }
+          // ================ React 生命周期 ================
         }, {
           key: "componentWillMount",
           value: function componentWillMount() {
@@ -1048,8 +879,8 @@
             this.triggerObservers(nextProps, this.props);
             this.triggerPropertiesObservers(this.props, nextProps);
             this.safeExecute(_get__default["default"](_getPrototypeOf__default["default"](BaseComponent.prototype), "componentWillReceiveProps", this));
-          } // ================ 小程序 App, Page, Component 实例属性与方法 ================
-
+          }
+          // ================ 小程序 App, Page, Component 实例属性与方法 ================
         }, {
           key: "is",
           get: function get() {
@@ -1069,10 +900,8 @@
           key: "componentMethodsProxy",
           value: function componentMethodsProxy(method) {
             var _this5 = this;
-
             return function () {
               var page = _this5.current.page;
-
               if (page === null || page === void 0 ? void 0 : page[method]) {
                 return page[method].apply(page, arguments);
               } else {
@@ -1101,16 +930,12 @@
             report(nonsupport.get('groupSetData'));
           }
         }]);
-
         return BaseComponent;
       }(ConnectComponent);
-
       var props = weappConf.properties;
-
       if (props) {
         for (var propKey in props) {
           var propValue = props[propKey];
-
           if (propValue != null && !isFunction(propValue)) {
             if (propValue.value !== undefined) {
               // 如果是 null 也赋值到 defaultProps
@@ -1119,11 +944,9 @@
           }
         }
       }
-
       var staticOptions = ['externalClasses', 'relations', 'options'];
       staticOptions.forEach(function (option) {
         var value = weappConf[option];
-
         if (value != null) {
           BaseComponent[option] = value;
         }