From 537ecc521e394bcc7f28d2fa4ba82cdb80e6d046 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Wed, 5 Jun 2019 15:40:51 +0800
Subject: [PATCH] [improvement] Uploader: optimize code

---
 packages/uploader/index.js | 59 +++++++++++---------------------------
 packages/uploader/utils.js | 27 +++++++++++++++++
 2 files changed, 44 insertions(+), 42 deletions(-)
 create mode 100644 packages/uploader/utils.js

diff --git a/packages/uploader/index.js b/packages/uploader/index.js
index 89cb41257..11fd74d56 100644
--- a/packages/uploader/index.js
+++ b/packages/uploader/index.js
@@ -1,4 +1,5 @@
 import { use, suffixPx } from '../utils';
+import { toArray, readFile, isOversize } from './utils';
 import Icon from '../icon';
 import Image from '../image';
 
@@ -56,55 +57,37 @@ export default sfc({
         return;
       }
 
-      files = files.length === 1 ? files[0] : [].slice.call(files, 0);
+      files = files.length === 1 ? files[0] : [].slice.call(files);
 
-      if (!files || (this.beforeRead && !this.beforeRead(files, this.detail))) {
+      if (this.beforeRead && !this.beforeRead(files, this.detail)) {
         this.resetInput();
         return;
       }
 
+      const oversize = isOversize(files, this.maxSize);
+
       if (Array.isArray(files)) {
         const maxCount = this.maxCount - this.fileList.length;
-        files = files.slice(0, maxCount);
 
-        Promise.all(files.map(this.readFile)).then(contents => {
-          let oversize = false;
-          const payload = files.map((file, index) => {
-            if (file.size > this.maxSize) {
-              oversize = true;
-            }
+        if (files.length > maxCount) {
+          files = files.slice(0, maxCount);
+        }
 
-            return {
-              file: files[index],
-              content: contents[index]
-            };
-          });
+        Promise.all(files.map(file => readFile(file, this.resultType))).then(contents => {
+          const fileList = files.map((file, index) => ({
+            file,
+            content: contents[index]
+          }));
 
-          this.onAfterRead(payload, oversize);
+          this.onAfterRead(fileList, oversize);
         });
       } else {
-        this.readFile(files).then(content => {
-          this.onAfterRead({ file: files, content }, files.size > this.maxSize);
+        readFile(files, this.resultType).then(content => {
+          this.onAfterRead({ file: files, content }, oversize);
         });
       }
     },
 
-    readFile(file) {
-      return new Promise(resolve => {
-        const reader = new FileReader();
-
-        reader.onload = event => {
-          resolve(event.target.result);
-        };
-
-        if (this.resultType === 'dataUrl') {
-          reader.readAsDataURL(file);
-        } else if (this.resultType === 'text') {
-          reader.readAsText(file);
-        }
-      });
-    },
-
     onAfterRead(files, oversize) {
       if (oversize) {
         this.$emit('oversize', files, this.detail);
@@ -112,21 +95,13 @@ export default sfc({
       }
 
       this.resetInput();
-      this.updateFileList(files);
+      this.$emit('input', [...this.fileList, ...toArray(files)]);
 
       if (this.afterRead) {
         this.afterRead(files, this.detail);
       }
     },
 
-    updateFileList(files) {
-      if (!Array.isArray(files)) {
-        files = [files];
-      }
-
-      this.$emit('input', [...this.fileList, ...files]);
-    },
-
     resetInput() {
       /* istanbul ignore else */
       if (this.$refs.input) {
diff --git a/packages/uploader/utils.js b/packages/uploader/utils.js
new file mode 100644
index 000000000..532d54203
--- /dev/null
+++ b/packages/uploader/utils.js
@@ -0,0 +1,27 @@
+export function toArray(item) {
+  if (Array.isArray(item)) {
+    return item;
+  }
+
+  return [item];
+}
+
+export function readFile(file, resultType) {
+  return new Promise(resolve => {
+    const reader = new FileReader();
+
+    reader.onload = event => {
+      resolve(event.target.result);
+    };
+
+    if (resultType === 'dataUrl') {
+      reader.readAsDataURL(file);
+    } else if (resultType === 'text') {
+      reader.readAsText(file);
+    }
+  });
+}
+
+export function isOversize(files, maxSize) {
+  return toArray(files).some(file => file.size > maxSize);
+}