easy3wui 1.5.75 → 1.5.76-beta.2

package/lib/Easy3wUploadB/index.js

@@ -147,7 +147,8 @@ var BigFileUpload = function (_Component) {
       uploadData: null, // 上传的数据
       iniSetedFlag: false, // 是否初始化
       CUSize: 0, // 当前上传附件大小
-      speed: 0 // 上传速率
+      speed: 0, // 上传速率
+      uploadQueue: [] // 队列
     };
     return _this;
   }
@@ -173,6 +174,10 @@ var BigFileUpload = function (_Component) {
   };
   // 预览
 
+  // 新增：从队列中取下一个开始上传（顺序上传）
+
+  // 处理下一个文件
+
   // url处理
 
 
@@ -195,6 +200,7 @@ var BigFileUpload = function (_Component) {
         showUploadList = _props.showUploadList,
         urlDownloadFile = _props.urlDownloadFile,
         initialValue = _props.initialValue,
+        multiple = _props.multiple,
         removeCallback = _props.removeCallback,
         propsAFlag = _props.propsAFlag,
         fileViewFlag = _props.fileViewFlag;
@@ -204,7 +210,8 @@ var BigFileUpload = function (_Component) {
         uploadPercent = _state.uploadPercent,
         preUploadPercent = _state.preUploadPercent,
         uploadRequest = _state.uploadRequest,
-        uploading = _state.uploading;
+        uploading = _state.uploading,
+        currentFile = _state.currentFile;
     var getFieldDecorator = form.getFieldDecorator;
 
     maxFileSize = maxFileSize || maxSizeB;
@@ -230,6 +237,7 @@ var BigFileUpload = function (_Component) {
           _this2.setState((0, _extends3['default'])({}, _this2.state, {
             cancelStatus: true,
             loading: false,
+            uploading: false,
             fileList: fileList,
             iniSetedFlag: iniSetedFlag
           }), function () {
@@ -245,6 +253,7 @@ var BigFileUpload = function (_Component) {
             _this2.setState((0, _extends3['default'])({}, _this2.state, {
               cancelStatus: true,
               loading: false,
+              uploading: false,
               fileList: fileList,
               currentFile: null,
               iniSetedFlag: iniSetedFlag
@@ -258,6 +267,7 @@ var BigFileUpload = function (_Component) {
             _this2.setState((0, _extends3['default'])({}, _this2.state, {
               cancelStatus: false,
               loading: true,
+              uploading: false,
               fileList: fileList,
               iniSetedFlag: iniSetedFlag
             }), function () {
@@ -271,6 +281,7 @@ var BigFileUpload = function (_Component) {
           _this2.setState((0, _extends3['default'])({}, _this2.state, {
             cancelStatus: true,
             loading: false,
+            uploading: false,
             fileList: fileList,
             iniSetedFlag: iniSetedFlag
           }), function () {
@@ -312,7 +323,6 @@ var BigFileUpload = function (_Component) {
           });
           return false;
         }
-        var multiple = _this2.props.multiple;
         var _state3 = _this2.state,
             fileList = _state3.fileList,
             iniSetedFlag = _state3.iniSetedFlag;
@@ -320,34 +330,52 @@ var BigFileUpload = function (_Component) {
         if (!iniSetedFlag) {
           iniSetedFlag = true;
         }
+        // 单附件
         if (!multiple) {
           fileList = [file];
-        } else {
-          fileList.push(file);
-        }
-        if (!iniSetedFlag) {
-          iniSetedFlag = true;
+          _this2.setState((0, _extends3['default'])({}, _this2.state, {
+            fileList: fileList,
+            currentFile: file,
+            preUploading: true, // 预处理中
+            uploading: false, // 上传中
+            uploadRequest: false, // 上传预处理
+            uploadPercent: -1,
+            preUploadPercent: -1,
+            chunkProgressStatus: 'active',
+            cancelStatus: false, // 取消状态
+            CUSize: 0, // 当前附件上传大小
+            loading: true, // 禁用上传
+            iniSetedFlag: iniSetedFlag
+          }), function () {
+            setImmediate(_this2.readFile, file);
+          });
+          return false; // 阻止 Upload 自动上传
         }
-        // 首先清除一下各种上传的状态
-        _this2.setState((0, _extends3['default'])({}, _this2.state, {
-          fileList: fileList,
-          currentFile: file,
-          preUploading: true, // 预处理中
-          uploading: false, // 上传中
-          uploadRequest: false, // 上传预处理
-          uploadPercent: -1,
-          preUploadPercent: -1,
-          chunkProgressStatus: 'active',
-          cancelStatus: false, // 取消状态
-          CUSize: 0, // 当前附件上传大小
-          loading: true, // 禁用上传
-          iniSetedFlag: iniSetedFlag,
-          fileViewFlag: fileViewFlag
-        }), function () {
-          setImmediate(_this2.readFile, file);
+        // 多文件
+        _this2.setState(function (prev) {
+          return (0, _extends3['default'])({}, _this2.state, {
+            fileList: [].concat(prev.fileList, [file]),
+            preUploading: _this2.state.preUploading || false,
+            uploadPercent: -1,
+            preUploadPercent: -1,
+            chunkProgressStatus: 'active',
+            cancelStatus: false,
+            CUSize: 0,
+            loading: true,
+            iniSetedFlag: iniSetedFlag,
+            uploadQueue: [].concat(prev.uploadQueue, [file])
+          });
+        }, function () {
+          // 如果当前没有正在上传的文件，则开始队列
+          if (!_this2.state.uploading && !_this2.state.currentFile) {
+            setTimeout(function () {
+              _this2.processQueue();
+            });
+          }
         });
         return false;
       },
+      multiple: !!multiple,
       fileList: this.state.fileList
     };
     var objPreviewFileNew = (0, _extends3['default'])({}, objPreviewFileDefault, _comonConfig.objPreviewFile, this.props.objPreviewFile);
@@ -427,6 +455,7 @@ var BigFileUpload = function (_Component) {
           _react2['default'].createElement(
             'span',
             { style: { margin: '10px auto', color: '#1890ff' } },
+            currentFile ? currentFile.name : '',
             '\u6587\u4EF6\u8BFB\u53D6\u4E2D...'
           ),
           _react2['default'].createElement(
@@ -435,17 +464,13 @@ var BigFileUpload = function (_Component) {
             _react2['default'].createElement(_progress2['default'], { width: 80, percent: preUploadPercent, status: 'active' })
           )
         ) : '',
-        !this.state.cancelStatus && this.state.fileList.length > 0 && !!uploadRequest && _react2['default'].createElement(
-          'span',
-          { style: { margin: '10px auto', color: '#1890ff' } },
-          '\u6587\u4EF6\u6821\u9A8C\u4E2D...'
-        ),
         !this.state.cancelStatus && this.state.fileList.length > 0 && uploadPercent >= 0 && uploadPercent < 100 && _react2['default'].createElement(
           'div',
           null,
           !!uploading && _react2['default'].createElement(
             'span',
             { style: { margin: '10px auto', color: '#1890ff' } },
+            currentFile ? currentFile.name : '',
             '\u6587\u4EF6\u4E0A\u4F20\u4E2D(',
             Math.floor(this.state.speed / 1024),
             'KB/S)'
@@ -554,8 +579,52 @@ var _initialiseProps = function _initialiseProps() {
     return iniVal;
   };
 
+  this.processQueue = function () {
+    var _state4 = _this3.state,
+        uploadQueue = _state4.uploadQueue,
+        uploading = _state4.uploading;
+
+    if (uploading) return;
+    // 没有待处理的文件
+    if (!uploadQueue || uploadQueue.length === 0) {
+      _this3.setState({ currentFile: null, uploading: false });
+      return;
+    }
+    // 取第一个文件
+    var nextFile = uploadQueue[0];
+    _this3.setState({
+      cancelStatus: false,
+      currentFile: nextFile,
+      uploading: true,
+      preUploading: true
+    }, function () {
+      setImmediate(_this3.readFile, nextFile);
+    });
+  };
+
+  this.dequeueAndProcessNext = function () {
+    var uploadQueue = _this3.state.uploadQueue;
+
+    var remainingQueue = uploadQueue.slice(1);
+    _this3.setState({
+      uploadQueue: remainingQueue,
+      currentFile: null,
+      uploading: false,
+      preUploading: false,
+      loading: false
+    }, function () {
+      if (remainingQueue.length > 0) {
+        setTimeout(function () {
+          _this3.processQueue();
+        }, 300);
+      }
+    });
+  };
+
   this.checkFile = function (uploadParams) {
     _this3.setState({ uploadRequest: true });
+    var currentFile = _this3.state.currentFile;
+
     var formData = new FormData();
     var authToken = Easy3wGetCookie('userToken') || '40572da23bee5fd59cc5b6c8d8bfb36d';
     var _props3 = _this3.props,
@@ -576,9 +645,7 @@ var _initialiseProps = function _initialiseProps() {
 
     _superagent2['default'].post('' + urlCheckProgress).send(formData).withCredentials().end(function (err, res) {
       if (err) {
-        var _state4 = _this3.state,
-            fileList = _state4.fileList,
-            currentFile = _state4.currentFile;
+        var fileList = _this3.state.fileList;
 
         var index = fileList.indexOf(currentFile);
         if (index >= 0) {
@@ -586,20 +653,22 @@ var _initialiseProps = function _initialiseProps() {
           _this3.setState((0, _extends3['default'])({}, _this3.state, {
             fileList: fileList,
             cancelStatus: true,
-            loading: false
+            loading: false,
+            uploading: false
           }), function () {
             _this3.setUploadValue(fileList);
+            _this3.dequeueAndProcessNext();
           });
         }
         if (err.timeout) {
           _modal2['default'].error({
             style: { top: '38%' },
-            content: '网络超时，上传失败，请检查网络后，重新续传。'
+            content: '\u7F51\u7EDC\u8D85\u65F6\uFF0C' + currentFile.name + '\u4E0A\u4F20\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5\u7F51\u7EDC\u540E\uFF0C\u91CD\u65B0\u7EED\u4F20\u3002'
           });
         } else {
           _modal2['default'].error({
             style: { top: '38%' },
-            content: '服务请求异常，请重试'
+            content: currentFile.name + '\u4E0A\u4F20\u5931\u8D25\uFF0C\u5B58\u5728\u670D\u52A1\u8BF7\u6C42\u5F02\u5E38\uFF0C\u8BF7\u91CD\u8BD5'
           });
         }
         return;
@@ -638,6 +707,7 @@ var _initialiseProps = function _initialiseProps() {
             if (uploadDoneCallback) {
               uploadDoneCallback(name, fileInfo, newList);
             }
+            _this3.dequeueAndProcessNext();
           });
         } else {
           var uploadPercent = 0;
@@ -663,15 +733,14 @@ var _initialiseProps = function _initialiseProps() {
           style: { top: '38%' },
           content: res.body.rspMsg
         });
-        var _state5 = _this3.state,
-            _fileList2 = _state5.fileList,
-            _currentFile = _state5.currentFile;
+        var _fileList2 = _this3.state.fileList;
 
-        var _index2 = _fileList2.indexOf(_currentFile);
+        var _index2 = _fileList2.indexOf(currentFile);
         if (_index2 >= 0) {
           _fileList2.splice(_index2, 1);
-          _this3.setState((0, _extends3['default'])({}, _this3.state, { fileList: _fileList2, loading: false }), function () {
+          _this3.setState((0, _extends3['default'])({}, _this3.state, { fileList: _fileList2, loading: false, uploading: false }), function () {
             _this3.setUploadValue(_fileList2);
+            _this3.dequeueAndProcessNext();
           });
         }
       }
@@ -680,13 +749,13 @@ var _initialiseProps = function _initialiseProps() {
 
   this.handlePartUpload = function (sIndex, eIndex) {
     try {
-      var _state6 = _this3.state,
-          currentFile = _state6.currentFile,
-          CUSize = _state6.CUSize,
-          cancelStatus = _state6.cancelStatus,
-          uploadData = _state6.uploadData,
-          loading = _state6.loading,
-          speed = _state6.speed;
+      var _state5 = _this3.state,
+          currentFile = _state5.currentFile,
+          CUSize = _state5.CUSize,
+          cancelStatus = _state5.cancelStatus,
+          uploadData = _state5.uploadData,
+          loading = _state5.loading,
+          speed = _state5.speed;
 
       if (cancelStatus) {
         if (loading) {
@@ -778,21 +847,25 @@ var _initialiseProps = function _initialiseProps() {
               _this3.setState((0, _extends3['default'])({}, _this3.state, {
                 fileList: fileList,
                 cancelStatus: true,
-                loading: false
+                loading: false,
+                uploading: false
               }), function () {
                 _this3.setUploadValue(fileList);
+                _this3.dequeueAndProcessNext();
               });
             }
             if (err.timeout) {
               _modal2['default'].error({
                 style: { top: '38%' },
-                content: '网络超时，上传失败，请检查网络后，重新续传。'
+                content: '\u7F51\u7EDC\u8D85\u65F6\uFF0C' + currentFile.name + '\u4E0A\u4F20\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5\u7F51\u7EDC\u540E\uFF0C\u91CD\u65B0\u7EED\u4F20\u3002'
               });
+              _this3.dequeueAndProcessNext();
             } else {
               _modal2['default'].error({
                 style: { top: '38%' },
-                content: '服务请求异常，请重试'
+                content: currentFile.name + '\u4E0A\u4F20\u5931\u8D25\uFF0C\u5B58\u5728\u670D\u52A1\u8BF7\u6C42\u5F02\u5E38\uFF0C\u8BF7\u91CD\u8BD5'
               });
+              _this3.dequeueAndProcessNext();
             }
             return;
           }
@@ -856,6 +929,7 @@ var _initialiseProps = function _initialiseProps() {
                   speed: curSpeed
                 }), function () {
                   _this3.setUploadValue(newList);
+                  _this3.dequeueAndProcessNext();
                 });
                 if (uploadCallback && typeof uploadCallback === 'function') {
                   uploadCallback(newList);
@@ -868,12 +942,12 @@ var _initialiseProps = function _initialiseProps() {
                 if (checkStatus !== '1') {
                   _modal2['default'].error({
                     style: { top: '38%' },
-                    content: '附件完整性验证失败：可能由于网络丢包原因，您上传的附件未通过完整性校验，需要您重新上传。'
+                    content: currentFile.name + '\u6587\u4EF6\u5B8C\u6574\u6027\u9A8C\u8BC1\u5931\u8D25\uFF1A\u53EF\u80FD\u7531\u4E8E\u7F51\u7EDC\u4E22\u5305\u539F\u56E0\uFF0C\u60A8\u4E0A\u4F20\u7684\u9644\u4EF6\u672A\u901A\u8FC7\u5B8C\u6574\u6027\u6821\u9A8C\uFF0C\u9700\u8981\u60A8\u91CD\u65B0\u4E0A\u4F20\u3002'
                   });
                 } else {
                   _modal2['default'].error({
                     style: { top: '38%' },
-                    content: '上传失败'
+                    content: currentFile.name + '\u6587\u4EF6\u4E0A\u4F20\u5931\u8D25'
                   });
                 }
                 var _index3 = _fileList3.indexOf(currentFile);
@@ -890,6 +964,7 @@ var _initialiseProps = function _initialiseProps() {
                     speed: curSpeed
                   }), function () {
                     _this3.setUploadValue(_fileList3);
+                    _this3.dequeueAndProcessNext();
                   });
                 }
               }
@@ -908,15 +983,16 @@ var _initialiseProps = function _initialiseProps() {
           } else {
             _modal2['default'].error({
               style: { top: '38%' },
-              content: res && res.body.rspMsg ? res.body.rspMsg : '上传失败'
+              content: res && res.body.rspMsg ? res.body.rspMsg : currentFile.name + '\u6587\u4EF6\u4E0A\u4F20\u5931\u8D25'
             });
             var _fileList4 = _this3.state.fileList;
 
             var _index4 = _fileList4.indexOf(currentFile);
             if (_index4 >= 0) {
               _fileList4.splice(_index4, 1);
-              _this3.setState((0, _extends3['default'])({}, _this3.state, { loading: false, fileList: _fileList4 }), function () {
+              _this3.setState((0, _extends3['default'])({}, _this3.state, { loading: false, uploading: false, fileList: _fileList4 }), function () {
                 _this3.setUploadValue(_fileList4);
+                _this3.dequeueAndProcessNext();
               });
             }
           }
@@ -929,15 +1005,16 @@ var _initialiseProps = function _initialiseProps() {
         style: { top: '38%' },
         content: error
       });
-      var _state7 = _this3.state,
-          fileList = _state7.fileList,
-          _currentFile2 = _state7.currentFile;
+      var _state6 = _this3.state,
+          fileList = _state6.fileList,
+          _currentFile = _state6.currentFile;
 
-      var index = fileList.indexOf(_currentFile2);
+      var index = fileList.indexOf(_currentFile);
       if (index >= 0) {
         fileList.splice(index, 1);
         _this3.setState((0, _extends3['default'])({}, _this3.state, { fileList: fileList }), function () {
           _this3.setUploadValue(fileList);
+          _this3.dequeueAndProcessNext();
         });
       }
     }
@@ -1052,15 +1129,16 @@ var _initialiseProps = function _initialiseProps() {
         style: { top: '38%' },
         content: error
       });
-      var _state8 = _this3.state,
-          fileList = _state8.fileList,
-          currentFile = _state8.currentFile;
+      var _state7 = _this3.state,
+          fileList = _state7.fileList,
+          currentFile = _state7.currentFile;
 
       var index = fileList.indexOf(currentFile);
       if (index >= 0) {
         fileList.splice(index, 1);
         _this3.setState((0, _extends3['default'])({}, _this3.state, { fileList: fileList }), function () {
           _this3.setUploadValue(fileList);
+          _this3.dequeueAndProcessNext();
         });
       }
     }