ztxkutils 2.10.66-3 → 2.10.66-30

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-f1ef06bc.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 { v as validate } from './validate-2138d94a.js';
+export { r as request } from './request-40e9ca7b.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';
 
@@ -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';

package/dist/reqUrl-ea7ef876.js

@@ -0,0 +1,83 @@
+/**
+ * @file 项目基本配置，包括各个环境的请求地址
+ */
+// 环境变量
+function getReqUrl(processObj) {
+    var ENV = processObj.REACT_APP_ENV;
+    // api服务器各个环境地址
+    var ZT_API_DEV = processObj.REACT_APP_ZT_API_DEV || window.location.origin; // 开发环境
+    var ZT_API_TEST = processObj.REACT_APP_ZT_API_TEST || window.location.origin; // 测试环境 https://192.168.0.135:8000
+    var ZT_API_STAGE = processObj.REACT_APP_ZT_API_STAGE || window.location.origin; // 阶段性环境 http://192.168.0.134:8000
+    var ZT_API_SIM = processObj.REACT_APP_ZT_API_SIM || window.location.origin; // 阶段性环境 http://192.168.0.134:8000
+    var ZT_API_PRODUCT = processObj.REACT_APP_ZT_API_PRODUCT || window.location.origin; // 生产环境 http://dz.zmd.com.cn
+    var ZT_API_PUBLIC_PRODUCT = processObj.REACT_APP_ZT_API_PUBLIC_PRODUCT ||
+        '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://preview-test.zmdms.com.cn:30079'; // 测试环境 http://172.55.5.101:33013
+    var ZT_FILE_PREVIEW_STAGE = processObj.REACT_APP_ZT_FILE_PREVIEW_STAGE ||
+        '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 ||
+        'https://dzfile.zmd.com.cn:8012'; // 生产环境
+    // 字体文件附件id
+    var ZT_FONTFAMILY_DEV = '1551733945007517697';
+    var ZT_FONTFAMILY_TEST = '1551836774183047169';
+    var ZT_FONTFAMILY_STAGE = '1551837561144905730';
+    var ZT_FONTFAMILY_SIM = '1562010976138207234';
+    var ZT_FONTFAMILY_PRODUCT = '1552851055372992513';
+    // 实际api请求地址
+    var ZT_API_BASEURL = ZT_API_DEV;
+    var ZT_API_PUBLICURL = ZT_API_PUBLIC_PRODUCT;
+    var ZT_FILE_BASEURL = ZT_FILE_PREVIEW_DEV;
+    var ZT_FONTFAMILY_BASEURL = ZT_FONTFAMILY_DEV;
+    if (ENV) {
+        switch (ENV.toLowerCase()) {
+            case 'zt-dev':
+                ZT_API_BASEURL = ZT_API_DEV;
+                ZT_API_PUBLICURL = ZT_API_DEV;
+                ZT_FILE_BASEURL = ZT_FILE_PREVIEW_DEV;
+                ZT_FONTFAMILY_BASEURL = ZT_FONTFAMILY_DEV;
+                break;
+            case 'zt-test':
+                ZT_API_BASEURL = ZT_API_TEST;
+                ZT_API_PUBLICURL = ZT_API_TEST;
+                ZT_FILE_BASEURL = ZT_FILE_PREVIEW_TEST;
+                ZT_FONTFAMILY_BASEURL = ZT_FONTFAMILY_TEST;
+                break;
+            case 'zt-stage':
+                ZT_API_BASEURL = ZT_API_STAGE;
+                ZT_API_PUBLICURL = ZT_API_STAGE;
+                ZT_FILE_BASEURL = ZT_FILE_PREVIEW_STAGE;
+                ZT_FONTFAMILY_BASEURL = ZT_FONTFAMILY_STAGE;
+                break;
+            case 'zt-sim':
+                ZT_API_BASEURL = ZT_API_SIM;
+                ZT_API_PUBLICURL = ZT_API_SIM;
+                ZT_FILE_BASEURL = ZT_FILE_PREVIEW_SIM;
+                ZT_FONTFAMILY_BASEURL = ZT_FONTFAMILY_SIM;
+                break;
+            case 'zt-product':
+                ZT_API_BASEURL = ZT_API_PRODUCT;
+                ZT_API_PUBLICURL = ZT_API_PUBLIC_PRODUCT;
+                ZT_FILE_BASEURL = ZT_FILE_PREVIEW_PRODUCT;
+                ZT_FONTFAMILY_BASEURL = ZT_FONTFAMILY_PRODUCT;
+                break;
+        }
+    }
+    return {
+        ZT_API_BASEURL: ZT_API_BASEURL,
+        ZT_FILE_BASEURL: ZT_FILE_BASEURL,
+        ZT_API_PUBLICURL: ZT_API_PUBLICURL,
+        ZT_FONTFAMILY_BASEURL: ZT_FONTFAMILY_BASEURL,
+    };
+}
+
+var reqUrl = /*#__PURE__*/Object.freeze({
+  __proto__: null,
+  getReqUrl: getReqUrl
+});
+
+export { getReqUrl as g, reqUrl as r };

package/dist/reqUrl.js

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

package/dist/{request-dc69f021.js → request-1e442d5d.js}

@@ -1,4 +1,5 @@
 import { a as __rest, _ as __assign } from './tslib.es6-35653116.js';
+import instance from './i18next.js';
 import axios from 'axios';
 import { Modal, message } from 'ztxkui';
 import { c as commonjsGlobal, a as crypto } from './crypto-c481f616.js';
@@ -2452,7 +2453,7 @@ var AxiosCancel = /** @class */ (function () {
         // 将token挂载到当前接口的请求头里面
         config.cancelToken = cancelTokenObj.token;
         if (this.pendingRequests.has(key)) {
-            this.pendingRequests.get(key).cancel('拦截重复请求');
+            this.pendingRequests.get(key).cancel(instance.t('拦截重复请求'));
             this.pendingRequests.delete(key);
         }
         this.pendingRequests.set(key, {
@@ -2512,7 +2513,7 @@ function checkStatus(response, jumpCallback, otherOptions) {
                 refreshTokenRequst(jumpCallback, InnerAuthorization);
             }
             else {
-                message.info("\u5237\u65B0token\u906D\u5230\u9891\u7E41\u8C03\u7528\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u67E5\u770B\u662F\u5426\u63A5\u53E3\u6743\u9650\u51FA\u73B0\u95EE\u9898\uFF0C\u53EF\u80FD\u662F" + (response === null || response === void 0 ? void 0 : response.config.url) + "\u63A5\u53E3\u51FA\u73B0\u95EE\u9898", 5);
+                message.info(instance.t('刷新token遭到频繁调用，请联系管理员查看是否接口权限出现问题，可能是{{slot0}}接口出现问题', { slot0: response === null || response === void 0 ? void 0 : response.config.url }), 5);
                 requestTokenEndTime = 0;
             }
         }
@@ -2560,6 +2561,7 @@ function refreshTokenRequst(jumpCallback, Authorization) {
             // 刷新成功 重置token 重置refresh-token
             setToken(data === null || data === void 0 ? void 0 : data.access_token);
             setRefreshToken(data === null || data === void 0 ? void 0 : data.refresh_token);
+            message.info(instance.t('token已经刷新成功，请重新提交！', {}));
             onAccessTokenFetched();
             isRefreshing = true;
         }
@@ -2573,7 +2575,7 @@ function refreshTokenRequst(jumpCallback, Authorization) {
                     jumpCallback(401);
                 }
                 else {
-                    message.info("\u767B\u5F55\u8FC7\u671F\uFF01", 3.5, function () {
+                    message.info(instance.t('登录过期！', {}), 3.5, function () {
                         isExpiration = false;
                     });
                     window.location.href = '/login';
@@ -2589,7 +2591,7 @@ function refreshTokenRequst(jumpCallback, Authorization) {
                 jumpCallback(401);
             }
             else {
-                message.info("\u767B\u5F55\u8FC7\u671F\uFF01", 3.5, function () {
+                message.info(instance.t('登录过期！', {}), 3.5, function () {
                     isExpiration = false;
                 });
                 window.location.href = '/login';
@@ -2634,7 +2636,7 @@ function setInterceptorsResponse(jumpCallback, otherOptions) {
             return Promise.reject(response);
         }
     }, function (error) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         // catchPromiseObj = [];
         console.error(error);
         var errRes = error === null || error === void 0 ? void 0 : error.response;
@@ -2649,8 +2651,9 @@ function setInterceptorsResponse(jumpCallback, otherOptions) {
             });
         });
         /** 如果接口出错了，清理掉这个错误的接口缓存 */
-        if (autonomousCatchingPromiseObj[error === null || error === void 0 ? void 0 : error.config.url]) {
-            autonomousCatchingPromiseObj[error === null || error === void 0 ? void 0 : error.config.url] = undefined;
+        var autonomousCatchingKey = ((_a = error === null || error === void 0 ? void 0 : error.config) === null || _a === void 0 ? void 0 : _a.autonomousKey) || (error === null || error === void 0 ? void 0 : error.config.url);
+        if (autonomousCatchingPromiseObj[autonomousCatchingKey]) {
+            autonomousCatchingPromiseObj[autonomousCatchingKey] = undefined;
         }
         if (item !== -1) {
             catchPromiseObj.splice(item, 1);
@@ -2660,11 +2663,15 @@ function setInterceptorsResponse(jumpCallback, otherOptions) {
         // 超时异常统一处理，超时的异常没有response值，只能通过toString处理
         if (!errRes && error.toString().indexOf(timeoutNum + "ms") !== -1) {
             if (!isMessage) {
-                if (((_b = (_a = error === null || error === void 0 ? void 0 : error.config) === null || _a === void 0 ? void 0 : _a.method) === null || _b === void 0 ? void 0 : _b.toUpperCase()) === 'POST' &&
+                if (((_c = (_b = error === null || error === void 0 ? void 0 : error.config) === null || _b === void 0 ? void 0 : _b.method) === null || _c === void 0 ? void 0 : _c.toUpperCase()) === 'POST' &&
                     __isTimeoutMessage) {
                     isMessage = true;
                     Modal.confirm({
-                        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),
+                        title: instance.t('请求超时，请稍后再试，请去列表确认数据是否插入成功，请勿重复提交！ 接口地址:{{slot0}} 请求方式:{{slot1}} 请求超时时间:{{slot2}}', {
+                            slot0: (_d = error === null || error === void 0 ? void 0 : error.config) === null || _d === void 0 ? void 0 : _d.url,
+                            slot1: (_e = error === null || error === void 0 ? void 0 : error.config) === null || _e === void 0 ? void 0 : _e.method,
+                            slot2: (_f = error === null || error === void 0 ? void 0 : error.config) === null || _f === void 0 ? void 0 : _f.timeout,
+                        }),
                         okCancel: false,
                         onOk: function () {
                             isMessage = false;
@@ -2678,7 +2685,7 @@ function setInterceptorsResponse(jumpCallback, otherOptions) {
         if ((errRes === null || errRes === void 0 ? void 0 : errRes.status) === 404) {
             if (!isNotFound) {
                 isNotFound = true;
-                message.info("\u63A5\u53E3: " + errRes.config.url + " \u672A\u627E\u5230\uFF01", 3.5, function () {
+                message.info(instance.t('接口: {{slot0}} 未找到！', { slot0: errRes.config.url }), 3.5, function () {
                     isNotFound = false;
                 });
             }
@@ -2694,7 +2701,7 @@ function setInterceptorsResponse(jumpCallback, otherOptions) {
                     jumpCallback(errRes === null || errRes === void 0 ? void 0 : errRes.status);
                 }
                 else {
-                    message.info("\u4F60\u7684\u8D26\u53F7\u5DF2\u5728\u5176\u4ED6\u5730\u65B9\u767B\u5F55\uFF01", 3.5, function () {
+                    message.info(instance.t('你的账号已在其他地方登录！', {}), 3.5, function () {
                         isOffSite = false;
                     });
                     window.location.href = '/login';
@@ -2712,7 +2719,7 @@ function setInterceptorsResponse(jumpCallback, otherOptions) {
                     jumpCallback(errRes === null || errRes === void 0 ? void 0 : errRes.status);
                 }
                 else {
-                    message.info("\u767B\u5F55\u8FC7\u671F\uFF01", 3.5, function () {
+                    message.info(instance.t('登录过期！', {}), 3.5, function () {
                         isExpiration = false;
                     });
                     window.location.href = '/login';
@@ -2778,7 +2785,7 @@ function request(myOptions, jumpCallback, otherOptions) {
         setInterceptorsResponse(jumpCallback, otherOptions);
         isFirstSet = true;
     }
-    var encryptionType = myOptions.encryptionType, isTimeoutMessage = myOptions.isTimeoutMessage, isForceRequest = myOptions.isForceRequest, _m = myOptions.noCatchUrl, noCatchUrl = _m === void 0 ? [] : _m, isCatch = myOptions.isCatch, mustCatch = myOptions.mustCatch, isAutonomousCatch = myOptions.isAutonomousCatch, _o = myOptions.autonomousCount, autonomousCount = _o === void 0 ? 1 : _o, options = __rest(myOptions, ["encryptionType", "isTimeoutMessage", "isForceRequest", "noCatchUrl", "isCatch", "mustCatch", "isAutonomousCatch", "autonomousCount"]);
+    var encryptionType = myOptions.encryptionType, isTimeoutMessage = myOptions.isTimeoutMessage, isForceRequest = myOptions.isForceRequest, _m = myOptions.noCatchUrl, noCatchUrl = _m === void 0 ? [] : _m, isCatch = myOptions.isCatch, mustCatch = myOptions.mustCatch, isAutonomousCatch = myOptions.isAutonomousCatch, _o = myOptions.autonomousCount, autonomousCount = _o === void 0 ? 1 : _o, autonomousKey = myOptions.autonomousKey, options = __rest(myOptions, ["encryptionType", "isTimeoutMessage", "isForceRequest", "noCatchUrl", "isCatch", "mustCatch", "isAutonomousCatch", "autonomousCount", "autonomousKey"]);
     timeoutNum =
         typeof myOptions.timeout === 'number' ? myOptions.timeout : timeoutNum;
     __isTimeoutMessage = isTimeoutMessage;
@@ -2792,6 +2799,8 @@ function request(myOptions, jumpCallback, otherOptions) {
             'Zmdms-Auth': "bearer " + token,
             'Tenant-Id': '000000',
             Authorization: InnerAuthorization ? InnerAuthorization : Authorization,
+            // 设置语言包请求头
+            'Zmdms-Lang': window.localStorage.getItem('languageType') || 'zh_CN',
         },
     };
     if ((_a = options.baseURL) === null || _a === void 0 ? void 0 : _a.endsWith('/')) {
@@ -2810,7 +2819,7 @@ function request(myOptions, jumpCallback, otherOptions) {
         options.params = transformObj(options.params);
     }
     // 将传入配置与默认配置混合
-    var newOptions = __assign(__assign(__assign({}, defaultOptions), options), { headers: __assign(__assign({}, defaultOptions.headers), options.headers) });
+    var newOptions = __assign(__assign(__assign({}, defaultOptions), options), { autonomousKey: autonomousKey, headers: __assign(__assign({}, defaultOptions.headers), options.headers) });
     // 特殊请求处理
     if (((_e = newOptions.method) === null || _e === void 0 ? void 0 : _e.toUpperCase()) === 'POST' ||
         ((_f = newOptions.method) === null || _f === void 0 ? void 0 : _f.toUpperCase()) === 'PUT' ||
@@ -2856,11 +2865,12 @@ function request(myOptions, jumpCallback, otherOptions) {
     }
     // 自主缓存请求。默认这个缓存只会针对一个url缓存一次请求
     if (isAutonomousCatch) {
-        var item = autonomousCatchingPromiseObj[newOptions.url];
+        var autonomousCatchingKey = autonomousKey || newOptions.url;
+        var item = autonomousCatchingPromiseObj[autonomousCatchingKey];
         // 如果当前接口没有缓存 缓存住，并且返回接口结果
         if (!item || !Array.isArray(item)) {
             var result = axios(newOptions);
-            autonomousCatchingPromiseObj[newOptions.url] = [
+            autonomousCatchingPromiseObj[autonomousCatchingKey] = [
                 {
                     params: newOptions.params,
                     promiseObj: result,