@dcloudio/uni-app-plus 2.0.1-alpha-34320220401001 → 2.0.1-alpha-34420220402001

package/dist/index.v3.js

@@ -3020,8 +3020,7 @@ var serviceContext = (function () {
 
   const pageScrollTo = {
     scrollTop: {
-      type: Number,
-      required: true
+      type: Number
     },
     duration: {
       type: Number,
@@ -6195,7 +6194,7 @@ var serviceContext = (function () {
   /**
    * 动态设置 tabBar 某一项的内容
    */
-  function setTabBarItem$1 (index, text, iconPath, selectedIconPath, visible) {
+  function setTabBarItem$1 (index, text, iconPath, selectedIconPath, visible, iconfont) {
     const item = {
       index
     };
@@ -6207,6 +6206,9 @@ var serviceContext = (function () {
     }
     if (selectedIconPath) {
       item.selectedIconPath = getRealPath$1(selectedIconPath);
+    }
+    if (iconfont !== undefined) {
+      item.iconfont = iconfont;
     }
     if (visible !== undefined) {
       item.visible = config.list[index].visible = visible;
@@ -11056,9 +11058,10 @@ var serviceContext = (function () {
     iconPath,
     selectedIconPath,
     pagePath,
-    visible
+    visible,
+    iconfont
   }) {
-    tabBar$1.setTabBarItem(index, text, iconPath, selectedIconPath, visible);
+    tabBar$1.setTabBarItem(index, text, iconPath, selectedIconPath, visible, iconfont);
     const route = pagePath && __uniRoutes.find(({ path }) => path === pagePath);
     if (route) {
       const meta = route.meta;
@@ -23048,88 +23051,88 @@ var serviceContext = (function () {
     };
   }
 
-  function parsePageCreateOptions (vm, route) {
-    const pagePath = '/' + route;
-    const routeOptions = __uniRoutes.find(route => route.path === pagePath);
-
-    const windowOptions = Object.assign({}, __uniConfig.window, routeOptions.window);
-    const disableScroll = windowOptions.disableScroll === true ? 1 : 0;
-    const onReachBottomDistance = hasOwn(windowOptions, 'onReachBottomDistance')
-      ? parseInt(windowOptions.onReachBottomDistance)
-      : ON_REACH_BOTTOM_DISTANCE;
-
-    const onPageScroll = hasLifecycleHook(vm.$options, 'onPageScroll') ? 1 : 0;
-    const onPageReachBottom = hasLifecycleHook(vm.$options, 'onReachBottom') ? 1 : 0;
-    const statusbarHeight = getStatusbarHeight();
-
-    return {
-      version: VD_SYNC_VERSION,
-      locale: weex.requireModule('plus').getLanguage(),
-      disableScroll,
-      onPageScroll,
-      onPageReachBottom,
-      onReachBottomDistance,
-      statusbarHeight,
-      windowTop: windowOptions.titleNView && windowOptions.titleNView.type === 'float' ? (statusbarHeight +
-        NAVBAR_HEIGHT) : 0,
-      windowBottom: (tabBar$1.indexOf(route) >= 0 && tabBar$1.cover) ? tabBar$1.height : 0
-    }
-  }
-
-  function initLifecycle (Vue) {
-    lifecycleMixin(Vue);
-
-    Vue.mixin({
-      beforeCreate () {
-        // TODO 临时解决方案,service 层也注入 wxs (适用于工具类)
-        const options = this.$options;
-
-        // 自动挂载 $store
-        if (options.store && !Vue.prototype.$store) {
-          Vue.prototype.$store = options.store;
-        }
-
-        const wxs = options.wxs;
-        if (wxs) {
-          Object.keys(wxs).forEach(module => {
-            this[module] = wxs[module];
-          });
-        }
-
-        if (this.mpType === 'page') {
-          const app = getApp();
-          if (app.$vm && app.$vm.$i18n) {
-            this._i18n = app.$vm.$i18n;
-          }
-          this.$scope = this.$options.pageInstance;
-          this.$scope.$vm = this;
-          delete this.$options.pageInstance;
-
-          const route = this.$scope.route;
-          const pageId = this.$scope.$page.id;
-          // 通知页面已开始创建
-          this._$vd.sendPageCreate([pageId, route, parsePageCreateOptions(this, route)]);
-        }
-      },
-      created () {
-        if (this.mpType === 'page') {
-          // 理论上应该从最开始的 parseQuery 的地方直接 decode 两次，为了减少影响范围，先仅处理 onLoad 参数
-          callPageHook(this.$scope, 'onLoad', decodedQuery(this.$options.pageQuery));
-          callPageHook(this.$scope, 'onShow');
-        }
-      },
-      beforeDestroy () {
-        if (this.mpType === 'page') {
-          callPageHook(this.$scope, 'onUnload');
-        }
-      },
-      mounted () {
-        if (this.mpType === 'page') {
-          callPageHook(this.$scope, 'onReady');
-          preloadSubPackages(this.$scope.route);
-        }
-      }
-    });
+  function parsePageCreateOptions (vm, route) {
+    const pagePath = '/' + route;
+    const routeOptions = __uniRoutes.find(route => route.path === pagePath);
+
+    const windowOptions = Object.assign({}, __uniConfig.window, routeOptions.window);
+    const disableScroll = windowOptions.disableScroll === true ? 1 : 0;
+    const onReachBottomDistance = hasOwn(windowOptions, 'onReachBottomDistance')
+      ? parseInt(windowOptions.onReachBottomDistance)
+      : ON_REACH_BOTTOM_DISTANCE;
+
+    const onPageScroll = hasLifecycleHook(vm.$options, 'onPageScroll') ? 1 : 0;
+    const onPageReachBottom = hasLifecycleHook(vm.$options, 'onReachBottom') ? 1 : 0;
+    const statusbarHeight = getStatusbarHeight();
+
+    return {
+      version: VD_SYNC_VERSION,
+      locale: weex.requireModule('plus').getLanguage(),
+      disableScroll,
+      onPageScroll,
+      onPageReachBottom,
+      onReachBottomDistance,
+      statusbarHeight,
+      windowTop: windowOptions.titleNView && windowOptions.titleNView.type === 'float' ? (statusbarHeight +
+        NAVBAR_HEIGHT) : 0,
+      windowBottom: (tabBar$1.indexOf(route) >= 0 && tabBar$1.cover) ? tabBar$1.height : 0
+    }
+  }
+
+  function initLifecycle (Vue) {
+    lifecycleMixin(Vue);
+
+    Vue.mixin({
+      beforeCreate () {
+        // TODO 临时解决方案,service 层也注入 wxs (适用于工具类)
+        const options = this.$options;
+
+        // 自动挂载 $store
+        if (options.store && !Vue.prototype.$store) {
+          Vue.prototype.$store = options.store;
+        }
+
+        const wxs = options.wxs;
+        if (wxs) {
+          Object.keys(wxs).forEach(module => {
+            this[module] = wxs[module];
+          });
+        }
+
+        if (this.mpType === 'page') {
+          const app = getApp();
+          if (app.$vm && app.$vm.$i18n) {
+            this._i18n = app.$vm.$i18n;
+          }
+          this.$scope = this.$options.pageInstance;
+          this.$scope.$vm = this;
+          delete this.$options.pageInstance;
+
+          const route = this.$scope.route;
+          const pageId = this.$scope.$page.id;
+          // 通知页面已开始创建
+          this._$vd.sendPageCreate([pageId, route, parsePageCreateOptions(this, route)]);
+        }
+      },
+      created () {
+        if (this.mpType === 'page') {
+          // 理论上应该从最开始的 parseQuery 的地方直接 decode 两次，为了减少影响范围，先仅处理 onLoad 参数
+          callPageHook(this.$scope, 'onLoad', decodedQuery(this.$options.pageQuery));
+          callPageHook(this.$scope, 'onShow');
+        }
+      },
+      beforeDestroy () {
+        if (this.mpType === 'page') {
+          callPageHook(this.$scope, 'onUnload');
+        }
+      },
+      mounted () {
+        if (this.mpType === 'page') {
+          callPageHook(this.$scope, 'onReady');
+          preloadSubPackages(this.$scope.route);
+        }
+      }
+    });
   }
 
   var vuePlugin = {