ztxkutils 2.10.28 → 2.10.30

package/dist/index.js

@@ -2,7 +2,7 @@ export { c as authority } from './authority-e6bde99f.js';
 export { d as dataModel } from './dataModel-1fbaff40.js';
 export { t as tools } from './tools-09a4d620.js';
 export { v as validate } from './validate-6e735536.js';
-export { r as request } from './request-944adae3.js';
+export { r as request } from './request-ef290b9a.js';
 export { r as reqUrl } from './reqUrl-787dd9e5.js';
 import './tslib.es6-35653116.js';
 import 'dayjs';

package/dist/print.d.ts

@@ -31,11 +31,12 @@ export declare function htmlToPdf({ pageClassName, dom, pdfName, isShowPage, noW
     imgPositionX?: number;
     waterText?: string;
 }): Promise<jsPDF>;
-export declare function htmlToPdfUseCanvas({ pageClassName, dom, pdfName, isShowPage, noWater, pdfOptions, imgPositionX, isDownload, }: {
+export declare function htmlToPdfUseCanvas({ pageClassName, dom, pdfName, isShowPage, isOnlyOne, noWater, pdfOptions, imgPositionX, isDownload, }: {
     pageClassName?: string;
     dom: HTMLElement;
     pdfName: string;
     isShowPage?: boolean;
+    isOnlyOne?: boolean;
     noWater?: boolean;
     pdfOptions?: any;
     imgPositionX?: number;

package/dist/print.js

@@ -232,7 +232,7 @@ function htmlToPdf(_a) {
     }
 }
 function htmlToPdfUseCanvas(_a) {
-    var pageClassName = _a.pageClassName, dom = _a.dom, pdfName = _a.pdfName, isShowPage = _a.isShowPage, noWater = _a.noWater, pdfOptions = _a.pdfOptions, imgPositionX = _a.imgPositionX, isDownload = _a.isDownload;
+    var pageClassName = _a.pageClassName, dom = _a.dom, pdfName = _a.pdfName, isShowPage = _a.isShowPage, isOnlyOne = _a.isOnlyOne, noWater = _a.noWater, pdfOptions = _a.pdfOptions, imgPositionX = _a.imgPositionX, isDownload = _a.isDownload;
     var allDom = document.querySelectorAll(pageClassName ? pageClassName : '.html2canvas-container-page');
     var format = (pdfOptions === null || pdfOptions === void 0 ? void 0 : pdfOptions.format) || [632.28, 841.89];
     var _pdfOptions = __assign({ unit: 'pt', format: format }, (pdfOptions || {}));
@@ -245,17 +245,59 @@ function htmlToPdfUseCanvas(_a) {
                 scale: 2,
             });
         });
+        if (isOnlyOne) {
+            var pdf_1 = new jsPDF(_pdfOptions);
+            return (function () {
+                return __awaiter(this, void 0, void 0, function () {
+                    var i, _i, promiseAllDomArray_4, item, canvas;
+                    return __generator(this, function (_a) {
+                        switch (_a.label) {
+                            case 0:
+                                i = 0;
+                                _i = 0, promiseAllDomArray_4 = promiseAllDomArray_3;
+                                _a.label = 1;
+                            case 1:
+                                if (!(_i < promiseAllDomArray_4.length)) return [3 /*break*/, 4];
+                                item = promiseAllDomArray_4[_i];
+                                i++;
+                                return [4 /*yield*/, item];
+                            case 2:
+                                canvas = _a.sent();
+                                createPdf(canvas, pdf_1, noWater, imgPositionX, {
+                                    width: format === null || format === void 0 ? void 0 : format[0],
+                                    height: format === null || format === void 0 ? void 0 : format[1],
+                                });
+                                if (i < promiseAllDomArray_3.length) {
+                                    pdf_1.addPage();
+                                }
+                                _a.label = 3;
+                            case 3:
+                                _i++;
+                                return [3 /*break*/, 1];
+                            case 4:
+                                if (isDownload) {
+                                    pdf_1.save(pdfName + ".pdf");
+                                }
+                                return [2 /*return*/, Promise.resolve({
+                                        pdfs: [pdf_1],
+                                        pdfBase64: [pdf_1.output('dataurlstring')],
+                                    })];
+                        }
+                    });
+                });
+            })();
+        }
         return (function () {
             return __awaiter(this, void 0, void 0, function () {
-                var _i, promiseAllDomArray_4, item, pdf, canvas;
+                var _i, promiseAllDomArray_5, item, pdf, canvas;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            _i = 0, promiseAllDomArray_4 = promiseAllDomArray_3;
+                            _i = 0, promiseAllDomArray_5 = promiseAllDomArray_3;
                             _a.label = 1;
                         case 1:
-                            if (!(_i < promiseAllDomArray_4.length)) return [3 /*break*/, 4];
-                            item = promiseAllDomArray_4[_i];
+                            if (!(_i < promiseAllDomArray_5.length)) return [3 /*break*/, 4];
+                            item = promiseAllDomArray_5[_i];
                             pdf = new jsPDF(_pdfOptions);
                             return [4 /*yield*/, item];
                         case 2:
@@ -283,18 +325,18 @@ function htmlToPdfUseCanvas(_a) {
         })();
     }
     else {
-        var pdf_1 = new jsPDF(_pdfOptions);
+        var pdf_2 = new jsPDF(_pdfOptions);
         return html2canvas(dom, { scale: 2 }).then(function (canvas) {
-            createPdf(canvas, pdf_1, noWater, imgPositionX, {
+            createPdf(canvas, pdf_2, noWater, imgPositionX, {
                 width: format === null || format === void 0 ? void 0 : format[0],
                 height: format === null || format === void 0 ? void 0 : format[1],
             });
             if (isDownload) {
-                pdf_1.save(pdfName + ".pdf");
+                pdf_2.save(pdfName + ".pdf");
             }
             return {
-                pdfs: [pdf_1],
-                pdfBase64: [pdf_1.output('dataurlstring')],
+                pdfs: [pdf_2],
+                pdfBase64: [pdf_2.output('dataurlstring')],
             };
         });
     }
@@ -303,7 +345,7 @@ function htmlToPdfNoCanvas(_a) {
     var _b, _c;
     var pageClassName = _a.pageClassName, dom = _a.dom, isShowPage = _a.isShowPage, fileBinary = _a.fileBinary, pdfName = _a.pdfName, isDownload = _a.isDownload, pdfOption = _a.pdfOption, isAddWater = _a.isAddWater, waterBase64 = _a.waterBase64, imgWidth = _a.imgWidth, imgHeight = _a.imgHeight, isCompress = _a.isCompress; _a.waterText;
     return __awaiter(this, void 0, void 0, function () {
-        var allDom, pageFormat, pageOrient, pageMarginX, pageMarginY, pdfOptions, allDomArray_1, pdfBase64_2, pdfs_2, pdf_2, pageWidth_1;
+        var allDom, pageFormat, pageOrient, pageMarginX, pageMarginY, pdfOptions, allDomArray_1, pdfBase64_2, pdfs_2, pdf_3, pageWidth_1;
         return __generator(this, function (_d) {
             allDom = dom.querySelectorAll(pageClassName ? pageClassName : '.html2canvas-container-page');
             pageFormat = (pdfOption === null || pdfOption === void 0 ? void 0 : pdfOption.pageFormat) ? pdfOption.pageFormat : 'a4';
@@ -408,10 +450,10 @@ function htmlToPdfNoCanvas(_a) {
                     })()];
             }
             else {
-                pdf_2 = new jsPDF(pdfOptions);
-                pageWidth_1 = pdf_2.internal.pageSize.width - pageMarginX * 2;
-                setPdfVersion(pdf_2);
-                supportJsPdfChinese(pdf_2, fileBinary);
+                pdf_3 = new jsPDF(pdfOptions);
+                pageWidth_1 = pdf_3.internal.pageSize.width - pageMarginX * 2;
+                setPdfVersion(pdf_3);
+                supportJsPdfChinese(pdf_3, fileBinary);
                 return [2 /*return*/, new Promise(function (resolve) {
                         new jsPDF(pdfOptions).html(dom, {
                             autoPaging: 'text',
@@ -421,28 +463,28 @@ function htmlToPdfNoCanvas(_a) {
                             callback: function (res) {
                                 // 添加呈现的HTML所需的页面（从第2页开始）
                                 for (var i = 2, j = res.internal.getNumberOfPages(); i <= j; i++) {
-                                    pdf_2.addPage(pageFormat, pageOrient);
+                                    pdf_3.addPage(pageFormat, pageOrient);
                                 }
                                 // 正确呈现文档
-                                pdf_2.html(dom, {
+                                pdf_3.html(dom, {
                                     autoPaging: 'text',
                                     margin: [pageMarginY, pageMarginX, pageMarginY, pageMarginX],
                                     width: pageWidth_1,
                                     windowWidth: pageWidth_1,
                                     callback: function () {
                                         for (var i = 1, j = res.internal.getNumberOfPages(); i <= j; i++) {
-                                            pdf_2.setPage(i);
+                                            pdf_3.setPage(i);
                                             // 添加水印
                                             if (isAddWater) {
-                                                setPdfWater(pdf_2, waterBase64, imgWidth, imgHeight);
+                                                setPdfWater(pdf_3, waterBase64, imgWidth, imgHeight);
                                             }
                                         }
                                         if (isDownload) {
-                                            pdf_2.save(pdfName + ".pdf");
+                                            pdf_3.save(pdfName + ".pdf");
                                         }
                                         resolve({
-                                            pdfs: [pdf_2],
-                                            pdfBase64: [pdf_2.output('dataurlstring')],
+                                            pdfs: [pdf_3],
+                                            pdfBase64: [pdf_3.output('dataurlstring')],
                                         });
                                     },
                                 });

package/dist/{request-944adae3.js → request-ef290b9a.js}

@@ -2584,7 +2584,7 @@ function setInterceptorsResponse(jumpCallback, otherOptions) {
             return Promise.reject(response);
         }
     }, function (error) {
-        var _a, _b;
+        var _a, _b, _c, _d, _e;
         // catchPromiseObj = [];
         console.error(error);
         var errRes = error === null || error === void 0 ? void 0 : error.response;
@@ -2610,7 +2610,7 @@ function setInterceptorsResponse(jumpCallback, otherOptions) {
                     __isTimeoutMessage) {
                     isMessage = true;
                     Modal.confirm({
-                        title: '请求超时，请稍后再试，请去列表确认数据是否插入成功，请勿重复提交！',
+                        title: "\u8BF7\u6C42\u8D85\u65F6\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5\uFF0C\u8BF7\u53BB\u5217\u8868\u786E\u8BA4\u6570\u636E\u662F\u5426\u63D2\u5165\u6210\u529F\uFF0C\u8BF7\u52FF\u91CD\u590D\u63D0\u4EA4\uFF01\n\u63A5\u53E3\u5730\u5740:" + ((_c = error === null || error === void 0 ? void 0 : error.config) === null || _c === void 0 ? void 0 : _c.url) + "\n\u8BF7\u6C42\u65B9\u5F0F:" + ((_d = error === null || error === void 0 ? void 0 : error.config) === null || _d === void 0 ? void 0 : _d.method) + "\n\u8BF7\u6C42\u8D85\u65F6\u65F6\u95F4:" + ((_e = error === null || error === void 0 ? void 0 : error.config) === null || _e === void 0 ? void 0 : _e.timeout),
                         okCancel: false,
                         onOk: function () {
                             isMessage = false;

package/dist/request.js

@@ -1,7 +1,7 @@
 import './tslib.es6-35653116.js';
 import 'axios';
 import 'ztxkui';
-export { N as NEW_AUTHORIZATION, O as OLD_AUTHORIZATION, c as clearCatch, a as default } from './request-944adae3.js';
+export { N as NEW_AUTHORIZATION, O as OLD_AUTHORIZATION, c as clearCatch, a as default } from './request-ef290b9a.js';
 import './authority-e6bde99f.js';
 import './crypto-c481f616.js';
 import 'crypto';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkutils",
-  "version": "2.10.28",
+  "version": "2.10.30",
   "description": "",
   "main": "./dist/index.js",
   "module": "./dist/index.js",