@kdcloudjs/kdesign 1.7.17 → 1.7.19

package/lib/upload/upload.js

@@ -85,12 +85,11 @@ function abort(file) {
 }
 var InternalUpload = function InternalUpload(props, ref) {
   var _context5, _classNames, _context6, _context7;
-  var _React$useContext = _react.default.useContext(_ConfigContext.default),
-    getPrefixCls = _React$useContext.getPrefixCls,
-    pkgPrefixCls = _React$useContext.prefixCls,
-    userDefaultProps = _React$useContext.compDefaultProps;
-  var innerRef = _react.default.useRef();
-  var mergedRef = ref || innerRef;
+  var _useContext = (0, _react.useContext)(_ConfigContext.default),
+    getPrefixCls = _useContext.getPrefixCls,
+    pkgPrefixCls = _useContext.prefixCls,
+    userDefaultProps = _useContext.compDefaultProps;
+  var inputRef = (0, _react.useRef)(null);
   var allProps = (0, _utils.getCompProps)('Upload', userDefaultProps, props); // 属性需要合并一遍用户定义的默认属性
   var type = allProps.type,
     style = allProps.style,
@@ -106,15 +105,15 @@ var InternalUpload = function InternalUpload(props, ref) {
     showUploadList = allProps.showUploadList,
     customPrefixcls = allProps.prefixCls,
     onPreview = allProps.onPreview;
-  var _React$useState = _react.default.useState(props.fileList || props.defaultFileList || []),
-    _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
-    fileList = _React$useState2[0],
-    setFileList = _React$useState2[1];
+  var _useState = (0, _react.useState)(props.fileList || props.defaultFileList || []),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    fileList = _useState2[0],
+    setFileList = _useState2[1];
   var hasChildren = children && _react.Children.toArray(children).length > 0;
-  _react.default.useEffect(function () {
+  (0, _react.useEffect)(function () {
     props.fileList && setFileList(props.fileList);
   }, [props.fileList]);
-  _react.default.useEffect(function () {
+  (0, _react.useEffect)(function () {
     return abort;
   }, []);
   var onClick = function onClick(e) {
@@ -134,20 +133,22 @@ var InternalUpload = function InternalUpload(props, ref) {
     });
   };
   var uploadFiles = function uploadFiles(files) {
-    var _context2;
-    files.forEach(function (file) {
-      file.originFileObj = new File([file], file.name, {
-        type: file.type
+    if (Array.isArray(files) && files.length) {
+      var _context2;
+      files.forEach(function (file) {
+        file.originFileObj = new File([file], file.name, {
+          type: file.type
+        });
+        file.uid = getUid();
+        file.status = 'notStart';
+        file.fileName = allProps.name || file.name;
       });
-      file.uid = getUid();
-      file.status = 'notStart';
-      file.fileName = allProps.name || file.name;
-    });
-    var newFileList = (0, _concat.default)(_context2 = []).call(_context2, (0, _toConsumableArray2.default)(fileList), (0, _toConsumableArray2.default)(files));
-    files.forEach(function (file) {
-      props.fileList === undefined && setFileList(fileList);
-      upload(file, newFileList);
-    });
+      var newFileList = (0, _concat.default)(_context2 = []).call(_context2, (0, _toConsumableArray2.default)(fileList), (0, _toConsumableArray2.default)(files));
+      files.forEach(function (file) {
+        props.fileList === undefined && setFileList(fileList);
+        upload(file, newFileList);
+      });
+    }
   };
   var upload = function upload(file, fileList) {
     if (props.beforeUpload) {
@@ -276,40 +277,53 @@ var InternalUpload = function InternalUpload(props, ref) {
       });
     });
   };
-  var handleRemove = function handleRemove(file, e) {
-    e.preventDefault();
-    var files = (0, _filter.default)(fileList).call(fileList, function (fileItem) {
-      return fileItem.uid !== file.uid;
-    });
-    if (onRemove) {
-      var remove = onRemove(file);
-      if (remove && typeof remove !== 'boolean' && remove.then) {
-        remove.then(function (flag) {
-          if (flag) {
-            onFileListChange(file, files);
-            abort(file);
-          }
-        }).catch(function (e) {
-          console.log(e);
-        });
-      } else if (remove !== false) {
+  var handleRemove = function handleRemove(originFile) {
+    var e = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : undefined;
+    if (e) {
+      e.preventDefault();
+    }
+    if (originFile) {
+      var file = (0, _extends2.default)((0, _extends2.default)({}, originFile), {
+        status: 'removed'
+      });
+      var files = (0, _filter.default)(fileList).call(fileList, function (fileItem) {
+        return fileItem.uid !== file.uid;
+      });
+      if (onRemove) {
+        var remove = onRemove(file);
+        if (remove && typeof remove !== 'boolean' && remove.then) {
+          remove.then(function (flag) {
+            if (flag) {
+              onFileListChange(file, files);
+              abort(file);
+            }
+          }).catch(function (e) {
+            console.log(e);
+          });
+        } else if (remove !== false) {
+          onFileListChange(file, files);
+          abort(file);
+        }
+      } else {
         onFileListChange(file, files);
         abort(file);
       }
-    } else {
-      onFileListChange(file, files);
-      abort(file);
     }
   };
-  var handleReUpload = function handleReUpload(file, e) {
-    e.preventDefault();
-    file.percent = 0;
-    file.status = 'uploading';
-    var files = (0, _map.default)(fileList).call(fileList, function (fileItem) {
-      return fileItem.uid === file.uid ? file : fileItem;
-    });
-    onFileListChange(file, files);
-    upload(file, files);
+  var handleReUpload = function handleReUpload(file) {
+    var e = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : undefined;
+    if (e) {
+      e.preventDefault();
+    }
+    if (file) {
+      file.percent = 0;
+      file.status = 'uploading';
+      var files = (0, _map.default)(fileList).call(fileList, function (fileItem) {
+        return fileItem.uid === file.uid ? file : fileItem;
+      });
+      onFileListChange(file, files);
+      upload(file, files);
+    }
   };
   var prefixCls = getPrefixCls(pkgPrefixCls, 'upload', customPrefixcls);
   var inputFileProps = {
@@ -322,10 +336,10 @@ var InternalUpload = function InternalUpload(props, ref) {
     webkitdirectory: directory ? 'webkitdirectory' : undefined
   };
   var dragEvents = {};
-  var _React$useState3 = _react.default.useState(false),
-    _React$useState4 = (0, _slicedToArray2.default)(_React$useState3, 2),
-    hover = _React$useState4[0],
-    setHover = _React$useState4[1];
+  var _useState3 = (0, _react.useState)(false),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    hover = _useState4[0],
+    setHover = _useState4[1];
   if (type === 'drag') {
     var onFileDrop = function onFileDrop(e) {
       e.preventDefault();
@@ -361,7 +375,7 @@ var InternalUpload = function InternalUpload(props, ref) {
     dragEvents.onDragOver = onFileLeave;
     dragEvents.onDragLeave = onFileLeave;
   }
-  _react.default.useEffect(function () {
+  (0, _react.useEffect)(function () {
     if (type === 'drag') {
       var stopDrop = function stopDrop(e) {
         return e.preventDefault();
@@ -374,6 +388,16 @@ var InternalUpload = function InternalUpload(props, ref) {
       };
     }
   }, [type]);
+  (0, _react.useImperativeHandle)(ref, function () {
+    return {
+      fileList: fileList,
+      uploadFiles: uploadFiles,
+      reUploadFile: handleReUpload,
+      removeFile: handleRemove,
+      abortFile: abort,
+      input: inputRef.current
+    };
+  });
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)(prefixCls, {
       disabled: disabled
@@ -389,7 +413,7 @@ var InternalUpload = function InternalUpload(props, ref) {
     title: "",
     type: "file"
   }, inputFileProps, {
-    ref: mergedRef
+    ref: inputRef
   })))), (listType === 'picture' || !(listType === 'text' && (!showUploadList || !fileList.length))) && /*#__PURE__*/_react.default.createElement("ul", {
     className: (0, _concat.default)(_context6 = "".concat(prefixCls, "-")).call(_context6, listType, "-list")
   }, listType === 'picture' && hasChildren && /*#__PURE__*/_react.default.createElement("li", {
@@ -404,7 +428,7 @@ var InternalUpload = function InternalUpload(props, ref) {
     title: "",
     type: "file"
   }, inputFileProps, {
-    ref: mergedRef
+    ref: inputRef
   }))))), showUploadList && (0, _map.default)(fileList).call(fileList, function (file) {
     return itemRender ? itemRender( /*#__PURE__*/_react.default.createElement(Item, (0, _extends2.default)({}, {
       file: file,
@@ -514,7 +538,7 @@ var Item = function Item(_ref3) {
     })]
   }));
 };
-var Upload = /*#__PURE__*/_react.default.forwardRef(InternalUpload);
+var Upload = /*#__PURE__*/(0, _react.forwardRef)(InternalUpload);
 Upload.displayName = 'Upload';
 var _default = Upload;
 exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/kdesign",
-  "version": "1.7.17",
+  "version": "1.7.19",
   "description": "KDesign 金蝶前端react 组件库",
   "title": "kdesign",
   "keywords": [