ztxkutils 2.10.66-4 → 2.10.66-41

package/dist/index.js

@@ -1,9 +1,10 @@
 export { d as authority } from './authority-7a91cb9f.js';
-export { d as dataModel } from './dataModel-1fbaff40.js';
-export { t as tools } from './tools-390e3466.js';
-export { v as validate } from './validate-18e52490.js';
-export { r as request } from './request-87d93572.js';
-export { r as reqUrl } from './reqUrl-22b880a4.js';
+export { d as dataModel } from './dataModel-f1ef06bc.js';
+export { t as tools } from './tools-47b9bee7.js';
+export { v as validate } from './validate-2138d94a.js';
+export { r as request } from './request-3b358860.js';
+export { r as reqUrl } from './reqUrl-ea7ef876.js';
+import './i18next.js';
 import './tslib.es6-35653116.js';
 import 'dayjs';
 import 'axios';

package/dist/myIndexDb.d.ts

@@ -1 +1 @@
-declare function openDB(dbName: string, version?: number): Promise<unknown>;
+export {};

package/dist/print.d.ts

@@ -66,10 +66,8 @@ export declare function htmlToPdfNoCanvas({ pageClassName, dom, isShowPage, file
     pdfName?: string;
     isDownload?: boolean;
     pdfOption?: IPdfOption;
-    /** 是否添加水印 */
-    isAddWater?: boolean;
-    /** 水印base 64字符串 */
-    waterBase64?: string;
+    /** 是否添加水印 */ isAddWater?: boolean;
+    /** 水印base 64字符串 */ waterBase64?: string;
     imgWidth?: number;
     imgHeight?: number;
     isCompress?: boolean;

package/dist/print.js

@@ -1,4 +1,5 @@
 import { d as __spreadArray, _ as __assign, b as __awaiter, c as __generator } from './tslib.es6-35653116.js';
+import instance from './i18next.js';
 import { jsPDF } from 'jspdf';
 import html2canvas from 'html2canvas';
 
@@ -57,6 +58,40 @@ function printCurrentDom(_a) {
     document.head.appendChild(styleDom);
     window.print();
 }
+function getTextDimensions(text, fontSize) {
+    var width, height;
+    try {
+        // 创建一个临时元素
+        var tempElement = document.createElement('div');
+        // 设置元素内容为传入的文本
+        tempElement.textContent = text;
+        // 设置样式使其不可见且不影响页面布局
+        tempElement.style.position = 'absolute';
+        tempElement.style.visibility = 'hidden'; // 元素不可见但仍占据空间
+        tempElement.style.opacity = '0'; // 完全透明
+        tempElement.style.pointerEvents = 'none'; // 不响应鼠标事件
+        tempElement.style.whiteSpace = 'nowrap'; // 防止文本换行影响宽度测量
+        tempElement.style.fontSize = fontSize;
+        tempElement.style.fontFamily = '微软雅黑';
+        tempElement.style.padding = '50px 10px';
+        // 插入到body中
+        document.body.appendChild(tempElement);
+        // 获取元素的宽高
+        width = tempElement.offsetWidth;
+        height = tempElement.offsetHeight;
+        // 从DOM中移除元素
+        document.body.removeChild(tempElement);
+    }
+    catch (err) {
+        width = text.length * 22;
+        height = text.length * 9;
+    }
+    // 返回测量结果
+    return {
+        width: width > 520 ? 520 : width < 240 ? 240 : width,
+        height: height > 200 ? 200 : height < 100 ? 100 : height,
+    };
+}
 /**
  * 创建文本水印图片
  * @param waterText 水印文本
@@ -74,17 +109,21 @@ function createWaterHandle(obj) {
     //     console.log(err);
     //   }
     // }
-    var defaultWaterText = '浙商中拓';
+    var defaultWaterText = instance.t('浙商中拓');
     var _a = obj || {}, waterText = _a.waterText, opacity = _a.opacity, fontSize = _a.fontSize, cavansWidth = _a.cavansWidth, cavansHeight = _a.cavansHeight;
     var canvas = document.createElement('canvas');
+    // 如何计算水印的大小。创建一个元素插入到body中，获取到宽高后移除
+    var _b = getTextDimensions(waterText, fontSize || '18px'), textWidth = _b.width, textHeight = _b.height;
+    // 之前的宽度是文本长度 * 22
     var defaultCanvasWidth = waterText
         ? waterText.length > 10
-            ? waterText.length * 22
+            ? textWidth
             : 240
         : 240;
+    // 之前的高度是文本长度 * 9
     var defaultCanvasHeight = waterText
         ? waterText.length > 10
-            ? waterText.length * 9
+            ? textHeight
             : 100
         : 100;
     canvas.width = cavansWidth || defaultCanvasWidth;
@@ -92,7 +131,7 @@ function createWaterHandle(obj) {
     var ctx = canvas.getContext('2d');
     if (ctx) {
         ctx.rotate((-10 * Math.PI) / 180); // 水印旋转角度
-        ctx.font = (fontSize || '18px') + " \u5FAE\u8F6F\u96C5\u9ED1";
+        ctx.font = instance.t('{{slot0}} 微软雅黑', { slot0: fontSize || '18px' });
         ctx.fillStyle = "rgba(0,0,0," + (opacity ? opacity : '0.07') + ")";
         ctx.textAlign = 'center';
         ctx.textBaseline = 'middle';
@@ -395,11 +434,16 @@ function htmlToPdfNoCanvas(_a) {
                                                                     windowWidth: pageWidth,
                                                                     callback: function (res) {
                                                                         // 添加呈现的HTML所需的页面（从第2页开始）
-                                                                        for (var i_1 = 2, j = res.internal.getNumberOfPages(); i_1 <= j; i_1++) {
-                                                                            pdf.addPage(pageFormat, pageOrient);
-                                                                        }
-                                                                        for (var i_2 = 1, j = res.internal.getNumberOfPages(); i_2 <= j; i_2++) {
-                                                                            pdf.setPage(i_2);
+                                                                        // 注释掉这里导致多出一页空白页
+                                                                        // for (
+                                                                        //   let i = 2, j = (res as any).internal.getNumberOfPages();
+                                                                        //   i <= j;
+                                                                        //   i++
+                                                                        // ) {
+                                                                        //   pdf.addPage(pageFormat, pageOrient);
+                                                                        // }
+                                                                        for (var i_1 = 1, j = res.internal.getNumberOfPages(); i_1 <= j; i_1++) {
+                                                                            pdf.setPage(i_1);
                                                                             // 添加水印
                                                                             if (isAddWater) {
                                                                                 setPdfWater(pdf, waterBase64, imgWidth, imgHeight);
@@ -497,9 +541,13 @@ function htmlToPdfNoCanvas(_a) {
                             windowWidth: pageWidth_1,
                             callback: function (res) {
                                 // 添加呈现的HTML所需的页面（从第2页开始）
-                                for (var i = 2, j = res.internal.getNumberOfPages(); i <= j; i++) {
-                                    pdf_3.addPage(pageFormat, pageOrient);
-                                }
+                                // for (
+                                //   let i = 2, j = (res as any).internal.getNumberOfPages();
+                                //   i <= j;
+                                //   i++
+                                // ) {
+                                //   pdf.addPage(pageFormat, pageOrient);
+                                // }
                                 for (var i = 1, j = res.internal.getNumberOfPages(); i <= j; i++) {
                                     pdf_3.setPage(i);
                                     // 添加水印

package/dist/{reqUrl-22b880a4.js → reqUrl-ea7ef876.js}

@@ -14,9 +14,10 @@ function getReqUrl(processObj) {
         'https://nportal.zmd.com.cn:18998'; // 生产环境外网api地址 https://m-portal.zmd.com.cn:18998 http://dz.zmd.com.cn:48000
     // 文件服务器
     var ZT_FILE_PREVIEW_DEV = processObj.REACT_APP_ZT_FILE_PREVIEW_DEV || 'http://192.168.0.83:88'; // 开发环境
-    var ZT_FILE_PREVIEW_TEST = processObj.REACT_APP_ZT_FILE_PREVIEW_TEST || 'http://172.55.5.101:33013'; // 测试环境 https://192.168.0.135:18012
+    var ZT_FILE_PREVIEW_TEST = processObj.REACT_APP_ZT_FILE_PREVIEW_TEST ||
+        'http://preview-test.zmdms.com.cn:30079'; // 测试环境 http://172.55.5.101:33013
     var ZT_FILE_PREVIEW_STAGE = processObj.REACT_APP_ZT_FILE_PREVIEW_STAGE ||
-        'https://dzfile-prod.zmd.com.cn/'; // 阶段性环境 http://192.168.0.134:8012
+        'http://preview-stage.zmdms.com.cn:30079'; // 阶段性环境 https://dzfile-prod.zmd.com.cn/
     var ZT_FILE_PREVIEW_SIM = processObj.REACT_APP_ZT_FILE_PREVIEW_SIM ||
         'https://dzfile-data.zmd.com.cn/'; // 阶段性环境 http://192.168.0.134:8012
     var ZT_FILE_PREVIEW_PRODUCT = processObj.REACT_APP_ZT_FILE_PREVIEW_PRODUCT ||

package/dist/reqUrl.js

@@ -1 +1 @@
-export { g as getReqUrl } from './reqUrl-22b880a4.js';
+export { g as getReqUrl } from './reqUrl-ea7ef876.js';