ztxkutils 2.10.66-20 → 2.10.66-21

package/dist/fileOperation.js

@@ -14,12 +14,12 @@ function downloadFile(apiUrl, fileId, fileName, otherOption) {
     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;
@@ -30,7 +30,7 @@ function downloadFile(apiUrl, fileId, fileName, otherOption) {
     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 : true), true);
+    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) {
@@ -51,7 +51,7 @@ function downloadFile(apiUrl, fileId, fileName, otherOption) {
 function downloadFileCallBack(apiUrl, fileId, fileName, otherOption) {
     // 给附件id加密
     fileId = encodeFileIdByDownload(fileId);
-    var _a = otherOption || {}, authToken = _a.authToken, callbackAfter = _a.callbackAfter, callbackError = _a.callbackError, _b = _a.addWaterMark, addWaterMark = _b === void 0 ? true : _b;
+    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('/')
@@ -60,7 +60,7 @@ function downloadFileCallBack(apiUrl, fileId, fileName, otherOption) {
     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 : true), true);
+    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) {
@@ -91,7 +91,7 @@ function downloadFileCallBack(apiUrl, fileId, fileName, otherOption) {
 function batchDownloadFileCallBack(apiUrl, fileIds, fileNames, otherOption) {
     // 给附件id加密
     fileIds = encodeFileIdByDownload(fileIds);
-    var _a = otherOption || {}, authToken = _a.authToken, zipName = _a.zipName, _b = _a.addWaterMark, addWaterMark = _b === void 0 ? true : _b, callbackAfter = _a.callbackAfter, callbackError = _a.callbackError;
+    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('/')
@@ -126,7 +126,7 @@ function batchDownloadFileCallBack(apiUrl, fileIds, fileNames, otherOption) {
         addWaterMark === 'true' ||
         addWaterMark === 'false';
     // 不传附件名
-    xhr.send("attachIds=" + fileIds + "&zipName=" + zipName + "&addWaterMark=" + (isLegalWaterMark ? addWaterMark : true));
+    xhr.send("attachIds=" + fileIds + "&zipName=" + zipName + "&addWaterMark=" + (isLegalWaterMark ? addWaterMark : false));
     // xhr.send(
     //   `attachIds=${fileIds}&fileNames=${fileNames}&zipName=${zipName}&addWaterMark=${addWaterMark}`
     // );

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

@@ -2,7 +2,7 @@ import { a as __rest, _ as __assign } from './tslib.es6-35653116.js';
 import axios from 'axios';
 import { Modal, message } from 'ztxkui';
 import { c as commonjsGlobal, a as crypto } from './crypto-c481f616.js';
-import { g as getToken, a as getRefreshToken, s as setToken, b as setRefreshToken } from './authority-e6bde99f.js';
+import { g as getToken, r as removeToken, a as removeRefreshToken, b as getRefreshToken, s as setToken, c as setRefreshToken } from './authority-7a91cb9f.js';
 
 /**
  * Removes all key-value entries from the list cache.
@@ -2480,6 +2480,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
@@ -2566,6 +2567,8 @@ function refreshTokenRequst(jumpCallback, Authorization) {
             requestTokenEndTime = 0;
             if (!isExpiration) {
                 isExpiration = true;
+                removeToken();
+                removeRefreshToken();
                 if (jumpCallback) {
                     jumpCallback(401);
                 }
@@ -2605,12 +2608,15 @@ function setInterceptorsResponse(jumpCallback, otherOptions) {
     // 拦截器，拦截响应头信息
     var isRefreshToken = (otherOptions || {}).isRefreshToken;
     axios.interceptors.response.use(function (response) {
-        var _a, _b;
+        var _a, _b, _c;
         // catchPromiseObj = [];
         axiosCancel.clearPendingRequest(response);
+        if ((_a = response.config) === null || _a === void 0 ? void 0 : _a.noInterceptorsResponse) {
+            return Promise.resolve(response);
+        }
         if (response.status === 200) {
-            if ((_a = response === null || response === void 0 ? void 0 : response.data) === null || _a === void 0 ? void 0 : _a.code) {
-                if (((_b = response === null || response === void 0 ? void 0 : response.data) === null || _b === void 0 ? void 0 : _b.code) === 200) {
+            if ((_b = response === null || response === void 0 ? void 0 : response.data) === null || _b === void 0 ? void 0 : _b.code) {
+                if (((_c = response === null || response === void 0 ? void 0 : response.data) === null || _c === void 0 ? void 0 : _c.code) === 200) {
                     return Promise.resolve(response);
                 }
                 else {
@@ -2628,7 +2634,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;
@@ -2642,19 +2648,24 @@ 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: "\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;
@@ -2678,6 +2689,8 @@ function setInterceptorsResponse(jumpCallback, otherOptions) {
         if ((errRes === null || errRes === void 0 ? void 0 : errRes.status) === 501) {
             if (!isOffSite) {
                 isOffSite = true;
+                removeToken();
+                removeRefreshToken();
                 if (jumpCallback) {
                     jumpCallback(errRes === null || errRes === void 0 ? void 0 : errRes.status);
                 }
@@ -2694,6 +2707,8 @@ function setInterceptorsResponse(jumpCallback, otherOptions) {
         if ((errRes === null || errRes === void 0 ? void 0 : errRes.status) === 401 && !isRefreshToken) {
             if (!isExpiration) {
                 isExpiration = true;
+                removeToken();
+                removeRefreshToken();
                 if (jumpCallback) {
                     jumpCallback(errRes === null || errRes === void 0 ? void 0 : errRes.status);
                 }
@@ -2714,14 +2729,15 @@ function setInterceptorsResponse(jumpCallback, otherOptions) {
 function setInterceptorsRequest() {
     // 拦截器，拦截响应头信息
     axios.interceptors.request.use(function (config) {
-        var _a;
+        var _a, _b, _c;
         if (config.isCancelRepeat) {
             axiosCancel.pendingRequestCancel(config);
         }
         // 如果需要清除未完成的请求 2023-05-15
         if (config.isCancelNoCompleteRequest &&
             !config.cancelToken &&
-            ((_a = config.method) === null || _a === void 0 ? void 0 : _a.toUpperCase()) !== 'POST') {
+            ((_a = config.method) === null || _a === void 0 ? void 0 : _a.toUpperCase()) !== 'POST' &&
+            !((_c = (_b = config.url) === null || _b === void 0 ? void 0 : _b.includes) === null || _c === void 0 ? void 0 : _c.call(_b, 'zmdms-resource'))) {
             var cancelTokenObj = axios.CancelToken.source();
             config.cancelToken = cancelTokenObj.token;
             pendingRequest.push(cancelTokenObj.cancel);
@@ -2756,14 +2772,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, options = __rest(myOptions, ["encryptionType", "isTimeoutMessage", "isForceRequest", "noCatchUrl", "isCatch"]);
+    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;
@@ -2777,6 +2793,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('/')) {
@@ -2795,7 +2813,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' ||
@@ -2839,12 +2857,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) {
+        isCatch) ||
+        mustCatch) &&
+        !isAutonomousCatch) {
         // 能不能找到，url与参数都一样得数据
         var index = catchPromiseObj.findIndex(function (item) {
             return isEqual_1({
@@ -2888,6 +2958,9 @@ function clearNoCompleteRequest() {
 }
 function clearCatch() {
     catchPromiseObj = [];
+}
+function clearAutonomousCatch(url) {
+    autonomousCatchingPromiseObj[url] = undefined;
 }
 
 var request$1 = /*#__PURE__*/Object.freeze({
@@ -2896,7 +2969,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-0cc024b1.js → request-dc69f021.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调用结束时间
@@ -2480,6 +2480,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
@@ -2647,10 +2648,14 @@ function setInterceptorsResponse(jumpCallback, otherOptions) {
                 params: error === null || error === void 0 ? void 0 : error.config.params,
             });
         });
+        /** 如果接口出错了，清理掉这个错误的接口缓存 */
+        if (autonomousCatchingPromiseObj[error === null || error === void 0 ? void 0 : error.config.url]) {
+            autonomousCatchingPromiseObj[error === null || error === void 0 ? void 0 : error.config.url] = 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) {
@@ -2766,14 +2771,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, options = __rest(myOptions, ["encryptionType", "isTimeoutMessage", "isForceRequest", "noCatchUrl", "isCatch", "mustCatch", "isAutonomousCatch", "autonomousCount"]);
     timeoutNum =
         typeof myOptions.timeout === 'number' ? myOptions.timeout : timeoutNum;
     __isTimeoutMessage = isTimeoutMessage;
@@ -2806,10 +2811,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') {
-        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' ||
@@ -2853,13 +2854,63 @@ function request(myOptions, jumpCallback, otherOptions) {
             };
         }
     }
+    // 自主缓存请求。默认这个缓存只会针对一个url缓存一次请求
+    if (isAutonomousCatch) {
+        var item = autonomousCatchingPromiseObj[newOptions.url];
+        // 如果当前接口没有缓存 缓存住，并且返回接口结果
+        if (!item || !Array.isArray(item)) {
+            var result = axios(newOptions);
+            autonomousCatchingPromiseObj[newOptions.url] = [
+                {
+                    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({
@@ -2903,6 +2954,9 @@ function clearNoCompleteRequest() {
 }
 function clearCatch() {
     catchPromiseObj = [];
+}
+function clearAutonomousCatch(url) {
+    autonomousCatchingPromiseObj[url] = undefined;
 }
 
 var request$1 = /*#__PURE__*/Object.freeze({
@@ -2911,7 +2965,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkutils",
-  "version": "2.10.66-20",
+  "version": "2.10.66-21",
   "description": "",
   "main": "./dist/index.js",
   "module": "./dist/index.js",

package/zti18n-cli/bin/index.js

@@ -1,3 +1,3 @@
-#!/usr/bin/env node
-
-require('../');
+#!/usr/bin/env node
+
+require('../');

package/zti18n-cli/index.js

@@ -1,23 +1,23 @@
-const program = require('./src');
-const initFileConf = require('./src/command/initFileConf');
-
-program
-  .command('init')
-  .alias('i')
-  .description('init locales conf')
-  .option('--vue', 'init for vue project')
-  .action(function (options) {
-    initFileConf(options.vue);
-  })
-  .on('--help', function () {
-    console.log('  Examples:');
-    console.log();
-    console.log('    $ zti18n init -c ./config/prod.config.js');
-    console.log();
-  });
-
-program.command('*').action(function (cmd) {
-  console.log('unknown command "%s"', cmd);
-});
-
-program.parse(process.argv);
+const program = require('./src');
+const initFileConf = require('./src/command/initFileConf');
+
+program
+  .command('init')
+  .alias('i')
+  .description('init locales conf')
+  .option('--vue', 'init for vue project')
+  .action(function (options) {
+    initFileConf(options.vue);
+  })
+  .on('--help', function () {
+    console.log('  Examples:');
+    console.log();
+    console.log('    $ zti18n init -c ./config/prod.config.js');
+    console.log();
+  });
+
+program.command('*').action(function (cmd) {
+  console.log('unknown command "%s"', cmd);
+});
+
+program.parse(process.argv);

package/zti18n-cli/src/command/convert.js

@@ -1,17 +1,17 @@
-const {
-  transformReactIntlToReactIntlUniversal,
-} = require('../../../zti18n-core');
-const mergeOptions = require('../utils/mergeOptions');
-const log = require('../utils/log');
-
-module.exports = function doConvertToReactIntlUniversal(programOption) {
-  const options = mergeOptions(programOption, ['entry', 'exclude', 'locales']);
-
-  if (!options.entry) {
-    log.error('\n · 使用 -e [path] 或 --entry [path] 命令增加待转换的源码目录');
-    log.error(" · 或在配置文件中设置 'entry' 字段\n");
-    process.exit(2);
-  }
-
-  transformReactIntlToReactIntlUniversal(options);
-};
+const {
+  transformReactIntlToReactIntlUniversal,
+} = require('../../../zti18n-core');
+const mergeOptions = require('../utils/mergeOptions');
+const log = require('../utils/log');
+
+module.exports = function doConvertToReactIntlUniversal(programOption) {
+  const options = mergeOptions(programOption, ['entry', 'exclude', 'locales']);
+
+  if (!options.entry) {
+    log.error('\n · 使用 -e [path] 或 --entry [path] 命令增加待转换的源码目录');
+    log.error(" · 或在配置文件中设置 'entry' 字段\n");
+    process.exit(2);
+  }
+
+  transformReactIntlToReactIntlUniversal(options);
+};

package/zti18n-cli/src/command/convert2.js

@@ -1,35 +1,35 @@
-const fs = require('fs');
-const { transformReactIntlUniveralToDi18n } = require('../../../zti18n-core');
-const mergeOptions = require('../utils/mergeOptions');
-const log = require('../utils/log');
-
-module.exports = function doConvert(programOption) {
-  const options = mergeOptions(programOption, ['entry', 'exclude', 'locales']);
-
-  if (!options.entry) {
-    log.error('no entry is specified');
-    process.exit(2);
-  }
-
-  if (Array.isArray(options.entry)) {
-    if (!Array.isArray(options.output)) {
-      log.error('output should be array too, since entry is array');
-      process.exit(2);
-    }
-
-    if (options.output.length !== options.entry.length) {
-      log.error('output length are not equal to entry length');
-      process.exit(2);
-    }
-  }
-
-  if (options.output) {
-    [].concat(options.output).forEach((outputDir) => {
-      if (!fs.existsSync(outputDir)) {
-        fs.mkdirSync(outputDir);
-      }
-    });
-  }
-
-  return transformReactIntlUniveralToDi18n(options);
-};
+const fs = require('fs');
+const { transformReactIntlUniveralToDi18n } = require('../../../zti18n-core');
+const mergeOptions = require('../utils/mergeOptions');
+const log = require('../utils/log');
+
+module.exports = function doConvert(programOption) {
+  const options = mergeOptions(programOption, ['entry', 'exclude', 'locales']);
+
+  if (!options.entry) {
+    log.error('no entry is specified');
+    process.exit(2);
+  }
+
+  if (Array.isArray(options.entry)) {
+    if (!Array.isArray(options.output)) {
+      log.error('output should be array too, since entry is array');
+      process.exit(2);
+    }
+
+    if (options.output.length !== options.entry.length) {
+      log.error('output length are not equal to entry length');
+      process.exit(2);
+    }
+  }
+
+  if (options.output) {
+    [].concat(options.output).forEach((outputDir) => {
+      if (!fs.existsSync(outputDir)) {
+        fs.mkdirSync(outputDir);
+      }
+    });
+  }
+
+  return transformReactIntlUniveralToDi18n(options);
+};