easy3wui 1.5.9 → 1.5.12

package/assets/formPage.css

@@ -1,10 +1,8 @@
 .ant-upload-list-item {
-  width: -moz-max-content;
-  width: max-content;
+  width: auto;
 }
 .ant-upload-list-item .ant-upload-list-item-info {
-  width: -moz-max-content;
-  width: max-content;
+  width: auto;
 }
 .ant-upload-list-item .anticon-cross {
   right: -2px;

package/assets/index.css

@@ -1380,12 +1380,10 @@ s {
   cursor: pointer;
 }
 .ant-upload-list-item {
-  width: -moz-max-content;
-  width: max-content;
+  width: auto;
 }
 .ant-upload-list-item .ant-upload-list-item-info {
-  width: -moz-max-content;
-  width: max-content;
+  width: auto;
 }
 .ant-upload-list-item .anticon-cross {
   right: -2px;

package/lib/Easy3wFormPage/index.js

@@ -469,7 +469,7 @@ var Easy3wFormPage = function (_Component) {
         }
       }
       if (fieldType === 'input' || fieldType === 'textarea') {
-        var maxLength = fieldType === 'textarea' ? 400 : 50;
+        var maxLength = fieldType === 'textarea' ? 1000 : 50;
         if (cmptPros) {
           if (cmptPros.maxLength) {
             maxLength = cmptPros.maxLength;

package/lib/Easy3wGridTextArea/index.js

@@ -61,7 +61,7 @@ var Easy3wGridTextArea = function (_Component) {
         maxLength = _ref.maxLength,
         disabled = _ref.disabled;
 
-    var rules = [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }, { max: maxLength || 50, message: '\u5F55\u5165\u6587\u5B57\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7' + (maxLength || 50) }];
+    var rules = [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }, { max: maxLength || 1000, message: '\u5F55\u5165\u6587\u5B57\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7' + (maxLength || 1000) }];
     if (disabled) {
       rules.pop();
     }

package/lib/Easy3wUploadB/index copy 2.js

@@ -0,0 +1,1011 @@
+'use strict';
+
+exports.__esModule = true;
+
+var _extends2 = require('babel-runtime/helpers/extends');
+
+var _extends3 = _interopRequireDefault(_extends2);
+
+var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck');
+
+var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+var _possibleConstructorReturn2 = require('babel-runtime/helpers/possibleConstructorReturn');
+
+var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2);
+
+var _inherits2 = require('babel-runtime/helpers/inherits');
+
+var _inherits3 = _interopRequireDefault(_inherits2);
+
+var _react = require('react');
+
+var _react2 = _interopRequireDefault(_react);
+
+var _propTypes = require('prop-types');
+
+var _propTypes2 = _interopRequireDefault(_propTypes);
+
+var _form = require('antd/lib/form');
+
+var _form2 = _interopRequireDefault(_form);
+
+require('antd/lib/form/style');
+
+var _upload = require('antd/lib/upload');
+
+var _upload2 = _interopRequireDefault(_upload);
+
+require('antd/lib/upload/style');
+
+var _icon = require('antd/lib/icon');
+
+var _icon2 = _interopRequireDefault(_icon);
+
+require('antd/lib/icon/style');
+
+var _button = require('antd/lib/button');
+
+var _button2 = _interopRequireDefault(_button);
+
+require('antd/lib/button/style');
+
+var _progress = require('antd/lib/progress');
+
+var _progress2 = _interopRequireDefault(_progress);
+
+require('antd/lib/progress/style');
+
+var _popover = require('antd/lib/popover');
+
+var _popover2 = _interopRequireDefault(_popover);
+
+require('antd/lib/popover/style');
+
+var _superagent = require('superagent');
+
+var _superagent2 = _interopRequireDefault(_superagent);
+
+var _sparkMd = require('spark-md5');
+
+var _sparkMd2 = _interopRequireDefault(_sparkMd);
+
+var _modal = require('antd/lib/modal');
+
+var _modal2 = _interopRequireDefault(_modal);
+
+require('antd/lib/modal/style');
+
+var _comonConfig = require('comonConfigPath/comonConfig');
+
+var _Easy3wGetCookie = require('./../Easy3wGetCookie');
+
+var _Easy3wGetCookie2 = _interopRequireDefault(_Easy3wGetCookie);
+
+var _Easy3wDownLoad = require('./../Easy3wDownLoad');
+
+var _Easy3wDownLoad2 = _interopRequireDefault(_Easy3wDownLoad);
+
+var _Easy3wAESEncrypt = require('./../Easy3wAESEncrypt');
+
+var _Easy3wAESEncrypt2 = _interopRequireDefault(_Easy3wAESEncrypt);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
+
+var formItemStyle = {
+  marginBottom: 6
+};
+
+var BigFileUpload = function (_Component) {
+  (0, _inherits3['default'])(BigFileUpload, _Component);
+
+  function BigFileUpload(props) {
+    (0, _classCallCheck3['default'])(this, BigFileUpload);
+
+    var _this = (0, _possibleConstructorReturn3['default'])(this, _Component.call(this, props));
+
+    _initialiseProps.call(_this);
+
+    var initialValue = _this.props.initialValue;
+
+    _this.state = {
+      preUploading: false, // 文件预处理中
+      uploadPercent: -1, // 上传率
+      preUploadPercent: -1, // 预处理率
+      uploadRequest: false, // 上传校验
+      uploading: false, // 文件上传中状态
+      cancelStatus: false, // 取消状态
+      loading: false, // 上传是否可用
+      fileList: initialValue && initialValue.length > 0 ? _this.iniValDeal(initialValue) : [], // 上传附件信息
+      chunkProgressStatus: 'active',
+      currentFile: null, // 当前附件
+      uploadData: null, // 上传的数据
+      iniSetedFlag: false, // 是否初始化
+      CUSize: 0, // 当前上传附件大小
+      speed: 0 // 上传速率
+    };
+    return _this;
+  }
+
+  BigFileUpload.prototype.componentWillReceiveProps = function componentWillReceiveProps(nextProps) {
+    var iniSetedFlag = this.state.iniSetedFlag;
+
+    if (!iniSetedFlag) {
+      var initialValue = nextProps.initialValue;
+      var fileList = this.state.fileList;
+
+      if (fileList && fileList.length > 0) {
+        return;
+      }
+      if (initialValue && initialValue.length > 0) {
+        var iniVal = this.iniValDeal(initialValue);
+        this.setState((0, _extends3['default'])({}, this.state, {
+          iniSetedFlag: true,
+          fileList: iniVal
+        }));
+      }
+    }
+  };
+
+  BigFileUpload.prototype.render = function render() {
+    var _this2 = this;
+
+    var _props = this.props,
+        name = _props.name,
+        listType = _props.listType,
+        accept = _props.accept,
+        required = _props.required,
+        help = _props.help,
+        buttonName = _props.buttonName,
+        form = _props.form,
+        isRead = _props.isRead,
+        label = _props.label,
+        className = _props.className,
+        labelCol = _props.labelCol,
+        wrapperCol = _props.wrapperCol,
+        showUploadList = _props.showUploadList,
+        urlDownloadFile = _props.urlDownloadFile,
+        initialValue = _props.initialValue;
+    var _state = this.state,
+        preUploading = _state.preUploading,
+        uploadPercent = _state.uploadPercent,
+        preUploadPercent = _state.preUploadPercent,
+        uploadRequest = _state.uploadRequest,
+        uploading = _state.uploading;
+    var getFieldDecorator = form.getFieldDecorator;
+
+    var uploadProp = {
+      // name,
+      listType: listType,
+      showUploadList: showUploadList,
+      accept: accept,
+      onRemove: function onRemove(file) {
+        var _state2 = _this2.state,
+            fileList = _state2.fileList,
+            currentFile = _state2.currentFile;
+        var iniSetedFlag = _this2.state.iniSetedFlag;
+
+        if (!iniSetedFlag) {
+          iniSetedFlag = true;
+        }
+        var index = fileList.indexOf(file);
+        if (index >= 0) {
+          fileList.splice(index, 1);
+        }
+        if (fileList.length === 0) {
+          _this2.setState((0, _extends3['default'])({}, _this2.state, {
+            cancelStatus: true,
+            loading: false,
+            fileList: fileList,
+            iniSetedFlag: iniSetedFlag
+          }), function () {
+            _this2.setUploadValue(fileList);
+          });
+          return;
+        }
+        if (currentFile && currentFile.uid) {
+          if (file.uid === currentFile.uid) {
+            _this2.setState((0, _extends3['default'])({}, _this2.state, {
+              cancelStatus: true,
+              loading: false,
+              fileList: fileList,
+              currentFile: null,
+              iniSetedFlag: iniSetedFlag
+            }), function () {
+              _this2.setUploadValue(fileList);
+            });
+          } else {
+            _this2.setState((0, _extends3['default'])({}, _this2.state, {
+              cancelStatus: false,
+              loading: true,
+              fileList: fileList,
+              iniSetedFlag: iniSetedFlag
+            }), function () {
+              _this2.setUploadValue(fileList);
+            });
+          }
+        } else {
+          _this2.setState((0, _extends3['default'])({}, _this2.state, {
+            cancelStatus: true,
+            loading: false,
+            fileList: fileList,
+            iniSetedFlag: iniSetedFlag
+          }), function () {
+            _this2.setUploadValue(fileList);
+          });
+        }
+        return true;
+      },
+      beforeUpload: function beforeUpload(file) {
+        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 (!fileTypePass) {
+          _modal2['default'].error({
+            style: { top: '38%' },
+            content: '\u4E0D\u652F\u6301' + fileType + '\u7C7B\u578B\u7684\u6587\u4EF6!'
+          });
+          return false;
+        }
+        if (file.size === 0) {
+          _modal2['default'].error({
+            style: { top: '38%' },
+            content: '附件必须大于0MB!'
+          });
+          return false;
+        }
+        var multiple = _this2.props.multiple;
+        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);
+        });
+        return false;
+      },
+      fileList: this.state.fileList
+    };
+    if (isRead) {
+      uploadProp = (0, _extends3['default'])({}, uploadProp, { showUploadList: { showPreviewIcon: true, showRemoveIcon: false } });
+    }
+    return isRead ? _react2['default'].createElement(
+      _form2['default'].Item,
+      {
+        label: label,
+        className: className,
+        labelCol: labelCol,
+        wrapperCol: wrapperCol,
+        style: formItemStyle
+      },
+      getFieldDecorator('' + name, {})(_react2['default'].createElement(_Easy3wDownLoad2['default'], {
+        pdfViewFlag: true,
+        imgVisible: true,
+        urlDownloadFile: urlDownloadFile,
+        downloadArr: initialValue
+      }))
+    ) : _react2['default'].createElement(
+      _form2['default'].Item,
+      {
+        label: label,
+        className: className,
+        labelCol: labelCol,
+        wrapperCol: wrapperCol,
+        style: formItemStyle
+      },
+      _react2['default'].createElement(
+        'div',
+        null,
+        getFieldDecorator('' + name, {
+          initialValue: this.state.fileList,
+          rules: [{ validator: this.requiredFile }, { required: required, message: help }]
+        })(_react2['default'].createElement(
+          _upload2['default'],
+          (0, _extends3['default'])({}, uploadProp, {
+            disabled: this.state.loading
+          }),
+          isRead ? null : _react2['default'].createElement(
+            _popover2['default'],
+            {
+              placement: 'right',
+              content: _react2['default'].createElement(
+                'div',
+                { style: { padding: '4px 0' } },
+                _react2['default'].createElement(
+                  'span',
+                  { style: { color: '#5468b2', width: 200, height: 300 } },
+                  help
+                )
+              ),
+              arrowPointAtCenter: true,
+              style: { width: 200, height: 'auto' }
+            },
+            _react2['default'].createElement(
+              _button2['default'],
+              null,
+              _react2['default'].createElement(_icon2['default'], { type: 'upload' }),
+              ' ',
+              buttonName
+            )
+          )
+        )),
+        !this.state.cancelStatus && preUploading ? _react2['default'].createElement(
+          'div',
+          null,
+          _react2['default'].createElement(
+            'span',
+            { style: { margin: '10px auto', color: '#1890ff' } },
+            '\u6587\u4EF6\u8BFB\u53D6\u4E2D...'
+          ),
+          _react2['default'].createElement(
+            'div',
+            { style: { width: '90%' } },
+            _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' } },
+            '\u6587\u4EF6\u4E0A\u4F20\u4E2D(',
+            Math.floor(this.state.speed / 1024),
+            'KB/S)'
+          ),
+          this.state.chunkProgressStatus === 'exception' ? _react2['default'].createElement(
+            'div',
+            { style: { width: '90%' } },
+            _react2['default'].createElement(_progress2['default'], { percent: uploadPercent, size: 'small', status: this.state.chunkProgressStatus })
+          ) : _react2['default'].createElement(
+            'div',
+            { style: { width: '90%' } },
+            _react2['default'].createElement(_progress2['default'], { percent: uploadPercent, size: 'small' })
+          )
+        )
+      )
+    );
+  };
+
+  return BigFileUpload;
+}(_react.Component);
+
+BigFileUpload.propTypes = {
+  name: _propTypes2['default'].string.isRequired, // 上传名称
+  sendData: _propTypes2['default'].object, // 传送数据接口
+  initialValue: _propTypes2['default'].array, // 初始值
+  urlUpBigFileGeneral: _propTypes2['default'].string.isRequired, // 上传附件服务地址
+  urlCheckProgress: _propTypes2['default'].string.isRequired, // 检查附件地址
+  urlDownloadFile: _propTypes2['default'].string.isRequired, // 下载附件地址
+  required: _propTypes2['default'].bool, // 是否必须
+  help: _propTypes2['default'].string, // 后台附件服务地址
+  limitChunkSize: _propTypes2['default'].number, // 分片大小
+  listType: _propTypes2['default'].string, // 附件类型
+  accept: _propTypes2['default'].string, // 接受类型
+  buttonName: _propTypes2['default'].string, // 上传名称
+  isRead: _propTypes2['default'].bool, // 是否只读
+  label: _propTypes2['default'].string, // lable名称
+  className: _propTypes2['default'].string, // CSS类名
+  labelCol: _propTypes2['default'].object, // CSS类名
+  wrapperCol: _propTypes2['default'].object, // CSS类名
+  multiple: _propTypes2['default'].bool, // 是否多附件
+  readFileSize: _propTypes2['default'].number // 读取文件大小
+};
+BigFileUpload.defaultProps = {
+  initialValue: [],
+  listType: 'text',
+  accept: '',
+  limitChunkSize: 1024 * 1024, // 不限定单位 默认单位byte 1024KB
+  buttonName: '选择附件',
+  help: '请上传附件',
+  required: true,
+  isRead: false,
+  label: '',
+  multiple: false, // 默认单附件上传
+  className: '',
+  labelCol: {},
+  wrapperCol: {},
+  readFileSize: 10 * 1024 * 1024, // 默认最小10MB
+  sendData: {}
+};
+
+var _initialiseProps = function _initialiseProps() {
+  var _this3 = this;
+
+  this.setUploadValue = function (v) {
+    var _setFieldsValue;
+
+    var _props2 = _this3.props,
+        form = _props2.form,
+        name = _props2.name;
+    var setFieldsValue = form.setFieldsValue;
+
+    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;
+
+      var url = _this3.urlDeal(urlDownloadFile, uid);
+      var status = 'done';
+      return { uid: uid, name: name, url: url, status: status };
+    });
+    return iniVal;
+  };
+
+  this.checkFile = function (uploadParams) {
+    _this3.setState({ uploadRequest: true });
+    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 _props3 = _this3.props,
+        name = _props3.name,
+        urlCheckProgress = _props3.urlCheckProgress,
+        urlDownloadFile = _props3.urlDownloadFile,
+        uploadDoneCallback = _props3.uploadDoneCallback;
+
+    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('sign', '2959f1aea8db0f7fbba61f0f8474d0ef');
+    _superagent2['default'].post('' + urlCheckProgress).send(formData).withCredentials().end(function (err, res) {
+      if (err) {
+        var _state4 = _this3.state,
+            fileList = _state4.fileList,
+            currentFile = _state4.currentFile;
+
+        var index = fileList.indexOf(currentFile);
+        if (index >= 0) {
+          fileList.splice(index, 1);
+          _this3.setState((0, _extends3['default'])({}, _this3.state, {
+            fileList: fileList,
+            cancelStatus: true,
+            loading: false
+          }), function () {
+            _this3.setUploadValue(fileList);
+          });
+        }
+        if (err.timeout) {
+          _modal2['default'].error({
+            style: { top: '38%' },
+            content: '网络超时，上传失败，请检查网络后，重新续传。'
+          });
+        } else {
+          _modal2['default'].error({
+            style: { top: '38%' },
+            content: '服务请求异常，请重试'
+          });
+        }
+        return;
+      }
+      _this3.setState({ uploadRequest: false });
+      if (res.body.rspCode === '0000' && res.body.data) {
+        var _res$body$data = res.body.data,
+            uploadStatus = _res$body$data.uploadStatus,
+            uploadedSize = _res$body$data.uploadedSize,
+            fileId = _res$body$data.fileId,
+            uid = _res$body$data.uid;
+        var _fileList = _this3.state.fileList;
+
+        var fileInfo = {};
+        if (uploadStatus === '1') {
+          // 上传完成
+          var newList = _fileList.map(function (item) {
+            var tempData = item;
+            if (uid === item.uid) {
+              tempData.uid = fileId;
+              tempData.fileId = fileId;
+              tempData.url = '' + urlDownloadFile + fileId;
+              tempData.status = 'done';
+              tempData.fileName = tempData.name;
+              fileInfo = tempData;
+            }
+            return tempData;
+          });
+          _this3.setState((0, _extends3['default'])({}, _this3.state, {
+            uploadPercent: 100, // 不显示进度条
+            loading: false,
+            fileList: newList,
+            currentFile: null
+          }), function () {
+            _this3.setUploadValue(newList);
+            if (uploadDoneCallback) {
+              uploadDoneCallback(name, fileInfo, newList);
+            }
+          });
+        } else {
+          var uploadPercent = 0;
+          for (var _index = 0; _index < _fileList.length; _index += 1) {
+            var file = _fileList[_index];
+            if (uid === file.uid) {
+              var size = file.size;
+
+              var tempSize = Number(uploadedSize);
+              uploadPercent = Math.floor(tempSize / size * 100 * 10) / 10;
+              _this3.setState({
+                uploadPercent: uploadPercent,
+                CUSize: tempSize
+              }, function () {
+                setImmediate(_this3.handlePartUpload);
+              });
+              break;
+            }
+          }
+        }
+      } else if (res.body.rspMsg) {
+        _modal2['default'].error({
+          style: { top: '38%' },
+          content: res.body.rspMsg
+        });
+        var _state5 = _this3.state,
+            _fileList2 = _state5.fileList,
+            _currentFile = _state5.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.setUploadValue(_fileList2);
+          });
+        }
+      }
+    });
+  };
+
+  this.handlePartUpload = function () {
+    try {
+      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) {
+          _this3.setState((0, _extends3['default'])({}, _this3.state, { loading: false }));
+        }
+        return;
+      }
+      var uploadPercent = _this3.state.uploadPercent;
+
+      if (uploadPercent === 100) {
+        _this3.setState((0, _extends3['default'])({}, _this3.state, { loading: false }));
+        return;
+      }
+      var uploadFileReader = new FileReader();
+      var blobSlice = File.prototype.slice || File.prototype.mozSlice || File.prototype.webkitSlice;
+      var chunkCheckErr = false;
+      var _props4 = _this3.props,
+          name = _props4.name,
+          limitChunkSize = _props4.limitChunkSize,
+          sendData = _props4.sendData,
+          uploadCallback = _props4.uploadCallback,
+          uploadDoneCallback = _props4.uploadDoneCallback,
+          urlUpBigFileGeneral = _props4.urlUpBigFileGeneral,
+          urlDownloadFile = _props4.urlDownloadFile;
+
+      var chunkSize = 0;
+      if (typeof limitChunkSize === 'string') {
+        if (limitChunkSize.toLowerCase().indexOf('k') !== -1) {
+          var temp = limitChunkSize.substring(0, limitChunkSize.toLowerCase().indexOf('k'));
+          chunkSize = Number(temp) * 1024;
+        } else if (limitChunkSize.toLowerCase().indexOf('m') !== -1) {
+          var _temp = limitChunkSize.substring(0, limitChunkSize.toLowerCase().indexOf('m'));
+          chunkSize = Number(_temp) * 1024 * 1024;
+        } else {
+          chunkSize = Number(limitChunkSize);
+        }
+      } else {
+        chunkSize = limitChunkSize;
+      }
+      var fileSize = currentFile.size;
+      var end = 0;
+      // 如果速率大于0 使用当前速率上传
+      if (speed > chunkSize) {
+        if (fileSize - CUSize > speed) {
+          end = CUSize + speed;
+        } else {
+          end = fileSize;
+        }
+      } else if (fileSize - CUSize > chunkSize) {
+        end = CUSize + chunkSize;
+      } else {
+        end = fileSize;
+      }
+      uploadFileReader.onload = function (e) {
+        if (chunkCheckErr) {
+          return;
+        }
+        // 上传附件
+        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 blob = new Blob([e.target.result], { type: 'application/octet-stream' });
+        var postParam = (0, _extends3['default'])({ fileInfo: file }, sendData, { currentSize: end });
+        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');
+        var startTime = new Date().getTime();
+        _superagent2['default'].post('' + urlUpBigFileGeneral).send(formData).withCredentials().end(function (err, res) {
+          if (err) {
+            var fileList = _this3.state.fileList;
+
+            var index = fileList.indexOf(currentFile);
+            if (index >= 0) {
+              fileList.splice(index, 1);
+              _this3.setState((0, _extends3['default'])({}, _this3.state, {
+                fileList: fileList,
+                cancelStatus: true,
+                loading: false
+              }), function () {
+                _this3.setUploadValue(fileList);
+              });
+            }
+            if (err.timeout) {
+              _modal2['default'].error({
+                style: { top: '38%' },
+                content: '网络超时，上传失败，请检查网络后，重新续传。'
+              });
+            } else {
+              _modal2['default'].error({
+                style: { top: '38%' },
+                content: '服务请求异常，请重试'
+              });
+            }
+            return;
+          }
+          var size = e.target.result.byteLength;
+          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;
+
+            var upSize = Number(uploadedSize);
+            // 计算上传进度
+            uploadPercent = Math.floor(upSize / fileSize * 100 * 10) / 10;
+            if (checkStatus === '0') {
+              chunkCheckErr = true;
+            }
+            var chunkProgressStatus = 'active';
+            if (uploadPercent >= 100) {
+              var _fileList3 = _this3.state.fileList;
+
+              if (uploadStatus === '1' && checkStatus === '1') {
+                // 上传并验证完毕
+                var fileInfo = null;
+                chunkProgressStatus = 'active';
+                var newList = _fileList3.map(function (item) {
+                  var tempData = item;
+                  if (currentFile && currentFile.uid === item.uid) {
+                    tempData.uid = fileId;
+                    tempData.fileId = fileId;
+                    tempData.url = '' + urlDownloadFile + fileId;
+                    tempData.status = 'done';
+                    tempData.fileName = tempData.name;
+                    fileInfo = tempData;
+                  }
+                  return tempData;
+                });
+                _this3.setState((0, _extends3['default'])({}, _this3.state, {
+                  uploadPercent: uploadPercent,
+                  uploading: false,
+                  loading: false,
+                  chunkProgressStatus: chunkProgressStatus,
+                  CUSize: upSize,
+                  fileList: newList,
+                  currentFile: null,
+                  speed: curSpeed
+                }), function () {
+                  _this3.setUploadValue(newList);
+                });
+                if (uploadCallback && typeof uploadCallback === 'function') {
+                  uploadCallback(newList);
+                }
+                if (uploadDoneCallback) {
+                  uploadDoneCallback(name, fileInfo, newList);
+                }
+              } else {
+                chunkProgressStatus = 'exception';
+                if (checkStatus !== '1') {
+                  _modal2['default'].error({
+                    style: { top: '38%' },
+                    content: '附件完整性验证失败：可能由于网络丢包原因，您上传的附件未通过完整性校验，需要您重新上传。'
+                  });
+                } else {
+                  _modal2['default'].error({
+                    style: { top: '38%' },
+                    content: '上传失败'
+                  });
+                }
+                var _index3 = _fileList3.indexOf(currentFile);
+                if (_index3 >= 0) {
+                  _fileList3.splice(_index3, 1);
+                  _this3.setState((0, _extends3['default'])({}, _this3.state, {
+                    uploadPercent: uploadPercent,
+                    uploading: false,
+                    loading: false,
+                    chunkProgressStatus: chunkProgressStatus,
+                    CUSize: upSize,
+                    fileList: _fileList3,
+                    currentFile: null,
+                    speed: curSpeed
+                  }), function () {
+                    _this3.setUploadValue(_fileList3);
+                  });
+                }
+              }
+            } else {
+              _this3.setState((0, _extends3['default'])({}, _this3.state, {
+                uploadPercent: uploadPercent,
+                uploading: true,
+                loading: true,
+                chunkProgressStatus: chunkProgressStatus,
+                CUSize: upSize,
+                speed: curSpeed
+              }), function () {
+                setImmediate(_this3.handlePartUpload);
+              });
+            }
+          } else if (res && res.body.rspMsg) {
+            _modal2['default'].error({
+              style: { top: '38%' },
+              content: res.body.rspMsg
+            });
+            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.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);
+              });
+            }
+          }
+        });
+      };
+      // console.log('读取文件', `文件大小：${currentFile.size}`, `已上传大小${CUSize}`, `结束值${end}`, `切片大小${speed}`);
+      uploadFileReader.readAsArrayBuffer(blobSlice.call(currentFile, CUSize, end));
+    } catch (error) {
+      _modal2['default'].error({
+        style: { top: '38%' },
+        content: error
+      });
+      var _state7 = _this3.state,
+          fileList = _state7.fileList,
+          _currentFile2 = _state7.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);
+        });
+      }
+    }
+  };
+
+  this.readFile = function (file) {
+    try {
+      var chunkReader = new FileReader();
+      var _props5 = _this3.props,
+          limitChunkSize = _props5.limitChunkSize,
+          readFileSize = _props5.readFileSize;
+      // ...对文件的预处理
+      // 兼容性的处理
+
+      var blobSlice = File.prototype.slice || File.prototype.mozSlice || File.prototype.webkitSlice;
+      var chunkSize = 0;
+      if (typeof limitChunkSize === 'string') {
+        if (limitChunkSize.toLowerCase().indexOf('k') !== -1) {
+          var temp = limitChunkSize.substring(0, limitChunkSize.toLowerCase().indexOf('k'));
+          chunkSize = Number(temp) * 1024;
+        } else if (limitChunkSize.toLowerCase().indexOf('m') !== -1) {
+          var _temp2 = limitChunkSize.substring(0, limitChunkSize.toLowerCase().indexOf('m'));
+          chunkSize = Number(_temp2) * 1024 * 1024;
+        } else {
+          chunkSize = Number(limitChunkSize);
+        }
+      } else {
+        chunkSize = limitChunkSize;
+      }
+      var tempreadFileSize = 0;
+      if (typeof readFileSize === 'string') {
+        if (readFileSize.toLowerCase().indexOf('k') !== -1) {
+          var _temp3 = readFileSize.substring(0, readFileSize.toLowerCase().indexOf('k'));
+          tempreadFileSize = Number(_temp3) * 1024;
+        } else if (readFileSize.toLowerCase().indexOf('m') !== -1) {
+          var _temp4 = readFileSize.substring(0, readFileSize.toLowerCase().indexOf('m'));
+          tempreadFileSize = Number(_temp4) * 1024 * 1024;
+        } else {
+          tempreadFileSize = Number(readFileSize);
+        }
+      } else {
+        tempreadFileSize = readFileSize;
+      }
+      if (tempreadFileSize < 5 * 1024 * 1024) {
+        tempreadFileSize = 5 * 1024 * 1024;
+      }
+      var sliceCount = 0;
+      if (chunkSize < tempreadFileSize) {
+        // 切片小于分段大小
+        sliceCount = Math.ceil(file.size / tempreadFileSize);
+      } else {
+        sliceCount = Math.ceil(file.size / chunkSize);
+      }
+      var mainFileSpark = new _sparkMd2['default'].ArrayBuffer(); // 对arrayBuffer数据进行md5加密，产生一个md5字符串 主文件
+      var params = { file: {} }; // 用于上传所有分片的md5信息
+      params.file.fileName = file.name;
+      params.file.fileSize = file.size;
+      params.file.uid = file.uid;
+      var sliceIndex = 0;
+      chunkReader.onload = function (e) {
+        mainFileSpark.append(e.target.result);
+        sliceIndex += 1;
+        if (sliceIndex < sliceCount) {
+          _this3.setState((0, _extends3['default'])({}, _this3.state, {
+            preUploading: true,
+            preUploadPercent: Number((sliceIndex / sliceCount * 100).toFixed(1)) }));
+          setImmediate(_loadNext, sliceIndex, tempreadFileSize);
+        } else {
+          var mainFileMD5 = mainFileSpark.end();
+          params.file.fileMd5 = mainFileMD5;
+          // 表示预处理结束，检验附件上传情况
+          _this3.setState((0, _extends3['default'])({}, _this3.state, {
+            preUploading: false,
+            preUploadPercent: 100,
+            uploadData: params
+            // loading: false
+          }), function () {
+            setImmediate(_this3.checkFile, params);
+          });
+        }
+      };
+      var _loadNext = function _loadNext(count, size) {
+        var cancelStatus = _this3.state.cancelStatus;
+
+        if (cancelStatus) {
+          return;
+        }
+        var start = count * size;
+        var end = start + size >= file.size ? file.size : start + size;
+        // console.log(`读取文件，文件大小${file.size}，截取开始位置${start}，结束位置${end}`);
+        chunkReader.readAsArrayBuffer(blobSlice.call(file, start, end));
+      };
+      _loadNext(sliceIndex, tempreadFileSize);
+    } catch (error) {
+      _modal2['default'].error({
+        style: { top: '38%' },
+        content: error
+      });
+      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);
+        });
+      }
+    }
+  };
+
+  this.requiredFile = function (rule, value, callback) {
+    var required = _this3.props.required;
+    var fileList = _this3.state.fileList;
+
+    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(' ');
+          break;
+        }
+      }
+    }
+    callback();
+  };
+};
+
+exports['default'] = BigFileUpload;
+module.exports = exports['default'];

package/lib/Easy3wUploadB/index.js

@@ -76,25 +76,20 @@ var _modal2 = _interopRequireDefault(_modal);
 
 require('antd/lib/modal/style');
 
-var _comonConfig = require('comonConfigPath/comonConfig');
-
-var _Easy3wGetCookie = require('./../Easy3wGetCookie');
-
-var _Easy3wGetCookie2 = _interopRequireDefault(_Easy3wGetCookie);
-
-var _Easy3wDownLoad = require('./../Easy3wDownLoad');
-
-var _Easy3wDownLoad2 = _interopRequireDefault(_Easy3wDownLoad);
-
-var _Easy3wAESEncrypt = require('./../Easy3wAESEncrypt');
-
-var _Easy3wAESEncrypt2 = _interopRequireDefault(_Easy3wAESEncrypt);
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
 var formItemStyle = {
   marginBottom: 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);
@@ -163,9 +158,7 @@ var BigFileUpload = function (_Component) {
         className = _props.className,
         labelCol = _props.labelCol,
         wrapperCol = _props.wrapperCol,
-        showUploadList = _props.showUploadList,
-        urlDownloadFile = _props.urlDownloadFile,
-        initialValue = _props.initialValue;
+        showUploadList = _props.showUploadList;
     var _state = this.state,
         preUploading = _state.preUploading,
         uploadPercent = _state.uploadPercent,
@@ -240,20 +233,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({
@@ -274,6 +257,9 @@ var BigFileUpload = function (_Component) {
             fileList = _state3.fileList,
             iniSetedFlag = _state3.iniSetedFlag;
 
+        if (!iniSetedFlag) {
+          iniSetedFlag = true;
+        }
         if (!multiple) {
           fileList = [file];
         } else {
@@ -303,25 +289,7 @@ var BigFileUpload = function (_Component) {
       },
       fileList: this.state.fileList
     };
-    if (isRead) {
-      uploadProp = (0, _extends3['default'])({}, uploadProp, { showUploadList: { showPreviewIcon: true, showRemoveIcon: false } });
-    }
-    return isRead ? _react2['default'].createElement(
-      _form2['default'].Item,
-      {
-        label: label,
-        className: className,
-        labelCol: labelCol,
-        wrapperCol: wrapperCol,
-        style: formItemStyle
-      },
-      getFieldDecorator('' + name, {})(_react2['default'].createElement(_Easy3wDownLoad2['default'], {
-        pdfViewFlag: true,
-        imgVisible: true,
-        urlDownloadFile: urlDownloadFile,
-        downloadArr: initialValue
-      }))
-    ) : _react2['default'].createElement(
+    return _react2['default'].createElement(
       _form2['default'].Item,
       {
         label: label,
@@ -465,19 +433,6 @@ 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;
 
@@ -485,7 +440,7 @@ var _initialiseProps = function _initialiseProps() {
       var uid = obj.uid,
           name = obj.name;
 
-      var url = _this3.urlDeal(urlDownloadFile, uid);
+      var url = '' + urlDownloadFile + uid;
       var status = 'done';
       return { uid: uid, name: name, url: url, status: status };
     });
@@ -495,11 +450,7 @@ var _initialiseProps = function _initialiseProps() {
   this.checkFile = function (uploadParams) {
     _this3.setState({ uploadRequest: true });
     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,
         name = _props3.name,
         urlCheckProgress = _props3.urlCheckProgress,
@@ -608,7 +559,7 @@ var _initialiseProps = function _initialiseProps() {
         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 }), function () {
             _this3.setUploadValue(_fileList2);
           });
         }
@@ -616,7 +567,7 @@ var _initialiseProps = function _initialiseProps() {
     });
   };
 
-  this.handlePartUpload = function () {
+  this.handlePartUpload = function (sIndex, eIndex) {
     try {
       var _state6 = _this3.state,
           currentFile = _state6.currentFile,
@@ -678,21 +629,25 @@ 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 }, sendData, { currentSize: end, startSize: start, chunkMD5: chunkMD5 });
         formData.append('chunk', blob);
         formData.append('sendTime', new Date().getTime());
         formData.append('appType', '01');
@@ -732,16 +687,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') {
@@ -827,10 +792,10 @@ 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 : '上传失败'
             });
             var _fileList4 = _this3.state.fileList;
 
@@ -841,25 +806,11 @@ var _initialiseProps = function _initialiseProps() {
                 _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);
-              });
-            }
           }
         });
       };
-      // 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%' },
@@ -939,7 +890,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();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wui",
-  "version": "1.5.9",
+  "version": "1.5.12",
   "description": "easy3wui components for react",
   "keywords": [
     "react",