ztxkutils 2.10.66-55 → 2.10.66-57

package/dist/fileOperation.d.ts

@@ -43,6 +43,18 @@ export declare function createDownloadUrlNoBase(fileId: string, authToken?: stri
  * @param {string} fileId 文件id
  */
 export declare function createPublicDownloadUrl(apiUrl: string, fileId: string): string;
+/**
+ * @description 生成文件预览路径，不需要权限
+ * @param {string} fileUrl 文件服务器ip端口
+ * @param {string} otherOption.fileId 文件id
+ * @param {string} otherOption.fileName 文件名
+ * @param {boolean} otherOption.encodeNum encode次数
+ */
+export declare function createPublicPreviewUrl(fileUrl: string, { fileId, fileName, encodeNum, }: {
+    fileId: string;
+    fileName: string;
+    encodeNum?: number;
+}): string;
 /**
  * @description 文件预览方法
  * @param {string} fileUrl 文件服务器ip端口
@@ -51,6 +63,11 @@ export declare function createPublicDownloadUrl(apiUrl: string, fileId: string):
  * @param {string} fileName 文件名
  */
 export declare function previewFile(fileUrl: string, fileId: string, otherOption?: any): void;
+export declare function previewPublicFile(fileUrl: string, { fileId, fileName, encodeNum, }: {
+    fileId: string;
+    fileName: string;
+    encodeNum?: number;
+}): void;
 /**
  * @description 批量文件预览方法,只针对图片类型
  * @param {string} fileUrl 文件服务器ip端口
@@ -73,6 +90,14 @@ export declare function createOriginalUrl(fileUrl: string, fileId: string, other
  * @param {string} scale 缩略倍数
  */
 export declare function createThumbnailUrl(apiUrl: string, fileId: string, scale: number, otherOption?: any): string;
+/**
+ * 附件id加密
+ */
+export declare function encryptFileId(fileId: string): string;
+/**
+ * 加密后的附件id encode次数
+ */
+export declare function encodeEncryptedFileId(encryptedFileId: string, encodeNum?: number): string;
 /**
  * 附件预览的文件id加密
  * @param fileId

package/dist/fileOperation.js

@@ -1,5 +1,5 @@
 import { g as getToken } from './authority-7a91cb9f.js';
-import { d as dangerouslySetXss } from './tools-390e3466.js';
+import { d as dangerouslySetXss } from './tools-38e8ca87.js';
 import { a as crypto } from './crypto-c481f616.js';
 import './tslib.es6-35653116.js';
 import 'dayjs';
@@ -210,6 +210,31 @@ function createPublicDownloadUrl(apiUrl, fileId) {
         : apiUrl;
     return _apiUrl + "/api/zmdms-resource/oss/endpoint/public/download-file/" + fileId;
 }
+/**
+ * @description 生成文件预览路径，不需要权限
+ * @param {string} fileUrl 文件服务器ip端口
+ * @param {string} otherOption.fileId 文件id
+ * @param {string} otherOption.fileName 文件名
+ * @param {boolean} otherOption.encodeNum encode次数
+ */
+function createPublicPreviewUrl(fileUrl, _a) {
+    var fileId = _a.fileId, fileName = _a.fileName, _b = _a.encodeNum, encodeNum = _b === void 0 ? 0 : _b;
+    var preFileId = encryptFileId(fileId);
+    // 给附件id加密
+    preFileId = encodeEncryptedFileId(preFileId, encodeNum);
+    var titleName = dangerouslySetXss(fileName);
+    try {
+        titleName = titleName.replace(/[~!@#$%^&*{}|]/g, '');
+    }
+    catch (err) {
+        console.log(err);
+    }
+    titleName = encodeURIComponent(titleName);
+    var _fileUrl = fileUrl.endsWith('/')
+        ? fileUrl.slice(0, fileUrl.length - 1)
+        : fileUrl;
+    return _fileUrl + "/pubicAttchPreview?attachId=" + preFileId + "&titleName=" + titleName;
+}
 /**
  * @description 文件预览方法
  * @param {string} fileUrl 文件服务器ip端口
@@ -251,6 +276,24 @@ function previewFile(fileUrl, fileId, otherOption) {
         window.open(fileUrl + "/attchPreview?attachId=" + fileId + "&Zmdms-Auth=bearer " + token + "&officePreviewType=pdf");
     }
 }
+function previewPublicFile(fileUrl, _a) {
+    var fileId = _a.fileId, fileName = _a.fileName, _b = _a.encodeNum, encodeNum = _b === void 0 ? 0 : _b;
+    var preFileId = encryptFileId(fileId);
+    // 给附件id加密
+    preFileId = encodeEncryptedFileId(preFileId, encodeNum);
+    var titleName = dangerouslySetXss(fileName);
+    try {
+        titleName = titleName.replace(/[~!@#$%^&*{}|]/g, '');
+    }
+    catch (err) {
+        console.log(err);
+    }
+    titleName = encodeURIComponent(titleName);
+    var _fileUrl = fileUrl.endsWith('/')
+        ? fileUrl.slice(0, fileUrl.length - 1)
+        : fileUrl;
+    window.open(_fileUrl + "/pubicAttchPreview?attachId=" + preFileId + "&titleName=" + titleName);
+}
 /**
  * @description 批量文件预览方法,只针对图片类型
  * @param {string} fileUrl 文件服务器ip端口
@@ -332,6 +375,24 @@ function createThumbnailUrl(apiUrl, fileId, scale, otherOption) {
     var token = getToken() || (otherOption === null || otherOption === void 0 ? void 0 : otherOption.authTOken);
     return _apiUrl + "/api/zmdms-resource/oss/endpoint/thumbnail/" + fileId + "?scale=" + scale + "&Zmdms-Auth=bearer " + token;
 }
+/**
+ * 附件id加密
+ */
+function encryptFileId(fileId) {
+    return crypto.encrypt(fileId);
+}
+/**
+ * 加密后的附件id encode次数
+ */
+function encodeEncryptedFileId(encryptedFileId, encodeNum) {
+    if (encodeNum === void 0) { encodeNum = 0; }
+    var resultFileId = encryptedFileId;
+    while (!!encodeNum) {
+        encodeNum--;
+        resultFileId = encodeURIComponent(resultFileId);
+    }
+    return resultFileId;
+}
 /**
  * 附件预览的文件id加密
  * @param fileId
@@ -358,4 +419,4 @@ function encodeOneFileIdByDownload(fileId) {
     return encodeURIComponent(crypto.encrypt(fileId));
 }
 
-export { batchDownloadFileCallBack, batchPreviewFile, createDownloadUrl, createDownloadUrlNoBase, createOriginalUrl, createPublicDownloadUrl, createThumbnailUrl, downloadFile, downloadFileCallBack, downloadPublicFile, encodeFileIdByDownload, encodeFileIdByPreview, encodeOneFileIdByDownload, previewFile };
+export { batchDownloadFileCallBack, batchPreviewFile, createDownloadUrl, createDownloadUrlNoBase, createOriginalUrl, createPublicDownloadUrl, createPublicPreviewUrl, createThumbnailUrl, downloadFile, downloadFileCallBack, downloadPublicFile, encodeEncryptedFileId, encodeFileIdByDownload, encodeFileIdByPreview, encodeOneFileIdByDownload, encryptFileId, previewFile, previewPublicFile };

package/dist/hooks/useHistory.d.ts

@@ -2,7 +2,9 @@
  * @author 陈亚雄
  * @description 代理路由的push方法，可以用window.open的方式跳转页面
  */
-export declare function useHistory(routeBasename?: string): any;
+export declare function useHistory(routeBasename?: string, options?: {
+    pushCallback?: any;
+}): any;
 /**
  * @author 陈亚雄
  * @description 设置浏览器标题信息

package/dist/hooks.js

@@ -6,7 +6,7 @@ import { message } from 'ztxkui';
 import axios from 'axios';
 import './fileOperation.js';
 import './authority-7a91cb9f.js';
-import './tools-390e3466.js';
+import './tools-38e8ca87.js';
 import 'dayjs';
 import './crypto-c481f616.js';
 import 'crypto';

package/dist/index.js

@@ -1,9 +1,9 @@
 export { d as authority } from './authority-7a91cb9f.js';
 export { d as dataModel } from './dataModel-f1ef06bc.js';
-export { t as tools } from './tools-390e3466.js';
+export { t as tools } from './tools-38e8ca87.js';
 export { v as validate } from './validate-2138d94a.js';
-export { r as request } from './request-40e9ca7b.js';
-export { r as reqUrl } from './reqUrl-ea7ef876.js';
+export { r as request } from './request-934324cc.js';
+export { r as reqUrl } from './reqUrl-e44a69ed.js';
 import './i18next.js';
 import './tslib.es6-35653116.js';
 import 'dayjs';

package/dist/print.js

@@ -58,6 +58,40 @@ function printCurrentDom(_a) {
     document.head.appendChild(styleDom);
     window.print();
 }
+function getTextDimensions(text, fontSize) {
+    var width, height;
+    try {
+        // 创建一个临时元素
+        var tempElement = document.createElement('div');
+        // 设置元素内容为传入的文本
+        tempElement.textContent = text;
+        // 设置样式使其不可见且不影响页面布局
+        tempElement.style.position = 'absolute';
+        tempElement.style.visibility = 'hidden'; // 元素不可见但仍占据空间
+        tempElement.style.opacity = '0'; // 完全透明
+        tempElement.style.pointerEvents = 'none'; // 不响应鼠标事件
+        tempElement.style.whiteSpace = 'nowrap'; // 防止文本换行影响宽度测量
+        tempElement.style.fontSize = fontSize;
+        tempElement.style.fontFamily = '微软雅黑';
+        tempElement.style.padding = '50px 10px';
+        // 插入到body中
+        document.body.appendChild(tempElement);
+        // 获取元素的宽高
+        width = tempElement.offsetWidth;
+        height = tempElement.offsetHeight;
+        // 从DOM中移除元素
+        document.body.removeChild(tempElement);
+    }
+    catch (err) {
+        width = text.length * 22;
+        height = text.length * 9;
+    }
+    // 返回测量结果
+    return {
+        width: width > 520 ? 520 : width < 240 ? 240 : width,
+        height: height > 200 ? 200 : height < 100 ? 100 : height,
+    };
+}
 /**
  * 创建文本水印图片
  * @param waterText 水印文本
@@ -78,14 +112,18 @@ function createWaterHandle(obj) {
     var defaultWaterText = instance.t('浙商中拓');
     var _a = obj || {}, waterText = _a.waterText, opacity = _a.opacity, fontSize = _a.fontSize, cavansWidth = _a.cavansWidth, cavansHeight = _a.cavansHeight;
     var canvas = document.createElement('canvas');
+    // 如何计算水印的大小。创建一个元素插入到body中，获取到宽高后移除
+    var _b = getTextDimensions(waterText, fontSize || '18px'), textWidth = _b.width, textHeight = _b.height;
+    // 之前的宽度是文本长度 * 22
     var defaultCanvasWidth = waterText
         ? waterText.length > 10
-            ? waterText.length * 22
+            ? textWidth
             : 240
         : 240;
+    // 之前的高度是文本长度 * 9
     var defaultCanvasHeight = waterText
         ? waterText.length > 10
-            ? waterText.length * 9
+            ? textHeight
             : 100
         : 100;
     canvas.width = cavansWidth || defaultCanvasWidth;
@@ -393,14 +431,20 @@ function htmlToPdfNoCanvas(_a) {
                                                                     autoPaging: 'text',
                                                                     margin: [pageMarginY, pageMarginX, pageMarginY, pageMarginX],
                                                                     width: pageWidth,
-                                                                    windowWidth: pageWidth,
+                                                                    // windowWidth: pageWidth,
+                                                                    windowWidth: 1050,
                                                                     callback: function (res) {
                                                                         // 添加呈现的HTML所需的页面（从第2页开始）
-                                                                        for (var i_1 = 2, j = res.internal.getNumberOfPages(); i_1 <= j; i_1++) {
-                                                                            pdf.addPage(pageFormat, pageOrient);
-                                                                        }
-                                                                        for (var i_2 = 1, j = res.internal.getNumberOfPages(); i_2 <= j; i_2++) {
-                                                                            pdf.setPage(i_2);
+                                                                        // 注释掉这里导致多出一页空白页
+                                                                        // for (
+                                                                        //   let i = 2, j = (res as any).internal.getNumberOfPages();
+                                                                        //   i <= j;
+                                                                        //   i++
+                                                                        // ) {
+                                                                        //   pdf.addPage(pageFormat, pageOrient);
+                                                                        // }
+                                                                        for (var i_1 = 1, j = res.internal.getNumberOfPages(); i_1 <= j; i_1++) {
+                                                                            pdf.setPage(i_1);
                                                                             // 添加水印
                                                                             if (isAddWater) {
                                                                                 setPdfWater(pdf, waterBase64, imgWidth, imgHeight);
@@ -495,12 +539,17 @@ function htmlToPdfNoCanvas(_a) {
                             autoPaging: 'text',
                             margin: [pageMarginY, pageMarginX, pageMarginY, pageMarginX],
                             width: pageWidth_1,
-                            windowWidth: pageWidth_1,
+                            // windowWidth: pageWidth,
+                            windowWidth: 1050,
                             callback: function (res) {
                                 // 添加呈现的HTML所需的页面（从第2页开始）
-                                for (var i = 2, j = res.internal.getNumberOfPages(); i <= j; i++) {
-                                    pdf_3.addPage(pageFormat, pageOrient);
-                                }
+                                // for (
+                                //   let i = 2, j = (res as any).internal.getNumberOfPages();
+                                //   i <= j;
+                                //   i++
+                                // ) {
+                                //   pdf.addPage(pageFormat, pageOrient);
+                                // }
                                 for (var i = 1, j = res.internal.getNumberOfPages(); i <= j; i++) {
                                     pdf_3.setPage(i);
                                     // 添加水印

package/dist/{reqUrl-22b880a4.js → reqUrl-e44a69ed.js}

@@ -13,10 +13,11 @@ function getReqUrl(processObj) {
     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_DEV = processObj.REACT_APP_ZT_FILE_PREVIEW_DEV || 'http://172.28.105.84:8012'; // 开发环境
+    var ZT_FILE_PREVIEW_TEST = processObj.REACT_APP_ZT_FILE_PREVIEW_TEST ||
+        'http://preview-test.zmdms.com.cn:30079'; // 测试环境 http://172.55.5.101:33013
     var ZT_FILE_PREVIEW_STAGE = processObj.REACT_APP_ZT_FILE_PREVIEW_STAGE ||
-        'https://dzfile-prod.zmd.com.cn/'; // 阶段性环境 http://192.168.0.134:8012
+        'http://preview-stage.zmdms.com.cn:30079'; // 阶段性环境 https://dzfile-prod.zmd.com.cn/
     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 ||

package/dist/reqUrl.js

@@ -1 +1 @@
-export { g as getReqUrl } from './reqUrl-ea7ef876.js';
+export { g as getReqUrl } from './reqUrl-e44a69ed.js';

package/dist/{request-d1972b41.js → request-2ae9cfae.js}

@@ -2471,7 +2471,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调用结束时间
@@ -2506,11 +2506,13 @@ 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(instance.t('刷新token遭到频繁调用，请联系管理员查看是否接口权限出现问题，可能是{{slot0}}接口出现问题', { slot0: response === null || response === void 0 ? void 0 : response.config.url }), 5);
@@ -2547,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',
@@ -2562,7 +2565,10 @@ function refreshTokenRequst(jumpCallback, Authorization) {
             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 {
@@ -2608,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 = [];
@@ -2636,7 +2642,7 @@ function setInterceptorsResponse(jumpCallback, otherOptions) {
             return Promise.reject(response);
         }
     }, function (error) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         // catchPromiseObj = [];
         console.error(error);
         var errRes = error === null || error === void 0 ? void 0 : error.response;
@@ -2710,7 +2716,10 @@ function setInterceptorsResponse(jumpCallback, otherOptions) {
             return Promise.reject(error);
         }
         // 接口401处理，401状态后不需要重新刷新token，直接退出登录
-        if ((errRes === null || errRes === void 0 ? void 0 : errRes.status) === 401 && !isRefreshToken) {
+        var resultRefreshToken = typeof ((_g = error === null || error === void 0 ? void 0 : error.config) === null || _g === void 0 ? void 0 : _g.isRefreshToken) === 'boolean'
+            ? (_h = error === null || error === void 0 ? void 0 : error.config) === null || _h === void 0 ? void 0 : _h.isRefreshToken
+            : isRefreshToken;
+        if ((errRes === null || errRes === void 0 ? void 0 : errRes.status) === 401 && !resultRefreshToken) {
             if (!isExpiration) {
                 isExpiration = true;
                 removeToken();
@@ -2778,14 +2787,14 @@ function transformObj(obj) {
     return obj;
 }
 function request(myOptions, jumpCallback, otherOptions) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+    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, _q = myOptions.noCatchUrl, noCatchUrl = _q === void 0 ? [] : _q, isCatch = myOptions.isCatch, mustCatch = myOptions.mustCatch, isAutonomousCatch = myOptions.isAutonomousCatch, _r = myOptions.autonomousCount, autonomousCount = _r === void 0 ? 1 : _r, autonomousKey = myOptions.autonomousKey, options = __rest(myOptions, ["encryptionType", "isTimeoutMessage", "isForceRequest", "noCatchUrl", "isCatch", "mustCatch", "isAutonomousCatch", "autonomousCount", "autonomousKey"]);
+    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;
@@ -2820,10 +2829,6 @@ function request(myOptions, jumpCallback, otherOptions) {
     }
     // 将传入配置与默认配置混合
     var newOptions = __assign(__assign(__assign({}, defaultOptions), options), { autonomousKey: autonomousKey, 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' ||
@@ -2846,12 +2851,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') {
@@ -2884,7 +2883,7 @@ function request(myOptions, jumpCallback, otherOptions) {
                 {
                     params: newOptions.params,
                     promiseObj: result,
-                    method: (_l = newOptions.method) === null || _l === void 0 ? void 0 : _l.toUpperCase(),
+                    method: (_h = newOptions.method) === null || _h === void 0 ? void 0 : _h.toUpperCase(),
                 },
             ];
             return result;
@@ -2918,15 +2917,15 @@ function request(myOptions, jumpCallback, otherOptions) {
             item.push({
                 params: newOptions.params,
                 promiseObj: result,
-                method: (_m = newOptions.method) === null || _m === void 0 ? void 0 : _m.toUpperCase(),
+                method: (_j = newOptions.method) === null || _j === void 0 ? void 0 : _j.toUpperCase(),
             });
             return result;
         }
     }
     // 缓存本次宏任务下的GET请求,并且不是以/page结尾的列表分页接口
     // 并且不是强制请求，强制请求需要
-    if (((((_o = newOptions.method) === null || _o === void 0 ? void 0 : _o.toUpperCase()) === 'GET' &&
-        !((_p = newOptions.url) === null || _p === void 0 ? void 0 : _p.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) &&