From 825345e20f669f8ed83f09189546197616012244 Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Fri, 18 Sep 2020 19:42:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=20uni.chooseVideo=20?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../helpers/protocol/media/choose-video.js    | 23 +++++++++----------
 .../service/api/media/choose-video.js         | 10 ++++----
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/core/helpers/protocol/media/choose-video.js b/src/core/helpers/protocol/media/choose-video.js
index 566f8c192..4efbf0d9a 100644
--- a/src/core/helpers/protocol/media/choose-video.js
+++ b/src/core/helpers/protocol/media/choose-video.js
@@ -6,17 +6,16 @@ export const chooseVideo = {
     required: false,
     default: SOURCE_TYPES,
     validator (sourceType, params) {
-      const length = sourceType.length
-      if (!length) {
-        params.sourceType = SOURCE_TYPES
-      } else {
-        for (let i = 0; i < length; i++) {
-          if (typeof sourceType[i] !== 'string' || !~SOURCE_TYPES.indexOf(sourceType[i])) {
-            params.sourceType = SOURCE_TYPES
-            break
-          }
-        }
-      }
+      sourceType = sourceType.filter(sourceType => SOURCE_TYPES.includes(sourceType))
+      params.sourceType = sourceType.length ? sourceType : SOURCE_TYPES
     }
+  },
+  maxDuration: {
+    type: Number,
+    default: 60
+  },
+  camera: {
+    type: String,
+    default: 'back'
   }
-}
+}
diff --git a/src/platforms/app-plus/service/api/media/choose-video.js b/src/platforms/app-plus/service/api/media/choose-video.js
index b001ba62f..f1de6357e 100644
--- a/src/platforms/app-plus/service/api/media/choose-video.js
+++ b/src/platforms/app-plus/service/api/media/choose-video.js
@@ -11,9 +11,9 @@ import {
 } from '../util'
 
 export function chooseVideo ({
-  sourceType = ['album', 'camera'],
-  maxDuration = 60,
-  camera = 'back'
+  sourceType,
+  maxDuration,
+  camera
 } = {}, callbackId) {
   const errorCallback = warpPlusErrorCallback(callbackId, 'chooseVideo', 'cancel')
 
@@ -53,10 +53,10 @@ export function chooseVideo ({
   }
 
   if (sourceType.length === 1) {
-    if (sourceType[0] === 'album') {
+    if (sourceType.includes('album')) {
       openAlbum()
       return
-    } else if (sourceType[0] === 'camera') {
+    } else if (sourceType.includes('camera')) {
       openCamera()
       return
     }
-- 
GitLab