@dcloudio/uni-cli-shared 2.0.2-3090820231124001 → 2.0.2-4000620240325001

package/components/i18n/en.json

@@ -1,6 +1,8 @@
 {
   "uniCloud.component.add.success": "Success",
   "uniCloud.component.update.success": "Success",
+  "uniCloud.component.update.showModal.title": "Tips",
+  "uniCloud.component.update.showModal.content": "是否更新该数据",
   "uniCloud.component.remove.showModal.title": "Tips",
   "uniCloud.component.remove.showModal.content": "是否删除该数据"
 }

package/components/i18n/es.json

@@ -1,6 +1,8 @@
 {
   "uniCloud.component.add.success": "新增成功",
   "uniCloud.component.update.success": "修改成功",
+  "uniCloud.component.update.showModal.title": "提示",
+  "uniCloud.component.update.showModal.content": "是否更新该数据",
   "uniCloud.component.remove.showModal.title": "提示",
   "uniCloud.component.remove.showModal.content": "是否删除该数据"
 }

package/components/i18n/fr.json

@@ -1,6 +1,8 @@
 {
   "uniCloud.component.add.success": "新增成功",
   "uniCloud.component.update.success": "修改成功",
+  "uniCloud.component.update.showModal.title": "提示",
+  "uniCloud.component.update.showModal.content": "是否更新该数据",
   "uniCloud.component.remove.showModal.title": "提示",
   "uniCloud.component.remove.showModal.content": "是否删除该数据"
 }

package/components/i18n/zh-Hans.json

@@ -1,6 +1,8 @@
 {
   "uniCloud.component.add.success": "新增成功",
   "uniCloud.component.update.success": "修改成功",
+  "uniCloud.component.update.showModal.title": "提示",
+  "uniCloud.component.update.showModal.content": "是否更新该数据",
   "uniCloud.component.remove.showModal.title": "提示",
   "uniCloud.component.remove.showModal.content": "是否删除该数据"
 }

package/components/i18n/zh-Hant.json

@@ -1,6 +1,8 @@
 {
   "uniCloud.component.add.success": "新增成功",
   "uniCloud.component.update.success": "修改成功",
+  "uniCloud.component.update.showModal.title": "提示",
+  "uniCloud.component.update.showModal.content": "是否更新该数据",
   "uniCloud.component.remove.showModal.title": "提示",
   "uniCloud.component.remove.showModal.content": "是否刪除數據"
 }

package/components/unicloud-db.vue

@@ -387,10 +387,29 @@ export default {
       success,
       fail,
       complete,
+      confirmTitle,
+      confirmContent,
       needConfirm = true,
       needLoading = true,
       loadingTitle = ''
     } = {}) {
+      if (!needConfirm) {
+        this._doUpdate(id, value, action, success, fail, complete, needConfirm, needLoading, loadingTitle)
+        return
+      }
+      uni.showModal({
+        title: confirmTitle || t('uniCloud.component.update.showModal.title'),
+        content: confirmContent || t('uniCloud.component.update.showModal.content'),
+        showCancel: true,
+        success: (res) => {
+          if (!res.confirm) {
+            return
+          }
+          this._doUpdate(id, value, action, success, fail, complete, needConfirm, needLoading, loadingTitle)
+        }
+      })
+    },
+    _doUpdate (id, value, action, success, fail, complete, needConfirm, needLoading, loadingTitle) {
       if (needLoading) {
         uni.showLoading({
           title: loadingTitle
@@ -402,7 +421,7 @@ export default {
         db = db.action(action)
       }
 
-      return db.collection(this.getMainCollection()).doc(id).update(value).then((res) => {
+      db.collection(this.getMainCollection()).doc(id).update(value).then((res) => {
         success && success(res)
         if (showToast) {
           uni.showToast({

package/lib/cache.js

@@ -79,7 +79,9 @@ function updateComponentJson (name, jsonObj, usingComponents = true, type = 'Com
   if (type === 'Component') {
     jsonObj.component = true
     if (process.env.UNI_PLATFORM === 'mp-alipay') {
-      jsonObj.styleIsolation = 'apply-shared'
+      const manifestConfig = process.UNI_MANIFEST
+      const alipayConfig = manifestConfig['mp-alipay'] || {}
+      jsonObj.styleIsolation = alipayConfig.styleIsolation || 'apply-shared'
     }
   } else if (type === 'Page') {
     if (process.env.UNI_PLATFORM === 'mp-baidu') {
@@ -160,39 +162,28 @@ function updateUsingComponents (name, usingComponents, type) {
   }
 
   const oldJsonStr = getJsonFile(name)
-  if (oldJsonStr) { // update
-    const jsonObj = JSON.parse(oldJsonStr)
-    if (type === 'Component') {
+  const jsonObj = oldJsonStr ? JSON.parse(oldJsonStr) : {
+    usingComponents
+  }
+  if (type === 'Component') {
+    jsonObj.component = true
+    if (process.env.UNI_PLATFORM === 'mp-alipay') {
+      const manifestConfig = process.UNI_MANIFEST
+      const alipayConfig = manifestConfig['mp-alipay'] || {}
+      jsonObj.styleIsolation = alipayConfig.styleIsolation || 'apply-shared'
+    }
+  } else if (type === 'Page') {
+    if (process.env.UNI_PLATFORM === 'mp-baidu') {
       jsonObj.component = true
-      if (process.env.UNI_PLATFORM === 'mp-alipay') {
-        jsonObj.styleIsolation = 'apply-shared'
-      }
-    } else if (type === 'Page') {
-      if (process.env.UNI_PLATFORM === 'mp-baidu') {
-        jsonObj.component = true
-      }
     }
-
+  }
+  if (oldJsonStr) { // update
     jsonObj.usingComponents = usingComponents
     const newJsonStr = JSON.stringify(jsonObj, null, 2)
     if (newJsonStr !== oldJsonStr) {
       updateJsonFile(name, newJsonStr)
     }
   } else { // add
-    const jsonObj = {
-      usingComponents
-    }
-    if (type === 'Component') {
-      jsonObj.component = true
-      if (process.env.UNI_PLATFORM === 'mp-alipay') {
-        jsonObj.styleIsolation = 'apply-shared'
-      }
-    } else if (type === 'Page') {
-      if (process.env.UNI_PLATFORM === 'mp-baidu') {
-        jsonObj.component = true
-      }
-    }
-
     updateJsonFile(name, jsonObj)
   }
 }

package/lib/file-loader.js

@@ -1,16 +1,35 @@
 const path = require('path')
+const webpack = require('webpack')
 const {
-  normalizeNodeModules
+  normalizePath
+  // normalizeNodeModules
 } = require('./util')
 
+let inputDir
+
 module.exports = {
   loader: 'file-loader',
   options: {
-    publicPath (url, resourcePath, context) {
-      return '/' + normalizeNodeModules(path.relative(process.env.UNI_INPUT_DIR, resourcePath))
-    },
-    outputPath (url, resourcePath, context) {
-      return normalizeNodeModules(path.relative(process.env.UNI_INPUT_DIR, resourcePath))
+    name (resourcePath, resourceQuery) {
+      if (!inputDir) {
+        inputDir = normalizePath(process.env.UNI_INPUT_DIR)
+      }
+      resourcePath = normalizePath(resourcePath)
+      if (resourcePath.startsWith(inputDir)) {
+        const relativePath = normalizePath(path.relative(inputDir,
+          resourcePath))
+        if (relativePath.startsWith('static/') || relativePath.includes(
+          '/static/')) {
+          return relativePath
+        }
+      }
+      return `assets/[name].[hash:8]${webpack.version[0] > 4 ? '' : '.'}[ext]`
     }
+    // publicPath (url, resourcePath, context) {
+    //   return '/' + normalizeNodeModules(path.relative(process.env.UNI_INPUT_DIR, resourcePath))
+    // },
+    // outputPath (url, resourcePath, context) {
+    //   return normalizeNodeModules(path.relative(process.env.UNI_INPUT_DIR, resourcePath))
+    // }
   }
-}
+}

package/lib/pages.js

@@ -122,7 +122,15 @@ function isValidPage (page, root = '') {
   let pagePath = page.path
 
   if (pagePath.indexOf('platforms') === 0) { // 平台相关
-    if (pagePath.indexOf('platforms/' + process.env.UNI_PLATFORM) === -1) { // 非本平台
+    if (process.env.UNI_PLATFORM === 'h5' || process.env.UNI_PLATFORM === 'web') {
+      if (!(pagePath.indexOf('platforms/h5/') === 0 || pagePath.indexOf('platforms/web/') === 0)) {
+        return false
+      }
+    } else if (process.env.UNI_PLATFORM === 'app-plus' || process.env.UNI_PLATFORM === 'app') {
+      if (!(pagePath.indexOf('platforms/app-plus/') === 0 || pagePath.indexOf('platforms/app/') === 0)) {
+        return false
+      }
+    } else if (pagePath.indexOf('platforms/' + process.env.UNI_PLATFORM) === -1) { // 非本平台
       return false
     }
   }
@@ -578,4 +586,4 @@ module.exports = {
   getGlobalUsingComponentsCode,
   parseUsingAutoImportComponents,
   generateGlobalUsingComponentsCode
-}
+}

package/lib/url-loader.js

@@ -35,8 +35,11 @@ module.exports = {
   loader: 'url-loader',
   options () {
     if (process.env.UNI_PLATFORM === 'h5') {
-      // h5平台，不对 url-loader 作调整，默认limit:4096，也不修改file-loader输出路径
-      return {}
+      // h5平台，不对 url-loader 作调整，默认limit:4096，也不修改file-loader输出路径（已做处理）
+      return {
+        ...defaultOptions,
+        limit: 4096
+      }
     }
     if (inlineLimit) {
       return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "2.0.2-3090820231124001",
+  "version": "2.0.2-4000620240325001",
   "description": "uni-cli-shared",
   "main": "lib/index.js",
   "repository": {
@@ -26,5 +26,5 @@
     "postcss-urlrewrite": "^0.2.2",
     "strip-json-comments": "^2.0.1"
   },
-  "gitHead": "c32691147b539a337d6bca396ba42a6c3ddc1dbf"
+  "gitHead": "2f9ba8ff3e3f185745faa67dd4eefaef7f3db374"
 }