easy3wui 1.5.7 → 1.5.8-2.beta

package/lib/Easy3wUploadB/index.js

@@ -78,23 +78,48 @@ require('antd/lib/modal/style');
 
 var _comonConfig = require('comonConfigPath/comonConfig');
 
-var _Easy3wGetCookie = require('./../Easy3wGetCookie');
-
-var _Easy3wGetCookie2 = _interopRequireDefault(_Easy3wGetCookie);
-
-var _Easy3wDownLoad = require('./../Easy3wDownLoad');
+var _Easy3wDownLoad = require('../Easy3wDownLoad');
 
 var _Easy3wDownLoad2 = _interopRequireDefault(_Easy3wDownLoad);
 
-var _Easy3wAESEncrypt = require('./../Easy3wAESEncrypt');
+var _Easy3wAESEncrypt = require('../Easy3wAESEncrypt');
 
 var _Easy3wAESEncrypt2 = _interopRequireDefault(_Easy3wAESEncrypt);
 
+var _Easy3wUIConfig = require('../Easy3wUIConfig');
+
+var _Easy3wUIConfig2 = _interopRequireDefault(_Easy3wUIConfig);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
+var objPreviewFileDefault = _Easy3wUIConfig2['default'].objPreviewFileDefault;
+
+// 文件上传配置
+
+var _ref = _comonConfig.objE3wUIFileConfig || {},
+    maxSizeB = _ref.maxSizeB;
+// maxSizeB 大附件-文件大小限制 单位：MB
+// maxSize 附件-文件大小限制 单位：MB
+
+
+var _ref2 = _comonConfig.objEasy3wUIConfig || {},
+    objEasy3wUploadB = _ref2.objEasy3wUploadB;
+
+var _ref3 = objEasy3wUploadB || {},
+    projectType = _ref3.projectType;
+
 var formItemStyle = {
-  marginBottom: 6
+  marginBottom: projectType === '1' ? 3 : 6
 };
+function Easy3wGetCookie(name) {
+  var arr = void 0;
+  var reg = new RegExp('(^| )' + name + '=([^;]*)(;|$)');
+  if (arr = document.cookie.match(reg)) {
+    return unescape(arr[2]);
+  } else {
+    return null;
+  }
+}
 
 var BigFileUpload = function (_Component) {
   (0, _inherits3['default'])(BigFileUpload, _Component);
@@ -122,7 +147,8 @@ var BigFileUpload = function (_Component) {
       uploadData: null, // 上传的数据
       iniSetedFlag: false, // 是否初始化
       CUSize: 0, // 当前上传附件大小
-      speed: 0 // 上传速率
+      speed: 0, // 上传速率
+      uploadQueue: [] // 队列
     };
     return _this;
   }
@@ -146,6 +172,14 @@ var BigFileUpload = function (_Component) {
       }
     }
   };
+  // 预览
+
+  // 新增：从队列中取下一个开始上传（顺序上传）
+
+  // 处理下一个文件
+
+  // url处理
+
 
   BigFileUpload.prototype.render = function render() {
     var _this2 = this;
@@ -165,15 +199,22 @@ var BigFileUpload = function (_Component) {
         wrapperCol = _props.wrapperCol,
         showUploadList = _props.showUploadList,
         urlDownloadFile = _props.urlDownloadFile,
-        initialValue = _props.initialValue;
+        initialValue = _props.initialValue,
+        multiple = _props.multiple,
+        removeCallback = _props.removeCallback,
+        propsAFlag = _props.propsAFlag,
+        fileViewFlag = _props.fileViewFlag;
+    var maxFileSize = this.props.maxFileSize;
     var _state = this.state,
         preUploading = _state.preUploading,
         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;
     var uploadProp = {
       // name,
       listType: listType,
@@ -196,10 +237,14 @@ var BigFileUpload = function (_Component) {
           _this2.setState((0, _extends3['default'])({}, _this2.state, {
             cancelStatus: true,
             loading: false,
+            uploading: false,
             fileList: fileList,
             iniSetedFlag: iniSetedFlag
           }), function () {
             _this2.setUploadValue(fileList);
+            if (removeCallback) {
+              removeCallback(name, file);
+            }
           });
           return;
         }
@@ -208,30 +253,42 @@ var BigFileUpload = function (_Component) {
             _this2.setState((0, _extends3['default'])({}, _this2.state, {
               cancelStatus: true,
               loading: false,
+              uploading: false,
               fileList: fileList,
               currentFile: null,
               iniSetedFlag: iniSetedFlag
             }), function () {
               _this2.setUploadValue(fileList);
+              if (removeCallback) {
+                removeCallback(name, file);
+              }
             });
           } else {
             _this2.setState((0, _extends3['default'])({}, _this2.state, {
               cancelStatus: false,
               loading: true,
+              uploading: false,
               fileList: fileList,
               iniSetedFlag: iniSetedFlag
             }), function () {
               _this2.setUploadValue(fileList);
+              if (removeCallback) {
+                removeCallback(name, file);
+              }
             });
           }
         } else {
           _this2.setState((0, _extends3['default'])({}, _this2.state, {
             cancelStatus: true,
             loading: false,
+            uploading: false,
             fileList: fileList,
             iniSetedFlag: iniSetedFlag
           }), function () {
             _this2.setUploadValue(fileList);
+            if (removeCallback) {
+              removeCallback(name, file);
+            }
           });
         }
         return true;
@@ -240,20 +297,10 @@ var BigFileUpload = function (_Component) {
         var fileTypePass = true;
         var fileNameArr = file.name.toLowerCase().split('.');
         var fileType = fileNameArr[fileNameArr.length - 1];
-        if (file.name.length > 100) {
-          _modal2['default'].info({
-            style: { top: '38%' },
-            content: '文件名称至多100个字符',
-            okText: '知道了'
-          });
-          return false;
-        }
-        var acceptDefault = '.rplib,.xls,.doc,.jpg,.pdf,.png,.zip,.bmp,.rar,.txt,.docx,.ico,.bid,.xlsx,.jpeg,.json,.xml,.ebid,.dwg,.pptx,.xmind,.xps,.crx,.7z,.ppt,.svg,.pdm,.xlsm,.vsd,.gif,.tif,.docm,.csv,.ttf,.wps,.psd,.mp4,.tiff,.rtf,.tlb,.xlsb';
         if (accept && accept.length > 0) {
-          acceptDefault = accept;
-        }
-        if (acceptDefault.indexOf(fileType) < 0) {
-          fileTypePass = false;
+          if (accept.indexOf(fileType) < 0) {
+            fileTypePass = false;
+          }
         }
         if (!fileTypePass) {
           _modal2['default'].error({
@@ -269,42 +316,76 @@ var BigFileUpload = function (_Component) {
           });
           return false;
         }
-        var multiple = _this2.props.multiple;
+        if (maxFileSize && maxFileSize > 0 && file.size / 1024 / 1024 > maxFileSize) {
+          _modal2['default'].error({
+            style: { top: '38%' },
+            content: '\u9644\u4EF6\u5FC5\u987B\u5C0F\u4E8E' + maxFileSize + 'MB!'
+          });
+          return false;
+        }
         var _state3 = _this2.state,
             fileList = _state3.fileList,
             iniSetedFlag = _state3.iniSetedFlag;
 
-        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);
+        // 单附件
+        if (!multiple) {
+          fileList = [file];
+          _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(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);
+    var previewFileFlag = objPreviewFileNew.previewFileFlag;
+
+    if (previewFileFlag && fileViewFlag !== false) {
+      uploadProp.onPreview = this.onPreview;
+    }
     if (isRead) {
-      uploadProp = (0, _extends3['default'])({}, uploadProp, { showUploadList: { showPreviewIcon: true, showRemoveIcon: false } });
+      uploadProp.children = true;
     }
     return isRead ? _react2['default'].createElement(
       _form2['default'].Item,
@@ -319,7 +400,9 @@ var BigFileUpload = function (_Component) {
         pdfViewFlag: true,
         imgVisible: true,
         urlDownloadFile: urlDownloadFile,
-        downloadArr: initialValue
+        downloadArr: initialValue,
+        propsAFlag: propsAFlag,
+        fileViewFlag: fileViewFlag
       }))
     ) : _react2['default'].createElement(
       _form2['default'].Item,
@@ -341,7 +424,7 @@ var BigFileUpload = function (_Component) {
           (0, _extends3['default'])({}, uploadProp, {
             disabled: this.state.loading
           }),
-          isRead ? null : _react2['default'].createElement(
+          _react2['default'].createElement(
             _popover2['default'],
             {
               placement: 'right',
@@ -372,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(
@@ -380,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)'
@@ -454,6 +534,25 @@ BigFileUpload.defaultProps = {
 var _initialiseProps = function _initialiseProps() {
   var _this3 = this;
 
+  this.onPreview = function (file) {
+    var objPreviewFileNew = (0, _extends3['default'])({}, objPreviewFileDefault, _comonConfig.objPreviewFile, _this3.props.objPreviewFile);
+    var previewFileUrl = objPreviewFileNew.previewFileUrl,
+        previewFileType = objPreviewFileNew.previewFileType;
+    var uid = file.uid,
+        url = file.url,
+        name = file.name;
+
+    var fileNameArr = name.toLowerCase().split('.');
+    var fileType = fileNameArr[fileNameArr.length - 1];
+    if (previewFileType.indexOf(fileType) >= 0) {
+      // const src = previewFileUrl + uid;
+      var src = _this3.urlDeal(previewFileUrl, uid);
+      window.open(src, '_blank');
+    } else {
+      window.open(url);
+    }
+  };
+
   this.setUploadValue = function (v) {
     var _setFieldsValue;
 
@@ -465,25 +564,13 @@ var _initialiseProps = function _initialiseProps() {
     setFieldsValue((_setFieldsValue = {}, _setFieldsValue[name] = v, _setFieldsValue));
   };
 
-  this.urlDeal = function (urlDownloadFile, uid) {
-    var retUrl = '';
-    if (uid !== '' && _comonConfig.aFlag && (_comonConfig.aFlag === '1' || _comonConfig.aFlag === '2')) {
-      var authToken = (0, _Easy3wGetCookie2['default'])('userToken') || 'E3WSAFEAPPQWEFGHYI7I483S';
-      var nowStr = _.now();
-      var encUrl = (0, _Easy3wAESEncrypt2['default'])(uid + '@#' + nowStr + '@#' + authToken, _comonConfig.a, _comonConfig.b);
-      return '' + urlDownloadFile + encUrl;
-    } else {
-      retUrl = '' + urlDownloadFile + uid;
-      return retUrl;
-    }
-  };
-
   this.iniValDeal = function (initialValue) {
     var urlDownloadFile = _this3.props.urlDownloadFile;
 
     var iniVal = initialValue.map(function (obj) {
       var uid = obj.uid,
           name = obj.name;
+      // const url = `${urlDownloadFile}${uid}`;
 
       var url = _this3.urlDeal(urlDownloadFile, uid);
       var status = 'done';
@@ -492,31 +579,73 @@ 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 = (0, _Easy3wGetCookie2['default'])('userToken') || 'E3WSAFEAPPQWEFGHYI7I483S';
-    // const timeStr = new Date().getTime();
-    // if (AESFlag && AESFlag === '1') {
-    //   authToken = Easy3wAESEncrypt(`${authToken}@#${timeStr}`, AESKey, AESIV);
-    // }
+    var authToken = Easy3wGetCookie('userToken') || '40572da23bee5fd59cc5b6c8d8bfb36d';
     var _props3 = _this3.props,
+        sendData = _props3.sendData,
         name = _props3.name,
         urlCheckProgress = _props3.urlCheckProgress,
         urlDownloadFile = _props3.urlDownloadFile,
         uploadDoneCallback = _props3.uploadDoneCallback;
 
+    var sendDataNew = sendData || {};
     formData.append('sendTime', new Date().getTime());
     formData.append('appType', '01');
     formData.append('authToken', authToken);
     formData.append('devId', '');
-    formData.append('data', JSON.stringify({ uploadParams: uploadParams }));
+    formData.append('data', JSON.stringify((0, _extends3['default'])({ uploadParams: uploadParams }, sendDataNew)));
     formData.append('sign', '2959f1aea8db0f7fbba61f0f8474d0ef');
+    formData.append('easy3wRootOrg', _comonConfig.easy3wRootOrg || '');
+
     _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) {
@@ -524,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;
@@ -576,6 +707,7 @@ var _initialiseProps = function _initialiseProps() {
             if (uploadDoneCallback) {
               uploadDoneCallback(name, fileInfo, newList);
             }
+            _this3.dequeueAndProcessNext();
           });
         } else {
           var uploadPercent = 0;
@@ -601,30 +733,29 @@ 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, { loading: false, fileList: _fileList2 }), function () {
+          _this3.setState((0, _extends3['default'])({}, _this3.state, { fileList: _fileList2, loading: false, uploading: false }), function () {
             _this3.setUploadValue(_fileList2);
+            _this3.dequeueAndProcessNext();
           });
         }
       }
     });
   };
 
-  this.handlePartUpload = function () {
+  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) {
@@ -650,6 +781,7 @@ var _initialiseProps = function _initialiseProps() {
           urlUpBigFileGeneral = _props4.urlUpBigFileGeneral,
           urlDownloadFile = _props4.urlDownloadFile;
 
+      var sendDataNew = sendData || {};
       var chunkSize = 0;
       if (typeof limitChunkSize === 'string') {
         if (limitChunkSize.toLowerCase().indexOf('k') !== -1) {
@@ -678,27 +810,32 @@ var _initialiseProps = function _initialiseProps() {
       } else {
         end = fileSize;
       }
+      var start = CUSize;
+      if (sIndex && sIndex > 0 && eIndex && eIndex > 0) {
+        end = eIndex;
+        start = sIndex;
+      }
       uploadFileReader.onload = function (e) {
         if (chunkCheckErr) {
           return;
         }
+        var mainFileSpark = new _sparkMd2['default'].ArrayBuffer(); // 对arrayBuffer数据进行md5加密，产生一个md5字符串 主文件
+        mainFileSpark.append(e.target.result);
+        var chunkMD5 = mainFileSpark.end();
         // 上传附件
         var file = uploadData.file;
 
         var formData = new FormData();
-        var authToken = (0, _Easy3wGetCookie2['default'])('userToken') || 'E3WSAFEAPPQWEFGHYI7I483S';
-        // const timeStr = new Date().getTime();
-        // if (AESFlag && AESFlag === '1') {
-        //   authToken = Easy3wAESEncrypt(`${authToken}@#${timeStr}`, AESKey, AESIV);
-        // }
+        var authToken = Easy3wGetCookie('userToken') || '40572da23bee5fd59cc5b6c8d8bfb36d';
         var blob = new Blob([e.target.result], { type: 'application/octet-stream' });
-        var postParam = (0, _extends3['default'])({ fileInfo: file }, sendData, { currentSize: end });
+        var postParam = (0, _extends3['default'])({ fileInfo: file }, sendDataNew, { currentSize: end, startSize: start, chunkMD5: chunkMD5 });
         formData.append('chunk', blob);
         formData.append('sendTime', new Date().getTime());
         formData.append('appType', '01');
         formData.append('authToken', authToken);
         formData.append('data', JSON.stringify(postParam));
         formData.append('sign', '2959f1aea8db0f7fbba61f0f8474d0ef');
+        formData.append('easy3wRootOrg', _comonConfig.easy3wRootOrg || '');
         var startTime = new Date().getTime();
         _superagent2['default'].post('' + urlUpBigFileGeneral).send(formData).withCredentials().end(function (err, res) {
           if (err) {
@@ -710,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;
           }
@@ -732,16 +873,26 @@ var _initialiseProps = function _initialiseProps() {
           blob = null;
           formData = null;
           if (res && res.body.rspCode === '0000') {
-            var useTime = (new Date().getTime() - startTime) / 1000; // 用时秒
-            // 1秒传输速率
-            var curSpeed = Math.floor(1 / useTime * size);
             var _res$body$data2 = res.body.data,
                 uploadStatus = _res$body$data2.uploadStatus,
                 fileId = _res$body$data2.fileId,
                 checkStatus = _res$body$data2.checkStatus,
-                uploadedSize = _res$body$data2.uploadedSize;
+                uploadedSize = _res$body$data2.uploadedSize,
+                startIndex = _res$body$data2.startIndex,
+                endIndex = _res$body$data2.endIndex;
 
+            var useTime = (new Date().getTime() - startTime) / 1000; // 用时秒
             var upSize = Number(uploadedSize);
+            // 1秒传输速率
+            var curSpeed = Math.floor(1 / useTime * size);
+            if (checkStatus && checkStatus === 'RETRY') {
+              _this3.setState((0, _extends3['default'])({}, _this3.state, {
+                speed: curSpeed
+              }), function () {
+                setImmediate(_this3.handlePartUpload, startIndex, endIndex);
+              });
+              return;
+            }
             // 计算上传进度
             uploadPercent = Math.floor(upSize / fileSize * 100 * 10) / 10;
             if (checkStatus === '0') {
@@ -778,6 +929,7 @@ var _initialiseProps = function _initialiseProps() {
                   speed: curSpeed
                 }), function () {
                   _this3.setUploadValue(newList);
+                  _this3.dequeueAndProcessNext();
                 });
                 if (uploadCallback && typeof uploadCallback === 'function') {
                   uploadCallback(newList);
@@ -790,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);
@@ -812,6 +964,7 @@ var _initialiseProps = function _initialiseProps() {
                     speed: curSpeed
                   }), function () {
                     _this3.setUploadValue(_fileList3);
+                    _this3.dequeueAndProcessNext();
                   });
                 }
               }
@@ -827,58 +980,61 @@ var _initialiseProps = function _initialiseProps() {
                 setImmediate(_this3.handlePartUpload);
               });
             }
-          } else if (res && res.body.rspMsg) {
+          } else {
             _modal2['default'].error({
               style: { top: '38%' },
-              content: 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);
-              });
-            }
-          } else {
-            _modal2['default'].error({
-              style: { top: '38%' },
-              content: '上传失败'
-            });
-            var _fileList5 = _this3.state.fileList;
-
-            var _index5 = _fileList5.indexOf(currentFile);
-            if (_index5 >= 0) {
-              _fileList5.splice(_index5, 1);
-              _this3.setState((0, _extends3['default'])({}, _this3.state, { loading: false, fileList: _fileList5 }), function () {
-                _this3.setUploadValue(_fileList5);
+                _this3.dequeueAndProcessNext();
               });
             }
           }
         });
       };
-      // console.log('读取文件', `文件大小：${currentFile.size}`, `已上传大小${CUSize}`, `结束值${end}`, `切片大小${speed}`);
-      uploadFileReader.readAsArrayBuffer(blobSlice.call(currentFile, CUSize, end));
+      // console.log('读取文件', `文件大小：${currentFile.size}`, `已上传大小${start}`, `结束值${end}`, `切片大小${speed}`);
+      uploadFileReader.readAsArrayBuffer(blobSlice.call(currentFile, start, end));
     } catch (error) {
       _modal2['default'].error({
         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();
         });
       }
     }
   };
 
+  this.urlDeal = function (urlDownloadFile, uid) {
+    var propsAFlag = _this3.props.propsAFlag; // propsAFlag 加密标识 从引用组件处传入 '1':加密 '0':不加密
+
+    var retUrl = '';
+    if (uid !== '' && propsAFlag === '1' || uid !== '' && propsAFlag !== '0' && (_comonConfig.aFlag === '1' || _comonConfig.aFlag === '2')) {
+      var authToken = Easy3wGetCookie('userToken') || 'E3WSAFEAPPQWEFGHYI7I483S';
+      var nowStr = _.now();
+      var encUrl = (0, _Easy3wAESEncrypt2['default'])(uid + '@#' + nowStr + '@#' + authToken, _comonConfig.a, _comonConfig.b);
+      return '' + urlDownloadFile + encUrl;
+    } else {
+      retUrl = '' + urlDownloadFile + uid;
+      return retUrl;
+    }
+  };
+
   this.readFile = function (file) {
     try {
       var chunkReader = new FileReader();
@@ -939,7 +1095,8 @@ var _initialiseProps = function _initialiseProps() {
         if (sliceIndex < sliceCount) {
           _this3.setState((0, _extends3['default'])({}, _this3.state, {
             preUploading: true,
-            preUploadPercent: Number((sliceIndex / sliceCount * 100).toFixed(1)) }));
+            preUploadPercent: Number((sliceIndex / sliceCount * 100).toFixed(1))
+          }));
           setImmediate(_loadNext, sliceIndex, tempreadFileSize);
         } else {
           var mainFileMD5 = mainFileSpark.end();
@@ -972,38 +1129,36 @@ 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();
         });
       }
     }
   };
 
   this.requiredFile = function (rule, value, callback) {
-    var required = _this3.props.required;
-    var fileList = _this3.state.fileList;
+    var str = void 0;
+    if (value && value instanceof Array) {
+      for (var i = 0; i < value.length; i += 1) {
+        var status = value[i].status;
 
-    if (required && (!fileList || fileList.length === 0)) {
-      callback();
-      return;
-    }
-    if (required) {
-      for (var i = 0; i < fileList.length; i += 1) {
-        var file = fileList[i];
-        if (file.status !== 'done') {
-          callback(' ');
+        if (status === 'uploading') {
+          str = ' ';
           break;
         }
       }
+    } else {
+      str = ' ';
     }
-    callback();
+    callback(str);
   };
 };