ztxkui 3.5.4 → 3.5.7

package/dist/DemoCom/PrintContainerDemo.js

@@ -17,6 +17,7 @@ import React, { useEffect, useState } from 'react';
 // redux
 // ztxkui公共组件
 import { PrintContainer } from '../index';
+// import Table, { ColumnsType } from 'components/Table';
 // 路由配置
 // store
 // 自定义组件
@@ -44,41 +45,66 @@ var dataSource1 = new Array(10).fill('1').map(function (item, index) { return ({
     id: "" + index,
 }); });
 var PrintContainerDemo = function () {
-    var _a = useState([]), dataSource = _a[0], setDataSource = _a[1];
+    // const [dataSource, setDataSource] = useState([]);
+    var _a = useState([]), setDataSource = _a[1];
     var _b = useState(true), loading = _b[0], setLoading = _b[1];
-    var columns = [
-        {
-            title: '测试一',
-            width: 100,
-            dataIndex: 'test1',
-            key: 'test1',
-        },
-        {
-            title: '测试一',
-            width: 100,
-            dataIndex: 'test2',
-            key: 'test2',
-        },
-        {
-            title: '测试一',
-            width: 100,
-            dataIndex: 'test3',
-            key: 'test3',
-        },
-        {
-            title: '测试一',
-            width: 100,
-            dataIndex: 'test4',
-            key: 'test4',
-        },
-    ];
+    // const columns: ColumnsType<any> = [
+    //   {
+    //     title: '测试一',
+    //     width: 100,
+    //     dataIndex: 'test1',
+    //     key: 'test1',
+    //   },
+    //   {
+    //     title: '测试一',
+    //     width: 100,
+    //     dataIndex: 'test2',
+    //     key: 'test2',
+    //   },
+    //   {
+    //     title: '测试一',
+    //     width: 100,
+    //     dataIndex: 'test3',
+    //     key: 'test3',
+    //   },
+    //   {
+    //     title: '测试一',
+    //     width: 100,
+    //     dataIndex: 'test4',
+    //     key: 'test4',
+    //   },
+    // ];
     useEffect(function () {
         setTimeout(function () {
             setLoading(false);
             setDataSource(dataSource1);
         }, 1000);
     }, []);
-    return (React.createElement(PrintContainer, { isAddExportPage: true, loading: loading, request: request, deptId: "1527122794329313281", flowId: "scm_print_thd", fileId: "1551837561144905730", keywordList: keywordList, imgWaterBg: water },
+    return (React.createElement(PrintContainer, { isAddExportPage: true, loading: loading, request: request, deptId: "1527122794329313281", flowId: "scm_print_thd", fileId: "1551837561144905730", keywordList: keywordList, imgWaterBg: water, showPrintMessage: true, 
+        // onPrintBeforeCallback={() => {
+        //   setLoading(true);
+        //   return new Promise((resolve, reject) => {
+        //     setTimeout(() => {
+        //       setLoading(false);
+        //       // 这样子会导致不会执行
+        //       // reject(false);
+        //       // 这样子会执行
+        //       resolve(true);
+        //     }, 2000);
+        //   });
+        // }}
+        onPrintCallback: function () {
+            setLoading(true);
+            return new Promise(function (resolve, reject) {
+                setTimeout(function () {
+                    setLoading(false);
+                    // 这样子不会执行
+                    // reject(false);
+                    // 这样子会执行
+                    resolve(true);
+                }, 0);
+            });
+        } },
         React.createElement("div", null,
             React.createElement("div", { className: "html2canvas-container-page simple-print" },
                 React.createElement("div", { className: "print-header" },

package/dist/UploadDemo.js

@@ -39,10 +39,11 @@ import Upload from 'components/Upload';
 import { useState, useEffect, useCallback, useRef } from 'react';
 import { UploadSingle } from './index';
 var originFileList = [];
-var token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJtZW1iZXJfdHlwZSI6MSwiaGFuZGxlX2hyX3Bob25lIjpudWxsLCJyZXN1bWVfZGF0ZSI6bnVsbCwidXNlcl9uYW1lIjoid2YxMCIsImVtcF9uYW1lIjoi5rWB56iL5Lit5b-DMTAiLCJlbXBfbnVtYmVyIjoiWUcyMjAzMDUwIiwiaW10X2lkIjpudWxsLCJyZWFsX25hbWUiOiLmtYHnqIvkuK3lv4MxMCIsImNsaWVudF90eXBlIjoid2ViIiwiZGF0YV9yb2xlX2lkIjoiMTM0NTk3ODUwNTMwMjA1Njk2MiwxNTQyMDc2MzA4NTc4MDI1NDc0IiwiY2xpZW50X2lkIjoic3dvcmQiLCJ1c2VyX3R5cGUiOiJ3ZWIiLCJyb2xlX2lkIjoiMTQ0NjgxOTQ2MzY5Mzg0NDQ4MiwxNDgwODI5MDYzNTY0NTQxOTU0IiwicG9zdF9uYW1lIjpudWxsLCJzY29wZSI6WyJhbGwiXSwiaW50ZXJ2aWV3X2lkIjpudWxsLCJleHAiOjE2NjA4MjM2OTUsIm9yZ19uYW1lIjoi5rWZ5ZWG5Lit5ouT6ZuG5Zui6IKh5Lu95pyJ6ZmQ5YWs5Y-4IiwianRpIjoiYzEyZTUxOTctZTg1OS00ZTYzLWJhNDQtYjVkOTQ2NzBlMjYzIiwibWVtYmVyX2lkIjoxNTA5NTA5ODExODI5OTUyNTEzLCJjb21wYW55X2lkIjoxNDE1ODM3OTkxNzAxMDM3MDU3LCJzeXN0ZW1faWQiOm51bGwsImRlcHRfbmFtZSI6bnVsbCwiYXZhdGFyIjoiIiwiZGF0YV9yb2xlX25hbWUiOiJhZG1pbixhZG1pbiIsImF1dGhvcml0aWVzIjpbInVzZXIiLCJhZG1pbmlzdHJhdG9yIl0sInJvbGVfbmFtZSI6ImFkbWluaXN0cmF0b3IsdXNlciIsInJlc3VtZV90ZW1wbGF0ZSI6bnVsbCwibGljZW5zZSI6InBvd2VyZWQgYnkgem1kbXMiLCJwb3N0X2lkIjoiIiwidXNlcl9pZCI6IjE1MDk1MTAyMzAzNjY5MjQ4MDIiLCJvcmdfaWQiOjE0NTc1Mjc3NjU5MTg1MTUyMDEsIm5pY2tfbmFtZSI6Iua1geeoi-S4reW_gzEwIiwiY29tcGFueV9uYW1lIjoi5rWZ5ZWG5Lit5ouT6ZuG5Zui6IKh5Lu95pyJ6ZmQ5YWs5Y-4IiwiZGVwdF9pZCI6IjE0MzI5NTYyMDI2NzQxODgyODkiLCJoYW5kbGVfaHJfbmFtZSI6bnVsbCwiYWNjb3VudCI6IndmMTAiLCJyZXN1bWVfaWQiOm51bGx9.mz7PP0RGshNbc6ynDibJASDvw1q1tmHn1rCBWQ2khEI";
+var token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJtZW1iZXJfdHlwZSI6MSwiaGFuZGxlX2hyX3Bob25lIjpudWxsLCJyZXN1bWVfZGF0ZSI6bnVsbCwidXNlcl9uYW1lIjoiY2hlbnl4IiwiZW1wX25hbWUiOm51bGwsImVtcF9udW1iZXIiOm51bGwsImltdF9pZCI6bnVsbCwicmVhbF9uYW1lIjoi6ZmI5Lqa6ZuEIiwiY2xpZW50X3R5cGUiOiJ3ZWIiLCJkYXRhX3JvbGVfaWQiOiIxMzQ1OTc4NTA1MzAyMDU2OTYyLDE0NjgwMzUzNTE2MjUyODU2MzQsMTU0MjA3NjMwODU3ODAyNTQ3NCIsImNsaWVudF9pZCI6InN3b3JkIiwidXNlcl90eXBlIjoid2ViIiwicm9sZV9pZCI6IjExMjM1OTg4MTY3Mzg2NzUyMDEsMTQ2NzAxNTk3NTQ4NDc2MDA2NiwxNDY4MDM0NDM3MTU3OTYxNzI5LDE0ODA4MjkzMzc5MzkxMzI0MTciLCJwb3N0X25hbWUiOm51bGwsInNjb3BlIjpbImFsbCJdLCJpbnRlcnZpZXdfaWQiOm51bGwsImV4cCI6MTY2MDk4OTYwNCwib3JnX25hbWUiOm51bGwsImp0aSI6IjUwYWNmZDUzLWQwODMtNDdjYy05YWY5LWUzMWQxYTk1NDBmZiIsIm1lbWJlcl9pZCI6MSwiY29tcGFueV9pZCI6bnVsbCwic3lzdGVtX2lkIjpudWxsLCJkZXB0X25hbWUiOm51bGwsImF2YXRhciI6IiIsImRhdGFfcm9sZV9uYW1lIjoiYWRtaW4sYWRtaW4sYWRtaW4iLCJhdXRob3JpdGllcyI6WyJhZG1pbiIsInVzZXIiLCJhZG1pbmlzdHJhdG9yIl0sInJvbGVfbmFtZSI6ImFkbWluaXN0cmF0b3IsdXNlcixhZG1pbixhZG1pbiIsInJlc3VtZV90ZW1wbGF0ZSI6bnVsbCwibGljZW5zZSI6InBvd2VyZWQgYnkgem1kbXMiLCJwb3N0X2lkIjoiIiwidXNlcl9pZCI6IjE0MTI5NTM4MDQzMzM1NTU3MTQiLCJvcmdfaWQiOm51bGwsIm5pY2tfbmFtZSI6IumZiOS6mumbhCIsImNvbXBhbnlfbmFtZSI6bnVsbCwiZGVwdF9pZCI6IiIsImhhbmRsZV9ocl9uYW1lIjpudWxsLCJhY2NvdW50IjoiY2hlbnl4IiwicmVzdW1lX2lkIjpudWxsfQ.eIZkNEbrItNuZ9YXo3tNhwnenZVOyVGXWh2Z5rOWC74";
 function UploadDemo() {
     var _this = this;
     var _a = useState(originFileList), fileList = _a[0], setFileList = _a[1];
+    var _b = useState([]), fileList1 = _b[0], setFileList1 = _b[1];
     var upload = useRef();
     var uploadTableRef = useRef();
     useEffect(function () {
@@ -139,6 +140,7 @@ function UploadDemo() {
             });
             console.log(successFileList);
             setFileList(filelist);
+            setFileList1(filelist);
         }
     }, []);
     var checkHandle = function () { return __awaiter(_this, void 0, void 0, function () {
@@ -208,7 +210,7 @@ function UploadDemo() {
                 showPreviewIcon: true,
                 showDownloadIcon: true,
                 showRemoveIcon: true,
-            }, apiBaseUrl: "http://192.168.0.83:8888", fileBaseUrl: "http://192.168.0.83:88", showTable: false, showTip: false, originFileList: fileList, maxCount: 1, callback: uploadCallbackFn, onDeleteCallback: function (index, file) {
+            }, apiBaseUrl: "http://192.168.0.83:8888", fileBaseUrl: "http://192.168.0.83:88", showTable: false, showTip: false, originFileList: fileList1, maxCount: 1, callback: uploadCallbackFn, onDeleteCallback: function (index, file) {
                 console.log(index, file);
             }, authToken: token }),
         React.createElement("button", { onClick: checkHandle }, "\u68C0\u67E5"),

package/dist/components/PrintContainer/lodop.d.ts

@@ -0,0 +1,12 @@
+/**
+ * 创建打印任务
+ * @param {*} taskName  任务名称
+ * @param {*} width 纸张宽度
+ * @param {*} height 纸张高度
+ */
+declare const createTask: ({ taskName, width, height }: {
+    taskName: any;
+    width: any;
+    height: any;
+}) => any;
+export { createTask };

package/dist/components/PrintContainer/lodop.js

@@ -0,0 +1,43 @@
+import { getLodop } from './utils';
+/**
+ * 创建打印任务
+ * @param {*} taskName  任务名称
+ * @param {*} width 纸张宽度
+ * @param {*} height 纸张高度
+ */
+var createTask = function (_a) {
+    var taskName = _a.taskName, width = _a.width, height = _a.height;
+    var config = Object.assign({}, {
+        taskName: taskName,
+        width: width,
+        height: height,
+    });
+    var LODOP = getLodop();
+    // 打印检查安装，必装
+    CheckIsInstall(LODOP);
+    // 任务名称
+    LODOP.PRINT_INIT(config.taskName);
+    // 展示模式
+    LODOP.SET_SHOW_MODE('NP_NO_RESULT', true);
+    // 纸张大小  intOrient,intPageWidth,intPageHeight,strPageName
+    LODOP.SET_PRINT_PAGESIZE(0, width, height, 'Note');
+    return LODOP;
+};
+/**
+ * 打印检查安装，必装
+ */
+var CheckIsInstall = function (LODOP) {
+    try {
+        if (LODOP.VERSION) {
+            if (LODOP.CVERSION) {
+                // alert('当前有WEB打印服务C-Lodop可用!\n C-Lodop版本:' + LODOP.CVERSION + '(内含Lodop' + LODOP.VERSION + ')') } else { alert('本机已成功安装了Lodop控件！\n 版本号:' + LODOP.VERSION)
+                // Vue.prototype.$message('当前有WEB打印服务C-Lodop可用' + LODOP.CVERSION)
+            }
+        }
+    }
+    catch (err) {
+        console.log('安装lodop');
+        window.open('http://www.lodop.net/download.html');
+    }
+};
+export { createTask };

package/dist/components/PrintContainer/print-container.d.ts

@@ -38,8 +38,10 @@ export interface IProps {
     flowId?: string;
     /** 水印图片 */
     imgWaterBg?: string;
+    /** 点击打印前端的回调函数 */
+    onPrintBeforeCallback?: () => Promise<any> | void;
     /** 点击打印的回调函数 */
-    onPrintCallback?: () => void;
+    onPrintCallback?: () => Promise<any> | void;
     /** 是否添加点击打印提示 */
     showPrintMessage?: boolean;
 }

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

@@ -75,7 +75,7 @@ function downloadFontTTF(_a) {
     });
 }
 var PrintContainer = function (_a) {
-    var children = _a.children, waterText = _a.waterText, onFonsizeChange = _a.onFonsizeChange, hiddenClassName = _a.hiddenClassName, _b = _a.isAddExportPage, isAddExportPage = _b === void 0 ? false : _b, _c = _a.loading, loading = _c === void 0 ? false : _c, _d = _a.pdfName, pdfName = _d === void 0 ? 'pdf文件' : _d, request = _a.request, sealIdList = _a.sealIdList, autoSealIdList = _a.autoSealIdList, keywordList = _a.keywordList, _e = _a.showHandSeal, showHandSeal = _e === void 0 ? true : _e, _f = _a.showAutoSeal, showAutoSeal = _f === void 0 ? true : _f, _g = _a.needWatermark, needWatermark = _g === void 0 ? 0 : _g, fileId = _a.fileId, deptId = _a.deptId, flowId = _a.flowId, imgWaterBg = _a.imgWaterBg, onPrintCallback = _a.onPrintCallback, showPrintMessage = _a.showPrintMessage;
+    var children = _a.children, waterText = _a.waterText, onFonsizeChange = _a.onFonsizeChange, hiddenClassName = _a.hiddenClassName, _b = _a.isAddExportPage, isAddExportPage = _b === void 0 ? false : _b, _c = _a.loading, loading = _c === void 0 ? false : _c, _d = _a.pdfName, pdfName = _d === void 0 ? 'pdf文件' : _d, request = _a.request, sealIdList = _a.sealIdList, autoSealIdList = _a.autoSealIdList, keywordList = _a.keywordList, _e = _a.showHandSeal, showHandSeal = _e === void 0 ? true : _e, _f = _a.showAutoSeal, showAutoSeal = _f === void 0 ? true : _f, _g = _a.needWatermark, needWatermark = _g === void 0 ? 0 : _g, fileId = _a.fileId, deptId = _a.deptId, flowId = _a.flowId, imgWaterBg = _a.imgWaterBg, onPrintCallback = _a.onPrintCallback, showPrintMessage = _a.showPrintMessage, onPrintBeforeCallback = _a.onPrintBeforeCallback;
     var _h = useState(false), showWater = _h[0], setShowWater = _h[1];
     var containerRef = useRef();
     var allDomRef = useRef();
@@ -230,39 +230,89 @@ var PrintContainer = function (_a) {
         }
     };
     // 打印
-    var onPrintHandle = function () {
-        if (showPrintMessage) {
-            var isOkSure_1 = false;
-            Modal.confirm({
-                title: '打印提示',
-                content: '点击确认按钮后，将作为一次成功的打印，并记录到系统！你确认要打印吗？',
-                okText: '确认',
-                onOk: function () {
-                    isOkSure_1 = true;
-                    onPrintCallback && onPrintCallback();
-                },
-                afterClose: function () {
-                    if (isOkSure_1) {
-                        setTimeout(function () {
-                            printCurrentDom({
-                                hiddenClassNames: __spreadArray([
-                                    '.print-container--header'
-                                ], (hiddenClassName || [])),
-                            });
+    var onPrintHandle = function () { return __awaiter(void 0, void 0, void 0, function () {
+        var result, err_1, isOkSure_1;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    result = true;
+                    if (!onPrintBeforeCallback) return [3 /*break*/, 4];
+                    _a.label = 1;
+                case 1:
+                    _a.trys.push([1, 3, , 4]);
+                    return [4 /*yield*/, onPrintBeforeCallback()];
+                case 2:
+                    result = _a.sent();
+                    return [3 /*break*/, 4];
+                case 3:
+                    err_1 = _a.sent();
+                    result = null;
+                    return [3 /*break*/, 4];
+                case 4:
+                    if (!result) {
+                        return [2 /*return*/];
+                    }
+                    if (showPrintMessage) {
+                        isOkSure_1 = false;
+                        Modal.confirm({
+                            title: '打印提示',
+                            content: '点击确认按钮后，将作为一次成功的打印，并记录到系统！你确认要打印吗？',
+                            okText: '确认',
+                            onOk: function () {
+                                if (onPrintCallback) {
+                                    var result_1 = onPrintCallback();
+                                    if (result_1 instanceof Promise) {
+                                        var startTime_1 = Date.now();
+                                        result_1.then(function (res) {
+                                            if (res) {
+                                                if (Date.now() - startTime_1 > 1000) {
+                                                    isOkSure_1 = true;
+                                                }
+                                                else {
+                                                    setTimeout(function () {
+                                                        printCurrentDom({
+                                                            hiddenClassNames: __spreadArray([
+                                                                '.print-container--header'
+                                                            ], (hiddenClassName || [])),
+                                                        });
+                                                    }, 1000);
+                                                }
+                                            }
+                                        });
+                                    }
+                                    else {
+                                        isOkSure_1 = true;
+                                    }
+                                }
+                                else {
+                                    isOkSure_1 = true;
+                                }
+                            },
+                            afterClose: function () {
+                                if (isOkSure_1) {
+                                    setTimeout(function () {
+                                        printCurrentDom({
+                                            hiddenClassNames: __spreadArray([
+                                                '.print-container--header'
+                                            ], (hiddenClassName || [])),
+                                        });
+                                    });
+                                }
+                            },
                         });
                     }
-                },
-            });
-        }
-        else {
-            onPrintCallback && onPrintCallback();
-            printCurrentDom({
-                hiddenClassNames: __spreadArray([
-                    '.print-container--header'
-                ], (hiddenClassName || [])),
-            });
-        }
-    };
+                    else {
+                        onPrintCallback && onPrintCallback();
+                        printCurrentDom({
+                            hiddenClassNames: __spreadArray([
+                                '.print-container--header'
+                            ], (hiddenClassName || [])),
+                        });
+                    }
+                    return [2 /*return*/];
+            }
+        });
+    }); };
     // 生成pdf
     var onPdfHandle = function () { return __awaiter(void 0, void 0, void 0, function () {
         var html2canvasDom;

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

@@ -26,11 +26,11 @@ var QunjSeal = function (_a) {
     var value = _a.value, onChange = _a.onChange, isEdit = _a.isEdit, showContranctNum = _a.showContranctNum, sealList = _a.sealList, handleRef = _a.handleRef, checked = _a.checked, form = _a.form, setQunjSeal = _a.setQunjSeal;
     useEffect(function () {
         if (value) {
-            var _value = __assign(__assign(__assign({}, value), { isTakeOut: "" + value.isTakeOut === '1' ? 1 : 0 }), (value.contranctNum ? {} : { contranctNum: 1 }));
+            var _value = __assign(__assign(__assign({}, value), { isTakeOut: "" + value.isTakeOut === '1' ? 1 : 0 }), (value.contranctNum || !showContranctNum ? {} : { contranctNum: 1 }));
             form.setFieldsValue(_value);
             setQunjSeal(_value);
         }
-    }, [value, form, setQunjSeal]);
+    }, [value, form, setQunjSeal, showContranctNum]);
     var onSealCheckboxHandle = function (values) {
         form.setFieldsValue({
             values: values,
@@ -47,7 +47,7 @@ var QunjSeal = function (_a) {
                 overflowY: 'auto',
                 overflowX: 'hidden',
             } },
-            React.createElement(SealCheckboxGroup, { sealList: sealList, onChange: onSealCheckboxHandle, handleRef: handleRef, isEdit: isEdit })));
+            React.createElement(SealCheckboxGroup, { sealList: sealList, onChange: onSealCheckboxHandle, handleRef: handleRef, isEdit: isEdit, showContranctNum: showContranctNum })));
     };
     return (React.createElement(Form, { form: form, onValuesChange: onValuesChangeHandle }, checked ? (React.createElement(React.Fragment, null,
         React.createElement("div", { style: {

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

@@ -22,6 +22,7 @@ interface ISealProps {
     }[];
     handleRef?: any;
     isEdit: boolean;
+    showContranctNum: boolean;
 }
 declare const SealCheckboxGroup: React.FC<ISealProps>;
 export { SealCheckboxGroup };

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

@@ -66,7 +66,7 @@ var SealCheckbox = function (_a) {
             React.createElement("div", { style: { marginLeft: '50px' } }, "\u6B21"))));
 };
 var SealCheckboxGroup = function (_a) {
-    var value = _a.value, onChange = _a.onChange, sealList = _a.sealList, handleRef = _a.handleRef, isEdit = _a.isEdit;
+    var value = _a.value, onChange = _a.onChange, sealList = _a.sealList, handleRef = _a.handleRef, isEdit = _a.isEdit, showContranctNum = _a.showContranctNum;
     var onChangeHandle = function (_value, index, sealNo, type) {
         var _a, _b, _c, _d;
         var contractNum = (_b = (_a = handleRef === null || handleRef === void 0 ? void 0 : handleRef.current) === null || _a === void 0 ? void 0 : _a.getData().qunjSeal) === null || _b === void 0 ? void 0 : _b.contranctNum;
@@ -90,7 +90,7 @@ var SealCheckboxGroup = function (_a) {
         }
         var totalSealNum = sumBy(valueArr, 'sealCount');
         onChange && onChange(valueArr);
-        if (typeof contractNum === 'number') {
+        if (typeof contractNum === 'number' && showContranctNum) {
             if (totalSealNum > contractNum * 4) {
                 (_c = handleRef === null || handleRef === void 0 ? void 0 : handleRef.current) === null || _c === void 0 ? void 0 : _c.getData('4');
                 message.warning('您的用印次数远超超过合理次数范围，请修改。');

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

@@ -107,18 +107,12 @@ var Sinatures = function (_a) {
     var _r = useState(false), loading = _r[0], setLoading = _r[1];
     /** 是否加盖群杰印章 */
     var needQjSealFn = function (e) {
+        var _value = __assign(__assign({ isTakeOut: 0 }, (showContranctNum ? { contranctNum: 1 } : {})), { details: [] });
         if (!e.target.checked) {
-            form.setFieldsValue({
-                isTakeOut: 0,
-                contranctNum: 1,
-                details: [],
-            });
-            qunjSealChangeHandle({
-                isTakeOut: 0,
-                contranctNum: 1,
-                details: [],
-            });
+            _value.contranctNum = null;
         }
+        form.setFieldsValue(_value);
+        qunjSealChangeHandle(_value);
         setChecked(e.target.checked);
     };
     /** 查询用印状态 */
@@ -224,7 +218,6 @@ var Sinatures = function (_a) {
     };
     /** 指定签署位置 */
     var checkSealFn = function () {
-        setLoading(true);
         // 已勾选的要加盖电子印章的附件id列表
         var checkedElecSealIds = records
             .filter(function (item) { return item.isElectronicSeal; })
@@ -233,6 +226,7 @@ var Sinatures = function (_a) {
             message.info('请勾选电子印章！');
             return;
         }
+        setLoading(true);
         var params = {
             attachIdList: [],
             sealIdList: innerElectronicSeal,
@@ -384,7 +378,7 @@ var Sinatures = function (_a) {
                     title: '保存为模版',
                     key: 'templateAttachId',
                     dataIndex: 'templateAttachId',
-                    width: 90,
+                    width: 110,
                     render: function (text, record, index) {
                         return NEED_SAVE_TEMPLATE.includes("" + flowId) ? (React.createElement(Switch, { checked: record.isCustomerReference, disabled: !isEdit, onChange: function (value) {
                                 return onSwitchChangeHandle(value, 'isCustomerReference', index);
@@ -408,12 +402,13 @@ var Sinatures = function (_a) {
             title: '电子印章',
             key: 'needQys',
             dataIndex: 'needQys',
+            width: 610,
             children: [
                 {
                     title: '盖电子印章',
                     key: 'isElectronicSeal',
                     dataIndex: 'isElectronicSeal',
-                    width: 90,
+                    width: 110,
                     render: function (text, record, index) {
                         return (React.createElement(Switch, { checked: text, disabled: !isEdit, onChange: function (value) {
                                 return onSwitchChangeHandle(value, 'isElectronicSeal', index);
@@ -424,7 +419,7 @@ var Sinatures = function (_a) {
                     title: '选择电子印章',
                     key: 'electronicSeal',
                     dataIndex: 'electronicSeal',
-                    width: '20%',
+                    width: 320,
                     render: function (value, row, index) {
                         // 是否有勾选加盖电子印章
                         var hasElectronicSeal = records === null || records === void 0 ? void 0 : records.some(function (item) { return !!item.isElectronicSeal; });
@@ -440,10 +435,15 @@ var Sinatures = function (_a) {
                     title: '电子印章设置',
                     key: 'setElectronicSeal',
                     dataIndex: 'setElectronicSeal',
-                    width: 135,
+                    width: 180,
                     render: function (value, row, index) {
                         var Comp = function () {
-                            return records.length !== 0 ? (React.createElement("div", { style: { height: '100%', paddingTop: '23px' } },
+                            return records.length !== 0 ? (React.createElement("div", { style: {
+                                    height: '100%',
+                                    paddingTop: '23px',
+                                    display: 'flex',
+                                    flexDirection: 'column',
+                                } },
                                 React.createElement(Button, { type: "link", style: __assign({}, (checkSealVisible && isEdit
                                         ? {}
                                         : { display: 'none' })), size: "small", loading: loading, onClick: checkSealFn }, "\u6307\u5B9A\u7B7E\u7F72\u4F4D\u7F6E"),
@@ -639,7 +639,7 @@ var Sinatures = function (_a) {
                 return false;
             }
             // 超过4倍禁止提交审批
-            if (isEdit && needQj && isTotalSealNumTooMore) {
+            if (isEdit && needQj && isTotalSealNumTooMore && showContranctNum) {
                 message.warning('您的用印次数远超超过合理次数范围，请修改。');
                 return false;
             }

package/dist/index.js

@@ -1,117 +1,87 @@
-// import React from 'react';
-// import ReactDOM from 'react-dom';
-// import App from './App';
-// import { ConfigProvider } from 'antd';
-// import zhCN from 'antd/lib/locale/zh_CN';
-// import * as dayjs from 'dayjs';
-// import zhCn from 'dayjs/locale/zh-cn';
-// import { BrowserRouter, Switch, Route, Link } from 'react-router-dom';
-// import Demo from './Demo';
-// import TreeSelectDemo from './TreeSelectDemo';
-// import TreeDemo from './TreeDemo';
-// import UploadDemo from './UploadDemo';
-// import CollapseDemo from './DemoCom/CollapseDemo';
-// import TimelineDemo from './DemoCom/TimelineDemo';
-// import WeChatDemo from './DemoCom/WechatDemo';
-// import TableDemo from './DemoCom/TableDemo';
-// import TableDemo1 from './DemoCom/TableDemo1';
-// import BasicDemo from './DemoCom/BasicDemo';
-// import FormDemo from './DemoCom/FormDemo';
-// import TableAnalyse from './DemoCom/TableAnalyse';
-// import DragSort from './DemoCom/DragSort';
-// import PrintDemo from './DemoCom/PrintDemo';
-// import PrintContainerDemo from './DemoCom/PrintContainerDemo';
-// import SinaturesDemo from './DemoCom/SinaturesDemo';
-// import TableDemoAll from './TableDemo';
-// import CodeQueryDemo from './DemoCom/CodeQueryDemo';
-// dayjs.locale(zhCn);
-// ReactDOM.render(
-//   // <React.StrictMode>
-//   <ConfigProvider locale={zhCN}>
-//     <BrowserRouter>
-//       <Switch>
-//         <Route exact path="/">
-//           <App />
-//         </Route>
-//         <Route exact path="/code-query">
-//           <CodeQueryDemo />
-//         </Route>
-//         <Route exact path="/select">
-//           <Demo />
-//         </Route>
-//         <Route exact path="/tree-select">
-//           <TreeSelectDemo />
-//         </Route>
-//         <Route exact path="/tree">
-//           <TreeDemo />
-//         </Route>
-//         <Route exact path="/upload">
-//           <UploadDemo />
-//         </Route>
-//         <Route exact path="/collapse">
-//           <CollapseDemo />
-//         </Route>
-//         <Route exact path="/timeline">
-//           <TimelineDemo />
-//         </Route>
-//         <Route exact path="/wechat">
-//           <WeChatDemo />
-//         </Route>
-//         <Route exact path="/table">
-//           <TableDemo />
-//         </Route>
-//         <Route exact path="/table1">
-//           <TableDemo1 />
-//         </Route>
-//         <Route exact path="/basic">
-//           <BasicDemo />
-//         </Route>
-//         <Route exact path="/form">
-//           <FormDemo />
-//         </Route>
-//         <Route exact path="/print">
-//           <PrintDemo />
-//         </Route>
-//         <Route exact path="/print-container">
-//           <PrintContainerDemo />
-//         </Route>
-//         <Route exact path="/tableall">
-//           <TableDemoAll />
-//         </Route>
-//         <Route exact path="/table-analyse">
-//           <TableAnalyse />
-//         </Route>
-//         <Route exact path="/drag-sort">
-//           <DragSort />
-//         </Route>
-//         <Route exact path="/sinatures">
-//           <SinaturesDemo />
-//         </Route>
-//         <Route exact path="/test">
-//           <div>
-//             <h1>
-//               <Link to="/select">select</Link>
-//             </h1>
-//             <h1>
-//               <Link to="/tree-select">tree select</Link>
-//             </h1>
-//             <h1>
-//               <Link to="/tree">tree</Link>
-//             </h1>
-//             <h1>
-//               <Link to="/upload">upload</Link>
-//             </h1>
-//             <h1>
-//               <Link to="/drag-sort">drag-sort</Link>
-//             </h1>
-//           </div>
-//         </Route>
-//       </Switch>
-//     </BrowserRouter>
-//   </ConfigProvider>,
-//   // </React.StrictMode>,
-//   document.getElementById('root')
-// );
+import React from 'react';
+import ReactDOM from 'react-dom';
+import App from './App';
+import { ConfigProvider } from 'antd';
+import zhCN from 'antd/lib/locale/zh_CN';
+import * as dayjs from 'dayjs';
+import zhCn from 'dayjs/locale/zh-cn';
+import { BrowserRouter, Switch, Route, Link } from 'react-router-dom';
+import Demo from './Demo';
+import TreeSelectDemo from './TreeSelectDemo';
+import TreeDemo from './TreeDemo';
+import UploadDemo from './UploadDemo';
+import CollapseDemo from './DemoCom/CollapseDemo';
+import TimelineDemo from './DemoCom/TimelineDemo';
+import WeChatDemo from './DemoCom/WechatDemo';
+import TableDemo from './DemoCom/TableDemo';
+import TableDemo1 from './DemoCom/TableDemo1';
+import BasicDemo from './DemoCom/BasicDemo';
+import FormDemo from './DemoCom/FormDemo';
+import TableAnalyse from './DemoCom/TableAnalyse';
+import DragSort from './DemoCom/DragSort';
+import PrintDemo from './DemoCom/PrintDemo';
+import PrintContainerDemo from './DemoCom/PrintContainerDemo';
+import SinaturesDemo from './DemoCom/SinaturesDemo';
+import TableDemoAll from './TableDemo';
+import CodeQueryDemo from './DemoCom/CodeQueryDemo';
+dayjs.locale(zhCn);
+ReactDOM.render(
+// <React.StrictMode>
+React.createElement(ConfigProvider, { locale: zhCN },
+    React.createElement(BrowserRouter, null,
+        React.createElement(Switch, null,
+            React.createElement(Route, { exact: true, path: "/" },
+                React.createElement(App, null)),
+            React.createElement(Route, { exact: true, path: "/code-query" },
+                React.createElement(CodeQueryDemo, null)),
+            React.createElement(Route, { exact: true, path: "/select" },
+                React.createElement(Demo, null)),
+            React.createElement(Route, { exact: true, path: "/tree-select" },
+                React.createElement(TreeSelectDemo, null)),
+            React.createElement(Route, { exact: true, path: "/tree" },
+                React.createElement(TreeDemo, null)),
+            React.createElement(Route, { exact: true, path: "/upload" },
+                React.createElement(UploadDemo, null)),
+            React.createElement(Route, { exact: true, path: "/collapse" },
+                React.createElement(CollapseDemo, null)),
+            React.createElement(Route, { exact: true, path: "/timeline" },
+                React.createElement(TimelineDemo, null)),
+            React.createElement(Route, { exact: true, path: "/wechat" },
+                React.createElement(WeChatDemo, null)),
+            React.createElement(Route, { exact: true, path: "/table" },
+                React.createElement(TableDemo, null)),
+            React.createElement(Route, { exact: true, path: "/table1" },
+                React.createElement(TableDemo1, null)),
+            React.createElement(Route, { exact: true, path: "/basic" },
+                React.createElement(BasicDemo, null)),
+            React.createElement(Route, { exact: true, path: "/form" },
+                React.createElement(FormDemo, null)),
+            React.createElement(Route, { exact: true, path: "/print" },
+                React.createElement(PrintDemo, null)),
+            React.createElement(Route, { exact: true, path: "/print-container" },
+                React.createElement(PrintContainerDemo, null)),
+            React.createElement(Route, { exact: true, path: "/tableall" },
+                React.createElement(TableDemoAll, null)),
+            React.createElement(Route, { exact: true, path: "/table-analyse" },
+                React.createElement(TableAnalyse, null)),
+            React.createElement(Route, { exact: true, path: "/drag-sort" },
+                React.createElement(DragSort, null)),
+            React.createElement(Route, { exact: true, path: "/sinatures" },
+                React.createElement(SinaturesDemo, null)),
+            React.createElement(Route, { exact: true, path: "/test" },
+                React.createElement("div", null,
+                    React.createElement("h1", null,
+                        React.createElement(Link, { to: "/select" }, "select")),
+                    React.createElement("h1", null,
+                        React.createElement(Link, { to: "/tree-select" }, "tree select")),
+                    React.createElement("h1", null,
+                        React.createElement(Link, { to: "/tree" }, "tree")),
+                    React.createElement("h1", null,
+                        React.createElement(Link, { to: "/upload" }, "upload")),
+                    React.createElement("h1", null,
+                        React.createElement(Link, { to: "/drag-sort" }, "drag-sort"))))))), 
+// </React.StrictMode>,
+document.getElementById('root'));
 export { default as Button } from './components/Button';
 export { default as Calendar } from './components/Calendar';
 export { default as Checkbox } from './components/Checkbox';

package/package.json

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