ztxkui 4.2.23-340-beta → 4.2.23-342-beta

package/dist/components/electron-signatures/fileComponents/file-operation.js

@@ -8,8 +8,9 @@ import { getToken } from 'ztxkutils/dist/authority';
 import { dangerouslySetXss } from 'ztxkutils/dist/tools';
 import { downloadFile } from './fileUtils';
 import { isImage } from '../../utils/upload';
+import FileUpload from './file-upload';
 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;
+    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 previewBtn = function (attachId, previewTitle, fileName) {
         return (React.createElement(Button, { type: "link", onClick: function () {
                 // 实现批量预览，只针对图片
@@ -28,6 +29,9 @@ var FileOperation = function (props) {
                 });
             } }, previewTitle));
     };
+    function onFileChange(info) {
+        onFileReplace && onFileReplace(info, fileId);
+    }
     return (React.createElement("div", { className: "file-operation--wrap" },
         React.createElement("p", { className: "file-operation--title" }, fileName),
         isEdit && fileId && (React.createElement("div", { className: "file-operation--isWater" },
@@ -35,6 +39,7 @@ var FileOperation = function (props) {
                     onWatermarkChange && onWatermarkChange(e.target.checked);
                 } }, "\u6DFB\u52A0\u6C34\u5370"))),
         React.createElement("div", { className: "file-operation--list" },
+            isReplaceFile && (React.createElement(FileUpload, { fileList: fileList, apiBaseUrl: apiBaseUrl, onFileChange: onFileChange, type: "link" }, "\u66FF\u6362")),
             isDownload && fileId ? (React.createElement(Button, { type: "link", onClick: function () {
                     downloadFileCallBack(apiBaseUrl, fileId, dangerouslySetXss(fileName) || '附件', {
                         addWaterMark: false,

package/dist/components/electron-signatures/fileComponents/file-upload.js

@@ -20,16 +20,16 @@ import useLastest from '../../utils/useLastest';
 import { getToken } from 'ztxkutils/dist/authority';
 import { formatUnit, getFileExtension } from '../utils';
 var FileUpload = function (props) {
-    var apiBaseUrl = props.apiBaseUrl, headers = props.headers, data = props.data, isPublic = props.isPublic, acceptList = props.acceptList, maxSize = props.maxSize, beforeUpload = props.beforeUpload, disAllowDuplicateFile = props.disAllowDuplicateFile, fileList = props.fileList, onFileChange = props.onFileChange;
-    var _a = useState(false), loading = _a[0], setLoading = _a[1];
+    var apiBaseUrl = props.apiBaseUrl, headers = props.headers, data = props.data, isPublic = props.isPublic, acceptList = props.acceptList, maxSize = props.maxSize, beforeUpload = props.beforeUpload, disAllowDuplicateFile = props.disAllowDuplicateFile, fileList = props.fileList, onFileChange = props.onFileChange, children = props.children, _a = props.multiple, multiple = _a === void 0 ? true : _a, _b = props.type, type = _b === void 0 ? 'primary' : _b;
+    var _c = useState(false), loading = _c[0], setLoading = _c[1];
     // 取接口地址
     var defaultApiBaseUrl = useBaseContext().apiBaseUrl;
-    var _b = useBasicInfo({
+    var _d = useBasicInfo({
         apiBaseUrl: apiBaseUrl || defaultApiBaseUrl,
         headers: headers,
         data: data,
         isPublic: isPublic,
-    }), fileAction = _b.fileAction, fileHeaders = _b.fileHeaders, fileData = _b.fileData;
+    }), fileAction = _d.fileAction, fileHeaders = _d.fileHeaders, fileData = _d.fileData;
     // 文件上传前的判断处理
     var beforeUploadHandle = useBeforeUpload({
         acceptList: acceptList,
@@ -49,8 +49,8 @@ var FileUpload = function (props) {
         }
         onFileChange && onFileChange(info);
     }, [onFileChange]);
-    return (React.createElement(Upload, { action: fileAction, headers: fileHeaders, data: fileData, showUploadList: false, beforeUpload: beforeUploadHandle, onChange: onChange, disabled: loading, multiple: true, className: "electron-file-upload" },
-        React.createElement(Button, { type: "primary", loading: loading }, "\u6DFB\u52A0\u9644\u4EF6")));
+    return (React.createElement(Upload, { action: fileAction, headers: fileHeaders, data: fileData, showUploadList: false, beforeUpload: beforeUploadHandle, onChange: onChange, disabled: loading, multiple: multiple, className: "electron-file-upload" },
+        React.createElement(Button, { type: type, loading: loading }, children)));
 };
 export default memo(FileUpload);
 function useBasicInfo(props) {

package/dist/components/electron-signatures/fileComponents/useFileColumns.d.ts

@@ -25,6 +25,7 @@ interface IOptions {
     currentIsEditMemo?: boolean;
     isControlNeedQys?: IElectronSignaturesItemPublic['isControlNeedQys'];
     organizationId?: string;
+    onFileReplace: any;
 }
 export default function useFileColumns(options: IOptions): {
     fileColumns: ColumnsType<any>;

package/dist/components/electron-signatures/fileComponents/useFileColumns.js

@@ -22,7 +22,7 @@ import dayjs from 'dayjs';
 export default 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;
+    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;
     var _a = allData[firstDataType] || {}, 
     // records: sameTypeRecords,
     setSameTypeRecords = _a.setRecords, onClearElectronListData = _a.onClearElectronListData, onClearElectronSetting = _a.onClearElectronSetting, 
@@ -128,7 +128,9 @@ export default function useFileColumns(options) {
                         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;
-                        return (React.createElement(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, onDelete: function () {
+                        // 是否替换附件
+                        var isReplaceFile = (record === null || record === void 0 ? void 0 : record.isReplaceFile) + '' === '1' ? true : false;
+                        return (React.createElement(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 () {
                                 var _a;
                                 // 因为数据是按照类型来归类了，那么这个索引的长度 实际应该减去之前的所有数据类型的长度
                                 var dataTypeIndex = index - preDataTypeRecordsLength;
@@ -156,7 +158,7 @@ export default function useFileColumns(options) {
                                     copyRecords.splice(dataTypeIndex, 1, __assign(__assign({}, item), (_a = { isWatermark: isChecked ? 1 : 0 }, _a[DATA_TYPE_KEY] = currentDataType, _a)));
                                     return copyRecords;
                                 });
-                            } }));
+                            }, fileList: records, onFileReplace: onFileReplace }));
                     },
                 },
                 {

package/dist/components/electron-signatures/index.js

@@ -275,6 +275,7 @@ var ElectronSignatures = function (props) {
         isDeleteAllFileWhenJustUseQj: isDeleteAllFileWhenJustUseQj,
         isControlNeedQys: isControlNeedQys,
         organizationId: organizationId,
+        onFileReplace: onFileReplace,
     }).fileColumns;
     // 智能合同比对
     var contractColumns = useContractColumns({
@@ -737,44 +738,63 @@ var ElectronSignatures = function (props) {
         },
     }); }, []);
     var _v = allData[firstDataType] || {}, sameTypeRecords = _v.records, setSameTypeRecords = _v.setRecords, parseCurrentUploadFile = _v.parseCurrentUploadFile;
+    function addFile(info, callback) {
+        var _a;
+        var file = info.file;
+        if (file.status === 'done') {
+            var currentData = allData[firstDataType];
+            // 附件类型字段对应表
+            var _b = ((_a = currentData.fileFieldsNameRef) === null || _a === void 0 ? void 0 : _a.current) || {}, _c = _b.isQunj, isQunjKey_1 = _c === void 0 ? 'isQunj' : _c, _d = _b.qunjSeal, qunjSealKey_1 = _d === void 0 ? 'qunjSeal' : _d;
+            setSameTypeRecords(function (preRecords) {
+                var copyRecords = (preRecords === null || preRecords === void 0 ? void 0 : preRecords.slice()) || [];
+                copyRecords = copyRecords.filter(function (record) { return !currentRecordIsOnlyQunj(record); });
+                // 插入一个给开发操作附件的机会
+                var newFile = callback(file);
+                // 每个附件都可以添加群杰时控制
+                if (isSingleQj) {
+                    newFile[isQunjKey_1] = 1;
+                    newFile[qunjSealKey_1] = { isTakeOut: 0 };
+                }
+                if (parseCurrentUploadFile) {
+                    newFile = parseCurrentUploadFile(newFile);
+                }
+                copyRecords.push(newFile);
+                return copyRecords;
+            });
+        }
+    }
+    function onFileChange(info) {
+        addFile(info, function (file) {
+            var _a;
+            var _b, _c, _d, _e;
+            return _a = {
+                    attachId: (_c = (_b = file === null || file === void 0 ? void 0 : file.response) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.attachId,
+                    attachName: (_e = (_d = file === null || file === void 0 ? void 0 : file.response) === null || _d === void 0 ? void 0 : _d.data) === null || _e === void 0 ? void 0 : _e.originalName
+                },
+                _a[DATA_TYPE_KEY] = firstDataType,
+                _a;
+        });
+    }
+    function onFileReplace(info, oldVersionId) {
+        addFile(info, function (file) {
+            var _a;
+            var _b, _c, _d, _e;
+            return _a = {
+                    attachId: (_c = (_b = file === null || file === void 0 ? void 0 : file.response) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.attachId,
+                    attachName: (_e = (_d = file === null || file === void 0 ? void 0 : file.response) === null || _d === void 0 ? void 0 : _d.data) === null || _e === void 0 ? void 0 : _e.originalName,
+                    oldVersionId: oldVersionId
+                },
+                _a[DATA_TYPE_KEY] = firstDataType,
+                _a;
+        });
+    }
     return (React.createElement(React.Fragment, null,
         allOptions.map(function (options, index) {
             var mergeOptions = index === 0
                 ? __assign(__assign({}, options), { onValueChange: onValueChange }) : __assign(__assign({ deptId: resetProps.deptId, flowId: resetProps.flowId }, options), { onValueChange: onValueChange });
             return (React.createElement(ElectronSignaturesFragment, __assign({ key: index, dataType: "" + index, onTrackChange: onTrackChange, request: request, isUnControlled: isUnControlled, setLoading: setLoading, apiBaseUrl: apiBaseUrl, fileBaseUrl: fileBaseUrl, isSingleQj: isSingleQj }, mergeOptions)));
         }),
-        React.createElement(ElectronSealBatchDownload, { request: request, apiBaseUrl: apiBaseUrl, selectRows: selectRows, allData: allData, isShowElectronBatchBtn: isShowElectronBatchBtn, isShowDownloadBatchBtn: isShowDownloadBatchBtn, isShowDoubleSignedBatchBtn: isShowDoubleSignedBatchBtn, batchDownloadZipName: batchDownloadZipName, firstDataType: firstDataType }, isShowFileUpload && currentIsEditMemo ? (React.createElement(FileUpload, __assign({ fileList: sameTypeRecords, apiBaseUrl: apiBaseUrl, onFileChange: function (info) {
-                var _a;
-                var file = info.file;
-                if (file.status === 'done') {
-                    var currentData = allData[firstDataType];
-                    // 附件类型字段对应表
-                    var _b = ((_a = currentData.fileFieldsNameRef) === null || _a === void 0 ? void 0 : _a.current) || {}, _c = _b.isQunj, isQunjKey_1 = _c === void 0 ? 'isQunj' : _c, _d = _b.qunjSeal, qunjSealKey_1 = _d === void 0 ? 'qunjSeal' : _d;
-                    setSameTypeRecords(function (preRecords) {
-                        var _a;
-                        var _b, _c, _d, _e;
-                        var copyRecords = (preRecords === null || preRecords === void 0 ? void 0 : preRecords.slice()) || [];
-                        copyRecords = copyRecords.filter(function (record) { return !currentRecordIsOnlyQunj(record); });
-                        // 插入一个给开发操作附件的机会
-                        var newFile = (_a = {
-                                attachId: (_c = (_b = file === null || file === void 0 ? void 0 : file.response) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.attachId,
-                                attachName: (_e = (_d = file === null || file === void 0 ? void 0 : file.response) === null || _d === void 0 ? void 0 : _d.data) === null || _e === void 0 ? void 0 : _e.originalName
-                            },
-                            _a[DATA_TYPE_KEY] = firstDataType,
-                            _a);
-                        // 每个附件都可以添加群杰时控制
-                        if (isSingleQj) {
-                            newFile[isQunjKey_1] = 1;
-                            newFile[qunjSealKey_1] = { isTakeOut: 0 };
-                        }
-                        if (parseCurrentUploadFile) {
-                            newFile = parseCurrentUploadFile(newFile);
-                        }
-                        copyRecords.push(newFile);
-                        return copyRecords;
-                    });
-                }
-            } }, fileUploadProps))) : null),
+        React.createElement(ElectronSealBatchDownload, { request: request, apiBaseUrl: apiBaseUrl, selectRows: selectRows, allData: allData, isShowElectronBatchBtn: isShowElectronBatchBtn, isShowDownloadBatchBtn: isShowDownloadBatchBtn, isShowDoubleSignedBatchBtn: isShowDoubleSignedBatchBtn, batchDownloadZipName: batchDownloadZipName, firstDataType: firstDataType }, isShowFileUpload && currentIsEditMemo ? (React.createElement(FileUpload, __assign({ fileList: sameTypeRecords, apiBaseUrl: apiBaseUrl, onFileChange: onFileChange, multiple: true }, fileUploadProps), "\u6DFB\u52A0\u9644\u4EF6")) : null),
         React.createElement(Table, { dataSource: mergeRecords, columns: columns, rowKey: "attachId", className: "zt-table electron-table", bordered: true, pagination: false, loading: loading, rowSelection: myRowSelection, scroll: __assign({ x: 'max-content', y: 500 }, tableScroll) }),
         React.createElement(LastQysModal, { modalHandleRef: modalHandleRef, appointSignLocation: function (info) {
                 // 未盖章的印章id列表

package/dist/components/electron-signatures/interface.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="react" />
+import { ButtonProps } from 'antd';
 /** 附件的字段说明 */
 export interface IFileFieldsName {
     /** 附件id */
@@ -49,6 +51,8 @@ export interface IFileFieldsName {
     qunjAddress?: string;
     /** 群杰印章信息 */
     qunjSeal?: string;
+    /** 是否替换附件 */
+    isReplaceFile?: number;
 }
 declare const FILE_FIELDS_NAME: IFileFieldsName;
 export { FILE_FIELDS_NAME };
@@ -639,6 +643,9 @@ export interface IFileUploadProps {
     fileList?: any;
     /** 附件发生改变时触发 */
     onFileChange?: any;
+    children?: React.ReactNode;
+    multiple?: boolean;
+    type?: ButtonProps['type'];
 }
 export interface IFileOperationProps {
     /**附件名称 */
@@ -671,4 +678,10 @@ export interface IFileOperationProps {
     onWatermarkChange?: any;
     /** 公司id */
     organizationId?: string;
+    /** 是否替换附件 */
+    isReplaceFile?: boolean;
+    /** 所有附件 */
+    fileList?: IFileItem[];
+    /** 替换文件回调 */
+    onFileReplace?: any;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkui",
-  "version": "4.2.23-340-beta",
+  "version": "4.2.23-342-beta",
   "private": false,
   "description": "React components library",
   "author": "zt-front-end",