@dcloudio/uni-cli-shared 2.0.0-32620210831002 → 2.0.0-32920211029001

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/file-loader.js

@@ -0,0 +1,17 @@
+const path = require('path')
+
+const isWin = /^win/.test(process.platform)
+
+const normalizePath = path => (isWin ? path.replace(/\\/g, '/') : path)
+
+module.exports = {
+  loader: 'file-loader',
+  options: {
+    publicPath (url, resourcePath, context) {
+      return '/' + normalizePath(path.relative(process.env.UNI_INPUT_DIR, resourcePath))
+    },
+    outputPath (url, resourcePath, context) {
+      return normalizePath(path.relative(process.env.UNI_INPUT_DIR, resourcePath))
+    }
+  }
+}

package/lib/i18n.js

@@ -0,0 +1,99 @@
+const fs = require('fs')
+const path = require('path')
+const {
+  parseJson
+} = require('./json')
+const {
+  getManifestJson
+} = require('./manifest')
+
+const delimiters = ['%', '%']
+
+function initI18nOptions (
+  platform,
+  inputDir,
+  warning = false,
+  withMessages = true
+) {
+  const locales = initLocales(path.resolve(inputDir, 'locale'), withMessages)
+  if (!Object.keys(locales).length) {
+    return
+  }
+  const manifestJson = getManifestJson()
+  const fallbackLocale = manifestJson.fallbackLocale || manifestJson.locale
+  const locale = resolveI18nLocale(
+    platform,
+    Object.keys(locales),
+    fallbackLocale
+  )
+  if (warning) {
+    if (!fallbackLocale) {
+      console.warn()
+    } else if (locale !== fallbackLocale) {
+      console.warn()
+    }
+  }
+  return {
+    locale,
+    locales,
+    delimiters
+  }
+}
+
+const localeJsonRE = /uni-app.*.json/
+
+function isUniAppLocaleFile (filepath) {
+  if (!filepath) {
+    return false
+  }
+  return localeJsonRE.test(path.basename(filepath))
+}
+
+function parseLocaleJson (filepath) {
+  let jsonObj = parseJson(fs.readFileSync(filepath, 'utf8'))
+  if (isUniAppLocaleFile(filepath)) {
+    jsonObj = jsonObj.common || {}
+  }
+  return jsonObj
+}
+
+function initLocales (dir, withMessages = true) {
+  if (!fs.existsSync(dir)) {
+    return {}
+  }
+  return fs.readdirSync(dir).reduce((res, filename) => {
+    if (path.extname(filename) === '.json') {
+      const locale = path
+        .basename(filename)
+        .replace(/(uni-app.)?(.*).json/, '$2')
+      if (withMessages) {
+        Object.assign(
+          res[locale] || (res[locale] = {}),
+          parseLocaleJson(path.join(dir, filename))
+        )
+      } else {
+        res[locale] = {}
+      }
+    }
+    return res
+  }, {})
+}
+
+function resolveI18nLocale (platfrom, locales, locale) {
+  if (locale && locales.includes(locale)) {
+    return locale
+  }
+  const defaultLocales = ['zh-Hans', 'zh-Hant']
+  if (platfrom === 'app' || platfrom === 'h5') {
+    defaultLocales.unshift('en')
+  } else {
+    // 小程序
+    defaultLocales.push('en')
+  }
+  return defaultLocales.find(locale => locales.includes(locale)) || locales[0]
+}
+
+module.exports = {
+  initLocales,
+  initI18nOptions
+}

package/lib/url-loader.js

@@ -1,22 +1,8 @@
-const path = require('path')
-
-const isWin = /^win/.test(process.platform)
-
-const normalizePath = path => (isWin ? path.replace(/\\/g, '/') : path)
+const fileLoader = require('./file-loader.js')
 
 const defaultOptions = {
   limit: -1,
-  fallback: {
-    loader: 'file-loader',
-    options: {
-      publicPath (url, resourcePath, context) {
-        return '/' + normalizePath(path.relative(process.env.UNI_INPUT_DIR, resourcePath))
-      },
-      outputPath (url, resourcePath, context) {
-        return normalizePath(path.relative(process.env.UNI_INPUT_DIR, resourcePath))
-      }
-    }
-  }
+  fallback: fileLoader
 }
 
 const inlineLimit =
@@ -60,4 +46,4 @@ module.exports = {
     }
   },
   rewriteUrl
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "2.0.0-32620210831002",
+  "version": "2.0.0-32920211029001",
   "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": "7c737dd6ca9e9001216a91e0bd98362200bff617"
+  "gitHead": "9577a22e00e4b90c8830d34f5966f1d379b455ea"
 }