fix: 解决本地选择的文件上传时丢失原始文件名的问题

src/platforms/h5/service/api/file/util.js

 /**
- * 从url读取Blob
+ * 暂存的文件对象
+ */
+const files = {}
+/**
+ * 从url读取File
  * @param {string} url
- * @param {Function} success
- * @param {Function} error
+ * @param {Promise}
  */
-export function urlToBlob (url, success, error) {
-  var xhr = new XMLHttpRequest()
-  xhr.open('GET', url, true)
-  xhr.responseType = 'blob'
-  xhr.onload = function () {
-    success(this.response)
+export function urlToFile (url) {
+  var file = files[url]
+  if (file) {
+    return Promise.resolve(file)
   }
-  xhr.onerror = error
-  xhr.send()
+  if (/^data:[a-z-]+\/[a-z-]+;base64,/.test(url)) {
+    return Promise.resolve(base64ToBlob(url))
+  }
+  return new Promise((resolve, reject) => {
+    var xhr = new XMLHttpRequest()
+    xhr.open('GET', url, true)
+    xhr.responseType = 'blob'
+    xhr.onload = function () {
+      resolve(this.response)
+    }
+    xhr.onerror = reject
+    xhr.send()
+  })
 }
 /**
  * base64转Blob
@@ -32,9 +44,19 @@ export function base64ToBlob (base64) {
 }
 /**
  * 从本地file或者blob对象创建url
- * @param {Blob|File} blob
+ * @param {Blob|File} file
  * @return {string}
  */
-export function blobToUrl (blob) {
-  return (window.URL || window.webkitURL).createObjectURL(blob)
+export function fileToUrl (file) {
+  for (const key in files) {
+    if (files.hasOwnProperty(key)) {
+      const oldFile = files[key]
+      if (oldFile === file) {
+        return key
+      }
+    }
+  }
+  var url = (window.URL || window.webkitURL).createObjectURL(file)
+  files[url] = file
+  return url
 }

src/platforms/h5/service/api/media/choose-image.js

+import { fileToUrl } from '../file/util'
+
 const {
   invokeCallbackHandler: invoke
 } = UniServiceJSBridge
@@ -44,7 +46,7 @@ export function chooseImage ({
     const fileCount = event.target.files.length
     for (let i = 0; i < fileCount; i++) {
       const file = event.target.files[i]
-      const filePath = window.URL.createObjectURL(file)
+      const filePath = fileToUrl(file)
 
       tempFilePaths.push(filePath)
       tempFiles.push({
@@ -63,4 +65,4 @@ export function chooseImage ({
   })
 
   imageInput.click()
-}
+}

src/platforms/h5/service/api/media/choose-video.js

+import { fileToUrl } from '../file/util'
+
 const {
   invokeCallbackHandler: invoke
 } = UniServiceJSBridge
@@ -31,7 +33,7 @@ export function chooseVideo ({
 
   videoInput.addEventListener('change', function (event) {
     const file = event.target.files[0]
-    const filePath = window.URL.createObjectURL(file)
+    const filePath = fileToUrl(file)
 
     invoke(callbackId, {
       errMsg: 'chooseVideo:ok',
@@ -43,4 +45,4 @@ export function chooseVideo ({
   })
 
   videoInput.click()
-}
+}

src/platforms/h5/service/api/network/download-file.js

-import { blobToUrl } from '../file/util'
+import { fileToUrl } from '../file/util'
 /**
  * 下载任务
  */
@@ -57,7 +57,7 @@ export function downloadFile ({
     invoke(callbackId, {
       errMsg: 'downloadFile:ok',
       statusCode,
-      tempFilePath: blobToUrl(blob)
+      tempFilePath: fileToUrl(blob)
     })
   }
   xhr.onabort = function () {

src/platforms/h5/service/api/network/upload-file.js

-import {
-  urlToBlob,
-  base64ToBlob
-} from '../file/util'
+import { urlToFile } from '../file/util'
 /**
  * 上传任务
  */
@@ -52,32 +49,15 @@ export function uploadFile ({
     invokeCallbackHandler: invoke
   } = UniServiceJSBridge
   var uploadTask = new UploadTask(null, callbackId)
-  // 暂时只支持blob和base64
-  if (filePath.indexOf('blob:http') === 0) {
-    urlToBlob(filePath, upload, () => {
-      setTimeout(() => {
-        invoke(callbackId, {
-          errMsg: 'uploadFile:fail file error'
-        })
-      }, 0)
-    })
-  } else if (/^data:[a-z-]+\/[a-z-]+;base64,/.test(filePath)) {
-    upload(base64ToBlob(filePath))
-  } else {
-    setTimeout(() => {
-      invoke(callbackId, {
-        errMsg: 'uploadFile:fail filePath error'
-      })
-    }, 0)
-  }
-  function upload (blob) {
+
+  function upload (file) {
     var xhr = new XMLHttpRequest()
     var form = new FormData()
     var timer
     Object.keys(formData).forEach(key => {
       form.append(key, formData[key])
     })
-    form.append(name, blob, `file-${Date.now()}`)
+    form.append(name, file, file.name || `file-${Date.now()}`)
     xhr.open('POST', url)
     Object.keys(header).forEach(key => {
       xhr.setRequestHeader(key, header[key])
@@ -131,5 +111,14 @@ export function uploadFile ({
       })
     }
   }
+
+  urlToFile(filePath).then(upload).catch(() => {
+    setTimeout(() => {
+      invoke(callbackId, {
+        errMsg: 'uploadFile:fail file error'
+      })
+    }, 0)
+  })
+
   return uploadTask
 }