@dcloudio/uni-cli-shared 2.0.1-alpha-36820221027001 → 2.0.1-alpha-36920221111002

package/components/unicloud-db.vue

@@ -161,13 +161,6 @@ export default {
     },
     isLookup () {
       return (Array.isArray(this.collection) && this.collection.length > 1) || (typeof this.collection === 'string' && this.collection.indexOf(',') > -1)
-    },
-    mainCollection () {
-      if (typeof this.collection === 'string') {
-        return this.collection.split(',')[0]
-      }
-      const mainQuery = JSON.parse(JSON.stringify(this.collection[0]))
-      return mainQuery.$db[0].$param[0]
     }
   },
   created () {
@@ -335,7 +328,7 @@ export default {
         db = db.action(action)
       }
 
-      db.collection(this.mainCollection).add(value).then((res) => {
+      db.collection(this.getMainCollection()).add(value).then((res) => {
         success && success(res)
         if (showToast) {
           uni.showToast({
@@ -409,7 +402,7 @@ export default {
         db = db.action(action)
       }
 
-      return db.collection(this.mainCollection).doc(id).update(value).then((res) => {
+      return db.collection(this.getMainCollection()).doc(id).update(value).then((res) => {
         success && success(res)
         if (showToast) {
           uni.showToast({
@@ -431,6 +424,13 @@ export default {
         complete && complete()
       })
     },
+    getMainCollection () {
+      if (typeof this.collection === 'string') {
+        return this.collection.split(',')[0]
+      }
+      const mainQuery = JSON.parse(JSON.stringify(this.collection[0]))
+      return mainQuery.$db[0].$param[0]
+    },
     getTemp (isTemp = true) {
       /* eslint-disable no-undef */
       let db = uniCloud.database(this.spaceInfo)
@@ -590,7 +590,7 @@ export default {
         exec = exec.action(action)
       }
 
-      exec.collection(this.mainCollection).where({
+      exec.collection(this.getMainCollection()).where({
         _id: dbCmd.in(ids)
       }).remove().then((res) => {
         success && success(res.result)

package/lib/index.js

@@ -65,6 +65,8 @@ const {
 
 const uts = require('./uts')
 
+const { parseTheme, initTheme } = require('./theme')
+
 module.exports = {
   uts,
   md5,
@@ -115,5 +117,7 @@ module.exports = {
   getPlatformGlobal,
   getPlatformStat,
   getPlatformPush,
-  getPlatformUniCloud
-}
+  getPlatformUniCloud,
+  parseTheme,
+  initTheme
+}

package/lib/theme.js

@@ -1,23 +1,23 @@
 const fs = require('fs')
 const path = require('path')
+const { parseJson, getJson } = require('./json')
 
-const {
-  getJson
-} = require('./json')
+let themeConfig = {}
 
 function parseThemeByJsonStr (jsonStr, keys, theme) {
   if (jsonStr.indexOf('@') === -1) {
     return jsonStr
   }
   keys.forEach(key => {
-    jsonStr = jsonStr.replace(new RegExp('@' + key, 'g'), theme[key])
+    jsonStr = jsonStr.replace(new RegExp('@' + key, 'g'), $1 => {
+      return theme[key] || $1
+    })
   })
   return jsonStr
 }
 
-const themeJsonPath = path.join(process.env.UNI_INPUT_DIR, 'theme.json')
-
-function hasTheme () {
+function hasTheme (themeLocation = 'theme.json') {
+  const themeJsonPath = path.join(process.env.UNI_INPUT_DIR, themeLocation)
   return fs.existsSync(themeJsonPath)
 }
 
@@ -26,24 +26,27 @@ function darkmode () {
 }
 
 module.exports = {
+  getTheme: () => themeConfig,
   darkmode,
   hasTheme,
-  initTheme () {
-    if (!hasTheme()) {
+  initTheme (manifestJson = {}) {
+    const platform = process.env.UNI_PLATFORM
+    const themeLocation = (manifestJson[platform] || {}).themeLocation || 'theme.json'
+    if (!hasTheme(themeLocation)) {
       return
     }
     if (darkmode()) {
       return
     }
     try {
-      const theme = getJson('theme.json', true)
-      global.uniPlugin.defaultTheme = theme.light
+      themeConfig = Object.keys(themeConfig).length ? themeConfig : getJson(themeLocation, true)
+      global.uniPlugin.defaultTheme = themeConfig.light
     } catch (e) {
       console.error(e)
     }
   },
-  parseTheme (json) {
-    const theme = global.uniPlugin.defaultTheme
+  parseTheme (json, _theme) {
+    const theme = themeConfig[_theme] || global.uniPlugin.defaultTheme
     if (!theme) {
       return json
     }
@@ -55,5 +58,16 @@ module.exports = {
       return parseThemeByJsonStr(json, keys, theme)
     }
     return JSON.parse(parseThemeByJsonStr(JSON.stringify(json), keys, theme))
+  },
+  copyMiniProgramThemeJson (platformOptions, vueOptions) {
+    const themeLocation = platformOptions.themeLocation || 'theme.json'
+    if (hasTheme(themeLocation)) {
+      platformOptions.themeLocation = themeLocation
+      return {
+        from: path.resolve(process.env.UNI_INPUT_DIR, platformOptions.themeLocation),
+        to: path.resolve(process.env.UNI_OUTPUT_DIR, platformOptions.themeLocation),
+        transform: content => JSON.stringify(parseJson(content.toString(), true))
+      }
+    }
   }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "2.0.1-alpha-36820221027001",
+  "version": "2.0.1-alpha-36920221111002",
   "description": "uni-cli-shared",
   "main": "lib/index.js",
   "repository": {
@@ -25,5 +25,5 @@
     "postcss-urlrewrite": "^0.2.2",
     "strip-json-comments": "^2.0.1"
   },
-  "gitHead": "40924371d61653884f7ca66ee0b301fef31bd59d"
+  "gitHead": "dc2bac7acb55d4569841b7487b4968ff7dc834c6"
 }