ztxkui 4.3.30 → 4.3.31

package/dist/components/PrintContainer/print-container.js

@@ -585,7 +585,9 @@ var PrintContainer = function (_a) {
     // 生成pdf
     var onPdfHandleFn = function (_a) {
         var pdfOptions = _a.pdfOptions, imgPositionX = _a.imgPositionX;
-        setSpinning(true);
+        setTimeout(function () {
+            setSpinning(true);
+        });
         htmlToPdf({
             dom: containerRef.current,
             pdfName: pdfName,
@@ -811,7 +813,7 @@ var PrintContainer = function (_a) {
                     ? pdfBase64.map(function (base64, index) {
                         var _a, _b;
                         var title = ((_b = (_a = allDom[index]) === null || _a === void 0 ? void 0 : _a.dataset) === null || _b === void 0 ? void 0 : _b.title) ||
-                            pdfName ||
+                            pdfName + "-" + (index + 1) ||
                             "\u5355\u636E" + (index + 1);
                         return dataURLtoFile(base64, title + ".pdf");
                     })
@@ -962,7 +964,7 @@ var PrintContainer = function (_a) {
                     ? pdfBase64.map(function (base64, index) {
                         var _a, _b;
                         var title = ((_b = (_a = allDom[index]) === null || _a === void 0 ? void 0 : _a.dataset) === null || _b === void 0 ? void 0 : _b.title) ||
-                            pdfName ||
+                            pdfName + "-" + (index + 1) ||
                             "\u5355\u636E" + (index + 1);
                         return dataURLtoFile(base64, title + ".pdf");
                     })
@@ -1056,7 +1058,9 @@ var PrintContainer = function (_a) {
         });
     };
     var onExportSealFileHandleFn = function (options, isZip) {
-        setSpinning(true);
+        setTimeout(function () {
+            setSpinning(true);
+        });
         // 文件还在加载中
         if (!fontTTF.data) {
             loadFontTTFPromise
@@ -1255,7 +1259,7 @@ var PrintContainer = function (_a) {
                     ? pdfBase64.map(function (base64, index) {
                         var _a, _b;
                         var title = ((_b = (_a = allDom[index]) === null || _a === void 0 ? void 0 : _a.dataset) === null || _b === void 0 ? void 0 : _b.title) ||
-                            pdfName ||
+                            pdfName + "-" + (index + 1) ||
                             "\u5355\u636E" + (index + 1);
                         return dataURLtoFile(base64, title + ".pdf");
                     })
@@ -1295,7 +1299,7 @@ var PrintContainer = function (_a) {
                     ? pdfBase64.map(function (base64, index) {
                         var _a, _b;
                         var title = ((_b = (_a = allDom[index]) === null || _a === void 0 ? void 0 : _a.dataset) === null || _b === void 0 ? void 0 : _b.title) ||
-                            pdfName ||
+                            pdfName + "-" + (index + 1) ||
                             "\u5355\u636E" + (index + 1);
                         return dataURLtoFile(base64, title + ".pdf");
                     })

package/dist/components/PrintContainer/service.js

@@ -36,11 +36,14 @@ export function autoSealThenDownloadFilesHandle(request, formData, options) {
         }
         var aLink = document.createElement('a');
         aLink.style.display = 'none';
-        aLink.href = window.URL.createObjectURL(blob);
-        aLink.download = fileNameStr === null || fileNameStr === void 0 ? void 0 : fileNameStr.replaceAll('"', '');
+        var href = window.URL.createObjectURL(blob);
+        aLink.href = href;
+        // aLink.download = fileNameStr?.replaceAll('"', '');
+        aLink.download = fileNameStr === null || fileNameStr === void 0 ? void 0 : fileNameStr.replace(/"/g, '');
         document.body.appendChild(aLink);
         aLink.click();
         document.body.removeChild(aLink);
+        window.URL.revokeObjectURL(href);
     })
         .catch(function (err) {
         var _a, _b, _c;

package/dist/components/Table/hooks/useColumns.js

@@ -210,14 +210,17 @@ function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig)
             _column.shouldCellUpdate = function (record, preRecord) {
                 try {
                     var recordKey_1 = record[rowKey];
-                    var currentIndex = currentDataSource.findIndex(function (item) { return item[rowKey] === recordKey_1; });
-                    var preIndex = preDataSource.findIndex(function (item) { return item[rowKey] === recordKey_1; });
-                    if (currentIndex !== preIndex) {
-                        return true;
-                    }
-                    if (typeof _column.dataIndex === 'string' &&
-                        record[_column.dataIndex] !== preRecord[_column.dataIndex]) {
-                        return true;
+                    if (Array.isArray(currentDataSource) &&
+                        Array.isArray(preDataSource)) {
+                        var currentIndex = currentDataSource.findIndex(function (item) { return item[rowKey] === recordKey_1; });
+                        var preIndex = preDataSource.findIndex(function (item) { return item[rowKey] === recordKey_1; });
+                        if (currentIndex !== preIndex) {
+                            return true;
+                        }
+                        if (typeof _column.dataIndex === 'string' &&
+                            record[_column.dataIndex] !== preRecord[_column.dataIndex]) {
+                            return true;
+                        }
                     }
                 }
                 catch (err) {

package/dist/components/business/Signatures/components/QunjSeal.js

@@ -43,13 +43,14 @@ var QunjSeal = function (_a) {
     /** 渲染SealCheckboxGroup组件 */
     var getSealCheckboxGroupRender = function () {
         return (React.createElement(Item, { name: "details", label: "", noBorder: true, width: "all", style: {
-                height: '180px',
+                height: '100%',
+                minHeight: '180px',
                 overflowY: 'auto',
                 overflowX: 'hidden',
             } },
             React.createElement(SealCheckboxGroup, { sealList: sealList, onChange: onSealCheckboxHandle, isEdit: isEdit })));
     };
-    return (React.createElement(Form, { form: form, onValuesChange: onValuesChangeHandle }, checked ? (React.createElement(React.Fragment, null,
+    return (React.createElement(Form, { form: form, onValuesChange: onValuesChangeHandle, style: { height: '100%' } }, checked ? (React.createElement(React.Fragment, null,
         React.createElement("div", { style: {
                 display: 'flex',
                 justifyContent: 'space-between',

package/dist/components/business/Signatures/index.js

@@ -103,68 +103,68 @@ var Sinatures = function (_a) {
     var isUpload = _a.isUpload, qunjSealChange = _a.qunjSealChange, electronicSealChange = _a.electronicSealChange, onSigValuesChange = _a.onSigValuesChange, handleRef = _a.handleRef, ZT_API_BASEURL = _a.ZT_API_BASEURL, ZT_FILE_BASEURL = _a.ZT_FILE_BASEURL, systemCode = _a.systemCode, token = _a.token, openCustomerModalHandle = _a.openCustomerModalHandle, request = _a.request, showDeleteBtn = _a.showDeleteBtn, batchDownloadZipName = _a.batchDownloadZipName, otherParams = __rest(_a, ["isUpload", "qunjSealChange", "electronicSealChange", "onSigValuesChange", "handleRef", "ZT_API_BASEURL", "ZT_FILE_BASEURL", "systemCode", "token", "openCustomerModalHandle", "request", "showDeleteBtn", "batchDownloadZipName"]);
     var canEdit = otherParams.canEdit, needQj = otherParams.needQj, needDg = otherParams.needDg, needQys = otherParams.needQys, fileList = otherParams.fileList, qunjSeal = otherParams.qunjSeal, electronicSeal = otherParams.electronicSealIdList, flowId = otherParams.flowId, deptId = otherParams.deptId, flowStatus = otherParams.flowStatus, caseId = otherParams.caseId, contract_id = otherParams.contractId, docAttachMap = otherParams.docAttachMap, checkAttachIdList = otherParams.checkAttachIdList, // 已盖章附件id
     documentIdList = otherParams.documentIdList, // 文档id列表
-    cancelDefaultCheckedQj = otherParams.cancelDefaultCheckedQj;
+    cancelDefaultCheckedQj = otherParams.cancelDefaultCheckedQj, // 取消默认勾选群杰用印申请
+    _b = otherParams.isCheckedEconomic, // 取消默认勾选群杰用印申请
+    isCheckedEconomic = _b === void 0 ? 1 : _b;
     var authToken = token || '';
     // 是否可编辑 1可编辑  0不可编辑
     var isEdit = canEdit === 1;
     // 如果上传，需要传入系统的code
     var uploadData = useMemo(function () { return (systemCode ? { system: systemCode } : {}); }, [systemCode]);
     // 组件内部管理的数组
-    var _b = useRecords(fileList), records = _b.records, setRecords = _b.setRecords;
+    var _c = useRecords(fileList), records = _c.records, setRecords = _c.setRecords;
     // 组件内部管理的群杰数据
-    var _c = useQunjData(qunjSeal), innerQunjSeal = _c.qunjSeal, setQunjSeal = _c.setQunjSeal;
+    var _d = useQunjData(qunjSeal), innerQunjSeal = _d.qunjSeal, setQunjSeal = _d.setQunjSeal;
     // 组件内部管理的电子印章数据
-    var _d = useElectronicData(electronicSeal), innerElectronicSeal = _d.electronicSeal, setElectronicSeal = _d.setElectronicSeal;
+    var _e = useElectronicData(electronicSeal), innerElectronicSeal = _e.electronicSeal, setElectronicSeal = _e.setElectronicSeal;
     // 设置确认盖章按钮是否展示
-    var _e = useState(false), checkSealVisible = _e[0], setCheckSealVisible = _e[1];
+    var _f = useState(false), checkSealVisible = _f[0], setCheckSealVisible = _f[1];
     // 合同id
-    var _f = useState(null), contractId = _f[0], setContractId = _f[1];
+    var _g = useState(null), contractId = _g[0], setContractId = _g[1];
     // 已盖章附件id
-    var _g = useState([]), sealedIds = _g[0], setSealedIds = _g[1];
+    var _h = useState([]), sealedIds = _h[0], setSealedIds = _h[1];
     // docAttachMap
-    var _h = useState(null), attachMap = _h[0], setAttachMap = _h[1];
+    var _j = useState(null), attachMap = _j[0], setAttachMap = _j[1];
     // 文档id列表
-    var _j = useState([]), documentIds = _j[0], setDocumentIds = _j[1];
+    var _k = useState([]), documentIds = _k[0], setDocumentIds = _k[1];
     // 总用印次数超过4倍
-    var _k = useState(false), isTotalSealNumTooMore = _k[0], setIsTotalSealNumTooMore = _k[1];
+    var _l = useState(false), isTotalSealNumTooMore = _l[0], setIsTotalSealNumTooMore = _l[1];
     // 采购合同 销售合同 双边合同 部门间交易合同 需要展示合同份数 其他的不需要
     var showContranctNum = FLOW_IDS.includes("" + flowId);
     // 电子印章列表
-    var _l = useState([]), electronicList = _l[0], setElectronicList = _l[1];
+    var _m = useState([]), electronicList = _m[0], setElectronicList = _m[1];
     // 群杰印章列表
-    var _m = useState([]), sealList = _m[0], setSealList = _m[1];
+    var _o = useState([]), sealList = _o[0], setSealList = _o[1];
     // 上一次盖章时的参数信息
-    var _o = useState({}), prevParam = _o[0], setPrevParam = _o[1];
+    var _p = useState({}), prevParam = _p[0], setPrevParam = _p[1];
     // 请确认
-    var _p = useState(false), isSure = _p[0], setIsSure = _p[1];
+    var _q = useState(false), isSure = _q[0], setIsSure = _q[1];
     // 群杰表单
     var form = Form.useForm()[0];
     // 是否加盖群杰印章
-    var _q = useState(true), checked = _q[0], setChecked = _q[1];
+    var _r = useState(true), checked = _r[0], setChecked = _r[1];
     // 盖章按钮loading
-    var _r = useState(false), loading = _r[0], setLoading = _r[1];
+    var _s = useState(false), loading = _s[0], setLoading = _s[1];
     // 初始化是否清空契约锁信息标识
-    var _s = useState(true), isInit = _s[0], setIsInit = _s[1];
+    var _t = useState(true), isInit = _t[0], setIsInit = _t[1];
     // 表格loading
     var tbloading = useState(false)[0];
     // 仅需要群杰印章
-    var _t = useState(false), isOnlyQj = _t[0], setIsOnlyQj = _t[1];
+    var _u = useState(false), isOnlyQj = _u[0], setIsOnlyQj = _u[1];
     // 存放onSigValuesChange缓存回调方法
     var fnRef = useRef();
     // 是否加盖经济责任人手签章
-    var _u = useState(true), isEconomic = _u[0], setIsEconomic = _u[1];
+    var _v = useState(isCheckedEconomic ? true : false), isEconomic = _v[0], setIsEconomic = _v[1];
     // 一级责任人名字
-    var _v = useState(''), yjzrr = _v[0], setYjzrr = _v[1];
+    var _w = useState(''), yjzrr = _w[0], setYjzrr = _w[1];
     // 未确认盖章位置的弹窗是否可见
-    var _w = useState(false), visible = _w[0], setVisible = _w[1];
+    var _x = useState(false), visible = _x[0], setVisible = _x[1];
     // 未确认盖章位置的电子印章列表
-    var _x = useState([]), unSealList = _x[0], setUnSealList = _x[1];
+    var _y = useState([]), unSealList = _y[0], setUnSealList = _y[1];
     // 需重新确认盖章位置的电子印章
-    var _y = useState([]), needReSealList = _y[0], setNeedReSealList = _y[1];
+    var _z = useState([]), needReSealList = _z[0], setNeedReSealList = _z[1];
     useEffect(function () {
-        if (cancelDefaultCheckedQj) {
-            setChecked(false);
-        }
+        setChecked(cancelDefaultCheckedQj ? false : true);
     }, [cancelDefaultCheckedQj]);
     useEffect(function () {
         fnRef.current = onSigValuesChange;
@@ -178,6 +178,7 @@ var Sinatures = function (_a) {
                 setSealedIds(checkAttachIdList || []);
                 setAttachMap(docAttachMap);
                 setDocumentIds(documentIdList);
+                setIsEconomic(isCheckedEconomic ? true : false);
                 // 从docAttachMap中获取是否加盖经济责任人手签章
                 if (typeof docAttachMap === 'string') {
                     var _isEconomic = Object.entries(JSON.parse(docAttachMap)).find(function (_a) {
@@ -208,6 +209,7 @@ var Sinatures = function (_a) {
         electronicSeal,
         isInit,
         records,
+        isCheckedEconomic,
     ]);
     /** 是否加盖群杰印章 */
     var needQjSealFn = function (e) {
@@ -796,7 +798,7 @@ var Sinatures = function (_a) {
         });
     }
     // 上传组件的数据
-    var _z = useState(), originFileList = _z[0], setOriginFileList = _z[1];
+    var _0 = useState(), originFileList = _0[0], setOriginFileList = _0[1];
     /** 签章组件onChange事件 */
     var sigValuesChange = useCallback(function (type, value) {
         var _a, _b;
@@ -826,7 +828,7 @@ var Sinatures = function (_a) {
             var hasElecSeal = records.filter(function (item) { return item.isElectronicSeal; });
             // 勾选加盖电子印章后 显示确认盖章按钮
             setCheckSealVisible(value ? true : hasElecSeal.length > 1 ? true : false);
-            setIsEconomic(value ? true : false);
+            isCheckedEconomic && setIsEconomic(value ? true : false);
             // 去除加盖电子印章勾选时  清除合同id 等之前的信息
             if (!value && hasElecSeal.length === 1) {
                 setSealedIds([]);
@@ -834,6 +836,7 @@ var Sinatures = function (_a) {
                 setAttachMap(null);
                 setDocumentIds([]);
                 setElectronicSeal([]);
+                !isCheckedEconomic && setIsEconomic(false);
                 if (onSigValuesChange) {
                     onSigValuesChange(sigValuesChange('clearContractPrevInfo'));
                 }

package/dist/components/business/Signatures/props.d.ts

@@ -85,4 +85,6 @@ export interface IProps {
     batchDownloadZipName?: string;
     /** 取消默认勾选群杰用印申请 */
     cancelDefaultCheckedQj?: number;
+    /** 是否默认勾选经济责任人 1为默认勾选 0为不勾选 */
+    isCheckedEconomic?: number;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkui",
-  "version": "4.3.30",
+  "version": "4.3.31",
   "private": false,
   "description": "React components library",
   "author": "zt-front-end",