@tarojs/taro-h5 3.3.17 → 3.3.18

package/dist/index.js

@@ -1168,11 +1168,15 @@ function prependBasename() {
   return basename.replace(/\/$/, '') + '/' + url.replace(/^\//, '');
 }
 
-var hasBasename = function hasBasename(path, prefix) {
+var hasBasename = function hasBasename() {
+  var path = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  var prefix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
   return new RegExp('^' + prefix + '(\\/|\\?|#|$)', 'i').test(path);
 };
 
-var stripBasename = function stripBasename(path, prefix) {
+var stripBasename = function stripBasename() {
+  var path = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  var prefix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
   return hasBasename(path, prefix) ? path.substr(prefix.length) : path;
 };
 
@@ -1216,12 +1220,14 @@ var Stacks = /*#__PURE__*/function () {
   }, {
     key: "getLastIndex",
     value: function getLastIndex(pathname) {
+      var stateWith = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
+
       var list = _toConsumableArray(this.stacks).reverse();
 
       return list.findIndex(function (page, i) {
         var _a;
 
-        return i !== 0 && ((_a = page.path) === null || _a === void 0 ? void 0 : _a.replace(/\?.*/g, '')) === pathname;
+        return i >= stateWith && ((_a = page.path) === null || _a === void 0 ? void 0 : _a.replace(/\?.*/g, '')) === pathname;
       });
     }
   }, {
@@ -1237,7 +1243,8 @@ var Stacks = /*#__PURE__*/function () {
   }, {
     key: "getPrevIndex",
     value: function getPrevIndex(pathname) {
-      var lastIndex = this.getLastIndex(pathname);
+      var stateWith = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
+      var lastIndex = this.getLastIndex(pathname, stateWith);
 
       if (lastIndex < 0) {
         return -1;
@@ -1278,7 +1285,9 @@ var RoutesAlias = /*#__PURE__*/function () {
 
     this.conf = [];
 
-    this.getConfig = function (url) {
+    this.getConfig = function () {
+      var url = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+
       var customRoute = _this2.conf.filter(function (arr) {
         return arr.includes(url);
       });
@@ -1286,19 +1295,24 @@ var RoutesAlias = /*#__PURE__*/function () {
       return customRoute[0];
     };
 
-    this.getOrigin = function (url) {
+    this.getOrigin = function () {
+      var url = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+
       var _a;
 
       return ((_a = _this2.getConfig(url)) === null || _a === void 0 ? void 0 : _a[0]) || url;
     };
 
-    this.getAlias = function (url) {
+    this.getAlias = function () {
+      var url = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+
       var _a;
 
       return ((_a = _this2.getConfig(url)) === null || _a === void 0 ? void 0 : _a[1]) || url;
     };
 
-    this.getAll = function (url) {
+    this.getAll = function () {
+      var url = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
       return _this2.conf.filter(function (arr) {
         return arr.includes(url);
       }).reduce(function (p, a) {
@@ -1343,33 +1357,6 @@ var RoutesAlias = /*#__PURE__*/function () {
 
 var routesAlias = new RoutesAlias();
 
-var isTabBar = function isTabBar(config) {
-  var _a, _b;
-
-  var _config$router = config.router,
-      _config$router$custom = _config$router.customRoutes,
-      customRoutes = _config$router$custom === void 0 ? {} : _config$router$custom,
-      _config$router$basena = _config$router.basename,
-      basename = _config$router$basena === void 0 ? '' : _config$router$basena,
-      pathname = _config$router.pathname;
-  var routePath = stripBasename(pathname, basename);
-  var pagePath = ((_a = Object.entries(customRoutes).find(function (_ref) {
-    var _ref2 = _slicedToArray(_ref, 2),
-        target = _ref2[1];
-
-    if (typeof target === 'string') {
-      return target === routePath;
-    } else if ((target === null || target === void 0 ? void 0 : target.length) > 0) {
-      return target.includes(routePath);
-    }
-
-    return false;
-  })) === null || _a === void 0 ? void 0 : _a[0]) || routePath;
-  return !!pagePath && (((_b = config.tabBar) === null || _b === void 0 ? void 0 : _b.list) || []).some(function (t) {
-    return t.pagePath === pagePath;
-  });
-};
-
 function processNavigateUrl(option) {
   var _a;
 
@@ -2137,119 +2124,7 @@ var UniversalRouter = function () {
   return UniversalRouter;
 }();
 
-UniversalRouter.pathToRegexp = pathToRegexp_1; // @ts-nocheck
-
-function initTabbar(config) {
-  if (config.tabBar == null) {
-    return;
-  } // TODO: 找到 tabbar 的类型
-
-
-  var tabbar = document.createElement('taro-tabbar');
-  var homePage = config.entryPagePath || (config.pages ? config.pages[0] : '');
-  tabbar.conf = config.tabBar;
-  tabbar.conf.homePage = history.location.pathname === '/' ? homePage : history.location.pathname;
-  var routerConfig = config.router;
-  tabbar.conf.mode = routerConfig && routerConfig.mode ? routerConfig.mode : 'hash';
-
-  if (routerConfig.customRoutes) {
-    tabbar.conf.custom = true;
-    tabbar.conf.customRoutes = routerConfig.customRoutes;
-  } else {
-    tabbar.conf.custom = false;
-    tabbar.conf.customRoutes = {};
-  }
-
-  if (typeof routerConfig.basename !== 'undefined') {
-    tabbar.conf.basename = routerConfig.basename;
-  }
-
-  var container = document.getElementById('container'); // eslint-disable-next-line no-unused-expressions
-
-  container === null || container === void 0 ? void 0 : container.appendChild(tabbar);
-  initTabBarApis$1(config);
-}
-
-var routerConfig = Object.create(null);
-
-function init(config) {
-  var _a;
-
-  config.router.mode = config.router.mode || 'hash';
-  setHistoryMode(config.router.mode, config.router.basename);
-  Object.assign(routerConfig, config);
-  (_a = document.getElementById('app')) === null || _a === void 0 ? void 0 : _a.remove();
-  var container = document.createElement('div');
-  container.classList.add('taro-tabbar__container');
-  container.id = 'container';
-  var panel = document.createElement('div');
-  panel.classList.add('taro-tabbar__panel');
-  var app = document.createElement('div');
-  app.id = 'app';
-  app.classList.add('taro_router');
-  panel.appendChild(app);
-  container.appendChild(panel);
-  document.body.appendChild(container);
-  initTabbar(config);
-}
-
-var pageScrollFn;
-var pageDOM = window;
-
-function bindPageScroll(page, config) {
-  pageDOM.removeEventListener('scroll', pageScrollFn);
-  pageDOM = getScrollContainer();
-  var distance = config.onReachBottomDistance || 50;
-  var isReachBottom = false;
-
-  pageScrollFn = function pageScrollFn() {
-    page.onPageScroll && page.onPageScroll({
-      scrollTop: pageDOM instanceof Window ? window.scrollY : pageDOM.scrollTop
-    });
-
-    if (isReachBottom && getOffset() > distance) {
-      isReachBottom = false;
-    }
-
-    if (page.onReachBottom && !isReachBottom && getOffset() < distance) {
-      isReachBottom = true;
-      page.onReachBottom();
-    }
-  };
-
-  pageDOM.addEventListener('scroll', pageScrollFn, false);
-}
-
-window.addEventListener('DOMSubtreeModified', function (e) {
-  var _a; // @ts-ignore
-
-
-  var className = (_a = e.target) === null || _a === void 0 ? void 0 : _a.className;
-
-  if (className && /taro-tabbar__/.test(className)) {
-    pageDOM.removeEventListener('scroll', pageScrollFn);
-    pageDOM = getScrollContainer();
-    pageDOM.addEventListener('scroll', pageScrollFn, false);
-  }
-}, false);
-
-function getScrollContainer() {
-  if (document.querySelector('.taro-tabbar__tabbar') === null) {
-    // 没设置tabbar
-    return window;
-  } else {
-    // 有设置tabbar
-    return document.querySelector('.taro-tabbar__panel') || window;
-  }
-}
-
-function getOffset() {
-  if (pageDOM instanceof Window) {
-    return document.documentElement.scrollHeight - window.scrollY - window.innerHeight;
-  } else {
-    return pageDOM.scrollHeight - pageDOM.scrollTop - pageDOM.clientHeight;
-  }
-}
+UniversalRouter.pathToRegexp = pathToRegexp_1;
 
 function createCommonjsModule$1(fn, module) {
   return module = {
@@ -2819,137 +2694,468 @@ var queryString_4 = queryString.parseUrl;
 var queryString_5 = queryString.stringifyUrl;
 var queryString_6 = queryString.pick;
 var queryString_7 = queryString.exclude;
+var pageScrollFn;
+var pageDOM = window;
 
-function getSearch() {
-  var search = '?';
+function bindPageScroll(page, config) {
+  pageDOM.removeEventListener('scroll', pageScrollFn);
+  pageDOM = getScrollContainer();
+  var distance = config.onReachBottomDistance || 50;
+  var isReachBottom = false;
 
-  if (routerConfig.router.mode === 'hash') {
-    var idx = location.hash.indexOf('?');
+  pageScrollFn = function pageScrollFn() {
+    page.onPageScroll && page.onPageScroll({
+      scrollTop: pageDOM instanceof Window ? window.scrollY : pageDOM.scrollTop
+    });
 
-    if (idx > -1) {
-      search = location.hash.slice(idx);
+    if (isReachBottom && getOffset() > distance) {
+      isReachBottom = false;
     }
-  } else {
-    search = location.search;
-  }
 
-  return search.substr(1);
+    if (page.onReachBottom && !isReachBottom && getOffset() < distance) {
+      isReachBottom = true;
+      page.onReachBottom();
+    }
+  };
+
+  pageDOM.addEventListener('scroll', pageScrollFn, false);
 }
 
-var qs = function qs() {
-  var stamp = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
-  var search = getSearch();
-  var query = search ? queryString.parse(search) : {};
+window.addEventListener('DOMSubtreeModified', function (e) {
+  var target = e.target;
+  var className = target === null || target === void 0 ? void 0 : target.className;
 
-  if (stamp) {
-    query.stamp = stamp.toString();
+  if (className && /taro_page/.test(className)) {
+    pageDOM.removeEventListener('scroll', pageScrollFn);
+    pageDOM = getScrollContainer();
+    pageDOM.addEventListener('scroll', pageScrollFn, false);
   }
+}, false);
 
-  return query;
-};
-/* eslint-disable dot-notation */
+function getScrollContainer() {
+  var _a;
 
+  var id = (_a = Current$1.page) === null || _a === void 0 ? void 0 : _a.path;
+  var el = id ? document.getElementById(id) : document.querySelector('.taro_page') || document.querySelector('.taro_router');
+  return el || window;
+}
 
-function pageOnReady(page) {
-  var onLoad = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+function getOffset() {
+  if (pageDOM instanceof Window) {
+    return document.documentElement.scrollHeight - window.scrollY - window.innerHeight;
+  } else {
+    return pageDOM.scrollHeight - pageDOM.scrollTop - pageDOM.clientHeight;
+  }
+}
+/**
+ * 插入页面动画需要的样式
+ */
 
-  var _a, _b;
 
-  var pageEl = document.getElementById(page.path);
+function loadAnimateStyle() {
+  var ms = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 300;
+  var css = "\n.taro_router .taro_page {\n  position: absolute;\n  left: 0;\n  top: 0;\n  width: 100%;\n  height: 100%;\n  transform: translate3d(100%, 0, 0);\n  transition: transform ".concat(ms, "ms;\n}\n\n.taro_router .taro_page.taro_tabbar_page {\n  transform: none;\n}\n\n.taro_router .taro_page.taro_page_show {\n  transform: translate3d(0, 0, 0);\n}");
+  var style = document.createElement('style');
+  style.innerHTML = css;
+  document.getElementsByTagName('head')[0].appendChild(style);
+} // @ts-nocheck
 
-  if (pageEl && !(pageEl === null || pageEl === void 0 ? void 0 : pageEl['__isReady'])) {
-    var el = pageEl.firstElementChild;
-    (_b = (_a = el === null || el === void 0 ? void 0 : el['componentOnReady']) === null || _a === void 0 ? void 0 : _a.call(el)) === null || _b === void 0 ? void 0 : _b.then(function () {
-      requestAnimationFrame(function () {
-        page.onReady();
-        pageEl['__isReady'] = true;
-      });
-    });
-    onLoad && (pageEl['__page'] = page);
-  }
-}
 
-function loadPage(page) {
-  var pageConfig = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  var stacksIndex = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
-  if (!page) return;
-  var pageEl = document.getElementById(page.path);
+function initTabbar(config) {
+  if (config.tabBar == null) {
+    return;
+  } // TODO: custom-tab-bar
+
+
+  var tabbar = document.createElement('taro-tabbar');
+  var homePage = config.entryPagePath || (config.pages ? config.pages[0] : '');
+  tabbar.conf = config.tabBar;
+  tabbar.conf.homePage = history.location.pathname === '/' ? homePage : history.location.pathname;
+  var routerConfig = config.router;
+  tabbar.conf.mode = routerConfig && routerConfig.mode ? routerConfig.mode : 'hash';
 
-  if (pageEl) {
-    pageEl.style.display = 'block';
+  if (routerConfig.customRoutes) {
+    tabbar.conf.custom = true;
+    tabbar.conf.customRoutes = routerConfig.customRoutes;
   } else {
-    page.onLoad(qs(stacksIndex), function () {
-      return pageOnReady(page, true);
-    });
+    tabbar.conf.custom = false;
+    tabbar.conf.customRoutes = {};
   }
 
-  stacks.push(page);
-  page.onShow();
-  bindPageScroll(page, pageConfig);
+  if (typeof routerConfig.basename !== 'undefined') {
+    tabbar.conf.basename = routerConfig.basename;
+  }
+
+  var container = document.getElementById('container');
+  container === null || container === void 0 ? void 0 : container.appendChild(tabbar);
+  initTabBarApis$1(config);
 }
 
-function unloadPage(page) {
-  var delta = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
-  if (!page) return;
-  stacks.delta = --delta;
-  stacks.pop();
-  page.onUnload();
-  if (delta >= 1) unloadPage(stacks.last, delta);
+function setDisplay(el) {
+  var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+
+  if (el) {
+    el.style.display = type;
+  }
 }
 
-function showPage(page) {
-  var pageConfig = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  var stacksIndex = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
-  if (!page) return;
-  page.onShow();
-  var pageEl = document.getElementById(page.path);
+var PageHandler = /*#__PURE__*/function () {
+  function PageHandler(config) {
+    _classCallCheck$1(this, PageHandler);
 
-  if (pageEl) {
-    pageEl.style.display = 'block';
-  } else {
-    page.onLoad(qs(stacksIndex), function () {
-      return pageOnReady(page, false);
-    });
+    this.defaultAnimation = {
+      duration: 300,
+      delay: 50
+    };
+    this.config = config;
+    this.mount();
   }
 
-  bindPageScroll(page, pageConfig);
-}
+  _createClass$1(PageHandler, [{
+    key: "appId",
+    get: function get() {
+      return 'app';
+    }
+  }, {
+    key: "router",
+    get: function get() {
+      return this.config.router;
+    }
+  }, {
+    key: "routerMode",
+    get: function get() {
+      return this.router.mode || 'hash';
+    }
+  }, {
+    key: "customRoutes",
+    get: function get() {
+      return this.router.customRoutes || {};
+    }
+  }, {
+    key: "routes",
+    get: function get() {
+      return this.config.routes;
+    }
+  }, {
+    key: "tabBarList",
+    get: function get() {
+      var _a;
 
-function hidePage(page) {
-  if (!page) return; // NOTE: 修复多页并发问题，此处可能因为路由跳转过快，执行时页面可能还没有创建成功
+      return ((_a = this.config.tabBar) === null || _a === void 0 ? void 0 : _a.list) || [];
+    }
+  }, {
+    key: "PullDownRefresh",
+    get: function get() {
+      return this.config.PullDownRefresh;
+    }
+  }, {
+    key: "animation",
+    get: function get() {
+      var _a, _b;
 
-  var pageEl = document.getElementById(page.path);
+      return (_b = (_a = this.config) === null || _a === void 0 ? void 0 : _a.animation) !== null && _b !== void 0 ? _b : this.defaultAnimation;
+    }
+  }, {
+    key: "animationDelay",
+    get: function get() {
+      var _a;
 
-  if (pageEl) {
-    pageEl.style.display = 'none';
-    page.onHide();
-  } else {
-    setTimeout(function () {
-      return hidePage(page);
-    }, 0);
-  }
-}
+      return _typeof$1(this.animation) === 'object' ? this.animation.delay : this.animation ? (_a = this.defaultAnimation) === null || _a === void 0 ? void 0 : _a.delay : 0;
+    }
+  }, {
+    key: "animationDuration",
+    get: function get() {
+      var _a;
+
+      return _typeof$1(this.animation) === 'object' ? this.animation.duration : this.animation ? (_a = this.defaultAnimation) === null || _a === void 0 ? void 0 : _a.duration : 0;
+    }
+  }, {
+    key: "pathname",
+    get: function get() {
+      return this.router.pathname;
+    },
+    set: function set(p) {
+      this.router.pathname = p;
+    }
+  }, {
+    key: "basename",
+    get: function get() {
+      return this.router.basename || '';
+    }
+  }, {
+    key: "pageConfig",
+    get: function get() {
+      var _this4 = this;
+
+      return this.routes.find(function (r) {
+        var _a;
+
+        var routePath = stripBasename(_this4.pathname, _this4.basename);
+        var pagePath = addLeadingSlash(r.path);
+        return pagePath === routePath || ((_a = routesAlias.getConfig(pagePath)) === null || _a === void 0 ? void 0 : _a.includes(routePath));
+      });
+    }
+  }, {
+    key: "isTabBar",
+    get: function get() {
+      var _a;
+
+      var routePath = stripBasename(this.pathname, this.basename);
+      var pagePath = ((_a = Object.entries(this.customRoutes).find(function (_ref) {
+        var _ref2 = _slicedToArray(_ref, 2),
+            target = _ref2[1];
+
+        if (typeof target === 'string') {
+          return target === routePath;
+        } else if ((target === null || target === void 0 ? void 0 : target.length) > 0) {
+          return target.includes(routePath);
+        }
+
+        return false;
+      })) === null || _a === void 0 ? void 0 : _a[0]) || routePath;
+      return !!pagePath && this.tabBarList.some(function (t) {
+        return t.pagePath === pagePath;
+      });
+    }
+  }, {
+    key: "isSamePage",
+    value: function isSamePage(page) {
+      var routePath = stripBasename(this.pathname, this.basename);
+      var pagePath = stripBasename(page === null || page === void 0 ? void 0 : page.path, this.basename);
+      return pagePath.startsWith(routePath + '?');
+    }
+  }, {
+    key: "search",
+    get: function get() {
+      var search = '?';
+
+      if (this.routerMode) {
+        var idx = location.hash.indexOf('?');
+
+        if (idx > -1) {
+          search = location.hash.slice(idx);
+        }
+      } else {
+        search = location.search;
+      }
+
+      return search.substr(1);
+    }
+  }, {
+    key: "getQuery",
+    value: function getQuery() {
+      var stamp = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+      var search = this.search;
+      var query = search ? queryString.parse(search) : {};
+
+      if (stamp) {
+        query.stamp = stamp.toString();
+      }
+
+      return query;
+    }
+  }, {
+    key: "mount",
+    value: function mount() {
+      var _a;
+
+      setHistoryMode(this.routerMode, this.router.basename);
+      (_a = document.getElementById('app')) === null || _a === void 0 ? void 0 : _a.remove();
+      this.animation && loadAnimateStyle(this.animationDuration);
+      var app = document.createElement('div');
+      app.id = this.appId;
+      app.classList.add('taro_router');
+
+      if (this.tabBarList.length > 1) {
+        var _container = document.createElement('div');
+
+        _container.classList.add('taro-tabbar__container');
+
+        _container.id = 'container';
+        var panel = document.createElement('div');
+        panel.classList.add('taro-tabbar__panel');
+        panel.appendChild(app);
+
+        _container.appendChild(panel);
+
+        document.body.appendChild(_container);
+        initTabbar(this.config);
+      } else {
+        document.body.appendChild(app);
+      }
+    }
+  }, {
+    key: "onReady",
+    value: function onReady(page) {
+      var onLoad = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+
+      var _a, _b;
+
+      var pageEl = document.getElementById(page.path);
+
+      if (pageEl && !(pageEl === null || pageEl === void 0 ? void 0 : pageEl['__isReady'])) {
+        var el = pageEl.firstElementChild;
+        (_b = (_a = el === null || el === void 0 ? void 0 : el['componentOnReady']) === null || _a === void 0 ? void 0 : _a.call(el)) === null || _b === void 0 ? void 0 : _b.then(function () {
+          requestAnimationFrame(function () {
+            page.onReady();
+            pageEl['__isReady'] = true;
+          });
+        });
+        onLoad && (pageEl['__page'] = page);
+      }
+    }
+  }, {
+    key: "load",
+    value: function load(page) {
+      var _this5 = this;
+
+      var pageConfig = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      var stacksIndex = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+      if (!page) return;
+      var pageEl = document.getElementById(page.path);
+
+      if (pageEl) {
+        setDisplay(pageEl);
+        this.isTabBar && pageEl.classList.add('taro_tabbar_page');
+        this.addAnimation(pageEl, stacksIndex === 0);
+      } else {
+        page.onLoad(this.getQuery(stacksIndex), function () {
+          pageEl = document.getElementById(page.path);
+          _this5.isTabBar && (pageEl === null || pageEl === void 0 ? void 0 : pageEl.classList.add('taro_tabbar_page'));
+
+          _this5.addAnimation(pageEl, stacksIndex === 0);
+
+          _this5.onReady(page, true);
+        });
+      }
+
+      stacks.push(page);
+      page.onShow();
+      bindPageScroll(page, pageConfig);
+    }
+  }, {
+    key: "unload",
+    value: function unload(page) {
+      var _this6 = this;
+
+      var delta = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
+      var top = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+
+      var _a;
+
+      if (!page) return;
+      stacks.delta = --delta;
+      stacks.pop();
+
+      if (this.animation && top) {
+        if (this.unloadTimer) {
+          clearTimeout(this.unloadTimer);
+          (_a = this.lastUnloadPage) === null || _a === void 0 ? void 0 : _a.onUnload();
+          this.unloadTimer = null;
+        }
+
+        this.lastUnloadPage = page;
+        var pageEl = document.getElementById(page.path);
+        pageEl === null || pageEl === void 0 ? void 0 : pageEl.classList.remove('taro_page_show');
+        this.unloadTimer = setTimeout(function () {
+          var _a;
+
+          _this6.unloadTimer = null;
+          (_a = _this6.lastUnloadPage) === null || _a === void 0 ? void 0 : _a.onUnload();
+        }, this.animationDuration);
+      }
+
+      if (delta >= 1) this.unload(stacks.last, delta);
+    }
+  }, {
+    key: "show",
+    value: function show(page) {
+      var _this7 = this;
+
+      var pageConfig = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      var stacksIndex = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+      if (!page) return;
+      page.onShow();
+      var pageEl = document.getElementById(page.path);
+
+      if (pageEl) {
+        setDisplay(pageEl);
+        this.addAnimation(pageEl, stacksIndex === 0);
+      } else {
+        page.onLoad(this.getQuery(stacksIndex), function () {
+          pageEl = document.getElementById(page.path);
+
+          _this7.addAnimation(pageEl, stacksIndex === 0);
+
+          _this7.onReady(page, false);
+        });
+      }
+
+      bindPageScroll(page, pageConfig);
+    }
+  }, {
+    key: "hide",
+    value: function hide(page) {
+      var _this8 = this;
+
+      if (!page) return; // NOTE: 修复多页并发问题，此处可能因为路由跳转过快，执行时页面可能还没有创建成功
+
+      var pageEl = document.getElementById(page.path);
+
+      if (pageEl) {
+        if (this.hideTimer) {
+          clearTimeout(this.hideTimer);
+          this.hideTimer = null;
+          setDisplay(this.lastHidePage, 'none');
+        }
+
+        this.lastHidePage = pageEl;
+        this.hideTimer = setTimeout(function () {
+          _this8.hideTimer = null;
+          setDisplay(_this8.lastHidePage, 'none');
+        }, this.animationDelay);
+        page.onHide();
+      } else {
+        setTimeout(function () {
+          return _this8.hide(page);
+        }, 0);
+      }
+    }
+  }, {
+    key: "addAnimation",
+    value: function addAnimation(pageEl) {
+      var first = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+      if (!pageEl) return;
+
+      if (this.animation && !first) {
+        setTimeout(function () {
+          pageEl.classList.add('taro_page_show');
+        }, this.animationDelay);
+      } else {
+        pageEl.classList.add('taro_page_show');
+      }
+    }
+  }]);
+
+  return PageHandler;
+}();
 /* eslint-disable dot-notation */
 
 
 function createRouter(app, config, framework) {
   var _a;
 
-  init(config);
-  var routes = [];
+  var handler = new PageHandler(config);
   var runtimeHooks = container.get(SERVICE_IDENTIFIER.Hooks);
-  routesAlias.set(config.router.customRoutes);
-
-  for (var i = 0; i < config.routes.length; i++) {
-    var route = config.routes[i];
-    var path = addLeadingSlash(route.path);
-    routes.push({
-      path: routesAlias.getAll(path),
+  routesAlias.set(handler.router.customRoutes);
+  var basename = handler.router.basename;
+  var routes = handler.routes.map(function (route) {
+    return {
+      path: routesAlias.getAll(addLeadingSlash(route.path)),
       action: route.load
-    });
-  }
-
-  var basename = config.router.basename;
+    };
+  });
+  var entryPagePath = config.entryPagePath || ((_a = routes[0].path) === null || _a === void 0 ? void 0 : _a[0]);
   var router = new UniversalRouter(routes, {
     baseUrl: basename || ''
   });
@@ -2964,10 +3170,10 @@ function createRouter(app, config, framework) {
           switch (_context.prev = _context.next) {
             case 0:
               location = _ref3.location, action = _ref3.action;
-              routerConfig.router.pathname = location.pathname;
+              handler.pathname = location.pathname;
               _context.prev = 2;
               _context.next = 5;
-              return router.resolve(config.router.forcePath || location.pathname);
+              return router.resolve(handler.router.forcePath || handler.pathname);
 
             case 5:
               element = _context.sent;
@@ -2984,7 +3190,7 @@ function createRouter(app, config, framework) {
               }
 
               (_a = app.onPageNotFound) === null || _a === void 0 ? void 0 : _a.call(app, {
-                path: location.pathname
+                path: handler.pathname
               });
               _context.next = 15;
               break;
@@ -3001,17 +3207,11 @@ function createRouter(app, config, framework) {
               return _context.abrupt("return");
 
             case 17:
-              pageConfig = config.routes.find(function (r) {
-                var _a;
-
-                var path = addLeadingSlash(r.path);
-                var urlPath = stripBasename(location.pathname, routerConfig.router.basename);
-                return path === urlPath || ((_a = routesAlias.getConfig(path)) === null || _a === void 0 ? void 0 : _a.includes(urlPath));
-              });
+              pageConfig = handler.pageConfig;
               enablePullDownRefresh = false;
               eventCenter$1.trigger('__taroRouterChange', {
                 toLocation: {
-                  path: location.pathname
+                  path: handler.pathname
                 }
               });
 
@@ -3021,7 +3221,7 @@ function createRouter(app, config, framework) {
               }
 
               currentPage = Current$1.page;
-              pathname = location.pathname;
+              pathname = handler.pathname;
               shouldLoad = false;
 
               if (!(action === 'POP')) {
@@ -3032,64 +3232,60 @@ function createRouter(app, config, framework) {
               // NOTE: 浏览器事件退后多次时，该事件只会被触发一次
               prevIndex = stacks.getPrevIndex(pathname);
               delta = stacks.getDelta(pathname);
-              unloadPage(currentPage, delta);
+              handler.unload(currentPage, delta, prevIndex > -1);
 
               if (prevIndex > -1) {
-                showPage(stacks.getItem(prevIndex), pageConfig, prevIndex);
+                handler.show(stacks.getItem(prevIndex), pageConfig, prevIndex);
               } else {
                 shouldLoad = true;
               }
 
-              _context.next = 47;
+              _context.next = 42;
               break;
 
             case 31:
-              if (!(action === 'PUSH')) {
-                _context.next = 36;
+              if (!handler.isTabBar) {
+                _context.next = 40;
                 break;
               }
 
-              hidePage(currentPage);
-              shouldLoad = true;
-              _context.next = 47;
-              break;
-
-            case 36:
-              if (!(action === 'REPLACE')) {
-                _context.next = 47;
+              if (!handler.isSamePage(currentPage)) {
+                _context.next = 34;
                 break;
               }
 
-              if (!isTabBar(config)) {
-                _context.next = 44;
-                break;
-              }
+              return _context.abrupt("return");
 
-              hidePage(currentPage);
-              _prevIndex = stacks.getPrevIndex(pathname);
+            case 34:
+              _prevIndex = stacks.getPrevIndex(pathname, 0);
+              handler.hide(currentPage);
 
               if (!(_prevIndex > -1)) {
-                _context.next = 42;
+                _context.next = 38;
                 break;
               }
 
-              return _context.abrupt("return", showPage(stacks.getItem(_prevIndex), pageConfig, _prevIndex));
+              return _context.abrupt("return", handler.show(stacks.getItem(_prevIndex), pageConfig, _prevIndex));
 
-            case 42:
-              _context.next = 46;
+            case 38:
+              _context.next = 41;
               break;
 
-            case 44:
-              _delta = stacks.getDelta(pathname); // NOTE: 页面路由记录并不会清空，只是移除掉缓存的 stack 以及页面
+            case 40:
+              if (action === 'REPLACE') {
+                _delta = stacks.getDelta(pathname); // NOTE: 页面路由记录并不会清空，只是移除掉缓存的 stack 以及页面
 
-              unloadPage(currentPage, _delta);
+                handler.unload(currentPage, _delta);
+              } else if (action === 'PUSH') {
+                handler.hide(currentPage);
+              }
 
-            case 46:
+            case 41:
               shouldLoad = true;
 
-            case 47:
+            case 42:
               if (!(shouldLoad || stacks.length < 1)) {
-                _context.next = 55;
+                _context.next = 50;
                 break;
               }
 
@@ -3098,10 +3294,10 @@ function createRouter(app, config, framework) {
               stacksIndex = stacks.length;
               delete loadConfig['path'];
               delete loadConfig['load'];
-              page = createPageConfig(enablePullDownRefresh ? (_d = runtimeHooks.createPullDownComponent) === null || _d === void 0 ? void 0 : _d.call(runtimeHooks, el, location.pathname, framework, routerConfig.PullDownRefresh) : el, pathname + stringify(qs(stacksIndex)), {}, loadConfig);
-              return _context.abrupt("return", loadPage(page, pageConfig, stacksIndex));
+              page = createPageConfig(enablePullDownRefresh ? (_d = runtimeHooks.createPullDownComponent) === null || _d === void 0 ? void 0 : _d.call(runtimeHooks, el, location.pathname, framework, handler.PullDownRefresh) : el, pathname + stringify(handler.getQuery(stacksIndex)), {}, loadConfig);
+              return _context.abrupt("return", handler.load(page, pageConfig, stacksIndex));
 
-            case 55:
+            case 50:
             case "end":
               return _context.stop();
           }
@@ -3115,14 +3311,14 @@ function createRouter(app, config, framework) {
   }();
 
   if (history.location.pathname === '/') {
-    history.replace(prependBasename((config.entryPagePath || ((_a = routes[0].path) === null || _a === void 0 ? void 0 : _a[0])) + history.location.search));
+    history.replace(prependBasename(entryPagePath + history.location.search));
   }
 
   render({
     location: history.location,
     action: r.Push
   });
-  app.onShow(qs(stacks.length));
+  app.onShow(handler.getQuery(stacks.length));
   return history.listen(render);
 }
 
@@ -3253,7 +3449,7 @@ function processOpenApi(apiName, defaultOptions, formatResult = res => res, form
         return p;
     };
 }
-const easeInOut = t => t < 0.5 ? 4 * t * t * t : (t - 1) * (2 * t - 2) * (2 * t - 2) + 1;
+const easeInOut = (t) => t < 0.5 ? 4 * t * t * t : (t - 1) * (2 * t - 2) * (2 * t - 2) + 1;
 const getTimingFunc = (easeFunc, frameCnt) => {
     return x => {
         if (frameCnt <= 1) {
@@ -4501,7 +4697,9 @@ const onNetworkStatusChange = (cb) => {
             });
         });
     }
-};
+};
+const offNetworkStatusChange = temporarilyNotSupport('offNetworkStatusChange');
+const getLocalIPAddress = temporarilyNotSupport('getLocalIPAddress');
 
 const updateWeChatApp = temporarilyNotSupport('updateWeChatApp');
 const getUpdateManager = temporarilyNotSupport('getUpdateManager');
@@ -4932,6 +5130,19 @@ const onBackgroundFetchData = temporarilyNotSupport('onBackgroundFetchData');
 const getBackgroundFetchToken = temporarilyNotSupport('getBackgroundFetchToken');
 const getBackgroundFetchData = temporarilyNotSupport('getBackgroundFetchData');
 
+function getItem(key) {
+    let item;
+    try {
+        item = JSON.parse(localStorage.getItem(key) || '');
+    }
+    catch (e) { }
+    if (item && typeof item === 'object' && item.hasOwnProperty('data')) {
+        return { result: true, data: item.data };
+    }
+    else {
+        return { result: false };
+    }
+}
 const setStorageSync = (key, data = '') => {
     if (typeof key !== 'string') {
         console.error(getParameterError({
@@ -4972,15 +5183,27 @@ const setStorage = (options) => {
     setStorageSync(key, data);
     return handle.success();
 };
-const getStorage = (options) => {
+const revokeBufferURL = temporarilyNotSupport('revokeBufferURL');
+const removeStorageSync = (key) => {
+    if (typeof key !== 'string') {
+        console.error(getParameterError({
+            name: 'removeStorage',
+            correct: 'String',
+            wrong: key
+        }));
+        return;
+    }
+    localStorage.removeItem(key);
+};
+const removeStorage = (options) => {
     const isObject = shouldBeObject(options);
     if (!isObject.flag) {
-        const res = { errMsg: `getStorage:fail ${isObject.msg}` };
+        const res = { errMsg: `removeStorage:fail ${isObject.msg}` };
         console.error(res.errMsg);
         return Promise.reject(res);
     }
     const { key, success, fail, complete } = options;
-    const handle = new MethodHandler({ name: 'getStorage', success, fail, complete });
+    const handle = new MethodHandler({ name: 'removeStorage', success, fail, complete });
     if (typeof key !== 'string') {
         return handle.fail({
             errMsg: getParameterError({
@@ -4990,15 +5213,8 @@ const getStorage = (options) => {
             })
         });
     }
-    const { result, data } = getItem(key);
-    if (result) {
-        return handle.success({ data });
-    }
-    else {
-        return handle.fail({
-            errMsg: 'data not found'
-        });
-    }
+    removeStorageSync(key);
+    return handle.success();
 };
 const getStorageSync = (key) => {
     if (typeof key !== 'string') {
@@ -5014,19 +5230,6 @@ const getStorageSync = (key) => {
         return res.data;
     return '';
 };
-function getItem(key) {
-    let item;
-    try {
-        item = JSON.parse(localStorage.getItem(key) || '');
-    }
-    catch (e) { }
-    if (item && typeof item === 'object' && item.hasOwnProperty('data')) {
-        return { result: true, data: item.data };
-    }
-    else {
-        return { result: false };
-    }
-}
 const getStorageInfoSync = () => {
     const res = {
         keys: Object.keys(localStorage),
@@ -5039,26 +5242,15 @@ const getStorageInfo = ({ success, fail, complete } = {}) => {
     const handle = new MethodHandler({ name: 'getStorageInfo', success, fail, complete });
     return handle.success(getStorageInfoSync());
 };
-const removeStorageSync = (key) => {
-    if (typeof key !== 'string') {
-        console.error(getParameterError({
-            name: 'removeStorage',
-            correct: 'String',
-            wrong: key
-        }));
-        return;
-    }
-    localStorage.removeItem(key);
-};
-const removeStorage = (options) => {
+const getStorage = (options) => {
     const isObject = shouldBeObject(options);
     if (!isObject.flag) {
-        const res = { errMsg: `removeStorage:fail ${isObject.msg}` };
+        const res = { errMsg: `getStorage:fail ${isObject.msg}` };
         console.error(res.errMsg);
         return Promise.reject(res);
     }
     const { key, success, fail, complete } = options;
-    const handle = new MethodHandler({ name: 'removeStorage', success, fail, complete });
+    const handle = new MethodHandler({ name: 'getStorage', success, fail, complete });
     if (typeof key !== 'string') {
         return handle.fail({
             errMsg: getParameterError({
@@ -5068,18 +5260,25 @@ const removeStorage = (options) => {
             })
         });
     }
-    removeStorageSync(key);
-    return handle.success();
+    const { result, data } = getItem(key);
+    if (result) {
+        return handle.success({ data });
+    }
+    else {
+        return handle.fail({
+            errMsg: 'data not found'
+        });
+    }
+};
+const createBufferURL = temporarilyNotSupport('createBufferURL');
+const clearStorageSync = () => {
+    localStorage.clear();
 };
 const clearStorage = ({ success, fail, complete } = {}) => {
     const handle = new MethodHandler({ name: 'clearStorage', success, fail, complete });
-    localStorage.clear();
+    clearStorageSync();
     return handle.success();
-};
-const clearStorageSync = () => {
-    clearStorage();
-};
-const revokeBufferURL = temporarilyNotSupport('revokeBufferURL');
+};
 
 const CLIPBOARD_STORAGE_NAME = 'taro_clipboard';
 document.addEventListener('copy', () => {
@@ -5518,23 +5717,28 @@ class InnerAudioContext {
         this.stopStack = new CallbackManager();
         Taro.eventCenter.on('__taroRouterChange', () => { this.stop(); });
     }
-    set autoplay(e) { Object.defineProperty(this.Instance, 'autoplay', { value: e }); }
+    set autoplay(e) { this.setProperty('autoplay', e); }
     get autoplay() { var _a; return ((_a = this.Instance) === null || _a === void 0 ? void 0 : _a.autoplay) || false; }
     get buffered() { var _a; return ((_a = this.Instance) === null || _a === void 0 ? void 0 : _a.buffered.length) || 0; }
     get currentTime() { var _a; return ((_a = this.Instance) === null || _a === void 0 ? void 0 : _a.currentTime) || 0; }
     get duration() { var _a; return ((_a = this.Instance) === null || _a === void 0 ? void 0 : _a.duration) || 0; }
-    set loop(e) { Object.defineProperty(this.Instance, 'loop', { value: e }); }
+    set loop(e) { this.setProperty('loop', e); }
     get loop() { var _a; return ((_a = this.Instance) === null || _a === void 0 ? void 0 : _a.loop) || false; }
     get paused() { var _a; return ((_a = this.Instance) === null || _a === void 0 ? void 0 : _a.paused) || true; }
-    set src(e) { Object.defineProperty(this.Instance, 'src', { value: e }); }
+    set src(e) { this.setProperty('src', e); }
     get src() { var _a; return ((_a = this.Instance) === null || _a === void 0 ? void 0 : _a.src) || ''; }
-    set volume(e) { Object.defineProperty(this.Instance, 'volume', { value: e }); }
+    set volume(e) { this.setProperty('volume', e); }
     get volume() { var _a; return ((_a = this.Instance) === null || _a === void 0 ? void 0 : _a.volume) || 0; }
-    set playbackRate(e) { Object.defineProperty(this.Instance, 'playbackRate', { value: e }); }
+    set playbackRate(e) { this.setProperty('playbackRate', e); }
     get playbackRate() { var _a; return ((_a = this.Instance) === null || _a === void 0 ? void 0 : _a.volume) || 0; }
     get obeyMuteSwitch() { return true; }
-    set startTime(e) { Object.defineProperty(this.Instance, 'startTime', { value: e }); }
+    set startTime(e) { this.setProperty('startTime', e); }
     get startTime() { var _a; return ((_a = this.Instance) === null || _a === void 0 ? void 0 : _a.volume) || 0; }
+    setProperty(key, value) {
+        if (this.Instance) {
+            this.Instance[key] = value;
+        }
+    }
 }
 const stopVoice = temporarilyNotSupport('stopVoice');
 const setInnerAudioOption = temporarilyNotSupport('setInnerAudioOption');
@@ -5575,186 +5779,107 @@ class EditorContext {
     }
 }
 
-/**
- * previewImage api基于开源的React组件[react-wx-images-viewer](https://github.com/react-ld/react-wx-images-viewer)开发，感谢！
- */
-
-/**
- * 在新页面中全屏预览图片。预览的过程中用户可以进行保存图片、发送给朋友等操作。
- * @param {Object} options
- * @param {Array.<string>} options.urls 需要预览的图片链接列表。2.2.3 起支持云文件ID。
- * @param {string} [options.current=options.urls[0]]  urls的第一张 当前显示图片的链接
- * @param {function} [options.success] 接口调用成功的回调函数
- * @param {function} [options.fail] 接口调用失败的回调函数
- * @param {function} [options.complete] 接口调用结束的回调函数（调用成功、失败都会执行）
- */
-function previewImage(_x) {
-  return _previewImage.apply(this, arguments);
-}
-
-function _previewImage() {
-  _previewImage = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(options) {
-    var container, swiper, _options$urls, urls, _options$current, current, children, i, child, currentIndex;
-
-    return regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            container = document.createElement('div');
-            container.classList.add('preview-image');
-            container.style.cssText = "\n    position: fixed;\n    top: 0;\n    left: 0;\n    z-index: 1050;\n    width: 100%;\n    height: 100%;\n    overflow: hidden;\n    outline: 0;\n    background-color: #111;\n  ";
-            container.addEventListener('click', function () {
-              container.remove();
-            });
-            swiper = document.createElement('taro-swiper-core');
-            swiper.full = true;
-            _options$urls = options.urls, urls = _options$urls === void 0 ? [] : _options$urls, _options$current = options.current, current = _options$current === void 0 ? '' : _options$current;
-            children = [];
-            _context.prev = 8;
-            _context.next = 11;
-            return Promise.all(urls.map(function (e) {
-              return loadImage(e, options.fail);
-            }));
-
-          case 11:
-            children = _context.sent;
-            _context.next = 17;
-            break;
-
-          case 14:
-            _context.prev = 14;
-            _context.t0 = _context["catch"](8);
-
-            if (options.fail) {
-              options.fail(_context.t0);
-            }
-
-          case 17:
-            for (i = 0; i < children.length; i++) {
-              child = children[i];
-              swiper.appendChild(child);
-            }
-
-            currentIndex = urls.indexOf(current);
-            swiper.current = currentIndex;
-            container.appendChild(swiper);
-            document.body.appendChild(container);
-
-            if (options.success) {
-              options.success();
-            }
-
-            if (options.complete) {
-              options.complete();
-            }
-
-          case 24:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee, null, [[8, 14]]);
-  }));
-  return _previewImage.apply(this, arguments);
-}
-
-function loadImage(url, fail) {
-  return new Promise(function (resolve) {
-    var item = document.createElement('taro-swiper-item-core');
-    item.style.cssText = "\n      display: flex;\n      align-items: start;\n      justify-content: center;\n      overflow-y: scroll;\n    ";
-    var image = new Image();
-    image.style.maxWidth = '100%';
-    image.src = url;
-    var div = document.createElement('div');
-    div.style.cssText = "\n      display: flex;\n      align-items: center;\n      justify-content: center;\n      max-width: 100%;\n      min-height: 100%;\n    ";
-    div.appendChild(image);
-    item.appendChild(div); // Note: 等待图片加载完后返回，会导致轮播被卡住
-
-    resolve(item);
-
-    if (typeof fail === 'function') {
-      image.addEventListener('error', function (err) {
-        fail(err);
-      });
-    }
-  });
-}
-
-// const ORIENTATION_MAP = {
-//   // up 默认方向（手机横持拍照），对应 Exif 中的 1。或无 orientation 信息。
-//   1: 'up',
-//   // up-mirrored 同 up，但镜像翻转，对应 Exif 中的 2
-//   2: 'up-mirrored',
-//   // down 旋转180度，对应 Exif 中的 3
-//   3: 'down',
-//   // down-mirrored 同 down，但镜像翻转，对应 Exif 中的 4
-//   4: 'down-mirrored',
-//   // left-mirrored 同 left，但镜像翻转，对应 Exif 中的 5
-//   5: 'left-mirrored',
-//   // right 顺时针旋转90度，对应 Exif 中的 6
-//   6: 'right',
-//   // right-mirrored 同 right，但镜像翻转，对应 Exif 中的 7
-//   7: 'right-mirrored',
-//   // left 逆时针旋转90度，对应 Exif 中的 8
-//   8: 'left'
-// }
-
-/**
- * @typedef {'up'|'up-mirrored'|'down'|'down-mirrored'|'left-mirrored'|'right'|'right-mirrored'|'left'} Orientation
- * @typedef ImageInfo object.success 回调函数的参数
- * @property {number} width 图片原始宽度，单位px。不考虑旋转。
- * @property {number} height 图片原始高度，单位px。不考虑旋转。
- * @property {string} path 图片的本地路径
- * @property {Orientation} orientation 拍照时设备方向
- * @property {string} type 图片格式
- */
-
-/**
- * 获取图片信息。网络图片需先配置download域名才能生效。
- * @param {Object} object 参数
- * @param {string} object.src 图片的路径，可以是相对路径、临时文件路径、存储文件路径、网络图片路径
- * @param {(res: ImageInfo) => void} [object.success] 接口调用成功的回调函数
- * @param {function} [object.fail] 接口调用失败的回调函数
- * @param {function} [object.complete] 接口调用结束的回调函数（调用成功、失败都会执行）
- */
-var getImageInfo = function getImageInfo() {
-  var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-      src = _ref.src,
-      success = _ref.success,
-      fail = _ref.fail,
-      complete = _ref.complete;
-
-  return new Promise(function (resolve, reject) {
-    var onSuccess = function onSuccess(res) {
-      success && success(res);
-      complete && complete();
-      resolve(res);
-    };
-
-    var onError = function onError(res) {
-      fail && fail(res);
-      complete && complete();
-      reject(res);
-    };
-
-    var image = new Image();
-
-    image.onload = function () {
-      onSuccess({
-        errMsg: 'getImageInfo:ok',
-        width: image.naturalWidth,
-        height: image.naturalHeight
-      });
-    };
-
-    image.onerror = function (e) {
-      onError({
-        errMsg: "getImageInfo:fail ".concat(e.message)
-      });
-    };
+const previewImage = async (options) => {
+    function loadImage(url, loadFail) {
+        return new Promise((resolve) => {
+            const item = document.createElement('taro-swiper-item-core');
+            item.style.cssText = `
+        display: flex;
+        align-items: start;
+        justify-content: center;
+        overflow-y: scroll;
+      `;
+            const image = new Image();
+            image.style.maxWidth = '100%';
+            image.src = url;
+            const div = document.createElement('div');
+            div.style.cssText = `
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        max-width: 100%;
+        min-height: 100%;
+      `;
+            div.appendChild(image);
+            item.appendChild(div);
+            resolve(item);
+            if (typeof loadFail === 'function') {
+                image.addEventListener('error', (err) => {
+                    loadFail({ errMsg: err.message });
+                });
+            }
+        });
+    }
+    const isObject = shouldBeObject(options);
+    if (!isObject.flag) {
+        const res = { errMsg: `previewImage:fail ${isObject.msg}` };
+        console.error(res.errMsg);
+        return Promise.reject(res);
+    }
+    const { urls = [], current = '', success, fail, complete } = options;
+    const handle = new MethodHandler({ name: 'previewImage', success, fail, complete });
+    const container = document.createElement('div');
+    container.classList.add('preview-image');
+    container.style.cssText = `
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 1050;
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+    outline: 0;
+    background-color: #111;
+  `;
+    container.addEventListener('click', () => {
+        container.remove();
+    });
+    const swiper = document.createElement('taro-swiper-core');
+    swiper.full = true;
+    let children = [];
+    try {
+        children = await Promise.all(urls.map(e => loadImage(e, fail)));
+    }
+    catch (error) {
+        return handle.fail({
+            errMsg: error
+        });
+    }
+    for (let i = 0; i < children.length; i++) {
+        const child = children[i];
+        swiper.appendChild(child);
+    }
+    const currentIndex = urls.indexOf(current);
+    swiper.current = currentIndex;
+    container.appendChild(swiper);
+    document.body.appendChild(container);
+    return handle.success();
+};
 
-    image.src = src;
-  });
+const getImageInfo = (options) => {
+    const isObject = shouldBeObject(options);
+    if (!isObject.flag) {
+        const res = { errMsg: `getImageInfo:fail ${isObject.msg}` };
+        console.error(res.errMsg);
+        return Promise.reject(res);
+    }
+    const { src, success, fail, complete } = options;
+    const handle = new MethodHandler({ name: 'getImageInfo', success, fail, complete });
+    return new Promise((resolve, reject) => {
+        const image = new Image();
+        image.onload = () => {
+            handle.success({
+                width: image.naturalWidth,
+                height: image.naturalHeight
+            }, resolve);
+        };
+        image.onerror = (e) => {
+            handle.fail({
+                errMsg: e.message
+            }, reject);
+        };
+        image.src = src;
+    });
 };
 
 const chooseImage = function (options) {
@@ -5930,6 +6055,137 @@ const navigateToMiniProgram = temporarilyNotSupport('navigateToMiniProgram');
 const navigateBackMiniProgram = temporarilyNotSupport('navigateBackMiniProgram');
 const exitMiniProgram = temporarilyNotSupport('exitMiniProgram');
 
+const NETWORK_TIMEOUT = 60000;
+const XHR_STATS = {
+    UNSENT: 0,
+    OPENED: 1,
+    HEADERS_RECEIVED: 2,
+    LOADING: 3,
+    DONE: 4
+};
+const setHeader = (xhr, header) => {
+    let headerKey;
+    for (headerKey in header) {
+        xhr.setRequestHeader(headerKey, header[headerKey]);
+    }
+};
+const convertObjectUrlToBlob = url => {
+    return new Promise((resolve, reject) => {
+        const xhr = new XMLHttpRequest();
+        xhr.open('GET', url, true);
+        xhr.responseType = 'blob';
+        xhr.onload = function () {
+            if (this.status === 200) {
+                resolve(this.response);
+            }
+            else {
+                reject({ status: this.status });
+            }
+        };
+        xhr.send();
+    });
+};
+
+const createDownloadTask = ({ url, header, success, error }) => {
+    let timeout;
+    const apiName = 'downloadFile';
+    const xhr = new XMLHttpRequest();
+    const callbackManager = {
+        headersReceived: new CallbackManager(),
+        progressUpdate: new CallbackManager()
+    };
+    xhr.open('GET', url, true);
+    xhr.responseType = 'blob';
+    setHeader(xhr, header);
+    xhr.onprogress = e => {
+        const { loaded, total } = e;
+        callbackManager.progressUpdate.trigger({
+            progress: Math.round(loaded / total * 100),
+            totalBytesWritten: loaded,
+            totalBytesExpectedToWrite: total
+        });
+    };
+    xhr.onreadystatechange = () => {
+        if (xhr.readyState !== XHR_STATS.HEADERS_RECEIVED)
+            return;
+        callbackManager.headersReceived.trigger({
+            header: xhr.getAllResponseHeaders()
+        });
+    };
+    xhr.onload = () => {
+        const response = xhr.response;
+        const status = xhr.status;
+        success({
+            errMsg: `${apiName}:ok`,
+            statusCode: status,
+            tempFilePath: window.URL.createObjectURL(response)
+        });
+    };
+    xhr.onabort = () => {
+        clearTimeout(timeout);
+        error({
+            errMsg: `${apiName}:fail abort`
+        });
+    };
+    xhr.onerror = (e) => {
+        error({
+            errMsg: `${apiName}:fail ${e.message}`
+        });
+    };
+    const abort = () => {
+        xhr.abort();
+    };
+    const send = () => {
+        xhr.send();
+        timeout = setTimeout(() => {
+            xhr.onabort = null;
+            xhr.onload = null;
+            xhr.onprogress = null;
+            xhr.onreadystatechange = null;
+            xhr.onerror = null;
+            abort();
+            error({
+                errMsg: `${apiName}:fail timeout`
+            });
+        }, NETWORK_TIMEOUT);
+    };
+    send();
+    const onHeadersReceived = callbackManager.headersReceived.add;
+    const offHeadersReceived = callbackManager.headersReceived.remove;
+    const onProgressUpdate = callbackManager.progressUpdate.add;
+    const offProgressUpdate = callbackManager.progressUpdate.remove;
+    return {
+        abort,
+        onHeadersReceived,
+        offHeadersReceived,
+        onProgressUpdate,
+        offProgressUpdate
+    };
+};
+const downloadFile = ({ url, header, success, fail, complete }) => {
+    let task;
+    const result = new Promise((resolve, reject) => {
+        task = createDownloadTask({
+            url,
+            header,
+            success: res => {
+                success && success(res);
+                complete && complete(res);
+                resolve(res);
+            },
+            error: res => {
+                fail && fail(res);
+                complete && complete(res);
+                reject(res);
+            }
+        });
+        result.headersReceive = task.onHeadersReceived;
+        result.progress = task.onProgressUpdate;
+        result.abort = task.abort;
+    });
+    return result;
+};
+
 const stopLocalServiceDiscovery = temporarilyNotSupport('stopLocalServiceDiscovery');
 const startLocalServiceDiscovery = temporarilyNotSupport('startLocalServiceDiscovery');
 const onLocalServiceResolveFail = temporarilyNotSupport('onLocalServiceResolveFail');
@@ -7200,6 +7456,133 @@ const createTCPSocket = temporarilyNotSupport('createTCPSocket');
 
 const createUDPSocket = temporarilyNotSupport('createUDPSocket');
 
+const createUploadTask = ({ url, filePath, formData, name, header, timeout, fileName, success, error }) => {
+    let timeoutInter;
+    let formKey;
+    const apiName = 'uploadFile';
+    const xhr = new XMLHttpRequest();
+    const form = new FormData();
+    const callbackManager = {
+        headersReceived: new CallbackManager(),
+        progressUpdate: new CallbackManager()
+    };
+    xhr.open('POST', url);
+    setHeader(xhr, header);
+    for (formKey in formData) {
+        form.append(formKey, formData[formKey]);
+    }
+    xhr.upload.onprogress = e => {
+        const { loaded, total } = e;
+        callbackManager.progressUpdate.trigger({
+            progress: Math.round(loaded / total * 100),
+            totalBytesSent: loaded,
+            totalBytesExpectedToSent: total
+        });
+    };
+    xhr.onreadystatechange = () => {
+        if (xhr.readyState !== XHR_STATS.HEADERS_RECEIVED)
+            return;
+        callbackManager.headersReceived.trigger({
+            header: xhr.getAllResponseHeaders()
+        });
+    };
+    xhr.onload = () => {
+        const status = xhr.status;
+        clearTimeout(timeoutInter);
+        success({
+            errMsg: `${apiName}:ok`,
+            statusCode: status,
+            data: xhr.responseText || xhr.response
+        });
+    };
+    xhr.onabort = () => {
+        clearTimeout(timeoutInter);
+        error({
+            errMsg: `${apiName}:fail abort`
+        });
+    };
+    xhr.onerror = (e) => {
+        clearTimeout(timeoutInter);
+        error({
+            errMsg: `${apiName}:fail ${e.message}`
+        });
+    };
+    const abort = () => {
+        clearTimeout(timeoutInter);
+        xhr.abort();
+    };
+    const send = () => {
+        xhr.send(form);
+        timeoutInter = setTimeout(() => {
+            xhr.onabort = null;
+            xhr.onload = null;
+            xhr.upload.onprogress = null;
+            xhr.onreadystatechange = null;
+            xhr.onerror = null;
+            abort();
+            error({
+                errMsg: `${apiName}:fail timeout`
+            });
+        }, timeout || NETWORK_TIMEOUT);
+    };
+    convertObjectUrlToBlob(filePath)
+        .then((fileObj) => {
+        if (!fileName) {
+            fileName = typeof fileObj !== 'string' && fileObj.name;
+        }
+        form.append(name, fileObj, fileName || `file-${Date.now()}`);
+        send();
+    })
+        .catch(e => {
+        error({
+            errMsg: `${apiName}:fail ${e.message}`
+        });
+    });
+    const onHeadersReceived = callbackManager.headersReceived.add;
+    const offHeadersReceived = callbackManager.headersReceived.remove;
+    const onProgressUpdate = callbackManager.progressUpdate.add;
+    const offProgressUpdate = callbackManager.progressUpdate.remove;
+    const headersReceived = temporarilyNotSupport('UploadTask.headersReceived');
+    const progress = temporarilyNotSupport('UploadTask.progress');
+    return {
+        abort,
+        onHeadersReceived,
+        offHeadersReceived,
+        onProgressUpdate,
+        offProgressUpdate,
+        headersReceived,
+        progress
+    };
+};
+const uploadFile = ({ url, filePath, name, header, formData, timeout, fileName, success, fail, complete }) => {
+    let task;
+    const result = new Promise((resolve, reject) => {
+        task = createUploadTask({
+            url,
+            header,
+            name,
+            filePath,
+            formData,
+            timeout,
+            fileName,
+            success: res => {
+                success && success(res);
+                complete && complete(res);
+                resolve(res);
+            },
+            error: res => {
+                fail && fail(res);
+                complete && complete(res);
+                reject(res);
+            }
+        });
+        result.headersReceive = task.onHeadersReceived;
+        result.progress = task.onProgressUpdate;
+        result.abort = task.abort;
+    });
+    return result;
+};
+
 class SocketTask {
     constructor(url, protocols) {
         if (protocols && protocols.length) {
@@ -7315,9 +7698,10 @@ function connectSocket(options) {
             socketTasks = socketTasks.filter(socketTask => socketTask !== this);
         };
         socketTasks.push(task);
-        return handle.success({
+        handle.success({
             socketTaskId: socketsCounter++
-        }, resolve);
+        });
+        return resolve(task);
     });
 }
 function closeSocket() {
@@ -7430,15 +7814,15 @@ if ($detect.style['animation-name'] === 'standard') {
     TRANSFORM = 'transform';
 }
 else if ($detect.style['-webkit-animation-name'] === 'webkit') {
-    TRANSITION_END = 'webkitTransionEnd';
+    TRANSITION_END = 'webkitTransitionEnd';
     TRANSFORM = '-webkit-transform';
 }
 else if ($detect.style['-moz-animation-name'] === 'moz') {
-    TRANSITION_END = 'mozTransionEnd';
+    TRANSITION_END = 'mozTransitionEnd';
     TRANSFORM = '-moz-transform';
 }
 else if ($detect.style['-ms-animation-name'] === 'ms') {
-    TRANSITION_END = 'MSTransionEnd';
+    TRANSITION_END = 'msTransitionEnd';
     TRANSFORM = '-ms-transform';
 }
 let animId = 0;
@@ -7486,8 +7870,8 @@ class Animation {
     setDefault(duration, delay, timingFunction, transformOrigin) {
         this.DEFAULT = { duration, delay, timingFunction, transformOrigin };
     }
-    matrix(a, b, c, d, e, f) {
-        this.transform.push(`matrix(${a}, ${b}, ${c}, ${d}, ${e}, ${f})`);
+    matrix(a, b, c, d, tx, ty) {
+        this.transform.push(`matrix(${a}, ${b}, ${c}, ${d}, ${tx}, ${ty})`);
         return this;
     }
     matrix3d(a1, b1, c1, d1, a2, b2, c2, d2, a3, b3, c3, d3, a4, b4, c4, d4) {
@@ -7499,7 +7883,12 @@ class Animation {
         return this;
     }
     rotate3d(x, y, z, angle) {
-        this.transform.push(`rotate3d(${x}, ${y}, ${z}, ${angle}deg)`);
+        if (typeof y !== 'number') {
+            this.transform.push(`rotate3d(${x})`);
+        }
+        else {
+            this.transform.push(`rotate3d(${x}, ${y || 0}, ${z || 0}, ${angle || 0}deg)`);
+        }
         return this;
     }
     rotateX(angle) {
@@ -7640,9 +8029,9 @@ class Animation {
         return this.createAnimationData();
     }
 }
-function createAnimation(...arg) {
-    return new Animation(...arg);
-}
+const createAnimation = (option) => {
+    return new Animation(option);
+};
 
 const setBackgroundTextStyle = temporarilyNotSupport('setBackgroundTextStyle');
 const setBackgroundColor = temporarilyNotSupport('setBackgroundColor');
@@ -7708,27 +8097,26 @@ const stopPullDownRefresh = function ({ success, fail, complete } = {}) {
     });
 };
 
-let scrollFunc;
 let timer;
 const FRAME_DURATION = 17;
 const pageScrollTo = ({ scrollTop, selector = '', duration = 300, success, fail, complete }) => {
+    let scrollFunc;
     const handle = new MethodHandler({ name: 'pageScrollTo', success, fail, complete });
     return new Promise((resolve, reject) => {
+        var _a;
         try {
             if (scrollTop === undefined && !selector) {
                 return handle.fail({
                     errMsg: 'scrollTop" 或 "selector" 需要其之一'
                 }, reject);
             }
-            let el;
-            if (document.querySelector('.taro-tabbar__tabbar') === null) {
-                el = window;
-            }
-            else {
-                el = document.querySelector('.taro-tabbar__panel') || window;
-            }
+            const id = (_a = Current$1.page) === null || _a === void 0 ? void 0 : _a.path;
+            const el = (id
+                ? document.getElementById(id)
+                : document.querySelector('.taro_page') ||
+                    document.querySelector('.taro_router'));
             if (!scrollFunc) {
-                if (el === window) {
+                if (!el) {
                     scrollFunc = pos => {
                         if (pos === undefined) {
                             return window.pageYOffset;
@@ -8126,7 +8514,11 @@ class Toast {
     }
     create(options = {}, _type = 'toast') {
         const { maskStyle, toastStyle, successStyle, errrorStyle, loadingStyle, imageStyle, textStyle } = this.style;
-        const config = Object.assign(Object.assign(Object.assign({}, this.options), options), { _type });
+        const config = {
+            ...this.options,
+            ...options,
+            _type
+        };
         this.el = document.createElement('div');
         this.el.className = 'taro__toast';
         this.el.style.opacity = '0';
@@ -8136,17 +8528,26 @@ class Toast {
         this.mask.style.display = config.mask ? 'block' : 'none';
         this.icon = document.createElement('p');
         if (config.image) {
-            this.icon.setAttribute('style', inlineStyle(Object.assign(Object.assign({}, imageStyle), { 'background-image': `url(${config.image})` })));
+            this.icon.setAttribute('style', inlineStyle({
+                ...imageStyle,
+                'background-image': `url(${config.image})`
+            }));
         }
         else {
             const iconStyle = config.icon === 'loading' ? loadingStyle : config.icon === 'error' ? errrorStyle : successStyle;
-            this.icon.setAttribute('style', inlineStyle(Object.assign(Object.assign({}, iconStyle), (config.icon === 'none' ? { display: 'none' } : {}))));
+            this.icon.setAttribute('style', inlineStyle({
+                ...iconStyle,
+                ...(config.icon === 'none' ? { display: 'none' } : {})
+            }));
         }
         this.toast = document.createElement('div');
-        this.toast.setAttribute('style', inlineStyle(Object.assign(Object.assign({}, toastStyle), (config.icon === 'none' ? {
-            'min-height': '0',
-            padding: '10px 15px'
-        } : {}))));
+        this.toast.setAttribute('style', inlineStyle({
+            ...toastStyle,
+            ...(config.icon === 'none' ? {
+                'min-height': '0',
+                padding: '10px 15px'
+            } : {})
+        }));
         this.title = document.createElement('p');
         this.title.setAttribute('style', inlineStyle(textStyle));
         this.title.textContent = config.title;
@@ -8161,7 +8562,11 @@ class Toast {
         return '';
     }
     show(options = {}, _type = 'toast') {
-        const config = Object.assign(Object.assign(Object.assign({}, this.options), options), { _type });
+        const config = {
+            ...this.options,
+            ...options,
+            _type
+        };
         if (this.hideOpacityTimer)
             clearTimeout(this.hideOpacityTimer);
         if (this.hideDisplayTimer)
@@ -8170,18 +8575,27 @@ class Toast {
         this.mask.style.display = config.mask ? 'block' : 'none';
         const { toastStyle, successStyle, errrorStyle, loadingStyle, imageStyle } = this.style;
         if (config.image) {
-            this.icon.setAttribute('style', inlineStyle(Object.assign(Object.assign({}, imageStyle), { 'background-image': `url(${config.image})` })));
+            this.icon.setAttribute('style', inlineStyle({
+                ...imageStyle,
+                'background-image': `url(${config.image})`
+            }));
         }
         else {
             if (!config.image && config.icon) {
                 const iconStyle = config.icon === 'loading' ? loadingStyle : config.icon === 'error' ? errrorStyle : successStyle;
-                this.icon.setAttribute('style', inlineStyle(Object.assign(Object.assign({}, iconStyle), (config.icon === 'none' ? { display: 'none' } : {}))));
+                this.icon.setAttribute('style', inlineStyle({
+                    ...iconStyle,
+                    ...(config.icon === 'none' ? { display: 'none' } : {})
+                }));
             }
         }
-        this.toast.setAttribute('style', inlineStyle(Object.assign(Object.assign({}, toastStyle), (config.icon === 'none' ? {
-            'min-height': '0',
-            padding: '10px 15px'
-        } : {}))));
+        this.toast.setAttribute('style', inlineStyle({
+            ...toastStyle,
+            ...(config.icon === 'none' ? {
+                'min-height': '0',
+                padding: '10px 15px'
+            } : {})
+        }));
         this.el.style.display = 'block';
         setTimeout(() => { this.el.style.opacity = '1'; }, 0);
         this.type = config._type;
@@ -8265,7 +8679,10 @@ class Modal {
     create(options = {}) {
         return new Promise((resolve) => {
             const { maskStyle, modalStyle, titleStyle, textStyle, footStyle, btnStyle } = this.style;
-            const config = Object.assign(Object.assign({}, this.options), options);
+            const config = {
+                ...this.options,
+                ...options
+            };
             this.el = document.createElement('div');
             this.el.className = 'taro__modal';
             this.el.style.opacity = '0';
@@ -8276,12 +8693,19 @@ class Modal {
             const modal = document.createElement('div');
             modal.className = 'taro-modal__content';
             modal.setAttribute('style', inlineStyle(modalStyle));
-            const titleCSS = config.title ? titleStyle : Object.assign(Object.assign({}, titleStyle), { display: 'none' });
+            const titleCSS = config.title ? titleStyle : {
+                ...titleStyle,
+                display: 'none'
+            };
             this.title = document.createElement('div');
             this.title.className = 'taro-modal__title';
             this.title.setAttribute('style', inlineStyle(titleCSS));
             this.title.textContent = config.title;
-            const textCSS = config.title ? textStyle : Object.assign(Object.assign({}, textStyle), { padding: '40px 20px 26px', color: '#353535' });
+            const textCSS = config.title ? textStyle : {
+                ...textStyle,
+                padding: '40px 20px 26px',
+                color: '#353535'
+            };
             this.text = document.createElement('div');
             this.text.className = 'taro-modal__text';
             this.text.setAttribute('style', inlineStyle(textCSS));
@@ -8289,7 +8713,11 @@ class Modal {
             const foot = document.createElement('div');
             foot.className = 'taro-modal__foot';
             foot.setAttribute('style', inlineStyle(footStyle));
-            const cancelCSS = Object.assign(Object.assign({}, btnStyle), { color: config.cancelColor, display: config.showCancel ? 'block' : 'none' });
+            const cancelCSS = {
+                ...btnStyle,
+                color: config.cancelColor,
+                display: config.showCancel ? 'block' : 'none'
+            };
             this.cancel = document.createElement('div');
             this.cancel.className = 'taro-model__btn taro-model__cancel';
             this.cancel.setAttribute('style', inlineStyle(cancelCSS));
@@ -8320,7 +8748,10 @@ class Modal {
     }
     show(options = {}) {
         return new Promise((resolve) => {
-            const config = Object.assign(Object.assign({}, this.options), options);
+            const config = {
+                ...this.options,
+                ...options
+            };
             if (this.hideOpacityTimer)
                 clearTimeout(this.hideOpacityTimer);
             if (this.hideDisplayTimer)
@@ -8333,7 +8764,11 @@ class Modal {
             }
             else {
                 this.title.style.display = 'none';
-                const textCSS = Object.assign(Object.assign({}, textStyle), { padding: '40px 20px 26px', color: '#353535' });
+                const textCSS = {
+                    ...textStyle,
+                    padding: '40px 20px 26px',
+                    color: '#353535'
+                };
                 this.text.setAttribute('style', inlineStyle(textCSS));
             }
             this.text.textContent = config.content || '';
@@ -8422,7 +8857,10 @@ class ActionSheet {
     create(options = {}) {
         return new Promise((resolve) => {
             const { maskStyle, actionSheetStyle, menuStyle, cellStyle, cancelStyle } = this.style;
-            const config = Object.assign(Object.assign({}, this.options), options);
+            const config = {
+                ...this.options,
+                ...options
+            };
             this.lastConfig = config;
             this.el = document.createElement('div');
             this.el.className = 'taro__actionSheet';
@@ -8433,7 +8871,10 @@ class ActionSheet {
             this.actionSheet = document.createElement('div');
             this.actionSheet.setAttribute('style', inlineStyle(actionSheetStyle));
             this.menu = document.createElement('div');
-            this.menu.setAttribute('style', inlineStyle(Object.assign(Object.assign({}, menuStyle), { color: config.itemColor })));
+            this.menu.setAttribute('style', inlineStyle({
+                ...menuStyle,
+                color: config.itemColor
+            }));
             this.cells = config.itemList.map((item, index) => {
                 const cell = document.createElement('div');
                 cell.className = 'taro-actionsheet__cell';
@@ -8471,7 +8912,10 @@ class ActionSheet {
     }
     show(options = {}) {
         return new Promise((resolve) => {
-            const config = Object.assign(Object.assign({}, this.options), options);
+            const config = {
+                ...this.options,
+                ...options
+            };
             this.lastConfig = config;
             if (this.hideOpacityTimer)
                 clearTimeout(this.hideOpacityTimer);
@@ -8530,7 +8974,7 @@ class ActionSheet {
 }
 
 let status = 'default';
-function init$1(doc) {
+function init(doc) {
     if (status === 'ready')
         return;
     const taroStyle = doc.createElement('style');
@@ -8541,14 +8985,15 @@ function init$1(doc) {
 const toast = new Toast();
 const modal = new Modal();
 const actionSheet = new ActionSheet();
-const showToast = (options = {
-    title: '',
-    icon: 'success',
-    image: '',
-    duration: 1500,
-    mask: false
-}) => {
-    init$1(document);
+const showToast = (options = { title: '' }) => {
+    init(document);
+    options = Object.assign({
+        title: '',
+        icon: 'success',
+        image: '',
+        duration: 1500,
+        mask: false
+    }, options);
     const { success, fail, complete } = options;
     const handle = new MethodHandler({ name: 'showToast', success, fail, complete });
     if (typeof options.title !== 'string') {
@@ -8588,11 +9033,12 @@ const hideToast = ({ success, fail, complete } = {}) => {
     toast.hide(0, 'toast');
     return handle.success();
 };
-const showLoading = (options = {
-    title: '',
-    mask: false
-}) => {
-    init$1(document);
+const showLoading = (options = { title: '' }) => {
+    init(document);
+    options = Object.assign({
+        title: '',
+        mask: false
+    }, options);
     const { success, fail, complete } = options;
     const handle = new MethodHandler({ name: 'showLoading', success, fail, complete });
     const config = {
@@ -8627,16 +9073,17 @@ const hideLoading = ({ success, fail, complete } = {}) => {
     toast.hide(0, 'loading');
     return handle.success();
 };
-const showModal = async (options = {
-    title: '',
-    content: '',
-    showCancel: true,
-    cancelText: '取消',
-    cancelColor: '#000000',
-    confirmText: '确定',
-    confirmColor: '#3CC51F'
-}) => {
-    init$1(document);
+const showModal = async (options = {}) => {
+    init(document);
+    options = Object.assign({
+        title: '',
+        content: '',
+        showCancel: true,
+        cancelText: '取消',
+        cancelColor: '#000000',
+        confirmText: '确定',
+        confirmColor: '#3CC51F'
+    }, options);
     const { success, fail, complete } = options;
     const handle = new MethodHandler({ name: 'showModal', success, fail, complete });
     if (typeof options.title !== 'string') {
@@ -8718,11 +9165,12 @@ function hideModal() {
         return;
     modal.hide();
 }
-const showActionSheet = async (options = {
-    itemColor: '#000000',
-    itemList: []
-}) => {
-    init$1(document);
+const showActionSheet = async (options = { itemList: [] }) => {
+    init(document);
+    options = Object.assign({
+        itemColor: '#000000',
+        itemList: []
+    }, options);
     const { success, fail, complete } = options;
     const handle = new MethodHandler({ name: 'showActionSheet', success, fail, complete });
     if (!Array.isArray(options.itemList)) {
@@ -8784,6 +9232,41 @@ const disableAlertBeforeUnload = temporarilyNotSupport('disableAlertBeforeUnload
 
 const createWorker = temporarilyNotSupport('createWorker');
 
+class NodesRef {
+    constructor(selector, querySelectorQuery, single) {
+        this.context = temporarilyNotSupport('NodesRef.context');
+        this.node = temporarilyNotSupport('NodesRef.node');
+        this._component = querySelectorQuery._component;
+        this._selector = selector;
+        this._selectorQuery = querySelectorQuery;
+        this._single = single;
+    }
+    boundingClientRect(cb) {
+        const { _selector, _component, _single, _selectorQuery } = this;
+        _selectorQuery._push(_selector, _component, _single, { id: !0, dataset: !0, rect: !0, size: !0 }, cb);
+        return _selectorQuery;
+    }
+    scrollOffset(cb) {
+        const { _selector, _component, _single, _selectorQuery } = this;
+        _selectorQuery._push(_selector, _component, _single, { id: !0, dataset: !0, scrollOffset: !0 }, cb);
+        return _selectorQuery;
+    }
+    fields(fields, cb) {
+        const { _selector, _component, _single, _selectorQuery } = this;
+        const { id, dataset, rect, size, scrollOffset, properties = [], computedStyle = [] } = fields;
+        _selectorQuery._push(_selector, _component, _single, {
+            id,
+            dataset,
+            rect,
+            size,
+            scrollOffset,
+            properties,
+            computedStyle
+        }, cb);
+        return _selectorQuery;
+    }
+}
+
 function filter(fields, dom, selector) {
     if (!dom)
         return null;
@@ -8921,40 +9404,6 @@ class SelectorQuery {
         });
         this._queueCb.push(callback);
     }
-}
-class NodesRef {
-    constructor(selector, querySelectorQuery, single) {
-        this.context = temporarilyNotSupport('NodesRef.context');
-        this.node = temporarilyNotSupport('NodesRef.node');
-        this._component = querySelectorQuery._component;
-        this._selector = selector;
-        this._selectorQuery = querySelectorQuery;
-        this._single = single;
-    }
-    boundingClientRect(cb) {
-        const { _selector, _component, _single, _selectorQuery } = this;
-        _selectorQuery._push(_selector, _component, _single, { id: !0, dataset: !0, rect: !0, size: !0 }, cb);
-        return _selectorQuery;
-    }
-    scrollOffset(cb) {
-        const { _selector, _component, _single, _selectorQuery } = this;
-        _selectorQuery._push(_selector, _component, _single, { id: !0, dataset: !0, scrollOffset: !0 }, cb);
-        return _selectorQuery;
-    }
-    fields(fields, cb) {
-        const { _selector, _component, _single, _selectorQuery } = this;
-        const { id, dataset, rect, size, scrollOffset, properties = [], computedStyle = [] } = fields;
-        _selectorQuery._push(_selector, _component, _single, {
-            id,
-            dataset,
-            rect,
-            size,
-            scrollOffset,
-            properties,
-            computedStyle
-        }, cb);
-        return _selectorQuery;
-    }
 }
 
 const createSelectorQuery = () => {
@@ -9041,4 +9490,4 @@ taro.initPxTransform = initPxTransform;
 taro.canIUseWebp = canIUseWebp;
 
 export default taro;
-export { Behavior$1 as Behavior, Current, ENV_TYPE$1 as ENV_TYPE, EditorContext, Events, Link$2 as Link, addCard, addFileToFavorites, addInterceptor, addPhoneCalendar, addPhoneContact, addPhoneRepeatCalendar, addVideoToFavorites, advancedGeneralIdentify, animalClassify, arrayBufferToBase64, authPrivateMessage, authorize, authorizeForMiniProgram, base64ToArrayBuffer, canIUse, canIUseWebp, canvasGetImageData, canvasPutImageData, canvasToTempFilePath, carClassify, checkIsOpenAccessibility, checkIsSoterEnrolledInDevice, checkIsSupportFacialRecognition, checkIsSupportSoterAuthentication, checkSession, chooseAddress, chooseContact, chooseImage, chooseInvoice, chooseInvoiceTitle, chooseLicensePlate, chooseLocation, chooseMedia, chooseMessageFile, choosePoi, chooseVideo, clearStorage, clearStorageSync, closeBLEConnection, closeBluetoothAdapter, closeSocket, cloud, compressImage, compressVideo, connectSocket, connectWifi, createAnimation, createAudioContext, createBLEConnection, createBLEPeripheralServer, createCameraContext, createCanvasContext, createInnerAudioContext, createIntersectionObserver, createInterstitialAd, createLivePlayerContext, createLivePusherContext, createMapContext, createMediaAudioPlayer, createMediaContainer, createMediaRecorder, createOffscreenCanvas, createRewardedVideoAd, createRouter, createSelectorQuery, createTCPSocket, createUDPSocket, createVKSession, createVideoContext, createVideoDecoder, createWebAudioContext, createWorker, disableAlertBeforeUnload, dishClassify, drawCanvas, enableAlertBeforeUnload, eventCenter, exitMiniProgram, exitVoIPChat, faceDetect, faceVerifyForPay, getAccountInfoSync, getApp, getAvailableAudioSources, getBLEDeviceCharacteristics, getBLEDeviceRSSI, getBLEDeviceServices, getBLEMTU, getBackgroundAudioManager, getBackgroundAudioPlayerState, getBackgroundFetchData, getBackgroundFetchToken, getBatteryInfo, getBatteryInfoSync, getBeacons, getBluetoothAdapterState, getBluetoothDevices, getChannelsLiveInfo, getChannelsLiveNoticeInfo, getClipboardData, getConnectedBluetoothDevices, getConnectedWifi, getCurrentInstance, getCurrentPages, getEnterOptionsSync, getEnv$1 as getEnv, getExptInfoSync, getExtConfig, getExtConfigSync, getFileInfo, getFileSystemManager, getGroupEnterInfo, getHCEState, getImageInfo, getLaunchOptionsSync, getLocation, getLogManager, getMenuButtonBoundingClientRect, getNFCAdapter, getNetworkType, getOpenUserInfo, getPerformance, getRandomValues, getRealtimeLogManager, getRecorderManager, getSavedFileInfo, getSavedFileList, getScreenBrightness, getSelectedTextRange, getSetting, getShareInfo, getStorage, getStorageInfo, getStorageInfoSync, getStorageSync, getSwanId, getSystemInfo, getSystemInfoSync, getUpdateManager, getUserCryptoManager, getUserInfo, getUserProfile, getVideoInfo, getWeRunData, getWifiList, hideHomeButton, hideKeyboard, hideLoading, hideNavigationBarLoading, hideShareMenu, hideTabBar, hideTabBarRedDot, hideToast, history, imageAudit, initFaceDetect, initPxTransform, initTabBarApis, interceptors$1 as interceptors, isBluetoothDevicePaired, joinVoIPChat, loadFontFace, login, logoClassify, makeBluetoothPair, makePhoneCall, navigateBack, navigateBackMiniProgram, navigateBackSmartProgram, navigateTo, navigateToMiniProgram, navigateToSmartGameProgram, navigateToSmartProgram, nextTick, notifyBLECharacteristicValueChange, objectDetectIdentify, ocrBankCard, ocrDrivingLicense, ocrIdCard, ocrVehicleLicense, offAccelerometerChange, offAppHide, offAppShow, offAudioInterruptionBegin, offAudioInterruptionEnd, offBLECharacteristicValueChange, offBLEConnectionStateChange, offBLEMTUChange, offBLEPeripheralConnectionStateChanged, offBeaconServiceChange, offBeaconUpdate, offBluetoothAdapterStateChange, offBluetoothDeviceFound, offCompassChange, offCopyUrl, offDeviceMotionChange, offError, offGetWifiList, offGyroscopeChange, offHCEMessage, offKeyboardHeightChange, offLocalServiceDiscoveryStop, offLocalServiceFound, offLocalServiceLost, offLocalServiceResolveFail, offLocationChange, offLocationChangeError, offMemoryWarning, offPageNotFound, offThemeChange, offUnhandledRejection, offUserCaptureScreen, offVoIPChatInterrupted, offVoIPChatMembersChanged, offVoIPChatStateChanged, offVoIPVideoMembersChanged, offWifiConnected, offWindowResize, onAccelerometerChange, onAppHide, onAppShow, onAudioInterruptionBegin, onAudioInterruptionEnd, onBLECharacteristicValueChange, onBLEConnectionStateChange, onBLEMTUChange, onBLEPeripheralConnectionStateChanged, onBackgroundAudioPause, onBackgroundAudioPlay, onBackgroundAudioStop, onBackgroundFetchData, onBeaconServiceChange, onBeaconUpdate, onBluetoothAdapterStateChange, onBluetoothDeviceFound, onCompassChange, onCopyUrl, onDeviceMotionChange, onError, onGetWifiList, onGyroscopeChange, onHCEMessage, onKeyboardHeightChange, onLocalServiceDiscoveryStop, onLocalServiceFound, onLocalServiceLost, onLocalServiceResolveFail, onLocationChange, onLocationChangeError, onMemoryWarning, onNetworkStatusChange, onPageNotFound, onSocketClose, onSocketError, onSocketMessage, onSocketOpen, onThemeChange, onUnhandledRejection, onUserCaptureScreen, onVoIPChatInterrupted, onVoIPChatMembersChanged, onVoIPChatSpeakersChanged, onVoIPChatStateChanged, onVoIPVideoMembersChanged, onWifiConnected, onWindowResize, openBluetoothAdapter, openCard, openChannelsActivity, openChannelsEvent, openChannelsLive, openCustomerServiceChat, openDocument, openEmbeddedMiniProgram, openLocation, openSetting, openVideoEditor, options, pageScrollTo, pauseBackgroundAudio, pauseVoice, plantClassify, playBackgroundAudio, playVoice, pluginLogin, preload, preloadSubPackage, previewImage, previewMedia, pxTransform, reLaunch, readBLECharacteristicValue, redirectTo, removeSavedFile, removeStorage, removeStorageSync, removeTabBarBadge, reportAnalytics, reportEvent, reportMonitor, reportPerformance, request, requestOrderPayment, requestPayment, requestPolymerPayment, requestSubscribeMessage, requirePlugin, reserveChannelsLive, revokeBufferURL, saveFile, saveFileToDisk, saveImageToPhotosAlbum, saveVideoToPhotosAlbum, scanCode, seekBackgroundAudio, sendHCEMessage, sendSocketMessage, setBLEMTU, setBackgroundColor, setBackgroundFetchToken, setBackgroundTextStyle, setClipboardData, setEnable1v1Chat, setEnableDebug, setInnerAudioOption, setKeepScreenOn, setNavigationBarColor, setNavigationBarTitle, setPageInfo, setScreenBrightness, setStorage, setStorageSync, setTabBarBadge, setTabBarItem, setTabBarStyle, setTopBarText, setVisualEffectOnCapture, setWifiList, setWindowSize, shareFileMessage, shareToWeRun, shareVideoMessage, showActionSheet, showLoading, showModal, showNavigationBarLoading, showRedPackage, showShareImageMenu, showShareMenu, showTabBar, showTabBarRedDot, showToast, startAccelerometer, startBeaconDiscovery, startBluetoothDevicesDiscovery, startCompass, startDeviceMotionListening, startFacialRecognitionVerify, startFacialRecognitionVerifyAndUploadVideo, startGyroscope, startHCE, startLocalServiceDiscovery, startLocationUpdate, startLocationUpdateBackground, startPullDownRefresh, startRecord, startSoterAuthentication, startWifi, stopAccelerometer, stopBackgroundAudio, stopBeaconDiscovery, stopBluetoothDevicesDiscovery, stopCompass, stopDeviceMotionListening, stopFaceDetect, stopGyroscope, stopHCE, stopLocalServiceDiscovery, stopLocationUpdate, stopPullDownRefresh, stopRecord, stopVoice, stopWifi, subscribeVoIPVideoMembers, switchTab, textReview, textToAudio, updateShareMenu, updateVoIPChatMuteConfig, updateWeChatApp, useAddToFavorites, useDidHide, useDidShow, useOptionMenuClick, usePageScroll, usePullDownRefresh, usePullIntercept, useReachBottom, useReady, useResize, useRouter, useShareAppMessage, useShareTimeline, useTabItemTap, useTitleClick, vibrateLong, vibrateShort, writeBLECharacteristicValue };
+export { Behavior$1 as Behavior, Current, ENV_TYPE$1 as ENV_TYPE, EditorContext, Events, Link$2 as Link, addCard, addFileToFavorites, addInterceptor, addPhoneCalendar, addPhoneContact, addPhoneRepeatCalendar, addVideoToFavorites, advancedGeneralIdentify, animalClassify, arrayBufferToBase64, authPrivateMessage, authorize, authorizeForMiniProgram, base64ToArrayBuffer, canIUse, canIUseWebp, canvasGetImageData, canvasPutImageData, canvasToTempFilePath, carClassify, checkIsOpenAccessibility, checkIsSoterEnrolledInDevice, checkIsSupportFacialRecognition, checkIsSupportSoterAuthentication, checkSession, chooseAddress, chooseContact, chooseImage, chooseInvoice, chooseInvoiceTitle, chooseLicensePlate, chooseLocation, chooseMedia, chooseMessageFile, choosePoi, chooseVideo, clearStorage, clearStorageSync, closeBLEConnection, closeBluetoothAdapter, closeSocket, cloud, compressImage, compressVideo, connectSocket, connectWifi, createAnimation, createAudioContext, createBLEConnection, createBLEPeripheralServer, createBufferURL, createCameraContext, createCanvasContext, createInnerAudioContext, createIntersectionObserver, createInterstitialAd, createLivePlayerContext, createLivePusherContext, createMapContext, createMediaAudioPlayer, createMediaContainer, createMediaRecorder, createOffscreenCanvas, createRewardedVideoAd, createRouter, createSelectorQuery, createTCPSocket, createUDPSocket, createVKSession, createVideoContext, createVideoDecoder, createWebAudioContext, createWorker, disableAlertBeforeUnload, dishClassify, downloadFile, drawCanvas, enableAlertBeforeUnload, eventCenter, exitMiniProgram, exitVoIPChat, faceDetect, faceVerifyForPay, getAccountInfoSync, getApp, getAvailableAudioSources, getBLEDeviceCharacteristics, getBLEDeviceRSSI, getBLEDeviceServices, getBLEMTU, getBackgroundAudioManager, getBackgroundAudioPlayerState, getBackgroundFetchData, getBackgroundFetchToken, getBatteryInfo, getBatteryInfoSync, getBeacons, getBluetoothAdapterState, getBluetoothDevices, getChannelsLiveInfo, getChannelsLiveNoticeInfo, getClipboardData, getConnectedBluetoothDevices, getConnectedWifi, getCurrentInstance, getCurrentPages, getEnterOptionsSync, getEnv$1 as getEnv, getExptInfoSync, getExtConfig, getExtConfigSync, getFileInfo, getFileSystemManager, getGroupEnterInfo, getHCEState, getImageInfo, getLaunchOptionsSync, getLocalIPAddress, getLocation, getLogManager, getMenuButtonBoundingClientRect, getNFCAdapter, getNetworkType, getOpenUserInfo, getPerformance, getRandomValues, getRealtimeLogManager, getRecorderManager, getSavedFileInfo, getSavedFileList, getScreenBrightness, getSelectedTextRange, getSetting, getShareInfo, getStorage, getStorageInfo, getStorageInfoSync, getStorageSync, getSwanId, getSystemInfo, getSystemInfoSync, getUpdateManager, getUserCryptoManager, getUserInfo, getUserProfile, getVideoInfo, getWeRunData, getWifiList, hideHomeButton, hideKeyboard, hideLoading, hideNavigationBarLoading, hideShareMenu, hideTabBar, hideTabBarRedDot, hideToast, history, imageAudit, initFaceDetect, initPxTransform, initTabBarApis, interceptors$1 as interceptors, isBluetoothDevicePaired, joinVoIPChat, loadFontFace, login, logoClassify, makeBluetoothPair, makePhoneCall, navigateBack, navigateBackMiniProgram, navigateBackSmartProgram, navigateTo, navigateToMiniProgram, navigateToSmartGameProgram, navigateToSmartProgram, nextTick, notifyBLECharacteristicValueChange, objectDetectIdentify, ocrBankCard, ocrDrivingLicense, ocrIdCard, ocrVehicleLicense, offAccelerometerChange, offAppHide, offAppShow, offAudioInterruptionBegin, offAudioInterruptionEnd, offBLECharacteristicValueChange, offBLEConnectionStateChange, offBLEMTUChange, offBLEPeripheralConnectionStateChanged, offBeaconServiceChange, offBeaconUpdate, offBluetoothAdapterStateChange, offBluetoothDeviceFound, offCompassChange, offCopyUrl, offDeviceMotionChange, offError, offGetWifiList, offGyroscopeChange, offHCEMessage, offKeyboardHeightChange, offLocalServiceDiscoveryStop, offLocalServiceFound, offLocalServiceLost, offLocalServiceResolveFail, offLocationChange, offLocationChangeError, offMemoryWarning, offNetworkStatusChange, offPageNotFound, offThemeChange, offUnhandledRejection, offUserCaptureScreen, offVoIPChatInterrupted, offVoIPChatMembersChanged, offVoIPChatStateChanged, offVoIPVideoMembersChanged, offWifiConnected, offWindowResize, onAccelerometerChange, onAppHide, onAppShow, onAudioInterruptionBegin, onAudioInterruptionEnd, onBLECharacteristicValueChange, onBLEConnectionStateChange, onBLEMTUChange, onBLEPeripheralConnectionStateChanged, onBackgroundAudioPause, onBackgroundAudioPlay, onBackgroundAudioStop, onBackgroundFetchData, onBeaconServiceChange, onBeaconUpdate, onBluetoothAdapterStateChange, onBluetoothDeviceFound, onCompassChange, onCopyUrl, onDeviceMotionChange, onError, onGetWifiList, onGyroscopeChange, onHCEMessage, onKeyboardHeightChange, onLocalServiceDiscoveryStop, onLocalServiceFound, onLocalServiceLost, onLocalServiceResolveFail, onLocationChange, onLocationChangeError, onMemoryWarning, onNetworkStatusChange, onPageNotFound, onSocketClose, onSocketError, onSocketMessage, onSocketOpen, onThemeChange, onUnhandledRejection, onUserCaptureScreen, onVoIPChatInterrupted, onVoIPChatMembersChanged, onVoIPChatSpeakersChanged, onVoIPChatStateChanged, onVoIPVideoMembersChanged, onWifiConnected, onWindowResize, openBluetoothAdapter, openCard, openChannelsActivity, openChannelsEvent, openChannelsLive, openCustomerServiceChat, openDocument, openEmbeddedMiniProgram, openLocation, openSetting, openVideoEditor, options, pageScrollTo, pauseBackgroundAudio, pauseVoice, plantClassify, playBackgroundAudio, playVoice, pluginLogin, preload, preloadSubPackage, previewImage, previewMedia, pxTransform, reLaunch, readBLECharacteristicValue, redirectTo, removeSavedFile, removeStorage, removeStorageSync, removeTabBarBadge, reportAnalytics, reportEvent, reportMonitor, reportPerformance, request, requestOrderPayment, requestPayment, requestPolymerPayment, requestSubscribeMessage, requirePlugin, reserveChannelsLive, revokeBufferURL, saveFile, saveFileToDisk, saveImageToPhotosAlbum, saveVideoToPhotosAlbum, scanCode, seekBackgroundAudio, sendHCEMessage, sendSocketMessage, setBLEMTU, setBackgroundColor, setBackgroundFetchToken, setBackgroundTextStyle, setClipboardData, setEnable1v1Chat, setEnableDebug, setInnerAudioOption, setKeepScreenOn, setNavigationBarColor, setNavigationBarTitle, setPageInfo, setScreenBrightness, setStorage, setStorageSync, setTabBarBadge, setTabBarItem, setTabBarStyle, setTopBarText, setVisualEffectOnCapture, setWifiList, setWindowSize, shareFileMessage, shareToWeRun, shareVideoMessage, showActionSheet, showLoading, showModal, showNavigationBarLoading, showRedPackage, showShareImageMenu, showShareMenu, showTabBar, showTabBarRedDot, showToast, startAccelerometer, startBeaconDiscovery, startBluetoothDevicesDiscovery, startCompass, startDeviceMotionListening, startFacialRecognitionVerify, startFacialRecognitionVerifyAndUploadVideo, startGyroscope, startHCE, startLocalServiceDiscovery, startLocationUpdate, startLocationUpdateBackground, startPullDownRefresh, startRecord, startSoterAuthentication, startWifi, stopAccelerometer, stopBackgroundAudio, stopBeaconDiscovery, stopBluetoothDevicesDiscovery, stopCompass, stopDeviceMotionListening, stopFaceDetect, stopGyroscope, stopHCE, stopLocalServiceDiscovery, stopLocationUpdate, stopPullDownRefresh, stopRecord, stopVoice, stopWifi, subscribeVoIPVideoMembers, switchTab, textReview, textToAudio, updateShareMenu, updateVoIPChatMuteConfig, updateWeChatApp, uploadFile, useAddToFavorites, useDidHide, useDidShow, useOptionMenuClick, usePageScroll, usePullDownRefresh, usePullIntercept, useReachBottom, useReady, useResize, useRouter, useShareAppMessage, useShareTimeline, useTabItemTap, useTitleClick, vibrateLong, vibrateShort, writeBLECharacteristicValue };