zmdms-webui 3.1.7 → 3.1.9

package/dist/es/electronsignatures/electroncomponents/utils.js

@@ -11,7 +11,7 @@ function fileBatchDownload(fileList, otherConfig) {
     };
     console.log(fileList);
     if (Array.isArray(fileList) && fileList.length > 0) {
-        var _a = otherConfig.showDownloadBtn, showDownloadBtn_1 = _a === void 0 ? true : _a, _b = otherConfig.showPreviewBtn, showPreviewBtn_1 = _b === void 0 ? true : _b, _c = otherConfig.isCompress, isCompress = _c === void 0 ? true : _c, authToken_1 = otherConfig.authToken, apiBaseUrl_1 = otherConfig.apiBaseUrl, zipName = otherConfig.zipName;
+        var _a = otherConfig.showDownloadBtn, showDownloadBtn_1 = _a === void 0 ? true : _a, _b = otherConfig.showPreviewBtn, showPreviewBtn_1 = _b === void 0 ? true : _b, _c = otherConfig.isCompress, isCompress = _c === void 0 ? true : _c, authToken_1 = otherConfig.authToken, apiBaseUrl_1 = otherConfig.apiBaseUrl, zipName = otherConfig.zipName, isWater_1 = otherConfig.isWater;
         // 找出可以下载的文件，以及不可以下载的文件
         fileList.forEach(function (fileItem, index) {
             var fileSize = fileItem.fileSize, operationAuth = fileItem.operationAuth;
@@ -45,7 +45,7 @@ function fileBatchDownload(fileList, otherConfig) {
                     : "".concat(zipName, ".zip")
                 : "批量下载附件.zip";
             // 批量下载默认需要水印
-            var addWaterMark_1 = true;
+            var addWaterMark_1 = typeof isWater_1 === "boolean" ? isWater_1 : true;
             canDownloadFileList.forEach(function (fileItem) {
                 attachIds_1.push(fileItem.fileId);
                 fileNames_1.push(fileItem.fileName || "");
@@ -81,7 +81,7 @@ function fileBatchDownload(fileList, otherConfig) {
                 downloadFile(fileId, fileName || "\u9644\u4EF6".concat(index + 1), {
                     API_BASEURL: apiBaseUrl_1,
                     authToken: authToken_1,
-                    waterMark: isWatermark,
+                    waterMark: typeof isWater_1 === "boolean" ? isWater_1 : isWatermark,
                 })
                     .then(function (res) {
                     fileItem._downloadStatus = "fulfilled";
@@ -104,8 +104,8 @@ function fileBatchDownload(fileList, otherConfig) {
         otherParams: otherParams,
     };
 }
-function sealFileBatchDownload(request, params, isCompress) {
-    if (isCompress === void 0) { isCompress = true; }
+function sealFileBatchDownload(request, params, options) {
+    var _a = options || {}, _b = _a.isCompress, isCompress = _b === void 0 ? true : _b, _c = _a.isWater, isWater = _c === void 0 ? false : _c;
     var otherParams = {
         status: "pending",
     };
@@ -113,14 +113,26 @@ function sealFileBatchDownload(request, params, isCompress) {
     if (Array.isArray(fileList) && fileList.length > 0) {
         if (isCompress) {
             // 下载打包成PDF的文件。
-            sealDownloadFileCallBack(request, params, {
-                callbackAfter: function () {
-                    otherParams.status = "fulfilled";
-                },
-                callbackError: function () {
-                    otherParams.status = "rejected";
-                },
-            });
+            if (isWater) {
+                sealWaterDownloadFileCallBack(request, params, {
+                    callbackAfter: function () {
+                        otherParams.status = "fulfilled";
+                    },
+                    callbackError: function () {
+                        otherParams.status = "rejected";
+                    },
+                });
+            }
+            else {
+                sealDownloadFileCallBack(request, params, {
+                    callbackAfter: function () {
+                        otherParams.status = "fulfilled";
+                    },
+                    callbackError: function () {
+                        otherParams.status = "rejected";
+                    },
+                });
+            }
         }
         else {
             // 单个文件下载
@@ -133,20 +145,41 @@ function sealFileBatchDownload(request, params, isCompress) {
                     docAttachMap: params.docAttachMap,
                     qysAttachVOList: [fileItem],
                 };
-                sealDownloadFileCallBack(request, newParams, {
-                    callbackAfter: function () {
-                        fileItem._downloadStatus = "fulfilled";
-                        if (otherParams.otherList) {
-                            otherParams.otherList[index] = "fulfilled";
-                        }
-                    },
-                    callbackError: function () {
-                        fileItem._downloadStatus = "rejected";
-                        if (otherParams.otherList) {
-                            otherParams.otherList[index] = "rejected";
-                        }
-                    },
-                });
+                if (isWater) {
+                    newParams.watermarkOrganizationType =
+                        params.watermarkOrganizationType;
+                    newParams.watermarkOrganizationId = params.watermarkOrganizationId;
+                    sealWaterDownloadFileCallBack(request, newParams, {
+                        callbackAfter: function () {
+                            fileItem._downloadStatus = "fulfilled";
+                            if (otherParams.otherList) {
+                                otherParams.otherList[index] = "fulfilled";
+                            }
+                        },
+                        callbackError: function () {
+                            fileItem._downloadStatus = "rejected";
+                            if (otherParams.otherList) {
+                                otherParams.otherList[index] = "rejected";
+                            }
+                        },
+                    });
+                }
+                else {
+                    sealDownloadFileCallBack(request, newParams, {
+                        callbackAfter: function () {
+                            fileItem._downloadStatus = "fulfilled";
+                            if (otherParams.otherList) {
+                                otherParams.otherList[index] = "fulfilled";
+                            }
+                        },
+                        callbackError: function () {
+                            fileItem._downloadStatus = "rejected";
+                            if (otherParams.otherList) {
+                                otherParams.otherList[index] = "rejected";
+                            }
+                        },
+                    });
+                }
             });
         }
     }
@@ -261,6 +294,64 @@ function sealDownloadFileCallBack(request, params, otherOption) {
         }
         callbackError && callbackError();
     });
+}
+/**
+ * 批量下载盖章件水印
+ */
+function sealWaterDownloadFileCallBack(request, params, otherOption) {
+    var _a = otherOption || {}, callbackAfter = _a.callbackAfter, callbackError = _a.callbackError;
+    request({
+        method: "POST",
+        url: "/api/zmdms-resource/seal/batch-download-seal-files-water-mark",
+        responseType: "blob",
+        data: params,
+    })
+        .then(function (res) {
+        var _a, _b, _c;
+        if (!((_a = res.headers) === null || _a === void 0 ? void 0 : _a["content-disposition"])) {
+            callbackError && callbackError();
+            myMessage.warning("没有可下载的内容");
+            return;
+        }
+        var fileName = res.headers["content-disposition"].split(";");
+        var fileNameArray = (_b = fileName[1]) === null || _b === void 0 ? void 0 : _b.split("=");
+        var fileNameStr = decodeURIComponent(fileNameArray[1]);
+        var blob = new Blob([res.data], {
+            type: "application/vnd.ms-excel",
+        });
+        if (blob.size < 1) {
+            callbackError && callbackError();
+            myMessage.warning("下载失败，下载的内容为空！");
+            return;
+        }
+        var aLink = document.createElement("a");
+        aLink.style.display = "none";
+        aLink.href = window.URL.createObjectURL(blob);
+        aLink.download = (_c = fileNameStr === null || fileNameStr === void 0 ? void 0 : fileNameStr.replace) === null || _c === void 0 ? void 0 : _c.call(fileNameStr, /["]/g, "");
+        document.body.appendChild(aLink);
+        aLink.click();
+        document.body.removeChild(aLink);
+        callbackAfter && callbackAfter();
+    })
+        .catch(function (err) {
+        var _a;
+        try {
+            var file_2 = new FileReader();
+            file_2.readAsText((_a = err === null || err === void 0 ? void 0 : err.response) === null || _a === void 0 ? void 0 : _a.data, "utf-8");
+            file_2.onload = function () {
+                var obj = {};
+                try {
+                    obj = JSON.parse(file_2.result);
+                }
+                catch (err) { }
+                myMessage.warning((obj === null || obj === void 0 ? void 0 : obj.msg) || "没有可下载的内容");
+            };
+        }
+        catch (err) {
+            myMessage.warning("下载出错");
+        }
+        callbackError && callbackError();
+    });
 }
 
-export { fileBatchDownload, nextDownload, preCanDownload, sealDownloadFileCallBack, sealFileBatchDownload };
+export { fileBatchDownload, nextDownload, preCanDownload, sealDownloadFileCallBack, sealFileBatchDownload, sealWaterDownloadFileCallBack };

package/dist/es/electronsignatures/filecomponents/file-operation.js

@@ -4,11 +4,12 @@ import { memo } from 'react';
 import { downloadFile, getToken, dangerouslyXss, getFileExtension, isImageExtension, previewFile } from 'zmdms-utils';
 import { downloadWaterFile } from './fileUtils.js';
 import FileUpload from './file-upload.js';
+import TranslationButtonComponents from '../translatecomponents/TranslateButton.js';
 import ButtonCom from '../../button/button.js';
 import { Checkbox, Popconfirm } from 'antd';
 
 var FileOperation = function (props) {
-    var isDownload = props.isDownload, isPreview = props.isPreview, isEdit = props.isEdit, isWater = props.isWater, records = props.records, isDelete = props.isDelete, fileName = props.fileName, _a = props.fileId, fileId = _a === void 0 ? "" : _a, _b = props.preFileId, preFileId = _b === void 0 ? "" : _b, _c = props.preFileName, preFileName = _c === void 0 ? "" : _c, _d = props.apiBaseUrl, apiBaseUrl = _d === void 0 ? "" : _d, _e = props.fileBaseUrl, fileBaseUrl = _e === void 0 ? "" : _e, onDelete = props.onDelete, onWatermarkChange = props.onWatermarkChange, organizationId = props.organizationId, isReplaceFile = props.isReplaceFile, fileList = props.fileList, onFileReplace = props.onFileReplace;
+    var isDownload = props.isDownload, isPreview = props.isPreview, isEdit = props.isEdit, isWater = props.isWater, records = props.records, isDelete = props.isDelete, fileName = props.fileName, _a = props.fileId, fileId = _a === void 0 ? "" : _a, _b = props.preFileId, preFileId = _b === void 0 ? "" : _b, _c = props.preFileName, preFileName = _c === void 0 ? "" : _c, _d = props.apiBaseUrl, apiBaseUrl = _d === void 0 ? "" : _d, _e = props.fileBaseUrl, fileBaseUrl = _e === void 0 ? "" : _e, onDelete = props.onDelete, onWatermarkChange = props.onWatermarkChange, organizationId = props.organizationId, isReplaceFile = props.isReplaceFile, fileList = props.fileList, onFileReplace = props.onFileReplace, _f = props.showAddWater, showAddWater = _f === void 0 ? true : _f, request = props.request, previewUrl = props.previewUrl, isTranslation = props.isTranslation, record = props.record, realIndex = props.realIndex, setRecords = props.setRecords, isNeedDg = props.isNeedDg;
     var previewBtn = function (attachId, previewTitle, fileName) {
         return (jsx(ButtonCom, __assign({ type: "link", onClick: function () {
                 // 实现批量预览，只针对图片
@@ -34,21 +35,22 @@ var FileOperation = function (props) {
     function onFileChange(info) {
         onFileReplace && onFileReplace(info, fileId);
     }
-    return (jsxs("div", __assign({ className: "file-operation--wrap" }, { children: [jsx("p", __assign({ className: "file-operation--title" }, { children: fileName })), isEdit && fileId && (jsx("div", __assign({ className: "file-operation--isWater" }, { children: jsx(Checkbox, __assign({ checked: isWater, onChange: function (e) {
+    return (jsxs("div", __assign({ className: "file-operation--wrap" }, { children: [jsx("p", __assign({ className: "file-operation--title" }, { children: fileName })), showAddWater && isEdit && fileId && (jsx("div", __assign({ className: "file-operation--isWater" }, { children: jsx(Checkbox, __assign({ checked: isWater, onChange: function (e) {
                         onWatermarkChange && onWatermarkChange(e.target.checked);
                     } }, { children: "\u6DFB\u52A0\u6C34\u5370" })) }))), jsxs("div", __assign({ className: "file-operation--list" }, { children: [isReplaceFile && (jsx(FileUpload, __assign({ fileList: fileList, apiBaseUrl: apiBaseUrl, onFileChange: onFileChange, type: "link" }, { children: "\u66FF\u6362" }))), isDownload && fileId ? (jsx(ButtonCom, __assign({ type: "link", onClick: function () {
                             downloadFile(fileId, fileName || "附件", {
                                 API_BASEURL: apiBaseUrl,
                                 waterMark: false,
                             });
-                        } }, { children: "\u4E0B\u8F7D" }))) : null, isPreview && fileId && previewBtn(fileId, "预览", fileName), isPreview && preFileId && previewBtn(preFileId, "上一版", preFileName), !isEdit && isDownload && fileId && isWater ? (jsx(ButtonCom, __assign({ type: "link", onClick: function () {
+                        } }, { children: "\u4E0B\u8F7D" }))) : null, isPreview && fileId && previewBtn(fileId, "预览", fileName), isPreview && preFileId && previewBtn(preFileId, "上一版", preFileName), (!isEdit && isDownload && fileId && isWater) ||
+                        (!isEdit && !showAddWater) ? (jsx(ButtonCom, __assign({ type: "link", onClick: function () {
                             var token = getToken();
                             downloadWaterFile(fileId, dangerouslyXss(fileName || "附件"), {
                                 API_BASEURL: apiBaseUrl,
                                 authToken: token ? token : "",
                                 organizationId: organizationId,
                             });
-                        } }, { children: "\u4E0B\u8F7D\u6C34\u5370\u7248" }))) : null, isDelete && (fileId || fileName) && (jsx(Popconfirm, __assign({ title: "\u662F\u5426\u5220\u9664\u8BE5\u6761\u6570\u636E?", cancelText: "\u5426", okText: "\u662F", onConfirm: onDelete }, { children: jsx(ButtonCom, __assign({ type: "link" }, { children: "\u5220\u9664" })) })))] }))] })));
+                        } }, { children: "\u4E0B\u8F7D\u6C34\u5370\u7248" }))) : null, isDelete && (fileId || fileName) && (jsx(Popconfirm, __assign({ title: "\u662F\u5426\u5220\u9664\u8BE5\u6761\u6570\u636E?", cancelText: "\u5426", okText: "\u662F", onConfirm: onDelete }, { children: jsx(ButtonCom, __assign({ type: "link" }, { children: "\u5220\u9664" })) }))), isNeedDg && (jsx(TranslationButtonComponents, { request: request, previewUrl: previewUrl, isTranslation: isTranslation, record: record, realIndex: realIndex, setRecords: setRecords }))] }))] })));
 };
 var FileOperation$1 = memo(FileOperation);
 

package/dist/es/electronsignatures/filecomponents/new-file-operation.js

@@ -0,0 +1,56 @@
+import { __assign } from '../../_virtual/_tslib.js';
+import { jsxs, jsx } from 'react/jsx-runtime';
+import { memo } from 'react';
+import { getFileExtension, isImageExtension, previewFile } from 'zmdms-utils';
+import FileUpload from './file-upload.js';
+import ButtonCom from '../../button/button.js';
+
+var FileOperation = function (props) {
+    props.isDownload; var isPreview = props.isPreview; props.isEdit; props.isWater; var records = props.records; props.isDelete; var fileName = props.fileName, _a = props.fileId, fileId = _a === void 0 ? "" : _a, _b = props.preFileId, preFileId = _b === void 0 ? "" : _b, _c = props.preFileName, preFileName = _c === void 0 ? "" : _c, _d = props.apiBaseUrl, apiBaseUrl = _d === void 0 ? "" : _d, _e = props.fileBaseUrl, fileBaseUrl = _e === void 0 ? "" : _e; props.onDelete; props.onWatermarkChange; props.organizationId; var isReplaceFile = props.isReplaceFile, fileList = props.fileList, onFileReplace = props.onFileReplace; props.showAddWater; props.request; props.previewUrl; props.isTranslation; var record = props.record; props.realIndex; props.setRecords; props.isNeedDg; var currentDate = props.currentDate, isWorlflowCompleted = props.isWorlflowCompleted;
+    var previewBtn = function (attachId, previewTitle, fileName) {
+        return (jsx(ButtonCom, __assign({ type: "link", onClick: function () {
+                // 实现批量预览，只针对图片
+                var _a = getFileExtension(fileName || ""), fileExtension = _a[1];
+                var result = isImageExtension(fileExtension);
+                if (result) {
+                    // const allImage = (Array.isArray(records) ? records : [])
+                    //   .filter(
+                    //     (item) => isImage(item.attachName) && item.attachId !== attachId
+                    //   )
+                    //   .map((item) => item.attachId);
+                    previewFile(attachId, fileName || "", {
+                        API_BASEURL: fileBaseUrl,
+                        fileList: Array.isArray(records) ? records : [],
+                    });
+                    return;
+                }
+                previewFile(attachId, fileName || "", {
+                    API_BASEURL: fileBaseUrl,
+                });
+            } }, { children: previewTitle })));
+    };
+    function onFileChange(info) {
+        onFileReplace && onFileReplace(info, fileId);
+    }
+    // 是否显示有盖章件
+    var isShowSeal = (record === null || record === void 0 ? void 0 : record.isElectronicSeal) + "" === "1";
+    // 是否显示重要文件
+    var isImportant = (record === null || record === void 0 ? void 0 : record.isImportant) + "" === "1";
+    // 是否显示水印
+    var isWatermark = (record === null || record === void 0 ? void 0 : record.isWatermark) + "" === "1";
+    // 待审核
+    var unAudited = (record === null || record === void 0 ? void 0 : record.isOther) + "" === "1";
+    // 已审核
+    var isAudited = (record === null || record === void 0 ? void 0 : record.isOther) + "" === "2";
+    // 是否显示有双签件
+    var doubleSignedSealInfoDTOListKey = "doubleSignedSealInfoDTOList";
+    var isShowSign = (record === null || record === void 0 ? void 0 : record[doubleSignedSealInfoDTOListKey]) &&
+        Array.isArray(record === null || record === void 0 ? void 0 : record[doubleSignedSealInfoDTOListKey]) &&
+        (record === null || record === void 0 ? void 0 : record[doubleSignedSealInfoDTOListKey].length) > 0;
+    return (jsxs("div", __assign({ className: "file-operation--wrap" }, { children: [jsx("div", __assign({ className: "file-operation--title", style: { textAlign: "left" } }, { children: previewBtn(fileId, fileName || "", fileName) })), jsxs("div", __assign({ className: "file-operation--date-container" }, { children: [jsx("div", { children: currentDate }), jsxs("div", __assign({ className: "file-operation--list" }, { children: [isReplaceFile && (jsx(FileUpload, __assign({ fileList: fileList, apiBaseUrl: apiBaseUrl, onFileChange: onFileChange, type: "link" }, { children: "\u66FF\u6362" }))), isPreview &&
+                                preFileId &&
+                                previewBtn(preFileId, "上一版", preFileName)] }))] })), isWorlflowCompleted ? (jsxs("div", __assign({ className: "file-operation--label" }, { children: [isImportant ? jsx("span", { children: "\u91CD\u8981" }) : null, isShowSeal ? jsx("span", { children: "\u6709\u76D6\u7AE0\u4EF6" }) : null, isShowSign ? jsx("span", { children: "\u6709\u53CC\u7B7E\u4EF6" }) : null, isWatermark ? jsx("span", { children: "\u6C34\u5370" }) : null, isAudited ? jsx("span", { children: "\u5DF2\u5BA1\u6838" }) : null, unAudited ? jsx("span", { children: "\u672A\u5BA1\u6838" }) : null] }))) : (jsxs("div", __assign({ className: "file-operation--label" }, { children: [isAudited ? jsx("span", { children: "\u5DF2\u5BA1\u6838" }) : null, unAudited ? jsx("span", { children: "\u672A\u5BA1\u6838" }) : null] })))] })));
+};
+var NewFileOperation = memo(FileOperation);
+
+export { NewFileOperation as default };

package/dist/es/electronsignatures/filecomponents/useFileColumns.js

@@ -1,18 +1,21 @@
 import { __assign } from '../../_virtual/_tslib.js';
-import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
+import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
+import { useContext, useMemo } from 'react';
 import { DATA_TYPE_KEY, getColumnMergeProp } from '../hooks/useParseRecords.js';
 import FileTypeSelect from './file-type-select.js';
 import FileOperation from './file-operation.js';
-import { useMemo } from 'react';
-import { currentRecordIsOnlyQunj, onlyQunjAttachId } from '../utils.js';
+import NewFileOperation from './new-file-operation.js';
+import { currentRecordIsOnlyQunj, onlyQunjAttachId, isFlowCompleted } from '../utils.js';
 import dayjs from 'dayjs';
+import { ElectronSignaturesContext } from '../index.js';
 import ButtonCom from '../../button/button.js';
 
 // 创建附件的clomuns
 function useFileColumns(options) {
     var records = options.records, dataTypeSort = options.dataTypeSort, allData = options.allData, isShowFileUpload = options.isShowFileUpload, apiBaseUrl = options.apiBaseUrl, fileBaseUrl = options.fileBaseUrl, firstDataType = options.firstDataType, 
     // fileUploadProps,
-    onValueChange = options.onValueChange, onFileTypeChangeGetItem = options.onFileTypeChangeGetItem, getCreateTimeHand = options.getCreateTimeHand, isSingleQj = options.isSingleQj, justNeedQj = options.justNeedQj, setJustNeedQj = options.setJustNeedQj, isShowFileType = options.isShowFileType, currentIsEditMemo = options.currentIsEditMemo, isDeleteAllFileWhenJustUseQj = options.isDeleteAllFileWhenJustUseQj, isControlNeedQys = options.isControlNeedQys, organizationId = options.organizationId, onFileReplace = options.onFileReplace;
+    onValueChange = options.onValueChange, onFileTypeChangeGetItem = options.onFileTypeChangeGetItem, getCreateTimeHand = options.getCreateTimeHand, isSingleQj = options.isSingleQj, justNeedQj = options.justNeedQj, setJustNeedQj = options.setJustNeedQj, isShowFileType = options.isShowFileType, currentIsEditMemo = options.currentIsEditMemo, isDeleteAllFileWhenJustUseQj = options.isDeleteAllFileWhenJustUseQj, isControlNeedQys = options.isControlNeedQys, organizationId = options.organizationId, onFileReplace = options.onFileReplace, isToggleQys = options.isToggleQys, previewUrl = options.previewUrl, request = options.request, isTranslation = options.isTranslation, isNeedDg = options.isNeedDg;
+    var isNewQys = useContext(ElectronSignaturesContext).isNewQys;
     var _a = allData[firstDataType] || {}, 
     // records: sameTypeRecords,
     setSameTypeRecords = _a.setRecords, onClearElectronListData = _a.onClearElectronListData, onClearElectronSetting = _a.onClearElectronSetting, 
@@ -60,115 +63,189 @@ function useFileColumns(options) {
                 } })) : (record === null || record === void 0 ? void 0 : record.attachTypeName);
         },
     };
-    var fileColumns = [
-        {
-            title: (jsxs("div", __assign({ className: "file-title" }, { children: [jsx("div", __assign({ className: "file-label" }, { children: "\u9644\u4EF6" })), jsx("div", __assign({ className: "file-upload" }, { children: isShowFileUpload && currentIsEditMemo && needQj ? (isControlNeedQys || needQys ? (jsx(ButtonCom, __assign({ type: "link", className: "file-add--isOnlyQunj", onClick: function () {
-                                var _a, _b, _c;
-                                setJustNeedQj(!justNeedQj);
-                                var newNeedQys = justNeedQj ? 1 : 0;
-                                var clearElectronListData = onClearElectronListData === null || onClearElectronListData === void 0 ? void 0 : onClearElectronListData();
-                                var clearElectronSetting = onClearElectronSetting === null || onClearElectronSetting === void 0 ? void 0 : onClearElectronSetting();
-                                // 是否组件内部可以更改需要契约锁逻辑
-                                var needQysObj = isControlNeedQys
-                                    ? { needQys: newNeedQys }
-                                    : {};
-                                if (isSingleQj) {
-                                    onValueChange &&
-                                        onValueChange((_a = {},
-                                            _a[firstDataType] = __assign(__assign(__assign({}, clearElectronListData), clearElectronSetting), needQysObj),
-                                            _a));
-                                    return;
-                                }
-                                if (isDeleteAllFileWhenJustUseQj) {
-                                    // 如果点击仅需要群杰印章信息的话，需要删除掉所有附件信息
+    var fileColumns = isNewQys
+        ? [
+            {
+                title: "附件名称",
+                dataIndex: "attachName",
+                key: "attachName",
+                width: 260,
+                align: "center",
+                render: function (text, record, index) {
+                    var currentOnlyQunj = currentRecordIsOnlyQunj(record);
+                    if (currentOnlyQunj) {
+                        return null;
+                    }
+                    var _a = getColumnMergeProp({
+                        record: record,
+                        index: index,
+                        records: records,
+                        dataTypeSort: dataTypeSort,
+                    }), currentDataType = _a.currentDataType, preDataTypeRecordsLength = _a.preDataTypeRecordsLength;
+                    var _b = allData[currentDataType] || {}, isEdit = _b.isEdit, sameTypeRecords = _b.records, setSameTypeRecords = _b.setRecords, fileFieldsNameRef = _b.fileFieldsNameRef, flowStatus = _b.flowStatus;
+                    var _c = (fileFieldsNameRef === null || fileFieldsNameRef === void 0 ? void 0 : fileFieldsNameRef.current) || {}, oldVersionId = _c.oldVersionId, oldVersionName = _c.oldVersionName;
+                    // 是否添加水印
+                    var isWater = (record === null || record === void 0 ? void 0 : record.isWatermark) + "" === "1" ? true : false;
+                    // 是否替换附件
+                    var isReplaceFile = (record === null || record === void 0 ? void 0 : record.isReplaceFile) + "" === "1" ? true : false;
+                    var showAddWater = record === null || record === void 0 ? void 0 : record.showAddWater;
+                    // 流程是否完结
+                    var isWorlflowCompleted = isFlowCompleted(flowStatus);
+                    var date = getCreateTimeHand(record);
+                    // 如果是内部附件 不展示上传时间
+                    var currentDate = currentRecordIsOnlyQunj(record) ? ("") : date ? (jsxs(Fragment, { children: [dayjs(date).format("YYYY年MM月DD日"), jsx("span", __assign({ style: { marginLeft: "4px" } }, { children: dayjs(date).format("HH:mm:ss") }))] })) : ("");
+                    return (jsx(NewFileOperation, { fileName: text, fileId: record.attachId, preFileId: record === null || record === void 0 ? void 0 : record[oldVersionId || ""], preFileName: record === null || record === void 0 ? void 0 : record[oldVersionName || ""], isDownload: true, isDelete: isEdit && isShowFileUpload, isPreview: true, isEdit: isEdit, isWater: isWater, apiBaseUrl: apiBaseUrl, fileBaseUrl: fileBaseUrl, records: sameTypeRecords, organizationId: organizationId, isReplaceFile: isReplaceFile, showAddWater: showAddWater, isWorlflowCompleted: isWorlflowCompleted, onDelete: function () {
+                            var _a;
+                            // 因为数据是按照类型来归类了，那么这个索引的长度 实际应该减去之前的所有数据类型的长度
+                            var dataTypeIndex = index - preDataTypeRecordsLength;
+                            var copyRecords = sameTypeRecords === null || sameTypeRecords === void 0 ? void 0 : sameTypeRecords.slice();
+                            if (Array.isArray(copyRecords)) {
+                                copyRecords.splice(dataTypeIndex, 1);
+                                if (copyRecords.length === 0) {
                                     setSameTypeRecords(defaultOnlyQunjRecords);
+                                    var clearElectronListData = onClearElectronListData === null || onClearElectronListData === void 0 ? void 0 : onClearElectronListData();
+                                    var clearElectronSetting = onClearElectronSetting === null || onClearElectronSetting === void 0 ? void 0 : onClearElectronSetting();
                                     onValueChange &&
-                                        onValueChange((_b = {},
-                                            _b[firstDataType] = __assign(__assign(__assign({ fileList: defaultOnlyQunjRecords }, clearElectronListData), clearElectronSetting), needQysObj),
-                                            _b));
+                                        onValueChange(__assign(__assign((_a = {}, _a[firstDataType] = {
+                                            fileList: defaultOnlyQunjRecords,
+                                        }, _a), clearElectronListData), clearElectronSetting));
                                 }
                                 else {
-                                    onValueChange &&
-                                        onValueChange((_c = {},
-                                            _c[firstDataType] = __assign(__assign(__assign({}, clearElectronListData), clearElectronSetting), needQysObj),
-                                            _c));
+                                    setSameTypeRecords(copyRecords);
                                 }
-                            } }, { children: justNeedQj ? "使用电子印章" : "仅使用群杰印章" }))) : null) : null }))] }))),
-            children: [
-                {
-                    title: "名称",
-                    dataIndex: "attachName",
-                    key: "attachName",
-                    width: 160,
-                    align: "center",
-                    render: function (text, record, index) {
-                        var currentOnlyQunj = currentRecordIsOnlyQunj(record);
-                        if (currentOnlyQunj) {
-                            return null;
-                        }
-                        var _a = getColumnMergeProp({
-                            record: record,
-                            index: index,
-                            records: records,
-                            dataTypeSort: dataTypeSort,
-                        }), currentDataType = _a.currentDataType, preDataTypeRecordsLength = _a.preDataTypeRecordsLength;
-                        var _b = allData[currentDataType] || {}, isEdit = _b.isEdit, sameTypeRecords = _b.records, setSameTypeRecords = _b.setRecords, fileFieldsNameRef = _b.fileFieldsNameRef;
-                        var _c = (fileFieldsNameRef === null || fileFieldsNameRef === void 0 ? void 0 : fileFieldsNameRef.current) || {}, oldVersionId = _c.oldVersionId, oldVersionName = _c.oldVersionName;
-                        // 是否添加水印
-                        var isWater = (record === null || record === void 0 ? void 0 : record.isWatermark) + "" === "1" ? true : false;
-                        // 是否替换附件
-                        var isReplaceFile = (record === null || record === void 0 ? void 0 : record.isReplaceFile) + "" === "1" ? true : false;
-                        return (jsx(FileOperation, { fileName: text, fileId: record.attachId, preFileId: record === null || record === void 0 ? void 0 : record[oldVersionId || ""], preFileName: record === null || record === void 0 ? void 0 : record[oldVersionName || ""], isDownload: true, isDelete: isEdit && isShowFileUpload, isPreview: true, isEdit: isEdit, isWater: isWater, apiBaseUrl: apiBaseUrl, fileBaseUrl: fileBaseUrl, records: sameTypeRecords, organizationId: organizationId, isReplaceFile: isReplaceFile, onDelete: function () {
+                            }
+                        }, onWatermarkChange: function (isChecked) {
+                            // 因为数据是按照类型来归类了，那么这个索引的长度 实际应该减去之前的所有数据类型的长度
+                            var dataTypeIndex = index - preDataTypeRecordsLength;
+                            setSameTypeRecords(function (preRecords) {
                                 var _a;
-                                // 因为数据是按照类型来归类了，那么这个索引的长度 实际应该减去之前的所有数据类型的长度
-                                var dataTypeIndex = index - preDataTypeRecordsLength;
-                                var copyRecords = sameTypeRecords === null || sameTypeRecords === void 0 ? void 0 : sameTypeRecords.slice();
-                                if (Array.isArray(copyRecords)) {
-                                    copyRecords.splice(dataTypeIndex, 1);
-                                    if (copyRecords.length === 0) {
-                                        setSameTypeRecords(defaultOnlyQunjRecords);
+                                var copyRecords = (preRecords === null || preRecords === void 0 ? void 0 : preRecords.slice()) || [];
+                                var item = copyRecords[dataTypeIndex];
+                                copyRecords.splice(dataTypeIndex, 1, __assign(__assign({}, item), (_a = { isWatermark: isChecked ? 1 : 0 }, _a[DATA_TYPE_KEY] = currentDataType, _a)));
+                                return copyRecords;
+                            });
+                        }, fileList: records, onFileReplace: onFileReplace, previewUrl: previewUrl, request: request, isTranslation: isTranslation, record: record, setRecords: setSameTypeRecords, realIndex: index, isNeedDg: isNeedDg, currentDate: currentDate }));
+                },
+            },
+        ]
+        : // 下面是最初设计的模式
+            [
+                {
+                    title: (jsxs("div", __assign({ className: "file-title" }, { children: [jsx("div", __assign({ className: "file-label" }, { children: "\u9644\u4EF6" })), jsx("div", __assign({ className: "file-upload" }, { children: isShowFileUpload && currentIsEditMemo && needQj ? ((isControlNeedQys || needQys) && isToggleQys ? (jsx(ButtonCom, __assign({ type: "link", className: "file-add--isOnlyQunj", onClick: function () {
+                                        var _a, _b, _c;
+                                        setJustNeedQj(!justNeedQj);
+                                        var newNeedQys = justNeedQj ? 1 : 0;
                                         var clearElectronListData = onClearElectronListData === null || onClearElectronListData === void 0 ? void 0 : onClearElectronListData();
                                         var clearElectronSetting = onClearElectronSetting === null || onClearElectronSetting === void 0 ? void 0 : onClearElectronSetting();
-                                        onValueChange &&
-                                            onValueChange(__assign(__assign((_a = {}, _a[firstDataType] = { fileList: defaultOnlyQunjRecords }, _a), clearElectronListData), clearElectronSetting));
-                                    }
-                                    else {
-                                        setSameTypeRecords(copyRecords);
-                                    }
+                                        // 是否组件内部可以更改需要契约锁逻辑
+                                        var needQysObj = isControlNeedQys
+                                            ? { needQys: newNeedQys }
+                                            : {};
+                                        if (isSingleQj) {
+                                            onValueChange &&
+                                                onValueChange((_a = {},
+                                                    _a[firstDataType] = __assign(__assign(__assign({}, clearElectronListData), clearElectronSetting), needQysObj),
+                                                    _a));
+                                            return;
+                                        }
+                                        if (isDeleteAllFileWhenJustUseQj) {
+                                            // 如果点击仅需要群杰印章信息的话，需要删除掉所有附件信息
+                                            setSameTypeRecords(defaultOnlyQunjRecords);
+                                            onValueChange &&
+                                                onValueChange((_b = {},
+                                                    _b[firstDataType] = __assign(__assign(__assign({ fileList: defaultOnlyQunjRecords }, clearElectronListData), clearElectronSetting), needQysObj),
+                                                    _b));
+                                        }
+                                        else {
+                                            onValueChange &&
+                                                onValueChange((_c = {},
+                                                    _c[firstDataType] = __assign(__assign(__assign({}, clearElectronListData), clearElectronSetting), needQysObj),
+                                                    _c));
+                                        }
+                                    } }, { children: justNeedQj ? "使用电子印章" : "仅使用群杰印章" }))) : null) : null }))] }))),
+                    children: [
+                        {
+                            title: "名称",
+                            dataIndex: "attachName",
+                            key: "attachName",
+                            width: 160,
+                            align: "center",
+                            render: function (text, record, index) {
+                                var currentOnlyQunj = currentRecordIsOnlyQunj(record);
+                                if (currentOnlyQunj) {
+                                    return null;
                                 }
-                            }, onWatermarkChange: function (isChecked) {
-                                // 因为数据是按照类型来归类了，那么这个索引的长度 实际应该减去之前的所有数据类型的长度
-                                var dataTypeIndex = index - preDataTypeRecordsLength;
-                                setSameTypeRecords(function (preRecords) {
-                                    var _a;
-                                    var copyRecords = (preRecords === null || preRecords === void 0 ? void 0 : preRecords.slice()) || [];
-                                    var item = copyRecords[dataTypeIndex];
-                                    copyRecords.splice(dataTypeIndex, 1, __assign(__assign({}, item), (_a = { isWatermark: isChecked ? 1 : 0 }, _a[DATA_TYPE_KEY] = currentDataType, _a)));
-                                    return copyRecords;
-                                });
-                            }, fileList: records, onFileReplace: onFileReplace }));
-                    },
-                },
-                {
-                    title: "上传时间",
-                    dataIndex: "createTime",
-                    key: "createTime",
-                    width: 112,
-                    align: "center",
-                    render: function (text, record, index) {
-                        var date = getCreateTimeHand(record);
-                        // 如果是内部附件 不展示上传时间
-                        if (currentRecordIsOnlyQunj(record)) {
-                            return "";
-                        }
-                        return date ? (jsxs(Fragment, { children: [jsx("div", { children: dayjs(date).format("YYYY年MM月DD日") }), jsx("div", { children: dayjs(date).format("HH:mm:ss") })] })) : ("");
-                    },
+                                var _a = getColumnMergeProp({
+                                    record: record,
+                                    index: index,
+                                    records: records,
+                                    dataTypeSort: dataTypeSort,
+                                }), currentDataType = _a.currentDataType, preDataTypeRecordsLength = _a.preDataTypeRecordsLength;
+                                var _b = allData[currentDataType] || {}, isEdit = _b.isEdit, sameTypeRecords = _b.records, setSameTypeRecords = _b.setRecords, fileFieldsNameRef = _b.fileFieldsNameRef;
+                                var _c = (fileFieldsNameRef === null || fileFieldsNameRef === void 0 ? void 0 : fileFieldsNameRef.current) || {}, oldVersionId = _c.oldVersionId, oldVersionName = _c.oldVersionName;
+                                // 是否添加水印
+                                var isWater = (record === null || record === void 0 ? void 0 : record.isWatermark) + "" === "1" ? true : false;
+                                // 是否替换附件
+                                var isReplaceFile = (record === null || record === void 0 ? void 0 : record.isReplaceFile) + "" === "1" ? true : false;
+                                var showAddWater = record === null || record === void 0 ? void 0 : record.showAddWater;
+                                return (jsx(FileOperation, { fileName: text, fileId: record.attachId, preFileId: record === null || record === void 0 ? void 0 : record[oldVersionId || ""], preFileName: record === null || record === void 0 ? void 0 : record[oldVersionName || ""], isDownload: true, isDelete: isEdit && isShowFileUpload, isPreview: true, isEdit: isEdit, isWater: isWater, apiBaseUrl: apiBaseUrl, fileBaseUrl: fileBaseUrl, records: sameTypeRecords, organizationId: organizationId, isReplaceFile: isReplaceFile, showAddWater: showAddWater, onDelete: function () {
+                                        var _a;
+                                        // 因为数据是按照类型来归类了，那么这个索引的长度 实际应该减去之前的所有数据类型的长度
+                                        var dataTypeIndex = index - preDataTypeRecordsLength;
+                                        var copyRecords = sameTypeRecords === null || sameTypeRecords === void 0 ? void 0 : sameTypeRecords.slice();
+                                        if (Array.isArray(copyRecords)) {
+                                            copyRecords.splice(dataTypeIndex, 1);
+                                            if (copyRecords.length === 0) {
+                                                setSameTypeRecords(defaultOnlyQunjRecords);
+                                                var clearElectronListData = onClearElectronListData === null || onClearElectronListData === void 0 ? void 0 : onClearElectronListData();
+                                                var clearElectronSetting = onClearElectronSetting === null || onClearElectronSetting === void 0 ? void 0 : onClearElectronSetting();
+                                                onValueChange &&
+                                                    onValueChange(__assign(__assign((_a = {}, _a[firstDataType] = {
+                                                        fileList: defaultOnlyQunjRecords,
+                                                    }, _a), clearElectronListData), clearElectronSetting));
+                                            }
+                                            else {
+                                                setSameTypeRecords(copyRecords);
+                                            }
+                                        }
+                                    }, onWatermarkChange: function (isChecked) {
+                                        // 因为数据是按照类型来归类了，那么这个索引的长度 实际应该减去之前的所有数据类型的长度
+                                        var dataTypeIndex = index - preDataTypeRecordsLength;
+                                        setSameTypeRecords(function (preRecords) {
+                                            var _a;
+                                            var copyRecords = (preRecords === null || preRecords === void 0 ? void 0 : preRecords.slice()) || [];
+                                            var item = copyRecords[dataTypeIndex];
+                                            copyRecords.splice(dataTypeIndex, 1, __assign(__assign({}, item), (_a = { isWatermark: isChecked ? 1 : 0 }, _a[DATA_TYPE_KEY] = currentDataType, _a)));
+                                            return copyRecords;
+                                        });
+                                    }, fileList: records, onFileReplace: onFileReplace, previewUrl: previewUrl, request: request, isTranslation: isTranslation, record: record, setRecords: setSameTypeRecords, realIndex: index, isNeedDg: isNeedDg }));
+                            },
+                        },
+                        {
+                            title: "上传时间",
+                            dataIndex: "createTime",
+                            key: "createTime",
+                            width: 112,
+                            align: "center",
+                            render: function (text, record, index) {
+                                var date = getCreateTimeHand(record);
+                                // 如果是内部附件 不展示上传时间
+                                if (currentRecordIsOnlyQunj(record)) {
+                                    return "";
+                                }
+                                return date ? (jsxs(Fragment, { children: [jsx("div", { children: dayjs(date).format("YYYY年MM月DD日") }), jsx("div", { children: dayjs(date).format("HH:mm:ss") })] })) : ("");
+                            },
+                        },
+                    ],
                 },
-            ],
-        },
-    ];
+            ];
     if (isShowFileType) {
-        fileColumns[0].children.unshift(fileTypeColumn);
+        if (isNewQys) {
+            fileColumns.unshift(fileTypeColumn);
+        }
+        else {
+            fileColumns[0].children.unshift(fileTypeColumn);
+        }
     }
     return {
         fileColumns: fileColumns,