easy3wui 4.0.38 → 4.0.39-beta.1

package/lib/Easy3wGridPage/index.js

@@ -105,13 +105,6 @@ var Easy3wGridPage = function (_Component) {
     }
   };
 
-  Easy3wGridPage.prototype.componentDidUpdate = function componentDidUpdate(prevProps) {
-    var that = this;
-    if (this.props.totalResult && this.props.totalResult !== prevProps.totalResult) {
-      that.setState({ pagination: { offset: 1, limit: 10 } });
-    }
-  };
-
   Easy3wGridPage.prototype.render = function render() {
     var _this2 = this;
 

package/lib/Easy3wNewUploadB/index.js

@@ -174,7 +174,7 @@ var NewBigFileUpload = function (_Component) {
         uploadRequest = _state.uploadRequest,
         uploading = _state.uploading;
 
-    var uploadProp = {
+    var upProps = {
       // name,
       listType: listType,
       showUploadList: showUploadList,
@@ -304,7 +304,7 @@ var NewBigFileUpload = function (_Component) {
       upProps = (0, _extends3['default'])({}, upProps, { showUploadList: { showDownloadIcon: downloadFileFlag === '1', showPreviewIcon: true, showRemoveIcon: false } });
     }
     if (previewFileFlag && fileViewFlag !== false) {
-      uploadProp.onPreview = this.onPreview;
+      upProps.onPreview = this.onPreview;
     }
     return _react2['default'].createElement(
       'div',
@@ -322,7 +322,7 @@ var NewBigFileUpload = function (_Component) {
         },
         _react2['default'].createElement(
           _upload2['default'],
-          (0, _extends3['default'])({}, uploadProp, {
+          (0, _extends3['default'])({}, upProps, {
             disabled: this.state.loading
           }),
           isRead ? null : _react2['default'].createElement(

package/lib/Easy3wUploadB/index.js

@@ -114,8 +114,7 @@ var BigFileUpload = function (_Component) {
       uploadData: null, // 上传的数据
       iniSetedFlag: false, // 是否初始化
       CUSize: 0, // 当前上传附件大小
-      speed: 0, // 上传速率
-      uploadQueue: [] // 队列
+      speed: 0 // 上传速率
     };
     return _this;
   }
@@ -141,10 +140,6 @@ var BigFileUpload = function (_Component) {
   };
   // 预览
 
-  // 新增：从队列中取下一个开始上传（顺序上传）
-
-  // 处理下一个文件
-
 
   BigFileUpload.prototype.render = function render() {
     var _this2 = this;
@@ -163,18 +158,16 @@ var BigFileUpload = function (_Component) {
         labelCol = _props.labelCol,
         wrapperCol = _props.wrapperCol,
         showUploadList = _props.showUploadList,
-        multiple = _props.multiple,
         fileViewFlag = _props.fileViewFlag;
     var _state = this.state,
         preUploading = _state.preUploading,
         uploadPercent = _state.uploadPercent,
         preUploadPercent = _state.preUploadPercent,
         uploadRequest = _state.uploadRequest,
-        uploading = _state.uploading,
-        currentFile = _state.currentFile;
+        uploading = _state.uploading;
     var getFieldDecorator = form.getFieldDecorator;
 
-    var uploadProp = {
+    var upProps = {
       // name,
       listType: listType,
       showUploadList: showUploadList,
@@ -196,7 +189,6 @@ var BigFileUpload = function (_Component) {
           _this2.setState((0, _extends3['default'])({}, _this2.state, {
             cancelStatus: true,
             loading: false,
-            uploading: false,
             fileList: fileList,
             iniSetedFlag: iniSetedFlag
           }), function () {
@@ -209,7 +201,6 @@ var BigFileUpload = function (_Component) {
             _this2.setState((0, _extends3['default'])({}, _this2.state, {
               cancelStatus: true,
               loading: false,
-              uploading: false,
               fileList: fileList,
               currentFile: null,
               iniSetedFlag: iniSetedFlag
@@ -220,7 +211,6 @@ var BigFileUpload = function (_Component) {
             _this2.setState((0, _extends3['default'])({}, _this2.state, {
               cancelStatus: false,
               loading: true,
-              uploading: false,
               fileList: fileList,
               iniSetedFlag: iniSetedFlag
             }), function () {
@@ -231,7 +221,6 @@ var BigFileUpload = function (_Component) {
           _this2.setState((0, _extends3['default'])({}, _this2.state, {
             cancelStatus: true,
             loading: false,
-            uploading: false,
             fileList: fileList,
             iniSetedFlag: iniSetedFlag
           }), function () {
@@ -273,63 +262,50 @@ var BigFileUpload = function (_Component) {
           });
           return false;
         }
+        var multiple = _this2.props.multiple;
         var _state3 = _this2.state,
             fileList = _state3.fileList,
             iniSetedFlag = _state3.iniSetedFlag;
-        // 单附件
 
         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 自动上传
+        } else {
+          fileList.push(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();
-            });
-          }
+        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;
       },
-      multiple: !!multiple,
       fileList: this.state.fileList
     };
     var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, this.props.objPreviewFile);
-    var previewFileFlag = objPreviewFileNew.previewFileFlag;
+    var previewFileFlag = objPreviewFileNew.previewFileFlag,
+        _objPreviewFileNew$do = objPreviewFileNew.downloadFileFlag,
+        downloadFileFlag = _objPreviewFileNew$do === undefined ? '1' : _objPreviewFileNew$do;
 
+    if (isRead) {
+      upProps = (0, _extends3['default'])({}, upProps, { showUploadList: { showDownloadIcon: downloadFileFlag === '1', showPreviewIcon: true, showRemoveIcon: false } });
+    }
     if (previewFileFlag && fileViewFlag !== false) {
-      uploadProp.onPreview = this.onPreview;
+      upProps.onPreview = this.onPreview;
     }
     return _react2['default'].createElement(
       _compatible.Form.Item,
@@ -348,7 +324,7 @@ var BigFileUpload = function (_Component) {
           rules: [{ validator: this.requiredFile }, { required: required, message: help }]
         })(_react2['default'].createElement(
           _upload2['default'],
-          (0, _extends3['default'])({}, uploadProp, {
+          (0, _extends3['default'])({}, upProps, {
             disabled: this.state.loading
           }),
           isRead ? null : _react2['default'].createElement(
@@ -382,7 +358,6 @@ 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(
@@ -391,13 +366,17 @@ 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)'
@@ -518,52 +497,8 @@ 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';
     var _props3 = _this3.props,
@@ -580,7 +515,9 @@ var _initialiseProps = function _initialiseProps() {
     formData.append('sign', '2959f1aea8db0f7fbba61f0f8474d0ef');
     _superagent2['default'].post('' + urlCheckProgress).send(formData).withCredentials().end(function (err, res) {
       if (err) {
-        var fileList = _this3.state.fileList;
+        var _state4 = _this3.state,
+            fileList = _state4.fileList,
+            currentFile = _state4.currentFile;
 
         var index = fileList.indexOf(currentFile);
         if (index >= 0) {
@@ -588,22 +525,20 @@ var _initialiseProps = function _initialiseProps() {
           _this3.setState((0, _extends3['default'])({}, _this3.state, {
             fileList: fileList,
             cancelStatus: true,
-            loading: false,
-            uploading: false
+            loading: false
           }), function () {
             _this3.setUploadValue(fileList);
-            _this3.dequeueAndProcessNext();
           });
         }
         if (err.timeout) {
           _modal2['default'].error({
             style: { top: '38%' },
-            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'
+            content: '网络超时，上传失败，请检查网络后，重新续传。'
           });
         } else {
           _modal2['default'].error({
             style: { top: '38%' },
-            content: currentFile.name + '\u4E0A\u4F20\u5931\u8D25\uFF0C\u5B58\u5728\u670D\u52A1\u8BF7\u6C42\u5F02\u5E38\uFF0C\u8BF7\u91CD\u8BD5'
+            content: '服务请求异常，请重试'
           });
         }
         return;
@@ -642,7 +577,6 @@ var _initialiseProps = function _initialiseProps() {
             if (uploadDoneCallback) {
               uploadDoneCallback(name, fileInfo, newList);
             }
-            _this3.dequeueAndProcessNext();
           });
         } else {
           var uploadPercent = 0;
@@ -668,14 +602,15 @@ var _initialiseProps = function _initialiseProps() {
           style: { top: '38%' },
           content: res.body.rspMsg
         });
-        var _fileList2 = _this3.state.fileList;
+        var _state5 = _this3.state,
+            _fileList2 = _state5.fileList,
+            _currentFile = _state5.currentFile;
 
-        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, uploading: false }), function () {
+          _this3.setState((0, _extends3['default'])({}, _this3.state, { loading: false, fileList: _fileList2 }), function () {
             _this3.setUploadValue(_fileList2);
-            _this3.dequeueAndProcessNext();
           });
         }
       }
@@ -684,13 +619,13 @@ var _initialiseProps = function _initialiseProps() {
 
   this.handlePartUpload = function () {
     try {
-      var _state5 = _this3.state,
-          currentFile = _state5.currentFile,
-          CUSize = _state5.CUSize,
-          cancelStatus = _state5.cancelStatus,
-          uploadData = _state5.uploadData,
-          loading = _state5.loading,
-          speed = _state5.speed;
+      var _state6 = _this3.state,
+          currentFile = _state6.currentFile,
+          CUSize = _state6.CUSize,
+          cancelStatus = _state6.cancelStatus,
+          uploadData = _state6.uploadData,
+          loading = _state6.loading,
+          speed = _state6.speed;
 
       if (cancelStatus) {
         if (loading) {
@@ -772,24 +707,21 @@ var _initialiseProps = function _initialiseProps() {
               _this3.setState((0, _extends3['default'])({}, _this3.state, {
                 fileList: fileList,
                 cancelStatus: true,
-                loading: false,
-                uploading: false
+                loading: false
               }), function () {
                 _this3.setUploadValue(fileList);
-                _this3.dequeueAndProcessNext();
               });
             }
             if (err.timeout) {
               _modal2['default'].error({
                 style: { top: '38%' },
-                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'
+                content: '网络超时，上传失败，请检查网络后，重新续传。'
               });
             } else {
               _modal2['default'].error({
                 style: { top: '38%' },
-                content: currentFile.name + '\u4E0A\u4F20\u5931\u8D25\uFF0C\u5B58\u5728\u670D\u52A1\u8BF7\u6C42\u5F02\u5E38\uFF0C\u8BF7\u91CD\u8BD5'
+                content: '服务请求异常，请重试'
               });
-              _this3.dequeueAndProcessNext();
             }
             return;
           }
@@ -843,7 +775,6 @@ var _initialiseProps = function _initialiseProps() {
                   speed: curSpeed
                 }), function () {
                   _this3.setUploadValue(newList);
-                  _this3.dequeueAndProcessNext();
                 });
                 if (uploadCallback && typeof uploadCallback === 'function') {
                   uploadCallback(newList);
@@ -856,12 +787,12 @@ var _initialiseProps = function _initialiseProps() {
                 if (checkStatus !== '1') {
                   _modal2['default'].error({
                     style: { top: '38%' },
-                    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'
+                    content: '附件完整性验证失败：可能由于网络丢包原因，您上传的附件未通过完整性校验，需要您重新上传。'
                   });
                 } else {
                   _modal2['default'].error({
                     style: { top: '38%' },
-                    content: currentFile.name + '\u6587\u4EF6\u4E0A\u4F20\u5931\u8D25'
+                    content: '上传失败'
                   });
                 }
                 var _index3 = _fileList3.indexOf(currentFile);
@@ -878,7 +809,6 @@ var _initialiseProps = function _initialiseProps() {
                     speed: curSpeed
                   }), function () {
                     _this3.setUploadValue(_fileList3);
-                    _this3.dequeueAndProcessNext();
                   });
                 }
               }
@@ -904,24 +834,22 @@ var _initialiseProps = function _initialiseProps() {
             var _index4 = _fileList4.indexOf(currentFile);
             if (_index4 >= 0) {
               _fileList4.splice(_index4, 1);
-              _this3.setState((0, _extends3['default'])({}, _this3.state, { loading: false, uploading: false, fileList: _fileList4 }), function () {
+              _this3.setState((0, _extends3['default'])({}, _this3.state, { loading: false, fileList: _fileList4 }), function () {
                 _this3.setUploadValue(_fileList4);
-                _this3.dequeueAndProcessNext();
               });
             }
           } else {
             _modal2['default'].error({
               style: { top: '38%' },
-              content: currentFile.name + '\u6587\u4EF6\u4E0A\u4F20\u5931\u8D25'
+              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, uploading: false, fileList: _fileList5 }), function () {
+              _this3.setState((0, _extends3['default'])({}, _this3.state, { loading: false, fileList: _fileList5 }), function () {
                 _this3.setUploadValue(_fileList5);
-                _this3.dequeueAndProcessNext();
               });
             }
           }
@@ -934,16 +862,15 @@ var _initialiseProps = function _initialiseProps() {
         style: { top: '38%' },
         content: error
       });
-      var _state6 = _this3.state,
-          fileList = _state6.fileList,
-          _currentFile = _state6.currentFile;
+      var _state7 = _this3.state,
+          fileList = _state7.fileList,
+          _currentFile2 = _state7.currentFile;
 
-      var index = fileList.indexOf(_currentFile);
+      var index = fileList.indexOf(_currentFile2);
       if (index >= 0) {
         fileList.splice(index, 1);
         _this3.setState((0, _extends3['default'])({}, _this3.state, { fileList: fileList }), function () {
           _this3.setUploadValue(fileList);
-          _this3.dequeueAndProcessNext();
         });
       }
     }
@@ -1042,16 +969,15 @@ var _initialiseProps = function _initialiseProps() {
         style: { top: '38%' },
         content: error
       });
-      var _state7 = _this3.state,
-          fileList = _state7.fileList,
-          currentFile = _state7.currentFile;
+      var _state8 = _this3.state,
+          fileList = _state8.fileList,
+          currentFile = _state8.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();
         });
       }
     }

package/lib/Easy3wUploadM/index.js

@@ -91,10 +91,7 @@ var Easy3wUploadM = function (_Component) {
     }
 
     return _ret = (_temp = (_this = (0, _possibleConstructorReturn3['default'])(this, _Component.call.apply(_Component, [this].concat(args))), _this), _this.state = {
-      fileList: [],
-      beforeFileList: [], // 上传前获取上传文件
-      finishFileList: [] // 上传完成文件
-
+      fileList: [{}]
       // 预览
     }, _this.onPreview = function (file) {
       var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, _this.props.objPreviewFile);
@@ -259,11 +256,6 @@ var Easy3wUploadM = function (_Component) {
         });
         return false;
       } else {
-        _this2.setState(function (prev) {
-          return (0, _extends3['default'])({}, _this2.state, {
-            beforeFileList: [].concat(prev.beforeFileList, [file])
-          });
-        });
         return true;
       }
     };
@@ -275,7 +267,6 @@ var Easy3wUploadM = function (_Component) {
     };
     var handleFileChange = function handleFileChange(e) {
       var fileList = e.fileList;
-      var file = e.file;
       // 移除大小不符、类型不符的文件
 
       fileList = fileList.filter(function (f1) {
@@ -319,9 +310,9 @@ var Easy3wUploadM = function (_Component) {
         return nFile;
       });
       // 3. filter successfully uploaded files according to response from server
-      fileList = fileList.filter(function (f3) {
-        var status = f3.status,
-            name = f3.name;
+      fileList = fileList.filter(function (file) {
+        var status = file.status,
+            name = file.name;
 
         if (status === 'error') {
           _modal2['default'].error({
@@ -330,17 +321,17 @@ var Easy3wUploadM = function (_Component) {
           });
           return false; // 上传失败
         }
-        if (f3.response) {
-          if (f3.response.rspCode === '0000') {
-            // if (uploadDoneCallback) {
-            //   uploadDoneCallback(uploadName, fileList, f3);
-            // }
+        if (file.response) {
+          if (file.response.rspCode === '0000') {
+            if (uploadDoneCallback) {
+              uploadDoneCallback(uploadName, fileList, file);
+            }
             return true;
           }
-          if (f3.response.rspMsg) {
+          if (file.response.rspMsg) {
             _modal2['default'].error({
               style: { top: '38%' },
-              content: f3.response.rspMsg
+              content: file.response.rspMsg
             });
           } else {
             _modal2['default'].error({
@@ -364,24 +355,6 @@ var Easy3wUploadM = function (_Component) {
         }
       });
       _this2.setState({ fileList: fileList });
-      var status = file.status;
-
-      if (status === 'done') {
-        _this2.setState(function (prev) {
-          return { finishFileList: [].concat(prev.finishFileList, [file]) };
-        }, function () {
-          var _state = _this2.state,
-              beforeFileList = _state.beforeFileList,
-              finishFileList = _state.finishFileList;
-
-          if (beforeFileList.length > 0 && finishFileList.length > 0 && beforeFileList.length === finishFileList.length) {
-            if (uploadDoneCallback) {
-              uploadDoneCallback(uploadName, fileList, file);
-              _this2.setState({ finishFileList: [], beforeFileList: [] });
-            }
-          }
-        });
-      }
       return fileList;
     };
     var checkFile = function checkFile(rule, value, callback) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wui",
-  "version": "4.0.38",
+  "version": "4.0.39-beta.1",
   "description": "easy3wui components for react",
   "keywords": [
     "react",