zmdms-webui 0.0.73 → 0.0.74

package/dist/es/uploadlist/hooks.js

@@ -3,6 +3,7 @@ import { useCallback, useState, useEffect, useMemo } from 'react';
 import { flushSync } from 'react-dom';
 import { getFileExtension, isImageExtension, createDownloadLink, createUploadFileLink, getToken, exactRound, times, divide } from 'zmdms-utils';
 import MemoUploadList from './uploadList.js';
+import { useLatest } from 'ahooks';
 import { message } from 'antd';
 
 // 默认限制的文件类型
@@ -11,17 +12,24 @@ var NO_ACCEPT = ["exe"];
  * 附件上传前的控制
  */
 function useBeforeUpload(props) {
-    var acceptList = props.acceptList, maxSize = props.maxSize, maxSizeStr = props.maxSizeStr, beforeUpload = props.beforeUpload, isImage = props.isImage;
+    var acceptList = props.acceptList, maxSize = props.maxSize, maxSizeStr = props.maxSizeStr, beforeUpload = props.beforeUpload, isImage = props.isImage, disAllowDuplicateFile = props.disAllowDuplicateFile, fileList = props.fileList;
+    var fileListRef = useLatest(fileList);
     return useCallback(function (file, fileList) {
+        var _a, _b;
         var fileName = file.name, fileSize = file.size;
         // 获取文件后缀
-        var _a = getFileExtension(fileName), fileExtension = _a[1];
+        var _c = getFileExtension(fileName), fileExtension = _c[1];
         if (beforeUpload) {
             var result = beforeUpload(file, fileList);
             if (result) {
                 return result;
             }
         }
+        if (disAllowDuplicateFile &&
+            ((_b = (_a = fileListRef.current) === null || _a === void 0 ? void 0 : _a.find) === null || _b === void 0 ? void 0 : _b.call(_a, function (item) { return item.name === fileName || item.attachName === fileName; }))) {
+            message.warning("不能上传同名附件!");
+            return MemoUploadList.LIST_IGNORE;
+        }
         // 文件大小
         if (fileSize === 0) {
             message.warning("不能上传空文件!");
@@ -49,7 +57,15 @@ function useBeforeUpload(props) {
             return MemoUploadList.LIST_IGNORE;
         }
         return Promise.resolve(file);
-    }, [acceptList, maxSize, maxSizeStr, beforeUpload, isImage]);
+    }, [
+        acceptList,
+        maxSize,
+        maxSizeStr,
+        beforeUpload,
+        isImage,
+        fileListRef,
+        disAllowDuplicateFile,
+    ]);
 }
 /**
  * 文件改变触发事件
@@ -142,13 +158,18 @@ function useOnChange(props) {
         innerFileList: innerFileList,
         setInnerFileList: function (c) {
             setInnerFileList(c);
-            if (typeof c === "function") {
-                var result = c(innerFileList);
-                onChange && onChange({ file: null, fileList: result });
-            }
-            else {
-                onChange && onChange({ file: null, fileList: c });
-            }
+            // 当删除附加时，需要手动触发这些操作
+            var newFileList = typeof c === "function" ? c(innerFileList) : c;
+            var successFileList = newFileList.filter(function (item) { return item.status === "done" || !item.status; });
+            var errorFileList = newFileList.filter(function (item) { return item.status === "error"; });
+            onChange &&
+                onChange({
+                    file: null,
+                    isComplete: true,
+                    fileList: newFileList,
+                    successFileList: successFileList,
+                    errorFileList: errorFileList,
+                });
         },
         onChangeHandle: onChangeHandle,
     };

package/dist/es/uploadlist/interface.d.ts

@@ -43,6 +43,8 @@ interface IUploadListProps extends Omit<UploadProps, "onChange"> {
     isImage?: boolean;
     /** 自定义按钮 */
     customRenderBtn?: React.ReactNode;
+    /** 不允许同名附件 */
+    disAllowDuplicateFile?: boolean;
 }
 interface UploadListComponent extends React.ForwardRefExoticComponent<IUploadListProps & React.RefAttributes<unknown>> {
     Dragger: typeof Upload.Dragger;

package/dist/es/uploadlist/uploadList.js

@@ -27,7 +27,7 @@ var MAXSIZE = 104857600; // 100 * 1024 * 1024
  * 附件大小 attachSize
  */
 var UploadList = function (props, ref) {
-    var children = props.children, btnText = props.btnText, className = props.className, _a = props.showTip, showTip = _a === void 0 ? true : _a, _b = props.maxSize, maxSize = _b === void 0 ? MAXSIZE : _b, showTable = props.showTable, acceptList = props.acceptList, beforeUpload = props.beforeUpload, onChange = props.onChange, PROPS_API_BASEURL = props.API_BASEURL, PROPS_FILE_API_BASEURL = props.FILE_API_BASEURL, action = props.action, headers = props.headers, data = props.data, userName = props.userName, fileList = props.fileList, isPublic = props.isPublic, _c = props.maxPreviewSize, maxPreviewSize = _c === void 0 ? MAX_PREVIEW_SIZE : _c, isPreview = props.isPreview, isDownload = props.isDownload, isDelete = props.isDelete, _d = props.zipName, zipName = _d === void 0 ? "\u6279\u91CF\u4E0B\u8F7D-".concat(Date.now(), ".zip") : _d, isImage = props.isImage, customRenderBtn = props.customRenderBtn, resetProps = __rest(props, ["children", "btnText", "className", "showTip", "maxSize", "showTable", "acceptList", "beforeUpload", "onChange", "API_BASEURL", "FILE_API_BASEURL", "action", "headers", "data", "userName", "fileList", "isPublic", "maxPreviewSize", "isPreview", "isDownload", "isDelete", "zipName", "isImage", "customRenderBtn"]);
+    var children = props.children, btnText = props.btnText, className = props.className, _a = props.showTip, showTip = _a === void 0 ? true : _a, _b = props.maxSize, maxSize = _b === void 0 ? MAXSIZE : _b, showTable = props.showTable, acceptList = props.acceptList, beforeUpload = props.beforeUpload, onChange = props.onChange, PROPS_API_BASEURL = props.API_BASEURL, PROPS_FILE_API_BASEURL = props.FILE_API_BASEURL, action = props.action, headers = props.headers, data = props.data, userName = props.userName, fileList = props.fileList, isPublic = props.isPublic, _c = props.maxPreviewSize, maxPreviewSize = _c === void 0 ? MAX_PREVIEW_SIZE : _c, isPreview = props.isPreview, isDownload = props.isDownload, isDelete = props.isDelete, _d = props.zipName, zipName = _d === void 0 ? "\u6279\u91CF\u4E0B\u8F7D-".concat(Date.now(), ".zip") : _d, isImage = props.isImage, customRenderBtn = props.customRenderBtn, disAllowDuplicateFile = props.disAllowDuplicateFile, resetProps = __rest(props, ["children", "btnText", "className", "showTip", "maxSize", "showTable", "acceptList", "beforeUpload", "onChange", "API_BASEURL", "FILE_API_BASEURL", "action", "headers", "data", "userName", "fileList", "isPublic", "maxPreviewSize", "isPreview", "isDownload", "isDelete", "zipName", "isImage", "customRenderBtn", "disAllowDuplicateFile"]);
     var maxCount = resetProps.maxCount, listType = resetProps.listType, method = resetProps.method;
     var classes = classNames("ztxk-upload", className, {});
     var maxSizeStr = formatUnit(maxSize);
@@ -46,6 +46,8 @@ var UploadList = function (props, ref) {
         maxSizeStr: maxSizeStr,
         beforeUpload: beforeUpload,
         isImage: isImage,
+        disAllowDuplicateFile: disAllowDuplicateFile,
+        fileList: fileList,
     });
     // 文件改变逻辑
     var _g = useOnChange({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zmdms-webui",
-  "version": "0.0.73",
+  "version": "0.0.74",
   "private": false,
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",