ztxkutils 10.0.11 → 20.0.2

package/dist/businessTools.js

@@ -1,3 +1,4 @@
+import instance from './i18next.js';
 import { Modal } from 'ztxkui';
 
 /**
@@ -6,9 +7,9 @@ import { Modal } from 'ztxkui';
 function openTipModal(callback, options) {
     if (options && options.showModal) {
         Modal.confirm({
-            content: options.tipTitle || '切换将清空已选数据！',
-            okText: '确认',
-            cancelText: '取消',
+            content: options.tipTitle || instance.t('切换将清空已选数据！'),
+            okText: instance.t('确认'),
+            cancelText: instance.t('取消'),
             onCancel: function () {
                 callback && callback(false);
             },

package/dist/dataModel-b3629ef3.js

@@ -0,0 +1,26 @@
+import instance from './i18next.js';
+
+/**
+ * @description 数据模型创建
+ */
+function createSuccessModel(data, message) {
+    return {
+        data: data,
+        message: message || instance.t('数据请求成功'),
+        success: true,
+    };
+}
+function createErrorModel(message) {
+    return {
+        message: message || instance.t('数据请求失败'),
+        success: false,
+    };
+}
+
+var dataModel = /*#__PURE__*/Object.freeze({
+  __proto__: null,
+  createSuccessModel: createSuccessModel,
+  createErrorModel: createErrorModel
+});
+
+export { createErrorModel as a, createSuccessModel as c, dataModel as d };

package/dist/dataModel.js

@@ -1 +1,2 @@
-export { a as createErrorModel, c as createSuccessModel } from './dataModel-1fbaff40.js';
+import './i18next.js';
+export { a as createErrorModel, c as createSuccessModel } from './dataModel-b3629ef3.js';

package/dist/fileOperation.d.ts

@@ -73,4 +73,23 @@ export declare function createOriginalUrl(fileUrl: string, fileId: string, other
  * @param {string} scale 缩略倍数
  */
 export declare function createThumbnailUrl(apiUrl: string, fileId: string, scale: number, otherOption?: any): string;
+/**
+ * 附件预览的文件id加密
+ * @param fileId
+ * @returns
+ */
+export declare function encodeFileIdByPreview(fileId: string): string;
+/**
+ * 附件预览的文件id加密
+ * @param fileId
+ * @returns
+ */
+export declare function encodeFileIdByDownload(fileId: string): string;
+/**
+ * 附件预览的文件id加密。加密后只encode一次
+ * 用在那些通过body传参的业务里
+ * @param fileId
+ * @returns
+ */
+export declare function encodeOneFileIdByDownload(fileId: string): string;
 export {};

package/dist/fileOperation.js

@@ -1,21 +1,25 @@
 import { g as getToken } from './authority-7a91cb9f.js';
 import { d as dangerouslySetXss } from './tools-390e3466.js';
+import { a as crypto } from './crypto-c481f616.js';
 import './tslib.es6-35653116.js';
 import 'dayjs';
+import 'crypto';
 
 /**
  * @author cyx
  * @description 文件操作相关
  */
 function downloadFile(apiUrl, fileId, fileName, otherOption) {
+    // 给附件id加密
+    fileId = encodeFileIdByDownload(fileId);
     var xhr = new XMLHttpRequest();
     var token = '';
-    var addWaterMark = 'true';
+    var addWaterMark = 'false';
     if (typeof otherOption === 'object') {
         token = getToken() || (otherOption === null || otherOption === void 0 ? void 0 : otherOption.authToken);
         addWaterMark = (otherOption === null || otherOption === void 0 ? void 0 : otherOption.addWaterMark)
             ? otherOption === null || otherOption === void 0 ? void 0 : otherOption.addWaterMark
-            : 'true';
+            : 'false';
     }
     else {
         token = getToken() || otherOption;
@@ -23,7 +27,10 @@ function downloadFile(apiUrl, fileId, fileName, otherOption) {
     var _apiUrl = apiUrl.endsWith('/')
         ? apiUrl.slice(0, apiUrl.length - 1)
         : apiUrl;
-    xhr.open('GET', _apiUrl + "/api/zmdms-resource/oss/endpoint/download-file/" + fileId + "?Zmdms-Auth=bearer " + token + "&addWaterMark=" + addWaterMark, true);
+    var isLegalWaterMark = typeof addWaterMark === 'boolean' ||
+        addWaterMark === 'true' ||
+        addWaterMark === 'false';
+    xhr.open('GET', _apiUrl + "/api/zmdms-resource/oss/endpoint/download-file/" + fileId + "?Zmdms-Auth=bearer " + token + "&addWaterMark=" + (isLegalWaterMark ? addWaterMark : false), true);
     xhr.responseType = 'blob';
     xhr.onload = function () {
         if (xhr.status === 200 || xhr.status === 201) {
@@ -42,13 +49,18 @@ function downloadFile(apiUrl, fileId, fileName, otherOption) {
     xhr.send();
 }
 function downloadFileCallBack(apiUrl, fileId, fileName, otherOption) {
-    var _a = otherOption || {}, authToken = _a.authToken, callbackAfter = _a.callbackAfter, callbackError = _a.callbackError, _b = _a.addWaterMark, addWaterMark = _b === void 0 ? true : _b;
+    // 给附件id加密
+    fileId = encodeFileIdByDownload(fileId);
+    var _a = otherOption || {}, authToken = _a.authToken, callbackAfter = _a.callbackAfter, callbackError = _a.callbackError, _b = _a.addWaterMark, addWaterMark = _b === void 0 ? false : _b;
     var xhr = new XMLHttpRequest();
     var token = getToken() || authToken;
     var _apiUrl = apiUrl.endsWith('/')
         ? apiUrl.slice(0, apiUrl.length - 1)
         : apiUrl;
-    xhr.open('GET', _apiUrl + "/api/zmdms-resource/oss/endpoint/download-file/" + fileId + "?Zmdms-Auth=bearer " + token + "&addWaterMark=" + addWaterMark, true);
+    var isLegalWaterMark = typeof addWaterMark === 'boolean' ||
+        addWaterMark === 'true' ||
+        addWaterMark === 'false';
+    xhr.open('GET', _apiUrl + "/api/zmdms-resource/oss/endpoint/download-file/" + fileId + "?Zmdms-Auth=bearer " + token + "&addWaterMark=" + (isLegalWaterMark ? addWaterMark : false), true);
     xhr.responseType = 'blob';
     xhr.onload = function () {
         if (xhr.status === 200 || xhr.status === 201) {
@@ -77,7 +89,9 @@ function downloadFileCallBack(apiUrl, fileId, fileName, otherOption) {
  * 批量下载
  */
 function batchDownloadFileCallBack(apiUrl, fileIds, fileNames, otherOption) {
-    var _a = otherOption || {}, authToken = _a.authToken, zipName = _a.zipName, _b = _a.addWaterMark, addWaterMark = _b === void 0 ? true : _b, callbackAfter = _a.callbackAfter, callbackError = _a.callbackError;
+    // 给附件id加密
+    fileIds = encodeFileIdByDownload(fileIds);
+    var _a = otherOption || {}, authToken = _a.authToken, zipName = _a.zipName, _b = _a.addWaterMark, addWaterMark = _b === void 0 ? false : _b, callbackAfter = _a.callbackAfter, callbackError = _a.callbackError;
     var xhr = new XMLHttpRequest();
     var token = getToken() || authToken;
     var _apiUrl = apiUrl.endsWith('/')
@@ -108,7 +122,14 @@ function batchDownloadFileCallBack(apiUrl, fileIds, fileNames, otherOption) {
     };
     xhr.setRequestHeader('Zmdms-Auth', token || '');
     xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
-    xhr.send("attachIds=" + fileIds + "&fileNames=" + fileNames + "&zipName=" + zipName + "&addWaterMark=" + addWaterMark);
+    var isLegalWaterMark = typeof addWaterMark === 'boolean' ||
+        addWaterMark === 'true' ||
+        addWaterMark === 'false';
+    // 不传附件名
+    xhr.send("attachIds=" + fileIds + "&zipName=" + zipName + "&addWaterMark=" + (isLegalWaterMark ? addWaterMark : false));
+    // xhr.send(
+    //   `attachIds=${fileIds}&fileNames=${fileNames}&zipName=${zipName}&addWaterMark=${addWaterMark}`
+    // );
 }
 /**
  * @description 公共文件下载，并重命名
@@ -117,6 +138,8 @@ function batchDownloadFileCallBack(apiUrl, fileIds, fileNames, otherOption) {
  * @param {string} fileName 文件名
  */
 function downloadPublicFile(apiUrl, fileId, fileName, otherOption) {
+    // 给附件id加密
+    // fileId = encodeURIComponent(crypto.encrypt(fileId));
     var _a = otherOption || {}, callbackAfter = _a.callbackAfter, callbackError = _a.callbackError;
     var xhr = new XMLHttpRequest();
     var _apiUrl = apiUrl.endsWith('/')
@@ -153,6 +176,9 @@ function downloadPublicFile(apiUrl, fileId, fileName, otherOption) {
  * @param {string} fileId 文件id
  */
 function createDownloadUrl(apiUrl, fileId, authToken) {
+    // 给附件id加密
+    // fileId = encodeURIComponent(crypto.encrypt(fileId));
+    fileId = encodeFileIdByDownload(fileId);
     var token = getToken() || authToken;
     var _apiUrl = apiUrl.endsWith('/')
         ? apiUrl.slice(0, apiUrl.length - 1)
@@ -165,6 +191,9 @@ function createDownloadUrl(apiUrl, fileId, authToken) {
  * @param {string} fileId 文件id
  */
 function createDownloadUrlNoBase(fileId, authToken) {
+    // 给附件id加密
+    // fileId = encodeURIComponent(crypto.encrypt(fileId));
+    fileId = encodeFileIdByDownload(fileId);
     var token = getToken() || authToken;
     return "/api/zmdms-resource/oss/endpoint/download-file/" + fileId + "?Zmdms-Auth=bearer " + token;
 }
@@ -174,6 +203,8 @@ function createDownloadUrlNoBase(fileId, authToken) {
  * @param {string} fileId 文件id
  */
 function createPublicDownloadUrl(apiUrl, fileId) {
+    // 给附件id加密
+    // fileId = encodeURIComponent(crypto.encrypt(fileId));
     var _apiUrl = apiUrl.endsWith('/')
         ? apiUrl.slice(0, apiUrl.length - 1)
         : apiUrl;
@@ -187,6 +218,9 @@ function createPublicDownloadUrl(apiUrl, fileId) {
  * @param {string} fileName 文件名
  */
 function previewFile(fileUrl, fileId, otherOption) {
+    var preFileId = fileId;
+    // 给附件id加密
+    fileId = encodeFileIdByPreview(fileId);
     var token = '';
     if (typeof otherOption === 'object') {
         token = getToken() || (otherOption === null || otherOption === void 0 ? void 0 : otherOption.authToken);
@@ -206,7 +240,7 @@ function previewFile(fileUrl, fileId, otherOption) {
         : fileUrl;
     if (titleName) {
         var lastPointIndex = titleName.lastIndexOf('.');
-        var preTitleName = titleName.substring(0, lastPointIndex) + ("-" + fileId);
+        var preTitleName = titleName.substring(0, lastPointIndex) + ("-" + preFileId);
         var suffixTitleName = titleName.substring(lastPointIndex + 1);
         titleName = suffixTitleName
             ? preTitleName + "." + suffixTitleName
@@ -225,6 +259,8 @@ function previewFile(fileUrl, fileId, otherOption) {
  * @param {string} fileName 文件名
  */
 function batchPreviewFile(fileUrl, fileId, otherOption) {
+    // 给附件id加密
+    fileId = encodeFileIdByPreview(fileId);
     var token = '';
     if (typeof otherOption === 'object') {
         token = getToken() || (otherOption === null || otherOption === void 0 ? void 0 : otherOption.authToken);
@@ -256,6 +292,9 @@ function batchPreviewFile(fileUrl, fileId, otherOption) {
  * @param {string} fileType 文件类型
  */
 function createOriginalUrl(fileUrl, fileId, otherOption) {
+    var preFileId = fileId;
+    // 给附件id加密
+    fileId = encodeFileIdByPreview(fileId);
     var token = getToken() || (otherOption === null || otherOption === void 0 ? void 0 : otherOption.authTOken);
     var titleName = dangerouslySetXss(otherOption === null || otherOption === void 0 ? void 0 : otherOption.titleName);
     try {
@@ -269,7 +308,7 @@ function createOriginalUrl(fileUrl, fileId, otherOption) {
         : fileUrl;
     if (titleName) {
         var lastPointIndex = titleName.lastIndexOf('.');
-        var preTitleName = titleName.substring(0, lastPointIndex) + ("-" + fileId);
+        var preTitleName = titleName.substring(0, lastPointIndex) + ("-" + preFileId);
         var suffixTitleName = titleName.substring(lastPointIndex + 1);
         titleName = suffixTitleName
             ? preTitleName + "." + suffixTitleName
@@ -292,6 +331,31 @@ function createThumbnailUrl(apiUrl, fileId, scale, otherOption) {
         : apiUrl;
     var token = getToken() || (otherOption === null || otherOption === void 0 ? void 0 : otherOption.authTOken);
     return _apiUrl + "/api/zmdms-resource/oss/endpoint/thumbnail/" + fileId + "?scale=" + scale + "&Zmdms-Auth=bearer " + token;
+}
+/**
+ * 附件预览的文件id加密
+ * @param fileId
+ * @returns
+ */
+function encodeFileIdByPreview(fileId) {
+    return encodeURIComponent(crypto.encrypt(fileId));
+}
+/**
+ * 附件预览的文件id加密
+ * @param fileId
+ * @returns
+ */
+function encodeFileIdByDownload(fileId) {
+    return encodeURIComponent(encodeURIComponent(crypto.encrypt(fileId)));
+}
+/**
+ * 附件预览的文件id加密。加密后只encode一次
+ * 用在那些通过body传参的业务里
+ * @param fileId
+ * @returns
+ */
+function encodeOneFileIdByDownload(fileId) {
+    return encodeURIComponent(crypto.encrypt(fileId));
 }
 
-export { batchDownloadFileCallBack, batchPreviewFile, createDownloadUrl, createDownloadUrlNoBase, createOriginalUrl, createPublicDownloadUrl, createThumbnailUrl, downloadFile, downloadFileCallBack, downloadPublicFile, previewFile };
+export { batchDownloadFileCallBack, batchPreviewFile, createDownloadUrl, createDownloadUrlNoBase, createOriginalUrl, createPublicDownloadUrl, createThumbnailUrl, downloadFile, downloadFileCallBack, downloadPublicFile, encodeFileIdByDownload, encodeFileIdByPreview, encodeOneFileIdByDownload, previewFile };

package/dist/hooks.js

@@ -1,5 +1,6 @@
 import { _ as __assign, b as __awaiter, c as __generator } from './tslib.es6-35653116.js';
 import { useState, useEffect, useRef, useCallback } from 'react';
+import instance from './i18next.js';
 export { default as useFileIdToBase64 } from './useFileIdToBase64.js';
 import { message } from 'ztxkui';
 import axios from 'axios';
@@ -7,6 +8,8 @@ import './fileOperation.js';
 import './authority-7a91cb9f.js';
 import './tools-390e3466.js';
 import 'dayjs';
+import './crypto-c481f616.js';
+import 'crypto';
 
 function useTableLinkage(_a) {
     var records = _a.records, callbackPromise = _a.callbackPromise, dependencies = _a.dependencies, devDependencies = _a.devDependencies;
@@ -134,7 +137,12 @@ function useTableValidate(records, columns, tableName, expandProps) {
                     return [4 /*yield*/, Promise.reject({
                             errorFields: [
                                 {
-                                    errors: (tableName || '') + " \u7B2C" + (i + 1) + "\u884C" + title + " " + (validate.message || '填写错误!'),
+                                    errors: instance.t('{{slot0}} 第{{slot1}}行{{title}} {{slot2}}', {
+                                        slot0: tableName || '',
+                                        slot1: i + 1,
+                                        title: title,
+                                        slot2: validate.message || '填写错误!',
+                                    }),
                                 },
                             ],
                         })];
@@ -146,7 +154,13 @@ function useTableValidate(records, columns, tableName, expandProps) {
                     if (!(item[key] === '' || item[key] == null)) return [3 /*break*/, 9];
                     return [4 /*yield*/, Promise.reject({
                             errorFields: [
-                                { errors: (tableName || '') + " \u7B2C" + (i + 1) + "\u884C" + title + "\u4E3A\u7A7A!" },
+                                {
+                                    errors: instance.t('{{slot0}} 第{{slot1}}行{{title}}为空!', {
+                                        slot0: tableName || '',
+                                        slot1: i + 1,
+                                        title: title,
+                                    }),
+                                },
                             ],
                         })];
                 case 8:
@@ -430,7 +444,7 @@ function useWs(info) {
     // 获取讯飞WS长连接地址
     var getWebSocketUrlHandle = useCallback(function () {
         if (!getWsUrlRequest) {
-            throw new Error('必须传入获取Ws长连接的方法');
+            throw new Error(instance.t('必须传入获取Ws长连接的方法'));
         }
         return new Promise(function (resolve, reject) {
             getWsUrlRequest()
@@ -441,12 +455,12 @@ function useWs(info) {
                     resolve(websocketUrlRef.current);
                 }
                 else {
-                    reject({ msg: '获取ws链接地址失败!' });
+                    reject({ msg: instance.t('获取ws链接地址失败!') });
                 }
             })
                 .catch(function (err) {
                 var _a;
-                reject({ msg: ((_a = err === null || err === void 0 ? void 0 : err.response) === null || _a === void 0 ? void 0 : _a.msg) || '获取ws地址失败!' });
+                reject({ msg: ((_a = err === null || err === void 0 ? void 0 : err.response) === null || _a === void 0 ? void 0 : _a.msg) || instance.t('获取ws地址失败!') });
             });
         });
     }, []);
@@ -474,14 +488,14 @@ function useWs(info) {
                     }
                     else {
                         changeStatus('CLOSED');
-                        message.info(((_a = res) === null || _a === void 0 ? void 0 : _a.msg) || '获取ws地址失败!');
+                        message.info(((_a = res) === null || _a === void 0 ? void 0 : _a.msg) || instance.t('获取ws地址失败!'));
                         return [2 /*return*/];
                     }
                     return [3 /*break*/, 4];
                 case 3:
                     err_1 = _b.sent();
                     changeStatus('CLOSED');
-                    message.info((err_1 === null || err_1 === void 0 ? void 0 : err_1.msg) || '获取ws地址失败!');
+                    message.info((err_1 === null || err_1 === void 0 ? void 0 : err_1.msg) || instance.t('获取ws地址失败!'));
                     return [2 /*return*/];
                 case 4:
                     // 长连接不能复用？  发送完 end: true后 长连接就关闭了
@@ -494,14 +508,14 @@ function useWs(info) {
                         webscoketObjRef.current = new window.MozWebSocket(websocketUrl);
                     }
                     else {
-                        message.info('浏览器不支持WebSocket');
+                        message.info(instance.t('浏览器不支持WebSocket'));
                         return [2 /*return*/];
                     }
                     // SETP 3 监听WS长连接的各种状态
                     // 连接建立开始后。开始录音
                     webscoketObjRef.current.onopen = function (e) {
                         if (isDebugger) {
-                            console.log('连接建立', e);
+                            console.log(instance.t('连接建立'), e);
                         }
                         resultTextRef.current = '';
                         textResultCbLastest.current &&
@@ -513,7 +527,7 @@ function useWs(info) {
                         parseWsData(e.data, function (msg) {
                             if (msg.code === '0') {
                                 if (isDebugger) {
-                                    console.log('识别结果：', msg.resultText);
+                                    console.log(instance.t('识别结果：'), msg.resultText);
                                 }
                                 resultTextRef.current += msg.resultText;
                                 textResultCbLastest.current &&
@@ -523,7 +537,7 @@ function useWs(info) {
                             var _a, _b;
                             if (err) {
                                 if (isDebugger) {
-                                    console.log('ws连接出错了!');
+                                    console.log(instance.t('ws连接出错了!'));
                                 }
                                 recorder.stop();
                                 webscoketObjRef.current.send('{"end": true}');
@@ -537,7 +551,7 @@ function useWs(info) {
                     // 修改状态为 CLOSED
                     webscoketObjRef.current.onerror = function (e) {
                         if (isDebugger) {
-                            console.log('连接异常', e);
+                            console.log(instance.t('连接异常'), e);
                         }
                         recorder.stop();
                         changeStatus('CLOSED');
@@ -547,7 +561,7 @@ function useWs(info) {
                     // 修改状态为 CLOSED
                     webscoketObjRef.current.onclose = function (e) {
                         if (isDebugger) {
-                            console.log('连接关闭', e);
+                            console.log(instance.t('连接关闭'), e);
                         }
                         recorder.stop();
                         changeStatus('CLOSED');
@@ -591,7 +605,7 @@ function useRecorderManager(options) {
         };
     }
     if (!RecorderManager) {
-        console.error('你没有引入路由相关API，请引入!');
+        console.error(instance.t('你没有引入路由相关API，请引入!'));
     }
     var start = function () { return __awaiter(_this, void 0, void 0, function () {
         var _a, _b;
@@ -624,13 +638,13 @@ function parseWsData(data, msgCallback, callback, isDebugger) {
         if (jsonData.action === 'started') {
             // 握手成功
             if (isDebugger) {
-                console.log('握手成功');
+                console.log(instance.t('握手成功'));
             }
         }
         else if (jsonData.action === 'result') {
             var data_1 = JSON.parse(jsonData.data);
             if (isDebugger) {
-                console.log('收到讯飞的语音提示', data_1);
+                console.log(instance.t('收到讯飞的语音提示'), data_1);
             }
             // 类型是 '0' 的话 表示是完整的音频
             // 类型是 '1' 的话 表示是中间的音频
@@ -654,9 +668,9 @@ function parseWsData(data, msgCallback, callback, isDebugger) {
         else if (jsonData.action === 'error') {
             // 连接发生错误
             if (isDebugger) {
-                console.log('出错了:', jsonData);
+                console.log(instance.t('出错了:'), jsonData);
             }
-            callback({ code: '1', msg: '连接出错了' });
+            callback({ code: '1', msg: instance.t('连接出错了') });
         }
     }
     catch (err) {
@@ -706,7 +720,7 @@ function useStartWs(info) {
                 webscoketObj.send(new Int8Array(frameBuffer));
                 if (isLastFrame) {
                     if (isDebugger) {
-                        console.log('收到录音的最后帧!');
+                        console.log(instance.t('收到录音的最后帧!'));
                     }
                     webscoketObj.send('{"end": true}');
                     // 最后一段录音结束才可以结束翻译
@@ -723,7 +737,7 @@ function useStartWs(info) {
                 statusLastest.current === 'CLOSED' &&
                 isNeedCmd) {
                 if (!getWsCmdRequest) {
-                    throw new Error('你没有传入 获取指令的接口，这将导致错误!');
+                    throw new Error(instance.t('你没有传入 获取指令的接口，这将导致错误!'));
                 }
                 if (cancelRef.current) {
                     cancelRef.current();
@@ -739,12 +753,12 @@ function useStartWs(info) {
                         cbLastest.current && cbLastest.current(res.data.data);
                     }
                     else {
-                        message.error(((_b = (_a = res === null || res === void 0 ? void 0 : res.data) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.msg) || '不支持处理该指令，请重说!');
+                        message.error(((_b = (_a = res === null || res === void 0 ? void 0 : res.data) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.msg) || instance.t('不支持处理该指令，请重说!'));
                     }
                 })
                     .catch(function (err) {
                     var _a, _b;
-                    message.error(((_b = (_a = err === null || err === void 0 ? void 0 : err.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.msg) || '不支持处理该指令，请重说!');
+                    message.error(((_b = (_a = err === null || err === void 0 ? void 0 : err.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.msg) || instance.t('不支持处理该指令，请重说!'));
                 });
             }
         },

package/dist/i18next.js

@@ -2377,25 +2377,13 @@ instance.hasLoadedNamespace;
 instance.loadNamespaces;
 instance.loadLanguages;
 
-var originalT = instance.t;
-// 直接修改原始函数的行为，在获取不到翻译时返回 key
-var t = originalT;
-Object.defineProperty(t, 'bind', {
-    value: function (context) {
-        var boundFn = originalT.bind(context);
-        return function () {
-            var args = [];
-            for (var _i = 0; _i < arguments.length; _i++) {
-                args[_i] = arguments[_i];
-            }
-            if (!args[0])
-                return args[0];
-            var result = boundFn.apply(void 0, args);
-            // 为了兼容enum中value翻译的情况
-            return (result || args[0]);
-        };
-    },
+var originalT = (function () {
+    var args = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
+    }
+    return originalT.apply(void 0, args) || args[0];
 });
-instance.t = t;
+instance.t = originalT;
 
 export default instance;

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 { d as dataModel } from './dataModel-b3629ef3.js';
 export { t as tools } from './tools-390e3466.js';
-export { v as validate } from './validate-18e52490.js';
-export { r as request } from './request-986d7090.js';
-export { r as reqUrl } from './reqUrl-22b880a4.js';
+export { v as validate } from './validate-21b58a69.js';
+export { r as request } from './request-d1972b41.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

@@ -31,7 +31,7 @@ export declare function htmlToPdf({ pageClassName, dom, pdfName, isShowPage, noW
     imgPositionX?: number;
     waterText?: string;
 }): Promise<jsPDF>;
-export declare function htmlToPdfUseCanvas({ pageClassName, dom, pdfName, isShowPage, isOnlyOne, noWater, pdfOptions, imgPositionX, isDownload, }: {
+export declare function htmlToPdfUseCanvas({ pageClassName, dom, pdfName, isShowPage, isOnlyOne, noWater, pdfOptions, imgPositionX, isDownload, isAutoPageCount, }: {
     pageClassName?: string;
     dom: HTMLElement;
     pdfName: string;
@@ -41,6 +41,7 @@ export declare function htmlToPdfUseCanvas({ pageClassName, dom, pdfName, isShow
     pdfOptions?: any;
     imgPositionX?: number;
     isDownload?: boolean;
+    isAutoPageCount?: boolean;
 }): Promise<{
     pdfs: any;
     pdfBase64: any;
@@ -65,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';
 
@@ -74,7 +75,7 @@ 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');
     var defaultCanvasWidth = waterText
@@ -92,7 +93,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';
@@ -232,7 +233,7 @@ function htmlToPdf(_a) {
     }
 }
 function htmlToPdfUseCanvas(_a) {
-    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 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; _a.isAutoPageCount;
     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 || {}));
@@ -395,15 +396,11 @@ function htmlToPdfNoCanvas(_a) {
                                                                     windowWidth: pageWidth,
                                                                     callback: function (res) {
                                                                         // 添加呈现的HTML所需的页面（从第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);
+                                                                        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);
                                                                             // 添加水印
                                                                             if (isAddWater) {
                                                                                 setPdfWater(pdf, waterBase64, imgWidth, imgHeight);
@@ -501,13 +498,9 @@ function htmlToPdfNoCanvas(_a) {
                             windowWidth: pageWidth_1,
                             callback: function (res) {
                                 // 添加呈现的HTML所需的页面（从第2页开始）
-                                // for (
-                                //   let i = 2, j = (res as any).internal.getNumberOfPages();
-                                //   i <= j;
-                                //   i++
-                                // ) {
-                                //   pdf.addPage(pageFormat, pageOrient);
-                                // }
+                                for (var i = 2, j = res.internal.getNumberOfPages(); i <= j; i++) {
+                                    pdf_3.addPage(pageFormat, pageOrient);
+                                }
                                 for (var i = 1, j = res.internal.getNumberOfPages(); i <= j; i++) {
                                     pdf_3.setPage(i);
                                     // 添加水印

package/dist/reqUrl.js

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