Merge branch 'master' of github.com:lian-yue/vue-upload-component

lian-yue · lian-yue · commit 8c2eba8d9a2c · 2019-01-16T17:33:56.000+08:00
diff --git a/docs/docs/en.md b/docs/docs/en.md
@@ -139,12 +139,36 @@ This process is divided in three phases: <strong>start</strong>, <strong>upload<
 
 #### start
 
-This is the first phase of the process. We'll tell the backend that we are going to upload a file, with certain `size` and `mime_type`.
+This is the first phase of the process. We'll tell the backend that we are going to upload a file, with certain `size`, `name` and `mime_type`.
 
 Use the option `startBody` to add more parameters to the body of this request.
 
 The backend should provide a `session_id` (to identify the upload) and a `end_offset` which is the size of every chunk
 
+##### HTTP start phase example
+
+Request body example:
+```
+{
+  "phase": "start",
+  "mime_type": "image/png",
+  "size": 12669430,
+  "name":"hubbleimage1stscihp1809af6400x4800.png"
+}
+```
+
+Response body example:
+```
+{
+  "data": {
+    "end_offset": 6291456,
+    "session_id": "61db8102-fca6-44ae-81e2-a499d438e7a5"
+  },
+  "status": "success"
+}
+
+```
+
 #### upload
 
 In this phase we'll upload every chunk until all of them are uploaded. This step allows some failures in the backend, and will retry up to `maxRetries` times.
@@ -153,12 +177,118 @@ We'll send the `session_id`, `start_offset` and `chunk` (the sliced blob - part
 
 Use the option `uploadBody` to add more parameters to the body of this request.
 
+##### HTTP upload phase example with 3 chunks
+
+Request body example - chunk 1 from 3:
+```
+------WebKitFormBoundaryuI0uiY8h7MCbcysx
+Content-Disposition: form-data; name="phase"
+
+upload
+------WebKitFormBoundaryuI0uiY8h7MCbcysx
+Content-Disposition: form-data; name="session_id"
+
+61db8102-fca6-44ae-81e2-a499d438e7a5
+------WebKitFormBoundaryuI0uiY8h7MCbcysx
+Content-Disposition: form-data; name="start_offset"
+
+0
+------WebKitFormBoundaryuI0uiY8h7MCbcysx
+Content-Disposition: form-data; name="chunk"; filename="blob"
+Content-Type: application/octet-stream
+
+
+------WebKitFormBoundaryuI0uiY8h7MCbcysx--
+```
+
+Response body example - chunk 1 from 3:
+```
+{
+  "status": "success"
+}
+```
+
+Request body example - chunk 2 from 3:
+```
+------WebKitFormBoundary4cjBupFqrx1SrHoR
+Content-Disposition: form-data; name="phase"
+
+upload
+------WebKitFormBoundary4cjBupFqrx1SrHoR
+Content-Disposition: form-data; name="session_id"
+
+61db8102-fca6-44ae-81e2-a499d438e7a5
+------WebKitFormBoundary4cjBupFqrx1SrHoR
+Content-Disposition: form-data; name="start_offset"
+
+6291456
+------WebKitFormBoundary4cjBupFqrx1SrHoR
+Content-Disposition: form-data; name="chunk"; filename="blob"
+Content-Type: application/octet-stream
+
+
+------WebKitFormBoundary4cjBupFqrx1SrHoR-
+```
+
+Response body example - chunk 2 from 3:
+```
+{
+  "status": "success"
+}
+```
+
+Request body example - chunk 3 from 3:
+```
+------WebKitFormBoundarypWxg4xnB5QBDoFys
+Content-Disposition: form-data; name="phase"
+
+upload
+------WebKitFormBoundarypWxg4xnB5QBDoFys
+Content-Disposition: form-data; name="session_id"
+
+61db8102-fca6-44ae-81e2-a499d438e7a5
+------WebKitFormBoundarypWxg4xnB5QBDoFys
+Content-Disposition: form-data; name="start_offset"
+
+12582912
+------WebKitFormBoundarypWxg4xnB5QBDoFys
+Content-Disposition: form-data; name="chunk"; filename="blob"
+Content-Type: application/octet-stream
+
+
+------WebKitFormBoundarypWxg4xnB5QBDoFys--
+```
+
+Response body example - chunk 1 from 3:
+```
+{
+  "status": "success"
+}
+```
+
 #### finish
 
 In this phase we tell the backend that there are no more chunks to upload, so it can wrap everything. We send the `session_id` in this phase.
 
 Use the option `finishBody` to add more parameters to the body of this request.
 
+##### HTTP finish phase example
+
+Request body example:
+```
+{
+  "phase": "finish",
+  "session_id": "61db8102-fca6-44ae-81e2-a499d438e7a5"
+}
+```
+
+Response body example:
+```
+{
+  "status": "success"
+}
+```
+
 #### Example
 
 In the following example we are going to add `Chunk Upload Functionality`. This component will use `Chunk Upload` when the size of the file is > `1MB`, it will behave as the `Simple example` when the size of the file is lower.
diff --git a/src/chunk/ChunkUploadHandler.js b/src/chunk/ChunkUploadHandler.js
@@ -45,7 +45,7 @@ export default class ChunkUploadHandler {
   }
 
   /**
-   * Gets the file size
+   * Gets the file name
    */
   get fileName () {
     return this.file.name

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ export default class ChunkUploadHandler {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`/**`
`48`		`- * Gets the file size`
	`48`	`+ * Gets the file name`
`49`	`49`	`*/`
`50`	`50`	`get fileName () {`
`51`	`51`	`return this.file.name`