Merge branch 'alpha'

lerna.json

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

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

 {
   "name": "@dcloudio/uni-app-plus-nvue",
-  "version": "2.0.0-alpha-30220201225001",
+  "version": "2.0.0-alpha-30420201230001",
   "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-30220201225001",
+  "version": "2.0.0-alpha-30420201230001",
   "description": "uni-app app-plus",
   "main": "dist/index.js",
   "repository": {

packages/uni-automator/package.json

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

packages/uni-cli-shared/components/unicloud-db.vue

@@ -315,13 +315,13 @@ export default {
         callback && callback(data2, this._isEnded)
         this._dispatchEvent(events.load, data2)
 
-        if (this.pageData === pageMode.add) {
+        if (this.getone || this.pageData === pageMode.replace) {
+          this.dataList = data2
+        } else {
           this.dataList.push(...data2)
           if (this.dataList.length) {
             this.paginationInternal.current++
           }
-        } else {
-          this.dataList = data2
         }
 
         if (this.getcount) {
@@ -331,7 +331,12 @@ export default {
         // #ifdef H5
         if (process.env.NODE_ENV === 'development') {
           this._debugDataList.length = 0
-          this._debugDataList.push(...JSON.parse(JSON.stringify(this.dataList)))
+          const formatData = JSON.parse(JSON.stringify(this.dataList))
+          if (Array.isArray(this.dataList)) {
+            this._debugDataList.push(...formatData)
+          } else {
+            this._debugDataList.push(formatData)
+          }
         }
         // #endif
       }).catch((err) => {

packages/uni-cli-shared/lib/util.js

@@ -93,7 +93,7 @@ const NODE_MODULES_REGEX = /(\.\.\/)?node_modules/g
 function normalizeNodeModules (str) {
   str = normalizePath(str).replace(NODE_MODULES_REGEX, 'node-modules')
   // HBuilderX 内置模块路径转换
-  str = str.replace(/.*HBuilderX\/plugins\/uniapp-cli\/node[-_]modules/, 'node-modules')
+  str = str.replace(/.*\/plugins\/uniapp-cli\/node[-_]modules/, 'node-modules')
   if (process.env.UNI_PLATFORM === 'mp-alipay') {
     str = str.replace('node-modules/@', 'node-modules/npm-scope-')
   }

packages/uni-cli-shared/package.json

 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "2.0.0-alpha-30220201225001",
+  "version": "2.0.0-alpha-30420201230001",
   "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-30220201225001",
+  "version": "2.0.0-alpha-30420201230001",
   "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-30220201225001",
+  "version": "2.0.0-alpha-30420201230001",
   "description": "uni-app h5",
   "main": "dist/index.umd.min.js",
   "repository": {

packages/uni-migration/package.json

 {
   "name": "@dcloudio/uni-migration",
-  "version": "2.0.0-alpha-30220201225001",
+  "version": "2.0.0-alpha-30420201230001",
   "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-30220201225001",
+  "version": "2.0.0-alpha-30420201230001",
   "description": "uni-app mp-alipay",
   "main": "dist/index.js",
   "repository": {

packages/uni-mp-baidu/package.json

 {
   "name": "@dcloudio/uni-mp-baidu",
-  "version": "2.0.0-alpha-30220201225001",
+  "version": "2.0.0-alpha-30420201230001",
   "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-30220201225001",
+  "version": "2.0.0-alpha-30420201230001",
   "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-30220201225001",
+  "version": "2.0.0-alpha-30420201230001",
   "description": "uni-app mp-qq",
   "main": "dist/index.js",
   "repository": {

packages/uni-mp-toutiao/lib/uni.config.js

@@ -11,6 +11,7 @@ module.exports = {
       style: '.ttss',
       template: '.ttml'
     },
+    subPackages: true,
     project: 'project.tt.json'
   },
   copyWebpackOptions (platformOptions, vueOptions) {
@@ -20,4 +21,4 @@ module.exports = {
     })
     return copyOptions
   }
-}
+}

packages/uni-mp-toutiao/package.json

 {
   "name": "@dcloudio/uni-mp-toutiao",
-  "version": "2.0.0-alpha-30220201225001",
+  "version": "2.0.0-alpha-30420201230001",
   "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-30220201225001",
+  "version": "2.0.0-alpha-30420201230001",
   "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-30220201225001",
+  "version": "2.0.0-alpha-30420201230001",
   "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-30220201225001",
+  "version": "2.0.0-alpha-30420201230001",
   "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-30220201225001",
+  "version": "2.0.0-alpha-30420201230001",
   "description": "uni-app quickapp-webview",
   "main": "dist/index.js",
   "repository": {

packages/uni-stat/package.json

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

packages/uni-template-compiler/package.json

 {
   "name": "@dcloudio/uni-template-compiler",
-  "version": "2.0.0-alpha-30220201225001",
+  "version": "2.0.0-alpha-30420201230001",
   "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-30220201225001",
+  "version": "2.0.0-alpha-30420201230001",
   "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-30220201225001",
+  "version": "2.0.0-alpha-30420201230001",
   "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-30220201225001",
+  "version": "2.0.0-alpha-30420201230001",
   "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-30220201225001",
+    "@dcloudio/uni-stat": "^2.0.0-alpha-30420201230001",
     "buffer-json": "^2.0.0",
     "copy-webpack-plugin": "^5.1.1",
     "cross-env": "^5.2.0",

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

 {
   "name": "@dcloudio/webpack-uni-mp-loader",
-  "version": "2.0.0-alpha-30220201225001",
+  "version": "2.0.0-alpha-30420201230001",
   "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-30220201225001",
+  "version": "2.0.0-alpha-30420201230001",
   "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.0.2"
+    "compilerVersion": "3.0.4"
   },
   "gitHead": "c135dec26ebb9c45211964ed038893f252612853"
 }