mali-applet-ui 1.0.21 → 1.0.24

package/lib/components/ml-upload/file-handle.js

@@ -14,9 +14,7 @@ export function uploadImageFiles (opts) {
   return new Promise((resolve, reject) => {
     uni.chooseImage({
       count: opts.count || 9,
-      sizeType: opts.sizeType || ['original', 'compressed'],
       sourceType: opts.sourceType || ['album', 'camera'],
-      extension: opts.extension,
       success (res) {
         resolve(normalizeChooseAndUploadFileRes(res, 'image'))
       },
@@ -40,7 +38,6 @@ export function uploadAllFiles (opts) {
     chooseFile({
       type: 'all',
       count: opts.count || 9,
-      extension: opts.extension,
       success (res) {
         resolve(normalizeChooseAndUploadFileRes(res))
       },

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

@@ -3,8 +3,8 @@
     <!-- 上传图片 -->
     <view v-if="mediatype === 'image'" class="ml-upload-image-list">
       <view class="ml-upload-image-item" v-for="(item, index) in fileList" :key="index">
-        <image class="ml-upload-image-img" mode="aspectFit" :src="getThumbnailFileUrl(item)" @click="previewImageEvent(item, index)"></image>
-        <view v-if="!isFromReadonly" class="ml-upload-image-del-btn" @click="removeEvent(item)">
+        <image class="ml-upload-image-img" mode="aspectFit" :src="getThumbnailFileUrl(item)" @tap="previewImageEvent(item, index)"></image>
+        <view v-if="!isFromReadonly" class="ml-upload-image-del-btn" @tap="removeEvent(item)">
           <ml-icon name="close" />
         </view>
       </view>
@@ -40,11 +40,11 @@
           <view class="ml-upload-file-name">{{ item[nameField] }}</view>
           <view class="ml-upload-file-desc">
             <ml-button v-if="preview && previewTypes.includes(item[typeField])" status="primary" type="text" size="small" @click="previewDocs(item)">预览</ml-button>
-            <ml-button status="primary" type="text" size="small" @click="downloadEvent(item)">下载</ml-button>
+            <ml-button status="primary" type="text" size="small" @tap="downloadEvent(item)">下载</ml-button>
           </view>
         </view>
         <view v-if="!isFromReadonly" class="ml-upload-file-right">
-          <view class="ml-upload-file-del-btn" @click="removeEvent(item)">
+          <view class="ml-upload-file-del-btn" @tap="removeEvent(item)">
             <ml-icon name="close" />
           </view>
         </view>
@@ -56,7 +56,56 @@
 <script>
 import globalStore from '../../../config/store'
 import { getFileSuffix, getFileName } from '../../../utils'
-import { uploadAllFiles, uploadImageFiles } from './file-handle'
+
+function normalizeChooseAndUploadFileRes (res, fileType) {
+  res.tempFiles.forEach((item) => {
+    if (!item.name) {
+      item.name = item.path.substring(item.path.lastIndexOf('/') + 1)
+    }
+    if (fileType) {
+      item.fileType = fileType
+    }
+  })
+  return res
+}
+
+function uploadImageFiles (opts) {
+  return new Promise((resolve, reject) => {
+    uni.chooseImage({
+      count: opts.count || 9,
+      sourceType: opts.sourceType || ['album', 'camera'],
+      success (res) {
+        resolve(normalizeChooseAndUploadFileRes(res, 'image'))
+      },
+      fail (res) {
+        reject(res)
+      }
+    })
+  })
+}
+
+function uploadAllFiles (opts) {
+  return new Promise((resolve, reject) => {
+    let chooseFile = uni.chooseFile
+    if (typeof wx !== 'undefined' && typeof wx.chooseMessageFile === 'function') {
+      chooseFile = wx.chooseMessageFile
+    }
+    if (typeof chooseFile !== 'function') {
+      const err = {}
+      return reject(err)
+    }
+    chooseFile({
+      type: 'all',
+      count: opts.count || 9,
+      success (res) {
+        resolve(normalizeChooseAndUploadFileRes(res))
+      },
+      fail (res) {
+        reject(res)
+      }
+    })
+  })
+}
 
 export default {
   name: 'MlUpload',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mali-applet-ui",
-  "version": "1.0.21",
+  "version": "1.0.24",
   "description": "码里云小程序组件库",
   "files": [
     "lib",