Merge branch 'main' of github.com:AntmJS/vantui into main

Author: qzhuo

packages/vantui/src/form/core/formstore.ts

@@ -393,8 +393,13 @@ class FormStore {
               break
             }
           } else if (typeof rule === 'function') {
-            // 检查函数是否返回Promise
-            const result = rule(value)
+            // 传统的回调函数形式
+            const validateCallback = (callbackMessage: string) => {
+              this.model[name].message = callbackMessage
+              status = !callbackMessage ? 'resolve' : 'reject'
+            }
+            // 检查函数是否返回Promise,传入callback兼容同步回调
+            const result = rule(value, validateCallback)
             if (isPromise(result)) {
               try {
                 // 规则函数返回Promise的情况
@@ -413,12 +418,6 @@ class FormStore {
                 break
               }
             } else {
-              // 传统的回调函数形式
-              const validateCallback = (callbackMessage: string) => {
-                this.model[name].message = callbackMessage
-                status = !callbackMessage ? 'resolve' : 'reject'
-              }
-
               // 执行规则函数
               rule(value, validateCallback)
 

packages/vantui/src/uploader/utils.ts

@@ -94,13 +94,24 @@ export function chooseFile({
   return new Promise((resolve, reject) => {
     switch (accept) {
       case 'image':
-        chooseImage({
-          count: multiple ? Math.min(maxCount, 9) : 1,
-          sourceType: capture || ['album', 'camera'],
-          sizeType: sizeType || ['original', 'compressed'],
-          success: (res) => resolve(formatImage(res)),
-          fail: reject,
-        })
+        process.env.TARO_ENV === 'weapp' ?
+          chooseMedia({
+            count: multiple ? Math.min(maxCount, 9) : 1,
+            mediaType: ['image'],
+            sourceType: capture || ['album', 'camera'],
+            maxDuration,
+            sizeType: sizeType || ['original', 'compressed'],
+            camera: camera || 'back',
+            success: (res) => resolve(formatMedia(res)),
+            fail: reject,
+          }) :
+          chooseImage({
+            count: multiple ? Math.min(maxCount, 9) : 1,
+            sourceType: capture || ['album', 'camera'],
+            sizeType: sizeType || ['original', 'compressed'],
+            success: (res) => resolve(formatImage(res)),
+            fail: reject,
+          })
         break
       case 'media':
         chooseMedia({
@@ -114,14 +125,27 @@ export function chooseFile({
         })
         break
       case 'video':
-        chooseVideo({
-          sourceType: capture || ['album', 'camera'],
-          compressed,
-          maxDuration: maxDuration || 60,
-          camera: camera || 'back',
-          success: (res) => resolve(formatVideo(res)),
-          fail: reject,
-        })
+        process.env.TARO_ENV === 'weapp' ?
+          chooseMedia({
+            count: multiple ? Math.min(maxCount, 9) : 1,
+            mediaType: ['video'],
+            sourceType: capture || ['album', 'camera'],
+            maxDuration,
+            sizeType: compressed
+              ? ['compressed']
+              : sizeType || ['original', 'compressed'],
+            camera: camera || 'back',
+            success: (res) => resolve(formatMedia(res)),
+            fail: reject,
+          }) :
+          chooseVideo({
+            sourceType: capture || ['album', 'camera'],
+            compressed,
+            maxDuration: maxDuration || 60,
+            camera: camera || 'back',
+            success: (res) => resolve(formatVideo(res)),
+            fail: reject,
+          })
         break
       default:
         chooseMessageFile({