From 8a70c218152e878ce31a39339b70d538e9029ded Mon Sep 17 00:00:00 2001 From: zhouoaoteng Date: Tue, 11 Mar 2025 21:38:53 +0800 Subject: [PATCH] fix:diff Signed-off-by: zhouoaoteng --- interfaces/kits/picker/picker.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/interfaces/kits/picker/picker.js b/interfaces/kits/picker/picker.js index 27014cc8..010f5f85 100644 --- a/interfaces/kits/picker/picker.js +++ b/interfaces/kits/picker/picker.js @@ -263,10 +263,11 @@ async function photoPickerSelect(...args) { console.log('[picker] photo select result: ' + JSON.stringify(modalSelectResult)); const photoSelectResult = getPhotoPickerSelectResult(modalSelectResult); console.log('[picker] photoSelectResult: ' + JSON.stringify(photoSelectResult)); - if (args.length === ARGS_TWO && typeof args[ARGS_ONE] === 'function') { - return args[ARGS_ONE](photoSelectResult.error, photoSelectResult.data); - } else if (args.length === ARGS_ONE && typeof args[ARGS_ZERO] === 'function') { - return args[ARGS_ZERO](photoSelectResult.error, photoSelectResult.data); + let inputArgs = args[ARGS_ZERO]; + if (inputArgs.length === ARGS_TWO && typeof inputArgs[ARGS_ONE] === 'function') { + return inputArgs[ARGS_ONE](photoSelectResult.error, photoSelectResult.data); + } else if (inputArgs.length === ARGS_ONE && typeof inputArgs[ARGS_ZERO] === 'function') { + return inputArgs[ARGS_ZERO](photoSelectResult.error, photoSelectResult.data); } return new Promise((resolve, reject) => { if (photoSelectResult.data !== undefined) { @@ -404,7 +405,7 @@ async function documentPickerSelect(...args) { console.error('[picker] DocumentSelect paramError: ' + JSON.stringify(paramError)); } selectResult = getDocumentPickerSelectResult(documentSelectResult); - return sendResult(args, selectResult); + return sendResult(args[ARGS_ZERO], selectResult); } function parseDocumentPickerSaveOption(args, action) { @@ -571,7 +572,7 @@ async function documentPickerSave(...args) { documentSaveResult = await modalPicker(documentSaveContext, documentSaveConfig, documentSaveWindow); saveResult = getDocumentPickerSaveResult(documentSaveResult); suffixIndex = saveResult.suffix; - return sendResult(args, saveResult); + return sendResult(args[ARGS_ZERO], saveResult); } function getSelectedSuffixIndex() { @@ -639,7 +640,7 @@ async function audioPickerSelect(...args) { } let modalSelectResult = await modalPicker(audioSelectContext, audioSelectConfig, audipSelectWindow); let saveResult = getAudioPickerSelectResult(modalSelectResult); - return sendResult(args, saveResult); + return sendResult(args[ARGS_ZERO], saveResult); } catch (error) { console.error('[picker] audio select error: ' + error); } -- Gitee