ztxkutils 2.10.66-27 → 2.10.66-28

package/dist/index.js

@@ -1,7 +1,7 @@
 export { d as authority } from './authority-7a91cb9f.js';
 export { d as dataModel } from './dataModel-6c68c88f.js';
 export { t as tools } from './tools-390e3466.js';
-export { v as validate } from './validate-21164759.js';
+export { v as validate } from './validate-4e0272c6.js';
 export { r as request } from './request-d8d72b87.js';
 export { r as reqUrl } from './reqUrl-ea7ef876.js';
 import './i18next.js';

package/dist/{request-c0970aae.js → request-3c906c2d.js}

@@ -2470,7 +2470,7 @@ var AxiosCancel = /** @class */ (function () {
 }());
 var axiosCancel = new AxiosCancel();
 
-var timeoutNum = 60000 * 5;
+var timeoutNum = 60000;
 var isRefreshing = true; // 是否需要刷新
 var subscribers = []; // 缓存需要帮助请求的接口
 var requestTokenEndTime = 0; // token调用结束时间
@@ -2806,10 +2806,6 @@ function request(myOptions, jumpCallback, otherOptions) {
     }
     // 将传入配置与默认配置混合
     var newOptions = __assign(__assign(__assign({}, defaultOptions), options), { headers: __assign(__assign({}, defaultOptions.headers), options.headers) });
-    // 湘钢国贸项目 除了登录接口外 去掉 Authorization认证头部
-    if (newOptions.url !== '/api/zmdms-auth/oauth/token' && !InnerAuthorization) {
-        delete newOptions.headers.Authorization;
-    }
     // 特殊请求处理
     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' ||

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

@@ -1,5 +1,4 @@
 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';
@@ -2453,7 +2452,7 @@ var AxiosCancel = /** @class */ (function () {
         // 将token挂载到当前接口的请求头里面
         config.cancelToken = cancelTokenObj.token;
         if (this.pendingRequests.has(key)) {
-            this.pendingRequests.get(key).cancel(instance.t('拦截重复请求'));
+            this.pendingRequests.get(key).cancel('拦截重复请求');
             this.pendingRequests.delete(key);
         }
         this.pendingRequests.set(key, {
@@ -2513,7 +2512,7 @@ function checkStatus(response, jumpCallback, otherOptions) {
                 refreshTokenRequst(jumpCallback, InnerAuthorization);
             }
             else {
-                message.info(instance.t('刷新token遭到频繁调用，请联系管理员查看是否接口权限出现问题，可能是{{slot0}}接口出现问题', { slot0: response === null || response === void 0 ? void 0 : response.config.url }), 5);
+                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);
                 requestTokenEndTime = 0;
             }
         }
@@ -2561,7 +2560,6 @@ 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;
         }
@@ -2575,7 +2573,7 @@ function refreshTokenRequst(jumpCallback, Authorization) {
                     jumpCallback(401);
                 }
                 else {
-                    message.info(instance.t('登录过期！', {}), 3.5, function () {
+                    message.info("\u767B\u5F55\u8FC7\u671F\uFF01", 3.5, function () {
                         isExpiration = false;
                     });
                     window.location.href = '/login';
@@ -2591,7 +2589,7 @@ function refreshTokenRequst(jumpCallback, Authorization) {
                 jumpCallback(401);
             }
             else {
-                message.info(instance.t('登录过期！', {}), 3.5, function () {
+                message.info("\u767B\u5F55\u8FC7\u671F\uFF01", 3.5, function () {
                     isExpiration = false;
                 });
                 window.location.href = '/login';
@@ -2667,11 +2665,7 @@ function setInterceptorsResponse(jumpCallback, otherOptions) {
                     __isTimeoutMessage) {
                     isMessage = true;
                     Modal.confirm({
-                        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,
-                        }),
+                        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),
                         okCancel: false,
                         onOk: function () {
                             isMessage = false;
@@ -2685,7 +2679,7 @@ function setInterceptorsResponse(jumpCallback, otherOptions) {
         if ((errRes === null || errRes === void 0 ? void 0 : errRes.status) === 404) {
             if (!isNotFound) {
                 isNotFound = true;
-                message.info(instance.t('接口: {{slot0}} 未找到！', { slot0: errRes.config.url }), 3.5, function () {
+                message.info("\u63A5\u53E3: " + errRes.config.url + " \u672A\u627E\u5230\uFF01", 3.5, function () {
                     isNotFound = false;
                 });
             }
@@ -2701,7 +2695,7 @@ function setInterceptorsResponse(jumpCallback, otherOptions) {
                     jumpCallback(errRes === null || errRes === void 0 ? void 0 : errRes.status);
                 }
                 else {
-                    message.info(instance.t('你的账号已在其他地方登录！', {}), 3.5, function () {
+                    message.info("\u4F60\u7684\u8D26\u53F7\u5DF2\u5728\u5176\u4ED6\u5730\u65B9\u767B\u5F55\uFF01", 3.5, function () {
                         isOffSite = false;
                     });
                     window.location.href = '/login';
@@ -2719,7 +2713,7 @@ function setInterceptorsResponse(jumpCallback, otherOptions) {
                     jumpCallback(errRes === null || errRes === void 0 ? void 0 : errRes.status);
                 }
                 else {
-                    message.info(instance.t('登录过期！', {}), 3.5, function () {
+                    message.info("\u767B\u5F55\u8FC7\u671F\uFF01", 3.5, function () {
                         isExpiration = false;
                     });
                     window.location.href = '/login';