Merge pull request #18 from eternalsky/master

加入 setOptions

Author: yanbingbing

README.md

@@ -223,6 +223,21 @@ videos = {
 
 静态变量，获得版本号。
 
+### UploadCore.setOptions
+
+修改已经初始化后的 Options，目前支持
+
+```javascript
+['name', 'url', 'params', 'action', 'data', 'headers', 
+'withCredentials', 'timeout', 'chunkEnable', 'chunkSize', 
+'chunkRetries', 'chunkProcessThreads', 'autoPending', 
+'auto', 'capcity', 'queueCapcity', 'sizeLimit', 
+'fileSizeLimit']
+```
+
+参数 | 类型 | 描述
+--- |----- | ------
+options | `object` | 传入参数，同初始化 
 
 ### UploadCore.addConstraint
 

demo/index.js

@@ -21,6 +21,11 @@ const core = new Core({
     preventDuplicate: false
 });
 
+window.core = core;
+core.setOptions({
+    queueCapcity: 2
+});
+
 // 上传完成
 core.on(Events.FILE_UPLOAD_COMPLETING, response => {
     let json = response.getJson();

src/core.js

@@ -27,9 +27,14 @@ class Core extends Emitter {
         this.constraints = new Constraints;
         this.filters = new Filters;
 
-        if (this.capcity > 0) {
-            this.addConstraint(() => this.stat.getTotal() >= this.capcity);
-        }
+        this.addConstraint(() => {
+            if (this.capcity > 0) {
+                return this.stat.getTotal() >= this.capcity
+            }
+            else {
+                return false;
+            }
+        });
 
         if (this.accept && this.accept.length > 0) {
             this.addFilter((file) => {
@@ -62,7 +67,7 @@ class Core extends Emitter {
             options.fitlers.forEach(filter => this.addFilter(filter));
         }
 
-        const request = options.request || {};
+        let request = options.request || {};
         REQUEST_OPTIONS.forEach((key) => {
             if (options.hasOwnProperty(key)) {
                 request[key] = options[key];
@@ -72,6 +77,23 @@ class Core extends Emitter {
         this.requestOptions = request;
     }
 
+    setOptions(options) {
+        if (typeof options === 'object' && !(options instanceof Array)) {
+            this.autoPending = options.autoPending || options.auto || this.autoPending;
+            this.capcity = options.capcity || options.queueCapcity || this.capcity;
+            this.sizeLimit = parseSize(options.sizeLimit || options.fileSizeLimit || this.sizeLimit);
+            let requestOptions = this.requestOptions
+            REQUEST_OPTIONS.forEach((key) => {
+                if (options.hasOwnProperty(key)) {
+                    requestOptions[key] = options[key];
+                }
+            });
+        }
+        else {
+            console && console.error('setOptions: type error, options should be an object/hashMap');
+        }
+    }
+
     createFileRequest(file) {
         return new FileRequest(file, this.requestOptions);
     }