ztxkui 3.5.19 → 3.6.0

package/dist/DemoCom/PrintContainerDemo.d.ts

@@ -3,5 +3,6 @@
  * @description
  */
 import React from 'react';
+import './print.scss';
 declare const PrintContainerDemo: React.FC;
 export default PrintContainerDemo;

package/dist/DemoCom/PrintContainerDemo.js

@@ -24,19 +24,19 @@ import { PrintContainer } from '../index';
 // 其他文件
 import axios from 'axios';
 import water from '../assets/img/water.png';
-// import './print.scss';
+import './print.scss';
 function request(options) {
     return axios({
-        baseURL: options.baseURL ? options.baseURL : 'https://dz-prod.zmd.com.cn',
+        baseURL: options.baseURL ? options.baseURL : 'http://192.168.0.83:8000',
         url: options.url,
-        headers: __assign({ 'Zmdms-Auth': 'bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJtZW1iZXJfdHlwZSI6MSwiaGFuZGxlX2hyX3Bob25lIjpudWxsLCJyZXN1bWVfZGF0ZSI6bnVsbCwidXNlcl9uYW1lIjoi6ZmI5Lqa6ZuEIiwiZW1wX25hbWUiOiLpmYjkuprpm4QiLCJlbXBfbnVtYmVyIjoiMTAwMDIyNzQiLCJpbXRfaWQiOm51bGwsInJlYWxfbmFtZSI6IumZiOS6mumbhCIsImNsaWVudF90eXBlIjoid2ViIiwiZGF0YV9yb2xlX2lkIjoiMTQ5MTk1MjI0MDcyNjk0OTg5MCIsImNsaWVudF9pZCI6InN3b3JkIiwidXNlcl90eXBlIjoid2ViIiwicm9sZV9pZCI6IjE0OTE5NTE4NTkzMjIxMDk5NTMsMTU0NjY4MDIzMjQzODIwMjM2OSIsInBvc3RfbmFtZSI6bnVsbCwic2NvcGUiOlsiYWxsIl0sImludGVydmlld19pZCI6bnVsbCwiZXhwIjoxNjYwODkxNjM4LCJvcmdfbmFtZSI6IuS4reaLk-S_oeaBr-enkeaKgC3noJTlj5Hpg6giLCJqdGkiOiIzZWJkZTk3NC05OTRkLTQ0MjctOGNhZS1kOWRkNTUzNTM1NTQiLCJtZW1iZXJfaWQiOjE0NjI0MzMwNTEyMDg3NjI5MTIsImNvbXBhbnlfaWQiOjEyOTU5MDg4NDI1MDIzNDg4MDEsInN5c3RlbV9pZCI6bnVsbCwiZGVwdF9uYW1lIjoi5rmW5YyX5Lit5ouTLea5luWMl-W3peeoi-mDqCIsImF2YXRhciI6IiIsImRhdGFfcm9sZV9uYW1lIjoiYWRtaW4iLCJhdXRob3JpdGllcyI6WyJhZG1pbiIsInVzZXIiXSwicm9sZV9uYW1lIjoiYWRtaW4sdXNlciIsInJlc3VtZV90ZW1wbGF0ZSI6bnVsbCwibGljZW5zZSI6InBvd2VyZWQgYnkgem1kbXMiLCJwb3N0X2lkIjoiIiwidXNlcl9pZCI6IjE1MzY1MjI3NTgzNjMwMTMxMjIiLCJvcmdfaWQiOjE0NTc1Mjc3NjU5MTg1MTU1MzksIm5pY2tfbmFtZSI6IumZiOS6mumbhCIsImNvbXBhbnlfbmFtZSI6Iua1meWVhuS4reaLk-mbhuWbou-8iOa5luWMl--8ieaciemZkOWFrOWPuCIsImRlcHRfaWQiOiIxMjk1OTEwMDMxMzQ0MjYzMTY5IiwiaGFuZGxlX2hyX25hbWUiOm51bGwsImFjY291bnQiOiLpmYjkuprpm4QiLCJyZXN1bWVfaWQiOm51bGx9.74sooLelR-eVH1pWPNaXJm_GMa-So2kWo6kJTrLi5KU' }, options.headers),
+        headers: __assign({ 'Zmdms-Auth': 'bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJtZW1iZXJfdHlwZSI6MSwiaGFuZGxlX2hyX3Bob25lIjpudWxsLCJyZXN1bWVfZGF0ZSI6bnVsbCwidXNlcl9uYW1lIjoiY2hlbnl4IiwiZW1wX25hbWUiOm51bGwsImVtcF9udW1iZXIiOm51bGwsImltdF9pZCI6bnVsbCwicmVhbF9uYW1lIjoi6ZmI5Lqa6ZuEIiwiY2xpZW50X3R5cGUiOiJ3ZWIiLCJkYXRhX3JvbGVfaWQiOiIxMzQ1OTc4NTA1MzAyMDU2OTYyLDE0NjgwMzUzNTE2MjUyODU2MzQsMTU0MjA3NjMwODU3ODAyNTQ3NCIsImNsaWVudF9pZCI6InN3b3JkIiwidXNlcl90eXBlIjoid2ViIiwicm9sZV9pZCI6IjExMjM1OTg4MTY3Mzg2NzUyMDEsMTQ2NzAxNTk3NTQ4NDc2MDA2NiwxNDY4MDM0NDM3MTU3OTYxNzI5LDE0ODA4MjkzMzc5MzkxMzI0MTciLCJwb3N0X25hbWUiOm51bGwsInNjb3BlIjpbImFsbCJdLCJpbnRlcnZpZXdfaWQiOm51bGwsImV4cCI6MTY2MTg1MjcwMSwib3JnX25hbWUiOm51bGwsImp0aSI6IjMzMjA1MzJhLTg1NDAtNDU4Ni05NGU2LWM4MTI1NDAxZTQyNCIsIm1lbWJlcl9pZCI6MSwiY29tcGFueV9pZCI6bnVsbCwic3lzdGVtX2lkIjpudWxsLCJkZXB0X25hbWUiOm51bGwsImF2YXRhciI6IiIsImRhdGFfcm9sZV9uYW1lIjoiYWRtaW4sYWRtaW4sYWRtaW4iLCJhdXRob3JpdGllcyI6WyJhZG1pbiIsInVzZXIiLCJhZG1pbmlzdHJhdG9yIl0sInJvbGVfbmFtZSI6ImFkbWluaXN0cmF0b3IsdXNlcixhZG1pbixhZG1pbiIsInJlc3VtZV90ZW1wbGF0ZSI6bnVsbCwibGljZW5zZSI6InBvd2VyZWQgYnkgem1kbXMiLCJwb3N0X2lkIjoiIiwidXNlcl9pZCI6IjE0MTI5NTM4MDQzMzM1NTU3MTQiLCJvcmdfaWQiOm51bGwsIm5pY2tfbmFtZSI6IumZiOS6mumbhCIsImNvbXBhbnlfbmFtZSI6bnVsbCwiZGVwdF9pZCI6IiIsImhhbmRsZV9ocl9uYW1lIjpudWxsLCJhY2NvdW50IjoiY2hlbnl4IiwicmVzdW1lX2lkIjpudWxsfQ.Vsa7BgmpPdvPVxZORNyvelSO0mH0cwdE-uAXuUvf2Uc' }, options.headers),
         method: options.method,
         data: options.data,
         params: options.params,
     });
 }
 // const sealIdList = ['2980019783467188885', '2982231505305256230'];
-var keywordList = ['测试一', '测试四'];
+// const keywordList = ['测试一', '测试四'];
 var dataSource1 = new Array(10).fill('1').map(function (item, index) { return ({
     test1: "\u6D4B\u8BD5\u4E00" + index,
     test2: "\u6D4B\u8BD5\u4E8C" + index,
@@ -80,7 +80,32 @@ var PrintContainerDemo = function () {
             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, showPrintMessage: true, 
+    function getBase64(blob) {
+        return new Promise(function (resolve, reject) {
+            var reader = new FileReader();
+            reader.readAsDataURL(blob);
+            reader.onload = function () { return resolve(reader.result); };
+            reader.onerror = function (error) { return reject(error); };
+        });
+    }
+    var _c = useState(''), base64Img = _c[0], setBase64Img = _c[1];
+    useEffect(function () {
+        var xhr = new XMLHttpRequest();
+        var token = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJtZW1iZXJfdHlwZSI6MSwiaGFuZGxlX2hyX3Bob25lIjpudWxsLCJyZXN1bWVfZGF0ZSI6bnVsbCwidXNlcl9uYW1lIjoiY2hlbnl4IiwiZW1wX25hbWUiOm51bGwsImVtcF9udW1iZXIiOm51bGwsImltdF9pZCI6bnVsbCwicmVhbF9uYW1lIjoi6ZmI5Lqa6ZuEIiwiY2xpZW50X3R5cGUiOiJ3ZWIiLCJkYXRhX3JvbGVfaWQiOiIxMzQ1OTc4NTA1MzAyMDU2OTYyLDE0NjgwMzUzNTE2MjUyODU2MzQsMTU0MjA3NjMwODU3ODAyNTQ3NCIsImNsaWVudF9pZCI6InN3b3JkIiwidXNlcl90eXBlIjoid2ViIiwicm9sZV9pZCI6IjExMjM1OTg4MTY3Mzg2NzUyMDEsMTQ2NzAxNTk3NTQ4NDc2MDA2NiwxNDY4MDM0NDM3MTU3OTYxNzI5LDE0ODA4MjkzMzc5MzkxMzI0MTciLCJwb3N0X25hbWUiOm51bGwsInNjb3BlIjpbImFsbCJdLCJpbnRlcnZpZXdfaWQiOm51bGwsImV4cCI6MTY2MTg1MjcwMSwib3JnX25hbWUiOm51bGwsImp0aSI6IjMzMjA1MzJhLTg1NDAtNDU4Ni05NGU2LWM4MTI1NDAxZTQyNCIsIm1lbWJlcl9pZCI6MSwiY29tcGFueV9pZCI6bnVsbCwic3lzdGVtX2lkIjpudWxsLCJkZXB0X25hbWUiOm51bGwsImF2YXRhciI6IiIsImRhdGFfcm9sZV9uYW1lIjoiYWRtaW4sYWRtaW4sYWRtaW4iLCJhdXRob3JpdGllcyI6WyJhZG1pbiIsInVzZXIiLCJhZG1pbmlzdHJhdG9yIl0sInJvbGVfbmFtZSI6ImFkbWluaXN0cmF0b3IsdXNlcixhZG1pbixhZG1pbiIsInJlc3VtZV90ZW1wbGF0ZSI6bnVsbCwibGljZW5zZSI6InBvd2VyZWQgYnkgem1kbXMiLCJwb3N0X2lkIjoiIiwidXNlcl9pZCI6IjE0MTI5NTM4MDQzMzM1NTU3MTQiLCJvcmdfaWQiOm51bGwsIm5pY2tfbmFtZSI6IumZiOS6mumbhCIsImNvbXBhbnlfbmFtZSI6bnVsbCwiZGVwdF9pZCI6IiIsImhhbmRsZV9ocl9uYW1lIjpudWxsLCJhY2NvdW50IjoiY2hlbnl4IiwicmVzdW1lX2lkIjpudWxsfQ.Vsa7BgmpPdvPVxZORNyvelSO0mH0cwdE-uAXuUvf2Uc';
+        xhr.open('GET', "http://192.168.0.83:8000/api/zmdms-resource/oss/endpoint/download-file/1559472632642387969?Zmdms-Auth=bearer " + token, true);
+        xhr.responseType = 'blob';
+        xhr.onload = function () {
+            if (xhr.status === 200 || xhr.status === 201) {
+                getBase64(xhr.response).then(function (res) {
+                    setBase64Img(res);
+                });
+            }
+        };
+        xhr.send();
+    }, []);
+    return (React.createElement(PrintContainer, { isAddExportPage: true, loading: loading, request: request, deptId: "153328416506517504", flowId: "scm_print_thd", fileId: "1551733945007517697", 
+        // keywordList={keywordList}
+        imgWaterBg: water, showPrintMessage: true, 
         // onPrintBeforeCallback={() => {
         //   setLoading(true);
         //   return new Promise((resolve, reject) => {
@@ -108,7 +133,7 @@ var PrintContainerDemo = function () {
         React.createElement("div", null,
             React.createElement("div", { className: "html2canvas-container-page simple-print" },
                 React.createElement("div", { className: "print-header" },
-                    React.createElement("img", { src: "https://dz-prod.zmd.com.cn/static/media/print_logo_2.1e599190.png", alt: "" }),
+                    React.createElement("img", { src: base64Img, alt: "" }),
                     React.createElement("h3", { className: "print-title" }, "\u63D0\u8D27\u5355"),
                     React.createElement("div", { className: "right-info" },
                         React.createElement("div", { className: "info-item" },
@@ -230,7 +255,7 @@ var PrintContainerDemo = function () {
                                     React.createElement("span", null, "chenyx"))))))),
             React.createElement("div", { className: "html2canvas-container-page simple-print" },
                 React.createElement("div", { className: "print-header" },
-                    React.createElement("img", { src: "https://dz-prod.zmd.com.cn/static/media/print_logo_2.1e599190.png", alt: "" }),
+                    React.createElement("img", { src: base64Img, alt: "" }),
                     React.createElement("h3", { className: "print-title" }, "\u63D0\u8D27\u5355"),
                     React.createElement("div", { className: "right-info" },
                         React.createElement("div", { className: "info-item" },

package/dist/components/PrintContainer/PrintModal.js

@@ -26,9 +26,11 @@ var PrintModal = function (_a) {
         if (!loading) {
             setTimeout(function () {
                 var printDom = document.querySelectorAll('.html2canvas-container-page');
-                setVhtml({
-                    __html: printDom[0].outerHTML,
-                });
+                if (printDom && printDom.length > 0) {
+                    setVhtml({
+                        __html: printDom[0].outerHTML,
+                    });
+                }
             }, 1000);
         }
     }, [loading]);

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

@@ -33,3 +33,9 @@ export declare function htmlToPdfNoCanvas({ pageClassName, dom, isShowPage, file
     imgWidth?: number;
     imgHeight?: number;
 }): Promise<unknown>;
+/**
+ * @author 陈亚雄
+ * @description 设置local
+ */
+export declare function setPositionLocal(value: any, localKey?: string): void;
+export declare function getPositionLocal(localKey?: string): any;

package/dist/components/PrintContainer/handle.js

@@ -252,3 +252,27 @@ function setPdfWater(pdf, waterBase64, imgWidth, imgHeight) {
         pdf.addImage(waterBase64, 'PNG', 20 + imgWidth, 20 + imgHeight + imgHeight, imgWidth, imgHeight, '6');
     }
 }
+/**
+ * @author 陈亚雄
+ * @description 设置local
+ */
+export function setPositionLocal(value, localKey) {
+    var v = '';
+    try {
+        v = JSON.stringify(value);
+        localStorage.setItem(localKey || 'SEAL_POSITION_LOCAL_SCM', v);
+    }
+    catch (er) {
+        console.log('设置local失败', er);
+    }
+}
+export function getPositionLocal(localKey) {
+    var v = '';
+    try {
+        v = JSON.parse(localStorage.getItem(localKey || 'SEAL_POSITION_LOCAL_SCM') || '{}');
+    }
+    catch (er) {
+        console.log('获取local失败', er);
+    }
+    return v;
+}

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

@@ -44,6 +44,12 @@ export interface IProps {
     onPrintCallback?: () => Promise<any> | void;
     /** 是否添加点击打印提示 */
     showPrintMessage?: boolean;
+    /** 是否显示打印按钮 */
+    showPrintBtn?: boolean;
+    /** 是否使用xy轴定位 */
+    isUseXy?: boolean;
+    /** 当前本地存储的key */
+    localKey?: string;
 }
 declare const PrintContainer: React.FC<IProps>;
 export default PrintContainer;

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

@@ -1,3 +1,14 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -54,13 +65,15 @@ import PrintModal from './PrintModal';
 // 其他文件
 import { printCurrentDom, htmlToPdfNoCanvas, htmlToPdf, } from 'ztxkutils/dist/print';
 import { createDownloadUrlNoBase } from 'ztxkutils/dist/fileOperation';
-import { dataURLtoFile, image2Base64 } from './handle';
+import { dataURLtoFile, image2Base64, setPositionLocal, getPositionLocal, } from './handle';
 import { createTask } from './lodop';
 import { setWater, removeWater } from './printUtils';
 var fontTTF = {
     data: '',
 };
 var loadFontTTFPromise = null;
+var loadFontTTFMaxNum = 3;
+var loadFontTTFNum = 0;
 // 字体文件下载
 function downloadFontTTF(_a) {
     var fileId = _a.fileId, request = _a.request;
@@ -78,43 +91,40 @@ 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, onPrintBeforeCallback = _a.onPrintBeforeCallback;
-    var _h = useState(false), showWater = _h[0], setShowWater = _h[1];
+    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, _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, _h = _a.showPrintBtn, showPrintBtn = _h === void 0 ? true : _h, isUseXy = _a.isUseXy, localKey = _a.localKey;
+    var _j = useState(false), showWater = _j[0], setShowWater = _j[1];
     var containerRef = useRef();
     var allDomRef = useRef();
-    var _j = useState(false), spinning = _j[0], setSpinning = _j[1];
+    var _k = useState(false), spinning = _k[0], setSpinning = _k[1];
     // 确认盖章后，会得到一个合同id 这个之后盖章要用
-    var _k = useState(), currentContractId = _k[0], setCurrentContractId = _k[1];
+    var _l = useState(), currentContractId = _l[0], setCurrentContractId = _l[1];
     // 盖章后会得到一个预览地址，这个地址耀保存,同一个合同id，不能重复盖章接口
-    var _l = useState(), currentViewUrl = _l[0], setCurrentViewUrl = _l[1];
-    // 印章列表
-    var _m = useState(), _sealIdList = _m[0], setSealIdList = _m[1];
-    // 自动盖章印章列表
-    var _o = useState(), _autoSealIdList = _o[0], setAutoSealIdList = _o[1];
-    // 关键字列表
-    var _p = useState(), _keywordList = _p[0], setKeywordList = _p[1];
+    var _m = useState(), currentViewUrl = _m[0], setCurrentViewUrl = _m[1];
+    // 收到盖章-印章列表
+    var _o = useState(), _sealIdList = _o[0], setSealIdList = _o[1];
+    // 自动盖章-印章列表
+    var _p = useState(), autoSealList = _p[0], setAutoSealList = _p[1];
     // 边距调整相关
     var _q = useState(false), visible = _q[0], setVisible = _q[1];
     var _r = useState({
         top: 0,
         left: 0,
     }), value = _r[0], setValue = _r[1];
+    useEffect(function () {
+        var v = getPositionLocal(localKey);
+        setValue(v);
+        var printDom = document.querySelectorAll('.html2canvas-container-page');
+        for (var i = 0; i < printDom.length; i++) {
+            var item = printDom[i];
+            item.setAttribute('style', "padding-top: " + (v === null || v === void 0 ? void 0 : v.top) + "%; padding-left: " + (v === null || v === void 0 ? void 0 : v.left) + "%");
+        }
+    }, [localKey]);
     // 根据传入参数设置印章 关键字
     useEffect(function () {
         if (sealIdList) {
             setSealIdList(sealIdList);
         }
     }, [sealIdList]);
-    useEffect(function () {
-        if (autoSealIdList) {
-            setAutoSealIdList(autoSealIdList);
-        }
-    }, [autoSealIdList]);
-    useEffect(function () {
-        if (keywordList) {
-            setKeywordList(keywordList);
-        }
-    }, [keywordList]);
     // 根据流程id 部门id获取印章信息 跟 关键字信息
     useEffect(function () {
         if (deptId && flowId && request) {
@@ -135,23 +145,14 @@ var PrintContainer = function (_a) {
                     var records = (data || {}).data.records;
                     if (Array.isArray(records)) {
                         var sealInfoList = ((_a = records[0]) === null || _a === void 0 ? void 0 : _a.sealInfoList) || [];
-                        var __sealIdList_1 = [];
-                        var __autoSealIdList_1 = [];
-                        var __keywordList_1 = [];
-                        sealInfoList.forEach(function (item, index) {
-                            // 只要传入的印章 都可以手动盖章
-                            if (item.sealId != null) {
-                                __sealIdList_1.push(item.sealId);
-                            }
-                            // 有关键字才可以自动盖章
-                            if (item.keyword != null) {
-                                __autoSealIdList_1.push(item.sealId);
-                                __keywordList_1.push(item.keyword);
-                            }
-                        });
-                        setSealIdList(__sealIdList_1);
-                        setAutoSealIdList(__autoSealIdList_1);
-                        setKeywordList(__keywordList_1);
+                        // 只要传入的印章 都可以手动盖章
+                        setSealIdList(sealInfoList
+                            .filter(function (item) { return item.sealId != null; })
+                            .map(function (item) { return item.sealId; }));
+                        // 自动盖章列表
+                        setAutoSealList(sealInfoList
+                            .filter(function (item) { return item.sealId != null; })
+                            .map(function (item) { return (__assign({}, item)); }));
                         return;
                     }
                     message.info('当前部门、流程下未找到对应的印章！');
@@ -213,7 +214,6 @@ var PrintContainer = function (_a) {
     };
     // 调整边距
     var onAdjustPadding = function () {
-        console.log(1111);
         setVisible(function (preVisible) { return !preVisible; });
     };
     // 添加水印
@@ -478,13 +478,21 @@ var PrintContainer = function (_a) {
                         .catch(function (err) {
                         // 出错了，重新下载
                         console.log('出错了，重新下载字体文件');
-                        setTimeout(function () {
-                            loadFontTTFPromise = downloadFontTTF({
-                                fileId: fileId,
-                                request: request,
-                            });
-                            onSurePositionHandle();
-                        }, 2000);
+                        if (loadFontTTFNum <= loadFontTTFMaxNum) {
+                            loadFontTTFNum++;
+                            setTimeout(function () {
+                                loadFontTTFPromise = downloadFontTTF({
+                                    fileId: fileId,
+                                    request: request,
+                                });
+                                onPdfHandle();
+                            }, 2000);
+                        }
+                        else {
+                            message.error('生成pdf所需要的字体文件下载失败！');
+                            loadFontTTFNum = 0;
+                            setSpinning(false);
+                        }
                     });
                 }
                 else {
@@ -602,13 +610,21 @@ var PrintContainer = function (_a) {
                 .catch(function (err) {
                 // 出错了，重新下载
                 console.log('出错了，重新下载字体文件');
-                setTimeout(function () {
-                    loadFontTTFPromise = downloadFontTTF({
-                        fileId: fileId,
-                        request: request,
-                    });
-                    onSurePositionHandle();
-                }, 2000);
+                if (loadFontTTFNum <= loadFontTTFMaxNum) {
+                    loadFontTTFNum++;
+                    setTimeout(function () {
+                        loadFontTTFPromise = downloadFontTTF({
+                            fileId: fileId,
+                            request: request,
+                        });
+                        onSurePositionHandle();
+                    }, 2000);
+                }
+                else {
+                    message.error('生成pdf所需要的字体文件下载失败！');
+                    loadFontTTFNum = 0;
+                    setSpinning(false);
+                }
             });
         }
         else {
@@ -725,8 +741,8 @@ var PrintContainer = function (_a) {
     };
     // 自动盖章
     var onAutoSealHandle = function () {
-        if (!Array.isArray(_autoSealIdList) || _autoSealIdList.length === 0) {
-            message.info("\u5F53\u524D\u90E8\u95E8\u3001\u6D41\u7A0B\u4E0B\u672A\u914D\u7F6E\u81EA\u52A8\u76D6\u7AE0\u5173\u952E\u5B57\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u914D\u7F6E!");
+        if (!Array.isArray(autoSealList) || autoSealList.length === 0) {
+            message.info("\u5F53\u524D\u90E8\u95E8\u3001\u6D41\u7A0B\u4E0B\u672A\u914D\u7F6E\u81EA\u52A8\u76D6\u7AE0\u76F8\u5173\u5370\u7AE0\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u914D\u7F6E!");
             return;
         }
         if (showWater) {
@@ -751,13 +767,21 @@ var PrintContainer = function (_a) {
                 .catch(function (err) {
                 // 出错了，重新下载
                 console.log('出错了，重新下载字体文件');
-                setTimeout(function () {
-                    loadFontTTFPromise = downloadFontTTF({
-                        fileId: fileId,
-                        request: request,
-                    });
-                    onAutoSealHandle();
-                }, 2000);
+                if (loadFontTTFNum <= loadFontTTFMaxNum) {
+                    loadFontTTFNum++;
+                    setTimeout(function () {
+                        loadFontTTFPromise = downloadFontTTF({
+                            fileId: fileId,
+                            request: request,
+                        });
+                        onAutoSealHandle();
+                    }, 2000);
+                }
+                else {
+                    message.error('生成pdf所需要的字体文件下载失败！');
+                    loadFontTTFNum = 0;
+                    setSpinning(false);
+                }
             });
         }
         else {
@@ -782,14 +806,25 @@ var PrintContainer = function (_a) {
                     ? pdfBase64.map(function (base64) { return dataURLtoFile(base64, pdfName + ".pdf"); })
                     : [];
                 var formData = new FormData();
+                if (isUseXy) {
+                    formData.append("useXY", 'true');
+                }
                 files.forEach(function (file, i) {
                     formData.append("fileList[" + i + "]", file);
                 });
-                if (Array.isArray(_autoSealIdList) && Array.isArray(_keywordList)) {
-                    _autoSealIdList.forEach(function (sealId, i) {
-                        var keyword = _keywordList[i];
+                if (Array.isArray(autoSealList)) {
+                    autoSealList.forEach(function (autoSealItem, i) {
+                        var sealId = autoSealItem.sealId, keyword = autoSealItem.keyword, x = autoSealItem.x, y = autoSealItem.y;
                         formData.append("sealPositionInfoList[" + i + "].sealId", sealId);
-                        formData.append("sealPositionInfoList[" + i + "].keyword", keyword);
+                        if (keyword) {
+                            formData.append("sealPositionInfoList[" + i + "].keyword", keyword);
+                        }
+                        if (x) {
+                            formData.append("sealPositionInfoList[" + i + "].x", x);
+                        }
+                        if (y) {
+                            formData.append("sealPositionInfoList[" + i + "].y", y);
+                        }
                     });
                 }
                 request({
@@ -834,8 +869,8 @@ var PrintContainer = function (_a) {
                 React.createElement(Button, { type: "primary", onClick: function () { return onFontsizeHandle('reduce'); } }, "\u7F29\u5C0F\u6587\u5B57"),
                 React.createElement(Button, { type: "primary", onClick: function () { return onAdjustPadding(); } }, "\u8C03\u6574\u8FB9\u8DDD"),
                 React.createElement(Button, { type: "primary", onClick: onWaterHandle }, !showWater ? '添加水印' : '移除水印'),
-                React.createElement(Button, { type: "primary", onClick: onPrintHandle }, "\u6253\u5370"),
-                React.createElement(Button, { type: "primary", onClick: onECPrintHandle }, "\u63D2\u4EF6\u6253\u5370"),
+                showPrintBtn && (React.createElement(Button, { type: "primary", onClick: onPrintHandle }, "\u6253\u5370")),
+                showPrintBtn && (React.createElement(Button, { type: "primary", onClick: onECPrintHandle }, "\u63D2\u4EF6\u6253\u5370")),
                 React.createElement(Button, { type: "primary", onClick: onPdfHandle }, "\u5BFC\u51FAPDF"),
                 showHandSeal && (React.createElement(React.Fragment, null,
                     React.createElement(Button, { type: "primary", onClick: onSurePositionHandle }, "\u786E\u8BA4\u76D6\u7AE0\u4F4D\u7F6E"),
@@ -846,6 +881,7 @@ var PrintContainer = function (_a) {
             React.createElement("div", { ref: containerRef }, children)),
         React.createElement(PrintModal, { loading: loading, visible: visible, onCancel: function () { return setVisible(false); }, value: value, setValue: setValue, onChange: function (value) {
                 setValue(value);
+                setPositionLocal(value, localKey);
                 setVisible(false);
                 var printDom = document.querySelectorAll('.html2canvas-container-page');
                 for (var i = 0; i < printDom.length; i++) {

package/dist/components/PrintContainer/utils.js

@@ -186,10 +186,12 @@ function getLodop() {
                 if (strAlertMessage) {
                     strAlertMessage = strAlertMessage + strInstallOK;
                     console.log('提示更新对应版本!', strAlertMessage);
-                    Modal.confirm({
-                        title: '提示更新对应版本',
-                        content: (React.createElement("div", { dangerouslySetInnerHTML: { __html: strAlertMessage } })),
-                    });
+                    // Modal.confirm({
+                    //   title: '提示更新对应版本',
+                    //   content: (
+                    //     <div dangerouslySetInnerHTML={{ __html: strAlertMessage }}></div>
+                    //   ),
+                    // });
                 }
             }
         }
@@ -228,10 +230,10 @@ function getLodop() {
             if (LODOP.VERSION < '6.2.2.6') {
                 var updateStr = (isWinIE64 ? strLodop64Update : strLodopUpdate) + strInstallOK;
                 console.log('需要更新对应版本', updateStr);
-                Modal.confirm({
-                    title: '需要更新对应版本',
-                    content: React.createElement("div", { dangerouslySetInnerHTML: { __html: updateStr } }),
-                });
+                // Modal.confirm({
+                //   title: '需要更新对应版本',
+                //   content: <div dangerouslySetInnerHTML={{ __html: updateStr }}></div>,
+                // });
             }
         }
         //===如下空白位置适合调用统一功能(如注册语句、语言选择等):=======================

package/package.json

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