ztxkutils 2.10.66-27-beta → 2.10.66-29

package/dist/{request-986d7090.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, _k, _l, _m;
+    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, _o = myOptions.noCatchUrl, noCatchUrl = _o === void 0 ? [] : _o, 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' && !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' ||
@@ -2832,12 +2833,6 @@ function request(myOptions, jumpCallback, otherOptions) {
             newOptions.headers = __assign({ 'Content-Type': 'application/json' }, newOptions.headers);
         }
     }
-    // 对Zmdms-Auth特殊处理
-    if (((_h = newOptions.headers) === null || _h === void 0 ? void 0 : _h['Zmdms-Auth']) &&
-        !((_j = newOptions.headers) === null || _j === void 0 ? void 0 : _j['Zmdms-Auth'].includes('bearer'))) {
-        newOptions.headers['Zmdms-Auth'] =
-            'bearer ' + ((_k = newOptions.headers) === null || _k === void 0 ? void 0 : _k['Zmdms-Auth']);
-    }
     // 将参数进行aes加密
     if (newOptions.data) {
         if (encryptionType === true || encryptionType === 'aes') {
@@ -2859,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 ((((_l = newOptions.method) === null || _l === void 0 ? void 0 : _l.toUpperCase()) === 'GET' &&
-        !((_m = newOptions.url) === null || _m === void 0 ? void 0 : _m.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({
@@ -2909,6 +2954,9 @@ function clearNoCompleteRequest() {
 }
 function clearCatch() {
     catchPromiseObj = [];
+}
+function clearAutonomousCatch(url) {
+    autonomousCatchingPromiseObj[url] = undefined;
 }
 
 var request$1 = /*#__PURE__*/Object.freeze({
@@ -2917,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/useHistory.js

@@ -126,6 +126,13 @@ function setSession(name, value) {
     sessionStorage.setItem(name, value);
 }
 function getSession(name) {
+    // 这里有两种场景需要处理：
+    // 1. 从统一门户单点到流程中心，流程中心嵌入的表单是不需要权限控制的。
+    // 因为这里认为，既然待办到了某人那里，那么这个路由的不管某人是否有权限，都需要能够查看。
+    // 2. 第二种情况，就是到了流程这里后，再跳转到其他页面的权限控制。
+    // 这里认为，跟流程表单关联的页面都不应该做权限控制。因为是跟流程相关的。
+    // 处理第一个问题的解决方案是：流程中心会通过iframe传递一个标识给子应用，子应用来设置一些逻辑。
+    // 处理第二个问题的解决方案是：通过opener来获取来源地址，来源地址如果是正确的，那么也应该权限通过。
     if (window.opener && Object.getOwnPropertyNames(window.opener).length > 0) {
         // let v = ROUTER_FILTER_RULES_VALUE;
         // try {

package/dist/{validate-21164759.js → validate-4e0272c6.js}

@@ -25,7 +25,9 @@ var validate = {
      */
     // phoneValidate: /^1(3\d|4\d|5\d|6\d|7\d|8\d|9\d)\d{8}$/,
     // 数字 横线 长度 0 - 15位/^([0-9])|(\-)*$/
-    phoneValidate: /^[0-9\-]{0,15}$/,
+    // /^[0-9\-]{0,15}$/ 老版
+    //  /^(?:\+?\d{1,20})$/g
+    phoneValidate: /^(?:\+?\d{1,20})$/g,
     /**
      * @description 短信验证码 接受11位手机号
      */

package/dist/{validate-2de5a28f.js → validate-eccfa73c.js}

@@ -25,7 +25,10 @@ var validate = {
      */
     // phoneValidate: /^1(3\d|4\d|5\d|6\d|7\d|8\d|9\d)\d{8}$/,
     // 数字 横线 长度 0 - 15位/^([0-9])|(\-)*$/
+    // /^[0-9\-]{0,15}$/ 老版
+    //  /^(?:\+?\d{1,20})$/g
     phoneValidate: /^[0-9\-]{0,15}$/,
+    abroadPhoneValidate: /^(?:\+?\d{1,20})$/g,
     /**
      * @description 短信验证码 接受11位手机号
      */

package/dist/validate.d.ts

@@ -22,6 +22,7 @@ declare const validate: {
      * @description 电话号码验证
      */
     phoneValidate: RegExp;
+    abroadPhoneValidate: RegExp;
     /**
      * @description 短信验证码 接受11位手机号
      */

package/dist/validate.js

@@ -1,2 +1,2 @@
 import './i18next.js';
-export { c as commonMessage, b as validate, a as validatePassword } from './validate-21164759.js';
+export { c as commonMessage, b as validate, a as validatePassword } from './validate-eccfa73c.js';

package/package.json

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

package/dist/dataModel-914b6226.js

@@ -1,26 +0,0 @@
-import instance from './i18next.js';
-
-/**
- * @description 数据模型创建
- */
-function createSuccessModel(data, message) {
-    return {
-        data: data,
-        message: message || instance.t('数据请求成功'),
-        success: true,
-    };
-}
-function createErrorModel(message) {
-    return {
-        message: message || instance.t('数据请求失败'),
-        success: false,
-    };
-}
-
-var dataModel = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  createSuccessModel: createSuccessModel,
-  createErrorModel: createErrorModel
-});
-
-export { createErrorModel as a, createSuccessModel as c, dataModel as d };