ztxkutils 2.7.13 → 2.7.16

package/dist/print.d.ts

@@ -1,3 +1,8 @@
+/**
+ * @author 陈亚雄
+ * @description 打印相关方法
+ */
+import { jsPDF } from 'jspdf';
 /**
  * 添加水印
  */
@@ -16,10 +21,17 @@ interface IParams {
     hiddenClassNames?: string[];
 }
 export declare function printCurrentDom({ hiddenClassNames }?: IParams): void;
-export declare function htmlToPdf({ pageClassName, dom, pdfName, isShowPage, }: {
+export declare function htmlToPdf({ pageClassName, dom, pdfName, isShowPage, noDownload, }: {
     pageClassName?: string;
     dom: HTMLElement;
     pdfName: string;
     isShowPage?: boolean;
-}): Promise<void>;
+    noDownload?: boolean;
+}): Promise<{
+    pdf: jsPDF;
+    pdfBase64: any[];
+}> | Promise<{
+    pdf: jsPDF;
+    pdfBase64: string;
+}>;
 export {};

package/dist/print.js

@@ -102,12 +102,13 @@ function createPdf(canvas, pdf) {
     }
 }
 function htmlToPdf(_a) {
-    var pageClassName = _a.pageClassName, dom = _a.dom, pdfName = _a.pdfName, isShowPage = _a.isShowPage;
+    var pageClassName = _a.pageClassName, dom = _a.dom, pdfName = _a.pdfName, isShowPage = _a.isShowPage, noDownload = _a.noDownload;
     var pdf = new jsPDF(undefined, 'pt', 'a4');
     var allDom = document.querySelectorAll(pageClassName ? pageClassName : '.html2canvas-container-page');
     if (allDom.length > 0 && isShowPage) {
         var allDomArray = Array.prototype.slice.call(allDom);
         var promiseAllDomArray_1 = allDomArray.map(function (dom) { return html2canvas(dom); });
+        var pdfBase64_1 = [];
         return (function () {
             return __awaiter(this, void 0, void 0, function () {
                 var i, _i, promiseAllDomArray_2, item, canvas;
@@ -128,13 +129,19 @@ function htmlToPdf(_a) {
                             if (i < promiseAllDomArray_1.length) {
                                 pdf.addPage();
                             }
+                            pdfBase64_1.push(pdf.output('dataurlstring'));
                             _a.label = 3;
                         case 3:
                             _i++;
                             return [3 /*break*/, 1];
                         case 4:
-                            pdf.save(pdfName + ".pdf");
-                            return [2 /*return*/, Promise.resolve()];
+                            if (!noDownload) {
+                                pdf.save(pdfName + ".pdf");
+                            }
+                            return [2 /*return*/, Promise.resolve({
+                                    pdf: pdf,
+                                    pdfBase64: pdfBase64_1,
+                                })];
                     }
                 });
             });
@@ -143,7 +150,13 @@ function htmlToPdf(_a) {
     else {
         return html2canvas(dom).then(function (canvas) {
             createPdf(canvas, pdf);
-            pdf.save(pdfName + ".pdf");
+            if (!noDownload) {
+                pdf.save(pdfName + ".pdf");
+            }
+            return {
+                pdf: pdf,
+                pdfBase64: pdf.output('dataurlstring'),
+            };
         });
     }
 }

package/dist/stompClient.js

@@ -43,21 +43,18 @@ var StompClient = /** @class */ (function () {
         this.clearIsClient = setTimeout(function () {
             _this.clearIsClient = null;
             if (!_this.isClient) {
-                console.log("\u8FDE\u63A5\u5DF2\u53D1\u8D77\uFF0C\u4F46\u662F10\u79D2\u540E\u672A\u6210\u529F\u5EFA\u7ACB\u8FDE\u63A5\uFF0C\u624B\u52A8\u65AD\u5F00\u91CD\u8FDE!");
+                console.log("\u8FDE\u63A5\u5DF2\u53D1\u8D77\uFF0C\u4F46\u662F10\u79D2\u540E\u672A\u6210\u529F\u5EFA\u7ACB\u8FDE\u63A5\uFF0C\u624B\u52A8\u65AD\u5F00\u91CD\u8FDE!system=" + _this.connectWsConfig.systemType);
                 try {
                     _this.client.disconnect(function () {
-                        // const timeInterval =
-                        //   Math.ceil(this.reconnectionNum / 5) *
-                        //   (this.connectWsConfig.reconnectionTime ?? 3000);
+                        _this.client = null;
                     });
                 }
                 catch (err) {
                     console.log('---连接未建立的关闭出错---', err);
                 }
-                _this.client = null;
                 _this.reconnectionNum++;
                 var timeInterval = 3000;
-                console.log("---\u7B2C" + _this.reconnectionNum + "\u6B21\u91CD\u8FDE\uFF01---");
+                console.log("---\u7B2C" + _this.reconnectionNum + "\u6B21\u91CD\u8FDE\uFF01time=" + Date.now() + "system=" + _this.connectWsConfig.systemType + "---");
                 if (_this.clearIsClientNo) {
                     clearTimeout(_this.clearIsClientNo);
                     _this.clearIsClientNo = null;
@@ -95,7 +92,7 @@ var StompClient = /** @class */ (function () {
                 _this.clearIsClientYes = null;
             }
             _this.reconnectionNum = 0;
-            console.log('---------连接成功--------');
+            console.log("---------\u8FDE\u63A5\u6210\u529F time=" + Date.now() + " system=" + _this.connectWsConfig.systemType + " time=" + Date.now() + "--------");
             // 连接成功后，将当前已注册的，未执行的 连接通道 连接
             var subscriptionsFnKeys = Object.keys(_this.subscriptionsFn);
             if (Array.isArray(subscriptionsFnKeys)) {
@@ -128,7 +125,7 @@ var StompClient = /** @class */ (function () {
         }, 
         // 连接失败回调
         function (err) {
-            console.log('---------连接失败--------');
+            console.log("---------\u8FDE\u63A5\u5931\u8D25 system=" + _this.connectWsConfig.systemType + " time=" + Date.now() + "--------");
             console.log(err);
             _this.isClient = true;
             if (_this.clearIsClient) {
@@ -173,21 +170,18 @@ var StompClient = /** @class */ (function () {
             // 重连间隔，每隔5秒递增，超过最大间隔时间后，取最大间隔时间重连
             try {
                 _this.client.disconnect(function () {
-                    // const timeInterval =
-                    //   Math.ceil(this.reconnectionNum / 5) *
-                    //   (this.connectWsConfig.reconnectionTime ?? 3000);
+                    _this.client = null;
                 });
             }
             catch (err) {
-                console.log('---连接已建立的关闭出错---', err);
+                console.log("---\u8FDE\u63A5\u5DF2\u5EFA\u7ACB\u7684\u5173\u95ED\u51FA\u9519 time=" + Date.now() + "system=" + _this.connectWsConfig.systemType + "---", err);
             }
-            _this.client = null;
             _this.reconnectionNum++;
             // const timeInterval =
             //   Math.ceil(this.reconnectionNum / 5) *
             //   (this.connectWsConfig.reconnectionTime ?? 3000);
             var timeInterval = 3000;
-            console.log("---\u7B2C" + _this.reconnectionNum + "\u6B21\u91CD\u8FDE\uFF01");
+            console.log("---\u7B2C" + _this.reconnectionNum + "\u6B21\u91CD\u8FDE\uFF01time=" + Date.now() + "system=" + _this.connectWsConfig.systemType);
             _this.clearIsClientYes = setTimeout(function () {
                 _this.init();
             }, timeInterval);
@@ -217,10 +211,12 @@ var StompClient = /** @class */ (function () {
             callback = undefined;
         }
         var subscriptionsFn = function () {
-            var subscription = _this.client.subscribe(pipe, function (response) {
-                callback && callback(response);
-            }, headers);
-            _this.subscriptions[subscribeId] = subscription;
+            if (_this.client) {
+                var subscription = _this.client.subscribe(pipe, function (response) {
+                    callback && callback(response);
+                }, headers);
+                _this.subscriptions[subscribeId] = subscription;
+            }
         };
         if ((_a = this.client) === null || _a === void 0 ? void 0 : _a.connected) {
             // 如果是连接状态 正常执行函数

package/package.json

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