zmdms-webui 1.7.3 → 1.7.4

package/dist/es/uploadlist/uploadList.js

@@ -384,7 +384,7 @@ var UploadList = function (props, ref) {
                     onClick: function (e) {
                         onBatchDownloadHandle(e.key);
                     },
-                }, placement: "bottomLeft" }, { children: jsx(ButtonCom, __assign({ type: "primary" }, { children: "\u6279\u91CF\u4E0B\u8F7D" })) }))) : null, customRenderBtn, showTable ? (jsx(UploadTable, { dataSource: uploadTableData, action: fileAction, headers: fileHeaders, data: fileData, method: method, setInnerFileList: setInnerFileList, isPublic: isPublic, API_BASEURL: API_BASEURL, FILE_API_BASEURL: FILE_API_BASEURL, maxPreviewSize: maxPreviewSize, isPreview: isPreview, isDelete: isDelete, isDownload: isDownload, ref: tableRef, listType: listType, tableColumns: tableColumns, onBeforeDeleteValidate: onBeforeDeleteValidate, onBeforeDownloadValidate: onBeforeDownloadValidate, onBeforePreviewValidate: onBeforePreviewValidate })) : null, isPreview && !showTable && !isImage ? (jsx(UploadListDetail, { dataSource: uploadTableData, action: fileAction, headers: fileHeaders, data: fileData, method: method, setInnerFileList: setInnerFileList, isPublic: isPublic, API_BASEURL: API_BASEURL, FILE_API_BASEURL: FILE_API_BASEURL, maxPreviewSize: maxPreviewSize, isPreview: isPreview, isDelete: isDelete, isDownload: isDownload, ref: tableRef, listType: listType, tableColumns: tableColumns })) : null, isImage && (jsx(ModalComponent, __assign({ ref: modalRef, footer: null, width: "520px" }, { children: jsx("div", __assign({ style: {
+                }, placement: "bottomLeft" }, { children: jsx(ButtonCom, __assign({ type: "primary" }, { children: "\u6279\u91CF\u4E0B\u8F7D" })) }))) : null, customRenderBtn, showTable ? (jsx(UploadTable, { dataSource: uploadTableData, action: fileAction, headers: fileHeaders, data: fileData, method: method, setInnerFileList: setInnerFileList, isPublic: isPublic, API_BASEURL: API_BASEURL, FILE_API_BASEURL: FILE_API_BASEURL, maxPreviewSize: maxPreviewSize, isPreview: isPreview, isDelete: isDelete, isDownload: isDownload, ref: tableRef, listType: listType, tableColumns: tableColumns, onBeforeDeleteValidate: onBeforeDeleteValidate, onBeforeDownloadValidate: onBeforeDownloadValidate, onBeforePreviewValidate: onBeforePreviewValidate })) : null, isPreview && !showTable && !isImage ? (jsx(UploadListDetail, { dataSource: uploadTableData, action: fileAction, headers: fileHeaders, data: fileData, method: method, setInnerFileList: setInnerFileList, isPublic: isPublic, API_BASEURL: API_BASEURL, FILE_API_BASEURL: FILE_API_BASEURL, maxPreviewSize: maxPreviewSize, isPreview: isPreview, isDelete: isDelete, isDownload: isDownload, ref: tableRef, listType: listType, tableColumns: tableColumns, onBeforeDeleteValidate: onBeforeDeleteValidate, onBeforeDownloadValidate: onBeforeDownloadValidate, onBeforePreviewValidate: onBeforePreviewValidate })) : null, isImage && (jsx(ModalComponent, __assign({ ref: modalRef, footer: null, width: "520px" }, { children: jsx("div", __assign({ style: {
                         textAlign: "center",
                     } }, { children: jsx("img", { src: imgSrc, alt: "\u9884\u89C8", style: {
                             maxWidth: "400px",

package/dist/es/uploadlist/uploadListDetail.js

@@ -10,7 +10,7 @@ import { Spin, message } from 'antd';
 
 var UploadTable = function (_a, ref) {
     var _b;
-    var dataSource = _a.dataSource; _a.action; _a.headers; _a.data; _a.method; var setInnerFileList = _a.setInnerFileList, isPublic = _a.isPublic, _c = _a.API_BASEURL, API_BASEURL = _c === void 0 ? "" : _c, _d = _a.FILE_API_BASEURL, FILE_API_BASEURL = _d === void 0 ? "" : _d, maxPreviewSize = _a.maxPreviewSize, isPreview = _a.isPreview, isDelete = _a.isDelete, isDownload = _a.isDownload; _a.listType; _a.tableColumns;
+    var dataSource = _a.dataSource; _a.action; _a.headers; _a.data; _a.method; var setInnerFileList = _a.setInnerFileList, isPublic = _a.isPublic, _c = _a.API_BASEURL, API_BASEURL = _c === void 0 ? "" : _c, _d = _a.FILE_API_BASEURL, FILE_API_BASEURL = _d === void 0 ? "" : _d, maxPreviewSize = _a.maxPreviewSize, isPreview = _a.isPreview, isDelete = _a.isDelete, isDownload = _a.isDownload; _a.listType; _a.tableColumns; var onBeforeDownloadValidate = _a.onBeforeDownloadValidate, onBeforePreviewValidate = _a.onBeforePreviewValidate; _a.onBeforeDeleteValidate;
     var _e = useState(false), loading = _e[0], setLoading = _e[1];
     var _f = useState(), checked = _f[0], setChecked = _f[1];
     var isDownloadSingleBoolean = isDownload;
@@ -68,7 +68,7 @@ var UploadTable = function (_a, ref) {
         return statusBtnConfig;
     };
     var operationCallback = function (type, record, index) { return __awaiter(void 0, void 0, void 0, function () {
-        var attachId, attachName, _a, endCallback, err_1;
+        var attachId, attachName, _a, endCallback, canDownload, err_2, endCallback_1, canDownload;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
@@ -76,10 +76,10 @@ var UploadTable = function (_a, ref) {
                     _a = type;
                     switch (_a) {
                         case "download": return [3 /*break*/, 1];
-                        case "preview": return [3 /*break*/, 6];
-                        case "delete": return [3 /*break*/, 7];
+                        case "preview": return [3 /*break*/, 10];
+                        case "delete": return [3 /*break*/, 15];
                     }
-                    return [3 /*break*/, 8];
+                    return [3 /*break*/, 16];
                 case 1:
                     setInnerFileList(function (innerFileList) {
                         var newInnerFileList = innerFileList.slice();
@@ -95,31 +95,76 @@ var UploadTable = function (_a, ref) {
                     };
                     _b.label = 2;
                 case 2:
-                    _b.trys.push([2, 4, , 5]);
-                    return [4 /*yield*/, downloadFile(attachId, attachName, {
-                            API_BASEURL: API_BASEURL,
-                            open: isPublic,
-                        })];
+                    _b.trys.push([2, 8, , 9]);
+                    if (!onBeforeDownloadValidate) return [3 /*break*/, 6];
+                    _b.label = 3;
                 case 3:
+                    _b.trys.push([3, 5, , 6]);
+                    return [4 /*yield*/, onBeforeDownloadValidate([record])];
+                case 4:
+                    canDownload = _b.sent();
+                    if (!canDownload) {
+                        endCallback();
+                        return [2 /*return*/];
+                    }
+                    return [3 /*break*/, 6];
+                case 5:
                     _b.sent();
                     endCallback();
-                    return [3 /*break*/, 5];
-                case 4:
-                    err_1 = _b.sent();
-                    console.log(err_1);
+                    return [2 /*return*/];
+                case 6: return [4 /*yield*/, downloadFile(attachId, attachName, {
+                        API_BASEURL: API_BASEURL,
+                        open: isPublic,
+                    })];
+                case 7:
+                    _b.sent();
                     endCallback();
-                    return [3 /*break*/, 5];
-                case 5: 
+                    return [3 /*break*/, 9];
+                case 8:
+                    err_2 = _b.sent();
+                    console.log(err_2);
+                    endCallback();
+                    return [3 /*break*/, 9];
+                case 9: 
                 // finally 可能再某些浏览器下不兼容
-                return [3 /*break*/, 8];
-                case 6:
+                return [3 /*break*/, 16];
+                case 10:
+                    if (!onBeforePreviewValidate) return [3 /*break*/, 14];
+                    setInnerFileList(function (innerFileList) {
+                        var newInnerFileList = innerFileList.slice();
+                        newInnerFileList.splice(index, 1, __assign(__assign({}, record), { loading: true }));
+                        return newInnerFileList;
+                    });
+                    endCallback_1 = function () {
+                        setInnerFileList(function (innerFileList) {
+                            var newInnerFileList = innerFileList.slice();
+                            newInnerFileList.splice(index, 1, __assign(__assign({}, record), { loading: false }));
+                            return newInnerFileList;
+                        });
+                    };
+                    _b.label = 11;
+                case 11:
+                    _b.trys.push([11, 13, , 14]);
+                    return [4 /*yield*/, onBeforePreviewValidate([record])];
+                case 12:
+                    canDownload = _b.sent();
+                    endCallback_1();
+                    if (!canDownload) {
+                        return [2 /*return*/];
+                    }
+                    return [3 /*break*/, 14];
+                case 13:
+                    _b.sent();
+                    endCallback_1();
+                    return [2 /*return*/];
+                case 14:
                     toPreviewFile(record, {
                         maxPreviewSize: maxPreviewSize,
                         FILE_API_BASEURL: FILE_API_BASEURL,
                         uploadTableData: dataSource,
                     });
-                    return [3 /*break*/, 8];
-                case 7:
+                    return [3 /*break*/, 16];
+                case 15:
                     setChecked(function (c) {
                         if (Array.isArray(c)) {
                             var copyC = c.slice();
@@ -133,8 +178,8 @@ var UploadTable = function (_a, ref) {
                         newInnerFileList.splice(index, 1);
                         return newInnerFileList;
                     });
-                    return [3 /*break*/, 8];
-                case 8: return [2 /*return*/];
+                    return [3 /*break*/, 16];
+                case 16: return [2 /*return*/];
             }
         });
     }); };
@@ -160,7 +205,7 @@ var UploadTable = function (_a, ref) {
                                     }
                                     message.info("暂无预览权限!");
                                     return Promise.resolve();
-                                }, style: { textAlign: "left" }, title: record.attachName }, { children: [jsx(LinkOutlined, {}), record.attachName] })) })), jsx("div", __assign({ className: "preview-list__item--right" }, { children: isDownloadAuth ? (jsx(ButtonCom, __assign({ type: "link", onClick: function () { return operationCallback("download", record, index); }, style: { textAlign: "left" }, title: "\u4E0B\u8F7D" }, { children: jsx(DownloadOutlined, {}) }))) : null }))] })));
+                                }, style: { textAlign: "left" }, title: record.attachName }, { children: [jsx(LinkOutlined, {}), record.attachName] })) })), jsx("div", __assign({ className: "preview-list__item--right" }, { children: isDownloadAuth ? (jsx(ButtonCom, __assign({ type: "link", onClick: function () { return operationCallback("download", record, index); }, style: { textAlign: "left" }, title: "\u4E0B\u8F7D" }, { children: jsx(DownloadOutlined, {}) }))) : null }))] }), record.attachId || record.fileId || index));
             }) })) })));
 };
 var UploadListDetail = forwardRef(UploadTable);

package/package.json

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