mali-applet-ui 1.1.83 → 1.1.85

package/lib/components/ml-upload/ml-upload.vue

@@ -216,6 +216,7 @@ export default {
     getThumbnailFileUrl: Function,
     uploadFile: Function,
     removeFile: Function,
+    previewFile: Function,
     downloadFile: Function
   },
   inject: {
@@ -435,6 +436,14 @@ export default {
       })
     },
     previewDocs (item) {
+      const previewMethod = this.previewFile ? this.previewFile : (globalStore.upload ? globalStore.upload.previewFile : null)
+      if (previewMethod) {
+        previewMethod({
+          item,
+          params: this.params
+        })
+        return
+      }
       // 仅支持文档和图片
       if (this.previewTypes.includes(item[this.typeField])) {
         uni.downloadFile({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mali-applet-ui",
-  "version": "1.1.83",
+  "version": "1.1.85",
   "description": "码里UI-小程序组件库(vue2)",
   "files": [
     "lib",

package/tongji/index.js

@@ -1,5 +1,8 @@
-if (process.env.VUE_APP_BAIDU_TONGJI_APP_KEY) {
-  require('./baidu/mtj-wx-sdk')
+if (process.env.NODE_ENV === 'production') {
+  if (process.env.VUE_APP_BAIDU_TONGJI_APP_KEY) {
+    require('./baidu/mtj-wx-sdk')
+    console.log('--- tongji ---', process.env.VUE_APP_BAIDU_TONGJI_APP_KEY)
+  }
 }
 
 const MaliTongJi = {}

package/utils/file.js

@@ -14,19 +14,86 @@ export function getFileName (url) {
   return urlRest.pathname.split('/').slice(-1)[0] || ''
 }
 
+export function getAllPreviewTypes () {
+  return getFilePreviewTypes().concat(getImagePreviewTypes())
+}
+
+export function getFilePreviewTypes () {
+  return ['doc', 'xls', 'ppt', 'pdf', 'docx', 'xlsx', 'pptx']
+}
+
+export function getImagePreviewTypes () {
+  return ['png', 'jpg', 'gif']
+}
+
+/**
+ * 附件预览
+ * @param {*} fileUrl
+ * @param {*} name
+ * @param {*} options
+ * @returns
+ */
+export function openFileByUrl (fileUrl, fileName, options) {
+  const opts = Object.assign({ type: '' }, options)
+  const url = decodeURIComponent(fileUrl)
+  const name = fileName || getFileName(url)
+  return new Promise((resolve, reject) => {
+    const fileType = opts.type || getFileSuffix(name || getFileName(url)).toLowerCase()
+    uni.downloadFile({
+      url,
+      filePath: name ? `${uni.env.USER_DATA_PATH}/${name.indexOf('.') === -1 ? `${name}.${fileType}` : name}` : '',
+      success: (downRes) => {
+        if (getFilePreviewTypes().includes(fileType)) {
+          uni.openDocument({
+            filePath: downRes.filePath || downRes.tempFilePath,
+            showMenu: true,
+            success () {
+              resolve({
+                savedFilePath: downRes.filePath || downRes.tempFilePath
+              })
+            },
+            fail (e) {
+              reject(e)
+            }
+          })
+        } else if (getImagePreviewTypes().includes(fileType)) {
+          uni.previewImage({
+            urls: [
+              downRes.filePath || downRes.tempFilePath
+            ],
+            longPressActions: {
+              itemList: ['保存图片']
+            }
+          })
+        } else {
+          const e = {}
+          reject(e)
+        }
+      },
+      fail (e) {
+        reject(e)
+      }
+    })
+  })
+}
+
 /**
  * 下载文件
  * @param {*} url
  * @param {*} name
  */
-export function saveFileByUrl (url, name, options) {
+export function saveFileByUrl (fileUrl, fileName, options) {
   const opts = Object.assign({ showMsg: true }, options)
+  const url = decodeURIComponent(fileUrl)
+  const name = fileName || getFileName(url)
   return new Promise((resolve, reject) => {
+    const fileType = opts.type || getFileSuffix(name || getFileName(url)).toLowerCase()
     uni.downloadFile({
       url,
+      filePath: name ? `${uni.env.USER_DATA_PATH}/${name.indexOf('.') === -1 ? `${name}.${fileType}` : name}` : '',
       success: (downRes) => {
         uni.saveFile({
-          tempFilePath: downRes.tempFilePath,
+          tempFilePath: downRes.filePath || downRes.tempFilePath,
           success (res) {
             if (opts.showMsg) {
               uni.showToast({