diff --git a/interfaces/kits/picker/include/picker_n_exporter.h b/interfaces/kits/picker/include/picker_n_exporter.h
index 09f58890a6fcdf529772da2818a4df9d3a1a18d5..d85f9d2a745aac0818c303987de636f74c5887d8 100644
--- a/interfaces/kits/picker/include/picker_n_exporter.h
+++ b/interfaces/kits/picker/include/picker_n_exporter.h
@@ -39,7 +39,7 @@ struct NameListArg {
 struct PickerCallBack {
     bool ready = false;
     int32_t resultCode;
-    string uri;
+    OHOS::AAFwk::Want want;
 };
 
 struct PickerAsyncContext {
@@ -55,6 +55,7 @@ class PickerNExporter final : public FileManagement::LibN::NExporter {
 public:
     inline static const std::string className_ = "Picker";
     static napi_value StartModalPicker(napi_env env, napi_callback_info info);
+    static napi_value MakeResultWithPickerCallBack(napi_env env, std::shared_ptr<PickerCallBack> pickerCallBack);
     bool Export() override;
     std::string GetClassName() override;
     PickerNExporter(napi_env env, napi_value exports);
diff --git a/interfaces/kits/picker/picker.js b/interfaces/kits/picker/picker.js
index c0fe563e90dfc8c151f6ee814f965f5f9332a1e7..e20e011c50f0ac1ea2975895d5009ee2f6683c19 100644
--- a/interfaces/kits/picker/picker.js
+++ b/interfaces/kits/picker/picker.js
@@ -40,6 +40,8 @@ const ExtTypes = {
 
 const PickerDetailType = {
   FILE_MGR_AUTH: 'downloadAuth', 
+  FILE_MGR_SELECT:'select',
+  FILE_MGR_SAVE:'save',
 };
 
 const ErrCode = {
@@ -67,7 +69,6 @@ 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',
-  SAVE_ACTION_DOWNLOAD: 'ohos.want.action.DOWNLOAD',
 }
 
 const CREATE_FILE_NAME_LENGTH_LIMIT = 256;
@@ -241,7 +242,9 @@ function parseDocumentPickerSelectOption(args, action) {
   if (args.length > ARGS_ZERO && typeof args[ARGS_ZERO] === 'object') {
     let option = args[ARGS_ZERO];
     config.parameters.key_select_mode = option.selectMode;
-    console.log('parseDocumentPickerSelectOption: ' + option.selectMode);
+    config.parameters.extType = ExtTypes.DOWNLOAD_TYPE;
+    config.parameters.pickerType = PickerDetailType.FILE_MGR_SELECT;
+    console.log('[picker] parseDocumentPickerSelectOption: ' + JSON.stringify(option));
 
     if ((option.maxSelectNumber !== undefined) && option.maxSelectNumber > 0) {
       config.parameters.key_pick_num = option.maxSelectNumber;
@@ -261,7 +264,7 @@ function parseDocumentPickerSelectOption(args, action) {
   return config;
 }
 
-function getDocumentPickerSelectResult(args) {
+function getAudioPickerSelectResult(args) {
   let selectResult = {
     error: undefined,
     data: undefined
@@ -290,6 +293,30 @@ function getDocumentPickerSelectResult(args) {
   return selectResult;
 }
 
+function getDocumentPickerSelectResult(args) {
+  let selectResult = {
+    error: undefined,
+    data: undefined
+  };
+  // 0:success
+  // -1:modal cancel
+  if (args.resultCode !== undefined && args.resultCode === 0) {
+    if (args.ability_params_stream) {
+      selectResult.data = args.ability_params_stream;
+      selectResult.error = args.resultCode;
+    }
+    
+  } else if (args.resultCode !== undefined && args.resultCode === -1) {
+    selectResult.data = [];
+    selectResult.error = args.resultCode;
+  } else {
+    selectResult.error = getErr(ErrCode.RESULT_ERROR);
+  }
+
+  console.log('[picker] document select selectResult: ' + JSON.stringify(selectResult));
+  return selectResult;
+}
+
 async function documentPickerSelect(...args) {
   let checkDocumentSelectArgsResult = checkArguments(args);
   if (checkDocumentSelectArgsResult !== undefined) {
@@ -300,6 +327,7 @@ async function documentPickerSelect(...args) {
   let documentSelectContext = undefined;
   let documentSelectConfig = undefined;
   let documentSelectResult = undefined;
+  let selectResult = undefined;
 
   try {
     if (this.context !== undefined) {
@@ -317,36 +345,14 @@ async function documentPickerSelect(...args) {
       throw getErr(ErrCode.CONTEXT_NO_EXIST);
     }
     documentSelectConfig = parseDocumentPickerSelectOption(args, ACTION.SELECT_ACTION_MODAL);
-    documentSelectResult = await documentSelectContext.requestDialogService(documentSelectConfig);
+    console.error('[picker] DocumentSelect documentSelectConfig: ' + JSON.stringify(documentSelectConfig));
+    documentSelectResult = await modalPicker(args, documentSelectContext, documentSelectConfig);
   } catch (paramError) {
     console.error('[picker] DocumentSelect paramError: ' + JSON.stringify(paramError));
-    try {
-      documentSelectConfig = parseDocumentPickerSelectOption(args, ACTION.SELECT_ACTION);
-      documentSelectResult = await documentSelectContext.startAbilityForResult(documentSelectConfig, {windowMode: 0});
-    } catch (error) {
-      console.error('[picker] DocumentSelect error: ' + error);
-      return undefined;
-    }
   }
   console.log('[picker] DocumentSelect result: ' + JSON.stringify(documentSelectResult));
-  try {
-    const selectResult = getDocumentPickerSelectResult(documentSelectResult);
-    if (args.length === ARGS_TWO && typeof args[ARGS_ONE] === 'function') {
-      return args[ARGS_ONE](selectResult.error, selectResult.data);
-    } else if (args.length === ARGS_ONE && typeof args[ARGS_ZERO] === 'function') {
-      return args[ARGS_ZERO](selectResult.error, selectResult.data);
-    }
-    return new Promise((resolve, reject) => {
-      if (selectResult.data !== undefined) {
-        resolve(selectResult.data);
-      } else {
-        reject(selectResult.error);
-      }
-    })
-  } catch (resultError) {
-    console.error('[picker] Result error: ' + resultError);
-  }
-  return undefined;
+  selectResult = getDocumentPickerSelectResult(documentSelectResult);
+  return sendResult(args, selectResult);
 }
 
 function parseDocumentPickerSaveOption(args, action) {
@@ -360,6 +366,9 @@ function parseDocumentPickerSaveOption(args, action) {
 
   if (args.length > ARGS_ZERO && typeof args[ARGS_ZERO] === 'object') {
     let option = args[ARGS_ZERO];
+    console.log('[picker] document save option: ' + JSON.stringify(option));
+    config.parameters.extType = ExtTypes.DOWNLOAD_TYPE;
+    config.parameters.pickerType = PickerDetailType.FILE_MGR_SAVE;
     if ((option.newFileNames !== undefined) && option.newFileNames.length > 0) {
       config.parameters.key_pick_file_name = option.newFileNames;
       config.parameters.saveFile = option.newFileNames[0];
@@ -373,8 +382,6 @@ function parseDocumentPickerSaveOption(args, action) {
     }
     if (option.pickerMode === DocumentPickerMode.DOWNLOAD) {
       config.parameters.pickerMode = option.pickerMode;
-      config.action = ACTION.SAVE_ACTION_DOWNLOAD;
-      config.parameters.extType = ExtTypes.DOWNLOAD_TYPE;
       config.parameters.pickerType = PickerDetailType.FILE_MGR_AUTH;
     }
   }
@@ -383,20 +390,6 @@ function parseDocumentPickerSaveOption(args, action) {
   return config;
 }
 
-function getModalPickerResult(args) {
-  let saveResult = {
-    error: undefined,
-    data: undefined
-  }
-  if (args) {
-    var dataArr = [];
-    dataArr.push(args.uri);
-    saveResult.data = dataArr;
-  }
-  console.log('[picker] modal picker: download saveResult: ' + JSON.stringify(saveResult));
-  return saveResult;
-}
-
 function getDocumentPickerSaveResult(args) {
   let saveResult = {
     error: undefined,
@@ -404,26 +397,21 @@ function getDocumentPickerSaveResult(args) {
   };
 
   // 0:success
-  // -1:Non modal cancel
-  // 1:Modal cancel
-  // ResultCode is a non modal return code.
-  // Result is the return code of the modality.
-  if ((args.resultCode !== undefined && args.resultCode === 0) || (args.result !== undefined && args.result === 0)) {
-    if (args.want && args.want.parameters) {
-      if (args.want.parameters.pick_path_return) {
-        saveResult.data = args.want.parameters.pick_path_return;
-      } else {
-        saveResult.data = args.want.parameters['ability.params.stream'];
-      }
+  // -1:modal cancel
+  if (args.resultCode !== undefined && args.resultCode === 0) {
+    if (args.ability_params_stream) {
+      saveResult.data = args.ability_params_stream;
+      saveResult.error = args.resultCode;
     }
-  } else if ((args.resultCode !== undefined && args.resultCode === -1) ||
-      (args.result !== undefined && args.result === 1) ) {
+    
+  } else if (args.resultCode !== undefined && args.resultCode === -1) {
     saveResult.data = [];
+    saveResult.error = args.resultCode;
   } else {
     saveResult.error = getErr(ErrCode.RESULT_ERROR);
   }
 
-  console.log('[picker] document saveResult: ' + JSON.stringify(saveResult));
+  console.log('[picker] getDocumentPickerSaveResult saveResult: ' + JSON.stringify(saveResult));
   return saveResult;
 }
 
@@ -438,7 +426,7 @@ function startModalPicker(context, config) {
   }
   gContext = context;
   if (pickerHelper === undefined) {
-    console.log('[picker] modal picker: pickerHelper undefined.')
+    console.log('[picker] modal picker: pickerHelper undefined.');
   }
   let helper = pickerHelper.startModalPicker(gContext, config);
   if (helper === undefined) {
@@ -450,9 +438,8 @@ function startModalPicker(context, config) {
 async function modalPicker(args, context, config) {
   try {
     console.log('[picker] modal picker: config: ' + JSON.stringify(config));
-    let modalSaveResult = await startModalPicker(context, config);
-    const saveResult = getModalPickerResult(modalSaveResult);
-    return saveResult;
+    let modalResult = await startModalPicker(context, config);
+    return modalResult;
   } catch (resultError) {
     console.error('[picker] modal picker: Result error: ' + resultError);
   }
@@ -482,43 +469,32 @@ async function documentPickerSave(...args) {
   }
 
   documentSaveConfig = parseDocumentPickerSaveOption(args, ACTION.SAVE_ACTION_MODAL);
-  if (documentSaveConfig.parameters.pickerMode === DocumentPickerMode.DOWNLOAD) {
-    console.log('[picker] modal picker: will start modal picker process. (DOWNLOAD)');
-    saveResult = await modalPicker(args, documentSaveContext, documentSaveConfig);
-  } else {
-    try {
-      if (documentSaveContext === undefined) {
-        console.error('[picker] documentSaveContext == undefined');
-        throw getErr(ErrCode.CONTEXT_NO_EXIST);
-      }
-      documentSaveConfig = parseDocumentPickerSaveOption(args, ACTION.SAVE_ACTION_MODAL);
-      documentSaveResult = await documentSaveContext.requestDialogService(documentSaveConfig);
-    } catch (paramError) {
-      console.error('[picker] paramError: ' + JSON.stringify(paramError));
-      try {
-        documentSaveConfig = parseDocumentPickerSaveOption(args, ACTION.SAVE_ACTION);
-        documentSaveResult = await documentSaveContext.startAbilityForResult(documentSaveConfig, {windowMode: 0});
-      } catch (error) {
-        console.error('[picker] document save error: ' + error);
-        return undefined;
-      }
-    }
-    console.log('[picker] document save result: ' + JSON.stringify(documentSaveResult));
-    saveResult = getDocumentPickerSaveResult(documentSaveResult);
-  }
+  console.log('[picker] document save start');
+
+  documentSaveResult = await modalPicker(args, documentSaveContext, documentSaveConfig);
+  saveResult = getDocumentPickerSaveResult(documentSaveResult);
+  console.log('[picker] download save result: ' + JSON.stringify(saveResult));
+  return sendResult(args, saveResult);
+}
+
+async function sendResult(args, result) {
   try {
+    if (result === undefined) {
+      console.log('[picker] modal picker: result is undefined.');
+      return undefined;
+    }
     if (args.length === ARGS_TWO && typeof args[ARGS_ONE] === 'function') {
-      return args[ARGS_ONE](saveResult.error, saveResult.data);
+      return args[ARGS_ONE](result.error, result.data);
     } else if (args.length === ARGS_ONE && typeof args[ARGS_ZERO] === 'function') {
-      return args[ARGS_ZERO](saveResult.error, saveResult.data);
+      return args[ARGS_ZERO](result.error, result.data);
     }
     return new Promise((resolve, reject) => {
-      if (saveResult.data !== undefined) {
-        resolve(saveResult.data);
+      if (result.data !== undefined) {
+        resolve(result.data);
       } else {
-        reject(saveResult.error);
+        reject(result.error);
       }
-    })
+    });
   } catch (resultError) {
     console.error('[picker] Result error: ' + resultError);
   }
@@ -553,7 +529,7 @@ async function audioPickerSelect(...args) {
     }
     let result = await audioSelectContext.startAbilityForResult(audioSelectConfig, {windowMode: 0});
     console.log('[picker] audio select result: ' + JSON.stringify(result));
-    const audioSelectResult = getDocumentPickerSelectResult(result);
+    const audioSelectResult = getAudioPickerSelectResult(result);
     console.log('[picker] documentSelectResult: ' + JSON.stringify(audioSelectResult));
     if (args.length === ARGS_TWO && typeof args[ARGS_ONE] === 'function') { 
       return args[ARGS_ONE](audioSelectResult.error, audioSelectResult.data);
diff --git a/interfaces/kits/picker/src/modal_ui_callback.cpp b/interfaces/kits/picker/src/modal_ui_callback.cpp
index 97140deccb802c1cdb8707e0d55612c8a786675b..f1f1564e1177b349bb0c2b7f4b707fcfdfa09fbd 100644
--- a/interfaces/kits/picker/src/modal_ui_callback.cpp
+++ b/interfaces/kits/picker/src/modal_ui_callback.cpp
@@ -28,7 +28,7 @@ ModalUICallback::ModalUICallback(Ace::UIContent* uiContent, PickerCallBack* pick
 
 void ModalUICallback::SetSessionId(int32_t sessionId)
 {
-    this->sessionId_=sessionId;
+    this->sessionId_ = sessionId;
 }
 
 void ModalUICallback::OnRelease(int32_t releaseCode)
@@ -46,12 +46,10 @@ void ModalUICallback::OnError(int32_t code, const std::string& name, const std::
 
 void ModalUICallback::OnResultForModal(int32_t resultCode, const OHOS::AAFwk::Want &result)
 {
-    HILOG_INFO("modal picker: OnResultForModal enter. resultCode is %{public}d", resultCode);
-    if (result.GetParams().HasParam("downloadNewUri")) {
-        HILOG_INFO("modal picker: downloadNewUri exit.");
-        pickerCallBack_->uri = result.GetStringParam("downloadNewUri");
-    }
+    HILOG_INFO("modal picker: OnResultForModal enter. resultCode is %{public}d, %{public}s",
+        resultCode,  result.ToString().c_str());
     pickerCallBack_->resultCode = resultCode;
+    pickerCallBack_->want = result;
     pickerCallBack_->ready = true;
 }
 
diff --git a/interfaces/kits/picker/src/picker_n_exporter.cpp b/interfaces/kits/picker/src/picker_n_exporter.cpp
index 740f4fc9d904dbc107df728a72fb20484a1ccc40..1005dec4f6609ccdeff227de42d85f7b279c0deb 100644
--- a/interfaces/kits/picker/src/picker_n_exporter.cpp
+++ b/interfaces/kits/picker/src/picker_n_exporter.cpp
@@ -55,6 +55,46 @@ static void StartModalPickerExecute(napi_env env, void *data)
     HILOG_INFO("modal picker: StartModalPickerExecute is ready.");
 }
 
+static napi_value MakeResultWithPickerCallBack(napi_env env, std::shared_ptr<PickerCallBack> pickerCallBack)
+{
+    if (pickerCallBack == nullptr) {
+        HILOG_ERROR("pickerCallBack is null");
+        return nullptr;
+    }
+    napi_value result = nullptr;
+    napi_status status = napi_generic_failure;
+    napi_create_object(env, &result);
+
+    const int32_t resCode = pickerCallBack->resultCode;
+    HILOG_INFO("modal picker: resCode is %{public}d. want is %{public}s.",
+        resCode, pickerCallBack->want.ToString().c_str());
+    napi_value resultCode = nullptr;
+    napi_create_int32(env, resCode, &resultCode);
+    status = napi_set_named_property(env, result, "resultCode", resultCode);
+    if (status != napi_ok) {
+        HILOG_ERROR("modal picker: napi_set_named_property resultCode failed");
+    }
+
+    napi_value array;
+    napi_create_array(env, &array);
+
+    if (pickerCallBack->want.GetParams().HasParam("ability.params.stream")) {
+        std::vector<std::string> list = pickerCallBack->want.GetStringArrayParam("ability.params.stream");
+        const int32_t len = list.size();
+        HILOG_INFO("modal picker: ability.params.stream size. %{public}d ", len);
+        for (int i = 0; i < len; i++) {
+            napi_value uri = nullptr;
+            napi_create_string_utf8(env, list[i].c_str(), NAPI_AUTO_LENGTH, &uri);
+            napi_set_element(env, array, i, uri);
+        }
+        status = napi_set_named_property(env, result, "ability_params_stream", array);
+        if (status != napi_ok) {
+            HILOG_ERROR("modal picker: napi_set_named_property uri failed");
+        }
+    }
+    return result;
+}
+
 static void StartModalPickerAsyncCallbackComplete(napi_env env, napi_status status, void *data)
 {
     HILOG_INFO("modal picker: StartModalPickerAsyncCallbackComplete begin.");
@@ -75,20 +115,7 @@ static void StartModalPickerAsyncCallbackComplete(napi_env env, napi_status stat
     if (status != napi_ok) {
         HILOG_ERROR("modal picker: napi_get_undefined jsContext->error failed");
     }
-    const string uri = context->pickerCallBack->uri;
-    HILOG_DEBUG("modal picker: uri is %{public}s.", uri.c_str());
-    napi_value jsUri = nullptr;
-    status = napi_create_string_utf8(env, uri.c_str(), NAPI_AUTO_LENGTH, &jsUri);
-
-    if (jsUri == nullptr) {
-        HILOG_ERROR("jsUri is nullptr.");
-    }
-    napi_value result = nullptr;
-    napi_create_object(env, &result);
-    status = napi_set_named_property(env, result, "uri", jsUri);
-    if (status != napi_ok) {
-        HILOG_ERROR("modal picker: napi_set_named_property uri failed");
-    }
+    napi_value result = MakeResultWithPickerCallBack(env, context->pickerCallBack);
     if (result != nullptr) {
         jsContext->data = result;
         jsContext->status = true;