@hi-ui/hiui 2.15.11 → 2.15.12

package/es/upload/Upload.js

@@ -1,10 +1,34 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
 
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
+var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+
+var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
+
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _reactDom = _interopRequireDefault(require("react-dom"));
@@ -21,72 +45,240 @@ var _button = _interopRequireDefault(require("../button"));
 
 var _icon = _interopRequireDefault(require("../icon"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
+var fileId = 0;
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+var Upload =
+/*#__PURE__*/
+function (_Component) {
+  (0, _inherits2["default"])(Upload, _Component);
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+  function Upload(props) {
+    var _this;
 
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+    (0, _classCallCheck2["default"])(this, Upload);
+    _this = (0, _possibleConstructorReturn2["default"])(this, (0, _getPrototypeOf2["default"])(Upload).call(this, props));
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "cancelEvent", function () {
+      _this.setState({
+        visibleModal: false
+      });
+    });
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "uploadFile",
+    /*#__PURE__*/
+    function () {
+      var _ref = (0, _asyncToGenerator2["default"])(
+      /*#__PURE__*/
+      _regenerator["default"].mark(function _callee(file) {
+        var dataUrl,
+            FileReader,
+            XMLHttpRequest,
+            FormData,
+            fileList,
+            _this$props,
+            name,
+            params,
+            headers,
+            uploadAction,
+            withCredentials,
+            maxCount,
+            _uploadAction,
+            onerror,
+            fr,
+            xhr,
+            formFile,
+            i,
+            j,
+            _args = arguments;
+
+        return _regenerator["default"].wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                dataUrl = _args.length > 1 && _args[1] !== undefined ? _args[1] : '';
+                FileReader = window.FileReader;
+                XMLHttpRequest = window.XMLHttpRequest;
+                FormData = window.FormData;
+                fileList = _this.state.fileList;
+                _this$props = _this.props, name = _this$props.name, params = _this$props.params, headers = _this$props.headers, uploadAction = _this$props.uploadAction, withCredentials = _this$props.withCredentials, maxCount = _this$props.maxCount;
+                _uploadAction = typeof uploadAction === 'string' ? uploadAction : uploadAction(file);
+
+                if (!(_uploadAction.toString() === '[object Promise]')) {
+                  _context.next = 10;
+                  break;
+                }
+
+                _context.next = 10;
+                return _uploadAction.then(function (res) {
+                  _uploadAction = res;
+                })["catch"](function (error) {
+                  throw new Error(error);
+                });
+
+              case 10:
+                _this.setState({
+                  fileCountLimted: fileList.length >= maxCount
+                });
+
+                onerror = function onerror(err) {
+                  var fileList = _this.state.fileList;
+                  var errRes = err !== undefined ? err : {
+                    status: xhr.status,
+                    statusText: xhr.statusText
+                  };
+
+                  var _fileList = (0, _toConsumableArray2["default"])(fileList);
+
+                  file.uploadState = 'error';
+
+                  var idx = _fileList.findIndex(function (item) {
+                    return item.fileId === file.fileId;
+                  });
+
+                  _fileList.splice(idx, 1, file);
+
+                  _this.setState({
+                    fileList: _fileList
+                  });
+
+                  _this.onUpload(file, _fileList, errRes);
+                };
+
+                if (file.fileType === 'img') {
+                  // 用来图片预览
+                  if (dataUrl) {
+                    file.url = dataUrl;
+                  } else if (dataUrl !== false) {
+                    fr = new FileReader();
+
+                    fr.onload = function (e) {
+                      var url = e.target.result;
+
+                      var _fileList = (0, _toConsumableArray2["default"])(fileList);
+
+                      file.url = url;
+
+                      var idx = _fileList.findIndex(function (item) {
+                        return item.fileId === file.fileId;
+                      });
+
+                      _fileList.splice(idx, 1, file);
+
+                      _this.setState({
+                        fileList: _fileList
+                      });
+                    };
+
+                    fr.readAsDataURL(file);
+                  }
+                }
+
+                xhr = new XMLHttpRequest();
+                formFile = new FormData();
+                file.xhr = xhr;
+                xhr.withCredentials = withCredentials;
+
+                if (dataUrl) {
+                  formFile.append(name, dataUrl);
+                } else {
+                  formFile.append(name, file);
+                } // 设置除file外需要带入的参数
+
+
+                if (params) {
+                  for (i in params) {
+                    formFile.append(i, params[i]);
+                  }
+                }
+
+                xhr.onreadystatechange = function () {
+                  if (xhr.readyState === 4) {
+                    if (xhr.status === 200) {
+                      var _fileList3 = _this.state.fileList;
 
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+                      var _fileList = (0, _toConsumableArray2["default"])(_fileList3);
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+                      file.uploadState = 'success';
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+                      var idx = _fileList.findIndex(function (item) {
+                        return item.fileId === file.fileId;
+                      });
 
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+                      _fileList.splice(idx, 1, file);
 
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+                      _this.setState({
+                        fileList: _fileList
+                      }, function () {
+                        return _this.onUpload(file, _fileList, JSON.parse(xhr.response));
+                      });
+                    } else {
+                      onerror();
+                    }
+                  }
+                };
 
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+                xhr.upload.onerror = function () {
+                  onerror();
+                };
 
-function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+                xhr.upload.onprogress = function (event) {
+                  var fileList = _this.state.fileList;
+                  var e = event || window.event;
+                  var percentComplete = Math.ceil(e.loaded / e.total * 100);
 
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+                  var _fileList = (0, _toConsumableArray2["default"])(fileList);
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+                  var idx = _fileList.findIndex(function (item) {
+                    return item.fileId === file.fileId;
+                  });
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+                  _fileList.splice(idx, 1, file);
 
-var fileId = 0;
+                  file.progressNumber = percentComplete;
 
-var Upload = /*#__PURE__*/function (_Component) {
-  _inherits(Upload, _Component);
+                  _this.setState({
+                    fileList: _fileList
+                  });
+                };
 
-  var _super = _createSuper(Upload);
+                xhr.open('post', _uploadAction, true); // 设置用户传入的请求头
 
-  function Upload(props) {
-    var _this;
+                if (headers) {
+                  for (j in headers) {
+                    xhr.setRequestHeader(j, headers[j]);
+                  }
+                }
 
-    _classCallCheck(this, Upload);
+                xhr.send(formFile);
 
-    _this = _super.call(this, props);
+              case 25:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }));
 
-    _defineProperty(_assertThisInitialized(_this), "cancelEvent", function () {
-      _this.setState({
-        visibleModal: false
-      });
-    });
+      return function (_x) {
+        return _ref.apply(this, arguments);
+      };
+    }());
 
-    var fileList = _this.prepareDefaultFileList(props.defaultFileList);
+    var _fileList2 = _this.prepareDefaultFileList(props.fileList || props.defaultFileList);
 
     _this.state = {
       visibleModal: false,
-      fileList: fileList,
-      fileCountLimted: props.defaultFileList.length >= props.maxCount
+      fileList: _fileList2,
+      fileCountLimted: _fileList2.length >= props.maxCount
     };
     return _this;
   }
 
-  _createClass(Upload, [{
+  (0, _createClass2["default"])(Upload, [{
     key: "componentWillReceiveProps",
     value: function componentWillReceiveProps(nextProps) {
-      if (!(0, _shallowequal["default"])(nextProps.defaultFileList, this.props.defaultFileList)) {
+      if (!(0, _shallowequal["default"])(nextProps.fileList, this.props.fileList)) {
         this.setState({
-          fileList: this.prepareDefaultFileList(nextProps.defaultFileList)
+          fileList: this.prepareDefaultFileList(nextProps.fileList),
+          fileCountLimted: nextProps.fileList.length >= nextProps.maxCount
         });
       }
     }
@@ -124,7 +316,7 @@ var Upload = /*#__PURE__*/function (_Component) {
           break;
 
         case 'doc':
-        case 'dcox':
+        case 'docx':
           fileType = 'word';
           break;
 
@@ -177,31 +369,31 @@ var Upload = /*#__PURE__*/function (_Component) {
       var localeDatas = this.props.localeDatas;
 
       if (this.state.visibleModal) {
-        return /*#__PURE__*/_react["default"].createElement(_modal["default"], {
+        return _react["default"].createElement(_modal["default"], {
           title: localeDatas.upload.modalTitle,
           style: {
             width: '480px'
           },
           onCancel: this.cancelEvent,
-          show: this.state.visibleModal,
-          footers: [/*#__PURE__*/_react["default"].createElement(_button["default"], {
+          visible: this.state.visibleModal,
+          footer: [_react["default"].createElement(_button["default"], {
             type: "primary",
             key: 0,
             onClick: this.cancelEvent
           }, localeDatas.upload.modalBtn)]
-        }, /*#__PURE__*/_react["default"].createElement("div", {
+        }, _react["default"].createElement("div", {
           className: "hi-upload__modal-tips"
-        }, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
+        }, _react["default"].createElement(_icon["default"], {
           name: "info-circle-o",
           style: {
             color: '#db9639',
             fontSize: '48px'
           }
-        }), /*#__PURE__*/_react["default"].createElement("div", {
+        }), _react["default"].createElement("div", {
           className: "hi-upload__error\u2014content"
-        }, /*#__PURE__*/_react["default"].createElement("div", {
+        }, _react["default"].createElement("div", {
           className: "hi-upload__error-title"
-        }, localeDatas.upload.modalTiptitle), /*#__PURE__*/_react["default"].createElement("div", {
+        }, localeDatas.upload.modalTiptitle), _react["default"].createElement("div", {
           className: "hi-upload__error-info"
         }, localeDatas.upload.modalTiptxt))));
       }
@@ -211,11 +403,12 @@ var Upload = /*#__PURE__*/function (_Component) {
   }, {
     key: "uploadFiles",
     value: function uploadFiles(files) {
-      var _this$props = this.props,
-          beforeUpload = _this$props.beforeUpload,
-          customUpload = _this$props.customUpload,
-          maxSize = _this$props.maxSize,
-          maxCount = _this$props.maxCount;
+      var _this3 = this;
+
+      var _this$props2 = this.props,
+          beforeUpload = _this$props2.beforeUpload,
+          customUpload = _this$props2.customUpload,
+          maxSize = _this$props2.maxSize;
       var _this$state = this.state,
           fileList = _this$state.fileList,
           fileCountLimted = _this$state.fileCountLimted;
@@ -230,43 +423,43 @@ var Upload = /*#__PURE__*/function (_Component) {
 
       if (customUpload) {
         customUpload(files);
+        _reactDom["default"].findDOMNode(this.uploadRef).value = '';
         return;
       }
 
       if (files.length === 0) return;
 
-      if (files[0].size > maxSize * 1024) {
-        this.setState({
-          visibleModal: true
-        });
-        return;
-      }
+      var _fileList = (0, _toConsumableArray2["default"])(fileList);
 
-      for (var key in files) {
-        if (!files.hasOwnProperty(key)) continue;
+      Object.keys(files).forEach(function (key) {
         var file = files[key];
-        file.fileId = this.getFileId();
+
+        if (file.size > maxSize * 1024) {
+          _this3.setState({
+            visibleModal: true
+          });
+
+          return;
+        }
+
+        file.fileId = _this3.getFileId();
         file.uploadState = 'loading';
-        file.fileType = this.getFileType(file);
-        fileList.unshift(file);
-        this.setState({
-          fileList: fileList
-        });
-        this.uploadFile(file);
-      }
+        file.fileType = _this3.getFileType(file);
 
-      if (fileList.length >= maxCount) {
-        this.setState({
-          fileCountLimted: true
-        });
-      }
+        _fileList.unshift(file);
 
+        _this3.setState({
+          fileList: _fileList
+        }, function () {
+          _this3.uploadFile(file);
+        });
+      });
       _reactDom["default"].findDOMNode(this.uploadRef).value = '';
     }
   }, {
     key: "deleteFile",
     value: function deleteFile(file, index) {
-      var _this3 = this;
+      var _this4 = this;
 
       var fileList = this.state.fileList;
       var onRemove = this.props.onRemove;
@@ -274,13 +467,14 @@ var Upload = /*#__PURE__*/function (_Component) {
       var doRemove = function doRemove() {
         fileList.splice(index, 1);
 
-        _this3.setState({
+        _this4.setState({
           fileList: fileList,
           fileCountLimted: false
         });
       };
 
       var ret = onRemove(file, fileList, index);
+      file.uploadState === 'loading' && file.xhr.abort();
 
       if (ret === true) {
         doRemove();
@@ -295,145 +489,46 @@ var Upload = /*#__PURE__*/function (_Component) {
   }, {
     key: "onUpload",
     value: function onUpload(file, fileList, response) {
-      var _this4 = this;
+      var _this5 = this;
 
-      var onChange = this.props.onChange;
+      var _this$props3 = this.props,
+          onChange = _this$props3.onChange,
+          maxCount = _this$props3.maxCount;
 
       var onUploadError = function onUploadError() {
         for (var index in fileList) {
           if (fileList[index].fileId === file.fileId) {
-            fileList.splice(index, 1);
-
-            _this4.setState({
-              fileList: fileList
-            });
-
-            break;
-          }
-        }
-      };
+            var _fileList = (0, _toConsumableArray2["default"])(fileList);
 
-      var callback = function callback(ret) {
-        if (ret === false) {
-          onUploadError();
-        } else if (ret && typeof ret.then === 'function') {
-          ret.then(function (res) {
-            if (res === false) {
-              onUploadError();
-            }
-          });
-        }
-      };
-
-      onChange(file, fileList, response, callback);
-    }
-  }, {
-    key: "uploadFile",
-    value: function uploadFile(file) {
-      var _this5 = this;
-
-      var dataUrl = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
-      var FileReader = window.FileReader;
-      var XMLHttpRequest = window.XMLHttpRequest;
-      var FormData = window.FormData;
-      var fileList = this.state.fileList;
-      var _this$props2 = this.props,
-          name = _this$props2.name,
-          param = _this$props2.param,
-          headers = _this$props2.headers,
-          uploadAction = _this$props2.uploadAction;
-
-      var onerror = function onerror(err) {
-        var errRes = err !== undefined ? err : {
-          status: xhr.status,
-          statusText: xhr.statusText
-        };
-        file.uploadState = 'error';
-
-        _this5.setState({
-          fileList: fileList
-        });
-
-        _this5.onUpload(file, fileList, errRes);
-      };
-
-      if (file.fileType === 'img') {
-        // 用来图片预览
-        if (dataUrl) {
-          file.url = dataUrl;
-        } else if (dataUrl !== false) {
-          var fr = new FileReader();
-
-          fr.onload = function (e) {
-            var url = e.target.result;
-            file.url = url;
+            _fileList.splice(index, 1);
 
             _this5.setState({
-              fileList: fileList
+              fileList: _fileList,
+              fileCountLimted: _fileList.length >= _this5.props.maxCount
             });
-          };
 
-          fr.readAsDataURL(file);
-        }
-      }
-
-      var xhr = new XMLHttpRequest();
-      var formFile = new FormData();
-
-      if (dataUrl) {
-        formFile.append(name, dataUrl);
-      } else {
-        formFile.append(name, file);
-      } // 设置除file外需要带入的参数
-
-
-      if (param) {
-        for (var i in param) {
-          formFile.append(i, param[i]);
-        }
-      }
-
-      xhr.upload.onload = function () {
-        file.uploadState = 'success';
-
-        _this5.setState({
-          fileList: fileList
-        });
-      };
-
-      xhr.onreadystatechange = function () {
-        if (xhr.readyState === 4) {
-          if (xhr.status === 200) {
-            _this5.onUpload(file, fileList, JSON.parse(xhr.response));
-          } else {
-            onerror();
+            break;
           }
         }
       };
 
-      xhr.upload.onerror = function () {
-        onerror();
-      };
-
-      xhr.upload.onprogress = function (event) {
-        var e = event || window.event;
-        var percentComplete = Math.ceil(e.loaded / e.total * 100);
-        file.progressNumber = percentComplete;
+      var changeResult = onChange(file, fileList, response);
 
-        _this5.setState({
-          fileList: fileList
+      if (changeResult === false) {
+        onUploadError();
+      } else if (changeResult && typeof changeResult.then === 'function') {
+        changeResult.then(function (res) {
+          if (res === false) {
+            onUploadError();
+          }
         });
-      };
-
-      xhr.open('post', uploadAction, true); // 设置用户传入的请求头
-
-      if (headers) {
-        for (var j in headers) {
-          xhr.setRequestHeader(j, headers[j]);
+      } else {
+        if (fileList.length >= maxCount) {
+          this.setState({
+            fileCountLimted: true
+          });
         }
       }
-
-      xhr.send(formFile);
     }
   }, {
     key: "uploadStatusIcon",
@@ -450,7 +545,6 @@ var Upload = /*#__PURE__*/function (_Component) {
       }
     }
   }]);
-
   return Upload;
 }(_react.Component);
 
@@ -460,7 +554,6 @@ Upload.propTypes = {
   limit: _propTypes["default"].number,
   buttonText: _propTypes["default"].string,
   buttonIcon: _propTypes["default"].string,
-  uploadAction: _propTypes["default"].string,
   param: _propTypes["default"].object,
   name: _propTypes["default"].string,
   disabled: _propTypes["default"].bool,
@@ -473,21 +566,21 @@ Upload.propTypes = {
   defaultFileList: _propTypes["default"].array,
   fileList: _propTypes["default"].array,
   onRemove: _propTypes["default"].oneOfType([_propTypes["default"].func, _propTypes["default"].bool]),
-  maxSize: _propTypes["default"].number
+  maxSize: _propTypes["default"].number,
+  withCredentials: _propTypes["default"].bool
 };
 Upload.defaultProps = {
   defaultFileList: [],
-  // headers: {'Content-type': 'multipart/form-data'}, // headers 不可以设置Content-type https://stackoverflow.com/questions/17415084/multipart-data-post-using-python-requests-no-multipart-boundary-was-found/17438575
   headers: {},
   accept: '',
   limit: null,
   buttonIcon: 'upload',
-  uploadAction: '',
   param: null,
   name: 'file',
   disabled: false,
   showUploadList: true,
   multiple: false,
+  withCredentials: false,
   beforeUpload: function beforeUpload() {
     return true;
   },
@@ -496,8 +589,7 @@ Upload.defaultProps = {
   },
   onChange: function onChange() {
     return true;
-  } // overEvent: false
-
+  }
 };
 var _default = Upload;
 exports["default"] = _default;