mali-applet-ui 1.1.91 → 1.1.94

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

@@ -10,12 +10,12 @@
           </view>
         </view>
         <template v-if="!isFromReadonly && !isLimit">
-          <view v-if="hasForm" class="ml-upload-image-form-add-btn" @tap="chooseEvent">
+          <view v-if="hasForm" class="ml-upload-image-form-add-btn" @tap="chooseImgEvent">
             <ml-icon v-if="loading" name="loading" roll />
             <ml-icon v-else name="add-circle" />
           </view>
           <view v-else class="ml-upload-image-add">
-            <view class="ml-upload-image-add-btn" @tap="chooseEvent">
+            <view class="ml-upload-image-add-btn" @tap="chooseImgEvent">
               <view class="ml-upload-image-add-icon">
                 <ml-icon v-if="loading" name="loading" roll />
                 <ml-icon v-else name="add" />
@@ -29,12 +29,12 @@
     <!-- 上传文件 -->
     <view v-else class="ml-upload-file-list-warpper">
       <template v-if="!isFromReadonly && !isLimit">
-        <view v-if="hasForm" class="ml-upload-file-form-add-btn" @tap="chooseEvent">
+        <view v-if="hasForm" class="ml-upload-file-form-add-btn" @tap="chooseFileEvent">
           <ml-icon v-if="loading" name="loading" roll />
           <ml-icon v-else name="add-circle" />
         </view>
         <view v-else class="ml-upload-file-add">
-          <view class="ml-upload-file-add-btn" @tap="chooseEvent">
+          <view class="ml-upload-file-add-btn" @tap="chooseFileEvent">
             <text class="ml-upload-file-add-icon">
               <ml-icon v-if="loading" name="loading" roll />
               <ml-icon v-else name="add" />
@@ -219,8 +219,10 @@ export default {
       type: Boolean,
       default: false
     },
-    limit: Number,
-    limitCount: Number,
+    limitCount: {
+      type: Number,
+      default: 0
+    },
     limitSize: {
       type: Number,
       default: Number(globalStore.upload?.limitSize || 20480)
@@ -298,7 +300,13 @@ export default {
       return !!this.form
     },
     limitFileLen () {
-      return this.limitCount || this.limit || 9
+      if (this.limitCount) {
+        return this.limitCount
+      }
+      if (this.mediatype === 'image') {
+        return 9
+      }
+      return 100
     },
     isLimit () {
       if (this.multiple) {
@@ -581,11 +589,11 @@ export default {
       })
       // #endif
     },
-    choose () {
+    choose (type) {
       if (this.loading) {
         return
       }
-      let chooseMethod = uploadAllFiles
+      let chooseMethod = type === 'image' ? uploadImageFiles : uploadAllFiles
       // 钉钉暂时只支持图片
       if (this.mediatype === 'image' || this.platformEnv.isDDMP || this.platformEnv.isQWMP) {
         chooseMethod = uploadImageFiles
@@ -639,8 +647,23 @@ export default {
         console.log(e)
       })
     },
-    chooseEvent () {
-      this.choose()
+    chooseImgEvent () {
+      this.choose('image')
+    },
+    chooseFileEvent () {
+      uni.showActionSheet({
+        itemList: ['选择图片', '选择文件'],
+        // #ifdef MP-DINGTALK
+        cancelButtonText: '取消',
+        // #endif
+        success: (res) => {
+          if (res.tapIndex === 1) {
+            this.choose()
+          } else {
+            this.choose('image')
+          }
+        }
+      })
     }
   }
 }

package/package.json

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