diff --git a/interfaces/kits/picker/picker.js b/interfaces/kits/picker/picker.js index 3ff7d7dd95b6692b552c0081465cfeb7608e65e8..a0a8835467542dcf72f393fa3a8e2a7cae280b83 100644 --- a/interfaces/kits/picker/picker.js +++ b/interfaces/kits/picker/picker.js @@ -21,7 +21,7 @@ const PhotoViewMIMETypes = { VIDEO_TYPE: 'video/*', IMAGE_VIDEO_TYPE: '*/*', INVALID_TYPE: '' -} +}; const DocumentSelectMode = { FILE: 0, @@ -50,7 +50,7 @@ const ErrCode = { RESULT_ERROR: 13900042, NAME_TOO_LONG: 13900030, CONTEXT_NO_EXIST: 16000011, -} +}; const ERRCODE_MAP = new Map([ [ErrCode.INVALID_ARGS, 'Invalid argument'], @@ -70,7 +70,7 @@ const ACTION = { SELECT_ACTION_MODAL: 'ohos.want.action.OPEN_FILE_SERVICE', SAVE_ACTION: 'ohos.want.action.CREATE_FILE', SAVE_ACTION_MODAL: 'ohos.want.action.CREATE_FILE_SERVICE', -} +}; const CREATE_FILE_NAME_LENGTH_LIMIT = 256; const ARGS_ZERO = 0; @@ -122,13 +122,15 @@ function checkArguments(args) { } } - if (option.newFileNames !== undefined && option.newFileNames.length > 0) { - for (let i = 0; i < option.newFileNames.length; i++) { - let value = option.newFileNames[i]; - if (strSizeUTF8(value) >= CREATE_FILE_NAME_LENGTH_LIMIT) { - console.log('[picker] checkArguments Invalid name: ' + value); - checkArgumentsResult = getErr(ErrCode.NAME_TOO_LONG); - } + if (option.newFileNames === undefined || option.newFileNames.length <= 0) { + return checkArgumentsResult; + } + + for (let i = 0; i < option.newFileNames.length; i++) { + let value = option.newFileNames[i]; + if (strSizeUTF8(value) >= CREATE_FILE_NAME_LENGTH_LIMIT) { + console.log('[picker] checkArguments Invalid name: ' + value); + checkArgumentsResult = getErr(ErrCode.NAME_TOO_LONG); } } } @@ -227,7 +229,7 @@ async function photoPickerSelect(...args) { } else { reject(photoSelectResult.error); } - }) + }); } catch (error) { console.error('[picker] photo select error: ' + error); } @@ -641,4 +643,4 @@ export default { PhotoViewPicker : PhotoViewPicker, DocumentViewPicker: DocumentViewPicker, AudioViewPicker : AudioViewPicker, -} +};