ztxkutils 2.10.66-4 → 2.10.66-41

package/dist/{request-87d93572.js → request-40e9ca7b.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';
@@ -2665,7 +2667,11 @@ function setInterceptorsResponse(jumpCallback, otherOptions) {
                     __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:" + ((_d = error === null || error === void 0 ? void 0 : error.config) === null || _d === void 0 ? void 0 : _d.url) + "\n\u8BF7\u6C42\u65B9\u5F0F:" + ((_e = error === null || error === void 0 ? void 0 : error.config) === null || _e === void 0 ? void 0 : _e.method) + "\n\u8BF7\u6C42\u8D85\u65F6\u65F6\u95F4:" + ((_f = error === null || error === void 0 ? void 0 : error.config) === null || _f === void 0 ? void 0 : _f.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;
@@ -2679,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;
                 });
             }
@@ -2695,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';
@@ -2713,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';
@@ -2793,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('/')) {

package/dist/{request-dc69f021.js → request-7bcf02f4.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, {
@@ -2505,14 +2506,16 @@ function loginRequest(params, InnerAuthorization) {
     });
 }
 function checkStatus(response, jumpCallback, otherOptions) {
-    var InnerAuthorization = (otherOptions || {}).InnerAuthorization;
+    var _a = otherOptions || {}, InnerAuthorization = _a.InnerAuthorization, refreshTokenCallback = _a.refreshTokenCallback;
     if ((response === null || response === void 0 ? void 0 : response.status) === 401) {
         if (isRefreshing) {
             if (Date.now() - requestTokenEndTime > reqTokenTimeInterval) {
-                refreshTokenRequst(jumpCallback, InnerAuthorization);
+                refreshTokenRequst(jumpCallback, InnerAuthorization, {
+                    refreshTokenCallback: refreshTokenCallback,
+                });
             }
             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;
             }
         }
@@ -2546,7 +2549,8 @@ function checkStatus(response, jumpCallback, otherOptions) {
         // return retryOriginalRequest;
     }
 }
-function refreshTokenRequst(jumpCallback, Authorization) {
+function refreshTokenRequst(jumpCallback, Authorization, otherOptions) {
+    var refreshTokenCallback = (otherOptions || {}).refreshTokenCallback;
     loginRequest({
         tenantId: '000000',
         grant_type: 'refresh_token',
@@ -2560,7 +2564,9 @@ 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();
+            refreshTokenCallback === null || refreshTokenCallback === void 0 ? void 0 : refreshTokenCallback();
             isRefreshing = true;
         }
         else {
@@ -2573,7 +2579,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 +2595,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';
@@ -2606,7 +2612,7 @@ function onAccessTokenFetched() {
 }
 function setInterceptorsResponse(jumpCallback, otherOptions) {
     // 拦截器，拦截响应头信息
-    var isRefreshToken = (otherOptions || {}).isRefreshToken;
+    var _a = otherOptions || {}, isRefreshToken = _a.isRefreshToken; _a.refreshTokenCallback;
     axios.interceptors.response.use(function (response) {
         var _a, _b, _c;
         // catchPromiseObj = [];
@@ -2634,7 +2640,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 +2655,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 +2667,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 +2689,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 +2705,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 +2723,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 +2789,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 +2803,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 +2823,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 +2869,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,

package/dist/{request-3c906c2d.js → request-e147d640.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, {
@@ -2480,6 +2481,7 @@ var isNotFound = false; // 404弹框
 var isOffSite = false; // 501异地登录
 var isExpiration = false; // 401登录过期
 var catchPromiseObj = []; // 缓存当前宏任务下的缓存
+var autonomousCatchingPromiseObj = {}; // 自主缓存。可以自主清空。每个url只对应一个请求
 var __isTimeoutMessage = false; // 是否需要默认展示超时弹框
 var isFirstSet = false; // 首次初始化
 // 'Basic em1kbXM6em1kbXNfc2VjcmV0' 新的auth
@@ -2504,14 +2506,16 @@ function loginRequest(params, InnerAuthorization) {
     });
 }
 function checkStatus(response, jumpCallback, otherOptions) {
-    var InnerAuthorization = (otherOptions || {}).InnerAuthorization;
+    var _a = otherOptions || {}, InnerAuthorization = _a.InnerAuthorization, refreshTokenCallback = _a.refreshTokenCallback;
     if ((response === null || response === void 0 ? void 0 : response.status) === 401) {
         if (isRefreshing) {
             if (Date.now() - requestTokenEndTime > reqTokenTimeInterval) {
-                refreshTokenRequst(jumpCallback, InnerAuthorization);
+                refreshTokenRequst(jumpCallback, InnerAuthorization, {
+                    refreshTokenCallback: refreshTokenCallback,
+                });
             }
             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;
             }
         }
@@ -2545,7 +2549,8 @@ function checkStatus(response, jumpCallback, otherOptions) {
         // return retryOriginalRequest;
     }
 }
-function refreshTokenRequst(jumpCallback, Authorization) {
+function refreshTokenRequst(jumpCallback, Authorization, otherOptions) {
+    var refreshTokenCallback = (otherOptions || {}).refreshTokenCallback;
     loginRequest({
         tenantId: '000000',
         grant_type: 'refresh_token',
@@ -2559,7 +2564,11 @@ 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已经刷新成功，请重新提交！', {}));
+            // 设置一个本地存储，用来告知这是刷新token 而不是被挤下线。
+            localStorage.setItem('__unWsNeedReconnect__', 'true');
             onAccessTokenFetched();
+            refreshTokenCallback === null || refreshTokenCallback === void 0 ? void 0 : refreshTokenCallback();
             isRefreshing = true;
         }
         else {
@@ -2572,7 +2581,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';
@@ -2588,7 +2597,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';
@@ -2605,7 +2614,7 @@ function onAccessTokenFetched() {
 }
 function setInterceptorsResponse(jumpCallback, otherOptions) {
     // 拦截器，拦截响应头信息
-    var isRefreshToken = (otherOptions || {}).isRefreshToken;
+    var _a = otherOptions || {}, isRefreshToken = _a.isRefreshToken; _a.refreshTokenCallback;
     axios.interceptors.response.use(function (response) {
         var _a, _b, _c;
         // catchPromiseObj = [];
@@ -2633,7 +2642,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;
@@ -2647,19 +2656,28 @@ function setInterceptorsResponse(jumpCallback, otherOptions) {
                 params: error === null || error === void 0 ? void 0 : error.config.params,
             });
         });
+        /** 如果接口出错了，清理掉这个错误的接口缓存 */
+        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);
         }
-        console.log(error === null || error === void 0 ? void 0 : error.config, catchPromiseObj);
+        // console.log(error?.config, catchPromiseObj);
         /** 如果接口出错了，那么清理掉这个错误的接口 */
         // 超时异常统一处理，超时的异常没有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;
@@ -2673,7 +2691,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;
                 });
             }
@@ -2689,7 +2707,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';
@@ -2707,7 +2725,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';
@@ -2766,14 +2784,14 @@ function transformObj(obj) {
     return obj;
 }
 function request(myOptions, jumpCallback, otherOptions) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
     var InnerAuthorization = (otherOptions || {}).InnerAuthorization;
     if (!isFirstSet) {
         setInterceptorsRequest();
         setInterceptorsResponse(jumpCallback, otherOptions);
         isFirstSet = true;
     }
-    var encryptionType = myOptions.encryptionType, isTimeoutMessage = myOptions.isTimeoutMessage, isForceRequest = myOptions.isForceRequest, _k = myOptions.noCatchUrl, noCatchUrl = _k === void 0 ? [] : _k, isCatch = myOptions.isCatch, mustCatch = myOptions.mustCatch, options = __rest(myOptions, ["encryptionType", "isTimeoutMessage", "isForceRequest", "noCatchUrl", "isCatch", "mustCatch"]);
+    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;
@@ -2787,6 +2805,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('/')) {
@@ -2805,7 +2825,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' ||
@@ -2849,13 +2869,64 @@ function request(myOptions, jumpCallback, otherOptions) {
             };
         }
     }
+    // 自主缓存请求。默认这个缓存只会针对一个url缓存一次请求
+    if (isAutonomousCatch) {
+        var autonomousCatchingKey = autonomousKey || newOptions.url;
+        var item = autonomousCatchingPromiseObj[autonomousCatchingKey];
+        // 如果当前接口没有缓存 缓存住，并且返回接口结果
+        if (!item || !Array.isArray(item)) {
+            var result = axios(newOptions);
+            autonomousCatchingPromiseObj[autonomousCatchingKey] = [
+                {
+                    params: newOptions.params,
+                    promiseObj: result,
+                    method: (_h = newOptions.method) === null || _h === void 0 ? void 0 : _h.toUpperCase(),
+                },
+            ];
+            return result;
+        }
+        // 如果当前接口有缓存
+        // 判断当前参数是否命中
+        var index = item.findIndex(function (itemChild) {
+            var _a, _b;
+            return isEqual_1({
+                method: (_a = itemChild.method) === null || _a === void 0 ? void 0 : _a.toUpperCase(),
+                params: itemChild.params,
+            }, {
+                method: (_b = newOptions.method) === null || _b === void 0 ? void 0 : _b.toUpperCase(),
+                params: newOptions.params,
+            });
+        });
+        // 如果缓存命中
+        if (index !== -1) {
+            // 最近使用优先
+            var result = item[index];
+            item.splice(index, 1);
+            item.push(result);
+            return result === null || result === void 0 ? void 0 : result.promiseObj;
+        }
+        else {
+            var result = axios(newOptions);
+            // 当前接口可以缓存几个结果 如果超过最大缓存数量 删除第一位
+            if (item.length >= autonomousCount) {
+                item.shift();
+            }
+            item.push({
+                params: newOptions.params,
+                promiseObj: result,
+                method: (_j = newOptions.method) === null || _j === void 0 ? void 0 : _j.toUpperCase(),
+            });
+            return result;
+        }
+    }
     // 缓存本次宏任务下的GET请求,并且不是以/page结尾的列表分页接口
     // 并且不是强制请求，强制请求需要
-    if ((((_h = newOptions.method) === null || _h === void 0 ? void 0 : _h.toUpperCase()) === 'GET' &&
-        !((_j = newOptions.url) === null || _j === void 0 ? void 0 : _j.endsWith('/page')) &&
+    if (((((_k = newOptions.method) === null || _k === void 0 ? void 0 : _k.toUpperCase()) === 'GET' &&
+        !((_l = newOptions.url) === null || _l === void 0 ? void 0 : _l.endsWith('/page')) &&
         !noCatchUrl.find(function (item) { var _a; return (_a = newOptions.url) === null || _a === void 0 ? void 0 : _a.endsWith(item); }) &&
         isCatch) ||
-        mustCatch) {
+        mustCatch) &&
+        !isAutonomousCatch) {
         // 能不能找到，url与参数都一样得数据
         var index = catchPromiseObj.findIndex(function (item) {
             return isEqual_1({
@@ -2899,6 +2970,9 @@ function clearNoCompleteRequest() {
 }
 function clearCatch() {
     catchPromiseObj = [];
+}
+function clearAutonomousCatch(url) {
+    autonomousCatchingPromiseObj[url] = undefined;
 }
 
 var request$1 = /*#__PURE__*/Object.freeze({
@@ -2907,7 +2981,8 @@ var request$1 = /*#__PURE__*/Object.freeze({
   NEW_AUTHORIZATION: NEW_AUTHORIZATION,
   'default': request,
   clearNoCompleteRequest: clearNoCompleteRequest,
-  clearCatch: clearCatch
+  clearCatch: clearCatch,
+  clearAutonomousCatch: clearAutonomousCatch
 });
 
-export { NEW_AUTHORIZATION as N, OLD_AUTHORIZATION as O, request as a, clearCatch as b, clearNoCompleteRequest as c, request$1 as r };
+export { NEW_AUTHORIZATION as N, OLD_AUTHORIZATION as O, request as a, clearCatch as b, clearNoCompleteRequest as c, clearAutonomousCatch as d, request$1 as r };

package/dist/request.d.ts

@@ -27,6 +27,10 @@ export interface IOptions extends AxiosRequestConfig {
      * 自主缓存的key值，默认取url
      */
     autonomousKey?: string;
+    /**
+     * 401时，是否需要刷新token
+     */
+    isRefreshToken?: boolean;
 }
 export default function request(myOptions: IOptions, jumpCallback?: any, otherOptions?: any): any;
 export declare function clearNoCompleteRequest(): void;

package/dist/request.js

@@ -1,7 +1,8 @@
 import './tslib.es6-35653116.js';
+import './i18next.js';
 import 'axios';
 import 'ztxkui';
-export { N as NEW_AUTHORIZATION, O as OLD_AUTHORIZATION, d as clearAutonomousCatch, b as clearCatch, c as clearNoCompleteRequest, a as default } from './request-87d93572.js';
+export { N as NEW_AUTHORIZATION, O as OLD_AUTHORIZATION, d as clearAutonomousCatch, b as clearCatch, c as clearNoCompleteRequest, a as default } from './request-3b358860.js';
 import './authority-7a91cb9f.js';
 import './crypto-c481f616.js';
 import 'crypto';