@dcloudio/uni-cli-shared 2.0.0-32920210927002 → 2.0.0-32920211120001

package/components/unicloud-db.vue

@@ -34,6 +34,7 @@ const loadMode = {
 const attrs = [
   'pageCurrent',
   'pageSize',
+  'spaceInfo',
   'collection',
   'action',
   'field',
@@ -54,6 +55,12 @@ export default {
         return {}
       }
     },
+    spaceInfo: {
+      type: Object,
+      default () {
+        return {}
+      }
+    },
     collection: {
       type: [String, Array],
       default: ''
@@ -178,12 +185,14 @@ export default {
       })
       return al
     }, (newValue, oldValue) => {
+      this.paginationInternal.size = this.pageSize
+      if (newValue[0] !== oldValue[0]) {
+        this.paginationInternal.current = this.pageCurrent
+      }
       if (this.loadtime === loadMode.manual) {
         return
       }
 
-      this.paginationInternal.size = this.pageSize
-
       let needReset = false
       for (let i = 2; i < newValue.length; i++) {
         if (newValue[i] !== oldValue[i]) {
@@ -195,9 +204,6 @@ export default {
         this.clear()
         this.reset()
       }
-      if (newValue[0] !== oldValue[0]) {
-        this.paginationInternal.current = this.pageCurrent
-      }
 
       this._execLoadData()
     })
@@ -324,7 +330,7 @@ export default {
         })
       }
       /* eslint-disable no-undef */
-      let db = uniCloud.database()
+      let db = uniCloud.database(this.spaceInfo)
       if (action) {
         db = db.action(action)
       }
@@ -398,7 +404,7 @@ export default {
         })
       }
       /* eslint-disable no-undef */
-      let db = uniCloud.database()
+      let db = uniCloud.database(this.spaceInfo)
       if (action) {
         db = db.action(action)
       }
@@ -427,7 +433,7 @@ export default {
     },
     getTemp (isTemp = true) {
       /* eslint-disable no-undef */
-      let db = uniCloud.database()
+      let db = uniCloud.database(this.spaceInfo)
 
       if (this.action) {
         db = db.action(this.action)
@@ -576,7 +582,7 @@ export default {
       }
 
       /* eslint-disable no-undef */
-      const db = uniCloud.database()
+      const db = uniCloud.database(this.spaceInfo)
       const dbCmd = db.command
 
       let exec = db

package/lib/manifest.js

@@ -85,8 +85,7 @@ function getH5Options (manifestJson) {
   }
 
   /* eslint-disable no-mixed-operators */
-  h5.template = h5.template && path.resolve(process.env.UNI_INPUT_DIR, h5.template) || path.resolve(__dirname,
-    '../../../../public/index.html')
+  h5.template = h5.template && path.resolve(process.env.UNI_INPUT_DIR, h5.template) || path.resolve(require('./util').getCLIContext(), 'public/index.html')
 
   h5.devServer = h5.devServer || {}
 
@@ -103,4 +102,4 @@ module.exports = {
   parseManifestJson,
   getNetworkTimeout,
   getH5Options
-}
+}

package/lib/platform.js

@@ -122,7 +122,7 @@ module.exports = {
   getShadowCss,
   getShadowTemplate (colorType = 'grey') {
     let tagName = 'cover-image'
-    if (process.env.UNI_PLATFORM === 'mp-toutiao') {
+    if (process.env.UNI_PLATFORM === 'mp-toutiao' || process.env.UNI_PLATFORM === 'mp-lark') {
       tagName = 'image'
     }
     return `<${tagName} src="https://cdn.dcloud.net.cn/img/shadow-${colorType}.png" style="z-index:998;position:fixed;left:0;top:0;width:100%;height:3px;"/>`
@@ -137,6 +137,8 @@ module.exports = {
     return {
       sourceType: 'module',
       plugins: [
+        ['pipelineOperator', { proposal: 'minimal' }],
+        'doExpressions',
         'optionalChaining',
         'typescript',
         ['decorators', {

package/lib/url-loader.js

@@ -10,6 +10,7 @@ const inlineLimit =
   process.env.UNI_PLATFORM === 'mp-qq' ||
   process.env.UNI_PLATFORM === 'mp-toutiao' ||
   process.env.UNI_PLATFORM === 'mp-kuaishou' ||
+  process.env.UNI_PLATFORM === 'mp-lark' ||
   process.env.UNI_PLATFORM === 'app-plus' // v2需要base64,v3需要rewriteUrl
 
 // mp-weixin,mp-qq,app-plus 非v3(即：需要base64的平台)
@@ -46,4 +47,4 @@ module.exports = {
     }
   },
   rewriteUrl
-}
+}

package/lib/util.js

@@ -1,4 +1,5 @@
 const path = require('path')
+const fs = require('fs')
 const hash = require('hash-sum')
 const crypto = require('crypto')
 
@@ -14,6 +15,24 @@ try {
 const isInHBuilderX = !!aboutPkg
 const isInHBuilderXAlpha = !!(isInHBuilderX && aboutPkg.alpha)
 
+function getCLIContext () {
+  var context = path.resolve(__dirname, '../../../../')
+  // const isInHBuilderX = fs.existsSync(path.resolve(context, 'bin/uniapp-cli.js'))
+  if (isInHBuilderX) {
+    return context
+  }
+  const pnpmFind = __dirname.match(/.+?[/\\].pnpm[/\\]/)
+  if (pnpmFind) {
+    const pnpm = pnpmFind[0]
+    context = path.resolve(pnpm, '../../')
+  }
+  const isInCLI = fs.existsSync(path.resolve(context, './src'))
+  if (isInCLI) {
+    return context
+  }
+  return process.cwd()
+}
+
 function removeExt (str, ext) {
   if (ext) {
     const reg = new RegExp(ext.replace(/\./, '\\.') + '$')
@@ -105,6 +124,7 @@ const _hasOwnProperty = Object.prototype.hasOwnProperty
 module.exports = {
   isInHBuilderX,
   isInHBuilderXAlpha,
+  getCLIContext,
   normalizeNodeModules,
   md5,
   hasOwn (obj, key) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "2.0.0-32920210927002",
+  "version": "2.0.0-32920211120001",
   "description": "uni-cli-shared",
   "main": "lib/index.js",
   "repository": {
@@ -23,5 +23,5 @@
     "postcss-urlrewrite": "^0.2.2",
     "strip-json-comments": "^2.0.1"
   },
-  "gitHead": "26392aaabf15a32cc592756b691a11ac312b0ac6"
+  "gitHead": "32ebf532a67f1f2c2abe2ed6e22a94599ffbb5a0"
 }