ztxkutils 2.10.59 → 2.10.60

package/dist/index.js

@@ -2,7 +2,7 @@ export { d as authority } from './authority-7a91cb9f.js';
 export { d as dataModel } from './dataModel-1fbaff40.js';
 export { t as tools } from './tools-16a7fb45.js';
 export { v as validate } from './validate-18e52490.js';
-export { r as request } from './request-3c906c2d.js';
+export { r as request } from './request-dc69f021.js';
 export { r as reqUrl } from './reqUrl-22b880a4.js';
 import './tslib.es6-35653116.js';
 import 'dayjs';

package/dist/{request-9dc2c20d.js → request-dc69f021.js}

@@ -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/dist/request.d.ts

@@ -15,7 +15,10 @@ export interface IOptions extends AxiosRequestConfig {
     isCancelRepeat?: boolean;
     isCancelNoCompleteRequest?: boolean;
     noInterceptorsResponse?: boolean;
+    isAutonomousCatch?: boolean;
+    autonomousCount?: number;
 }
 export default function request(myOptions: IOptions, jumpCallback?: any, otherOptions?: any): any;
 export declare function clearNoCompleteRequest(): void;
 export declare function clearCatch(): void;
+export declare function clearAutonomousCatch(url: any): void;

package/dist/request.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkutils",
-  "version": "2.10.59",
+  "version": "2.10.60",
   "description": "",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -72,4 +72,4 @@
     "zt-sockjs-client": ">=0.0.1",
     "zt-stompjs": ">=1.0.3"
   }
-}
+}

package/dist/reqUrl-3792afcd.js

@@ -1,82 +0,0 @@
-/**
- * @file 项目基本配置，包括各个环境的请求地址
- */
-// 环境变量
-function getReqUrl(processObj) {
-    var ENV = processObj.REACT_APP_ENV;
-    // api服务器各个环境地址
-    var ZT_API_DEV = processObj.REACT_APP_ZT_API_DEV || 'http://192.168.0.83:8000'; // 开发环境
-    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://172.55.5.101:33013'; // 测试环境 https://192.168.0.135:18012
-    var ZT_FILE_PREVIEW_STAGE = processObj.REACT_APP_ZT_FILE_PREVIEW_STAGE ||
-        'https://dzfile-prod.zmd.com.cn/'; // 阶段性环境 http://192.168.0.134:8012
-    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 };