Merge commit '6c932bc9'

lerna.json

@@ -12,5 +12,5 @@
       "message": "chore(release): publish %s"
     }
   },
-  "version": "2.0.0-alpha-31520210315001"
+  "version": "2.0.0-31620210325001"
 }

packages/uni-app-plus-nvue/package.json

 {
   "name": "@dcloudio/uni-app-plus-nvue",
-  "version": "2.0.0-alpha-31520210315001",
+  "version": "2.0.0-31620210325001",
   "description": "uni-app app-plus-nvue",
   "main": "dist/index.js",
   "repository": {

packages/uni-app-plus/package.json

 {
   "name": "@dcloudio/uni-app-plus",
-  "version": "2.0.0-alpha-31520210315001",
+  "version": "2.0.0-31620210325001",
   "description": "uni-app app-plus",
   "main": "dist/index.js",
   "repository": {

packages/uni-automator/package.json

 {
   "name": "@dcloudio/uni-automator",
-  "version": "2.0.0-alpha-31520210315001",
+  "version": "2.0.0-31620210325001",
   "description": "uni-app automator",
   "main": "dist/index.js",
   "repository": {

packages/uni-cli-shared/package.json

 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "2.0.0-alpha-31520210315001",
+  "version": "2.0.0-31620210325001",
   "description": "uni-cli-shared",
   "main": "lib/index.js",
   "repository": {

packages/uni-h5-ui/package.json

 {
   "name": "@dcloudio/uni-h5-ui",
-  "version": "2.0.0-alpha-31520210315001",
+  "version": "2.0.0-31620210325001",
   "description": "uni-app h5 ui",
   "main": "dist/index.umd.min.js",
   "repository": {

packages/uni-h5/package.json

 {
   "name": "@dcloudio/uni-h5",
-  "version": "2.0.0-alpha-31520210315001",
+  "version": "2.0.0-31620210325001",
   "description": "uni-app h5",
   "main": "dist/index.umd.min.js",
   "repository": {

packages/uni-i18n/package.json

 {
   "name": "@dcloudio/uni-i18n",
-  "version": "2.0.0-alpha-31520210315001",
+  "version": "2.0.0-31620210325001",
   "description": "@dcloudio/uni-i18n",
   "main": "dist/uni-i18n.cjs.js",
   "module": "dist/uni-i18n.esm.js",

packages/uni-migration/package.json

 {
   "name": "@dcloudio/uni-migration",
-  "version": "2.0.0-alpha-31520210315001",
+  "version": "2.0.0-31620210325001",
   "description": "uni-app migration",
   "main": "lib/index.js",
   "repository": {

packages/uni-mp-alipay/package.json

 {
   "name": "@dcloudio/uni-mp-alipay",
-  "version": "2.0.0-alpha-31520210315001",
+  "version": "2.0.0-31620210325001",
   "description": "uni-app mp-alipay",
   "main": "dist/index.js",
   "repository": {

packages/uni-mp-baidu/dist/index.js

@@ -1945,6 +1945,23 @@ function parseComponent (vueOptions) {
   const oldAttached = componentOptions.lifetimes.attached;
   // 百度小程序基础库 3.260 以上支持页面 onInit 生命周期，提前创建 vm 实例
   componentOptions.lifetimes.onInit = function onInit (query) {
+    // 处理百度小程序 onInit 生命周期调用 setData 无效的问题
+    const setData = this.setData;
+    const setDataArgs = [];
+    this.setData = function () {
+      setDataArgs.push(arguments);
+    };
+    this.__fixInitData = function () {
+      delete this.__fixInitData;
+      this.setData = setData;
+      if (setDataArgs.length) {
+        this.groupSetData(() => {
+          setDataArgs.forEach(args => {
+            setData.apply(this, args);
+          });
+        });
+      }
+    };
     oldAttached.call(this);
     this.pageinstance.$vm = this.$vm;
     this.$vm.__call_hook('onInit', query);
@@ -1952,6 +1969,8 @@ function parseComponent (vueOptions) {
   componentOptions.lifetimes.attached = function attached () {
     if (!this.$vm) {
       oldAttached.call(this);
+    } else {
+      this.__fixInitData && this.__fixInitData();
     }
     if (isPage.call(this)) { // 百度 onLoad 在 attached 之前触发（基础库小于 3.70）
       // 百度 当组件作为页面时 pageinstancce 不是原来组件的 instance

packages/uni-mp-baidu/package.json

 {
   "name": "@dcloudio/uni-mp-baidu",
-  "version": "2.0.0-alpha-31520210315001",
+  "version": "2.0.0-31620210325001",
   "description": "uni-app mp-baidu",
   "main": "dist/index.js",
   "repository": {

packages/uni-mp-kuaishou/package.json

 {
   "name": "@dcloudio/uni-mp-kuaishou",
-  "version": "2.0.0-alpha-31520210315001",
+  "version": "2.0.0-31620210325001",
   "description": "uni-app mp-kuaishou",
   "main": "dist/index.js",
   "repository": {

packages/uni-mp-qq/package.json

 {
   "name": "@dcloudio/uni-mp-qq",
-  "version": "2.0.0-alpha-31520210315001",
+  "version": "2.0.0-31620210325001",
   "description": "uni-app mp-qq",
   "main": "dist/index.js",
   "repository": {

packages/uni-mp-toutiao/package.json

 {
   "name": "@dcloudio/uni-mp-toutiao",
-  "version": "2.0.0-alpha-31520210315001",
+  "version": "2.0.0-31620210325001",
   "description": "uni-app mp-toutiao",
   "main": "dist/index.js",
   "repository": {

packages/uni-mp-vue/package.json

 {
   "name": "@dcloudio/uni-mp-vue",
-  "version": "2.0.0-alpha-31520210315001",
+  "version": "2.0.0-31620210325001",
   "description": "@dcloudio/uni-mp-vue",
   "main": "dist/vue.runtime.esm.js",
   "module": "dist/vue.runtime.esm.js",

packages/uni-mp-weixin/package.json

 {
   "name": "@dcloudio/uni-mp-weixin",
-  "version": "2.0.0-alpha-31520210315001",
+  "version": "2.0.0-31620210325001",
   "description": "uni-app mp-weixin",
   "main": "dist/index.js",
   "repository": {

packages/uni-quickapp-native/package.json

 {
   "name": "@dcloudio/uni-quickapp-native",
-  "version": "2.0.0-alpha-31520210315001",
+  "version": "2.0.0-31620210325001",
   "description": "uni-app quickapp-native",
   "main": "dist/vue.prod.js",
   "repository": {

packages/uni-quickapp-webview/package.json

 {
   "name": "@dcloudio/uni-quickapp-webview",
-  "version": "2.0.0-alpha-31520210315001",
+  "version": "2.0.0-31620210325001",
   "description": "uni-app quickapp-webview",
   "main": "dist/index.js",
   "repository": {

packages/uni-stat/package.json

 {
   "name": "@dcloudio/uni-stat",
-  "version": "2.0.0-alpha-31520210315001",
+  "version": "2.0.0-31620210325001",
   "description": "",
   "main": "dist/index.js",
   "repository": {

packages/uni-template-compiler/package.json

 {
   "name": "@dcloudio/uni-template-compiler",
-  "version": "2.0.0-alpha-31520210315001",
+  "version": "2.0.0-31620210325001",
   "description": "uni-template-compiler",
   "main": "lib/index.js",
   "repository": {

packages/vue-cli-plugin-hbuilderx/package.json

 {
   "name": "@dcloudio/vue-cli-plugin-hbuilderx",
-  "version": "2.0.0-alpha-31520210315001",
+  "version": "2.0.0-31620210325001",
   "description": "HBuilderX plugin for vue-cli 3",
   "main": "index.js",
   "repository": {

packages/vue-cli-plugin-uni-optimize/package.json

 {
   "name": "@dcloudio/vue-cli-plugin-uni-optimize",
-  "version": "2.0.0-alpha-31520210315001",
+  "version": "2.0.0-31620210325001",
   "description": "uni-app optimize plugin for vue-cli 3",
   "main": "index.js",
   "repository": {

packages/vue-cli-plugin-uni/package.json

 {
   "name": "@dcloudio/vue-cli-plugin-uni",
-  "version": "2.0.0-alpha-31520210315001",
+  "version": "2.0.0-31620210325001",
   "description": "uni-app plugin for vue-cli 3",
   "main": "index.js",
   "repository": {
@@ -17,7 +17,7 @@
   "author": "fxy060608",
   "license": "Apache-2.0",
   "dependencies": {
-    "@dcloudio/uni-stat": "^2.0.0-alpha-31520210315001",
+    "@dcloudio/uni-stat": "^2.0.0-31620210325001",
     "buffer-json": "^2.0.0",
     "copy-webpack-plugin": "^5.1.1",
     "cross-env": "^5.2.0",

packages/webpack-uni-mp-loader/lib/plugin/generate-json.js

@@ -129,7 +129,12 @@ module.exports = function generateJson (compilation) {
       Object.keys(usingComponents).forEach(key => {
         const value = usingComponents[key]
         if (value.includes('://')) {
-          delete usingComponents[key]
+          /**
+           * 百度小程序部分组件（如：editor）使用‘usingSwanComponents’ 引入
+           * 部分组件（如：swan-sitemap-list）使用'usingComponents'引入
+           * 经测试，两者保留都不会报错，因此去除以下 delete 语句
+           */
+          // delete usingComponents[key]
           jsonObj.usingSwanComponents = jsonObj.usingSwanComponents || {}
           jsonObj.usingSwanComponents[key] = value
         }
@@ -223,4 +228,4 @@ module.exports = function generateJson (compilation) {
       require('@dcloudio/uni-cli-shared/lib/cache').store()
     }, 50)
   }
-}
+}

packages/webpack-uni-mp-loader/package.json

 {
   "name": "@dcloudio/webpack-uni-mp-loader",
-  "version": "2.0.0-alpha-31520210315001",
+  "version": "2.0.0-31620210325001",
   "description": "webpack-uni-mp-loader",
   "main": "index.js",
   "repository": {

packages/webpack-uni-pages-loader/package.json

 {
   "name": "@dcloudio/webpack-uni-pages-loader",
-  "version": "2.0.0-alpha-31520210315001",
+  "version": "2.0.0-31620210325001",
   "description": "uni-app pages.json loader",
   "main": "lib/index.js",
   "repository": {
@@ -21,7 +21,7 @@
     "strip-json-comments": "^2.0.1"
   },
   "uni-app": {
-    "compilerVersion": "3.1.5"
+    "compilerVersion": "3.1.6"
   },
   "gitHead": "b366367ac0b63f41ef205dc93eee55d8e9f8f3ed"
 }

src/platforms/mp-baidu/runtime/wrapper/component-parser.js

@@ -27,6 +27,23 @@ export default function parseComponent (vueOptions) {
   const oldAttached = componentOptions.lifetimes.attached
   // 百度小程序基础库 3.260 以上支持页面 onInit 生命周期，提前创建 vm 实例
   componentOptions.lifetimes.onInit = function onInit (query) {
+    // 处理百度小程序 onInit 生命周期调用 setData 无效的问题
+    const setData = this.setData
+    const setDataArgs = []
+    this.setData = function () {
+      setDataArgs.push(arguments)
+    }
+    this.__fixInitData = function () {
+      delete this.__fixInitData
+      this.setData = setData
+      if (setDataArgs.length) {
+        this.groupSetData(() => {
+          setDataArgs.forEach(args => {
+            setData.apply(this, args)
+          })
+        })
+      }
+    }
     oldAttached.call(this)
     this.pageinstance.$vm = this.$vm
     this.$vm.__call_hook('onInit', query)
@@ -34,6 +51,8 @@ export default function parseComponent (vueOptions) {
   componentOptions.lifetimes.attached = function attached () {
     if (!this.$vm) {
       oldAttached.call(this)
+    } else {
+      this.__fixInitData && this.__fixInitData()
     }
     if (isPage.call(this)) { // 百度 onLoad 在 attached 之前触发（基础库小于 3.70）
       // 百度 当组件作为页面时 pageinstancce 不是原来组件的 instance