ztxkutils 2.10.20 → 2.10.22

package/dist/fileOperation.js

@@ -1,8 +1,7 @@
 import { g as getToken } from './authority-e6bde99f.js';
-import { d as dangerouslySetXss } from './tools-5541a681.js';
-import './tslib.es6-f9459658.js';
+import { d as dangerouslySetXss } from './tools-42d3993e.js';
+import './tslib.es6-35653116.js';
 import 'dayjs';
-import 'number-precision';
 
 /**
  * @author cyx

package/dist/hooks.js

@@ -1,11 +1,10 @@
-import { _ as __assign, c as __awaiter, d as __generator } from './tslib.es6-f9459658.js';
+import { _ as __assign, b as __awaiter, c as __generator } from './tslib.es6-35653116.js';
 import { useState, useEffect, useRef, useCallback } from 'react';
 export { default as useFileIdToBase64 } from './useFileIdToBase64.js';
 import './fileOperation.js';
 import './authority-e6bde99f.js';
-import './tools-5541a681.js';
+import './tools-42d3993e.js';
 import 'dayjs';
-import 'number-precision';
 
 function useTableLinkage(_a) {
     var records = _a.records, callbackPromise = _a.callbackPromise, dependencies = _a.dependencies, devDependencies = _a.devDependencies;

package/dist/index.js

@@ -1,12 +1,11 @@
 export { c as authority } from './authority-e6bde99f.js';
 export { d as dataModel } from './dataModel-1fbaff40.js';
-export { t as tools } from './tools-5541a681.js';
+export { t as tools } from './tools-42d3993e.js';
 export { v as validate } from './validate-6e735536.js';
-export { r as request } from './request-5ad0262d.js';
+export { r as request } from './request-bf07dd24.js';
 export { r as reqUrl } from './reqUrl-787dd9e5.js';
-import './tslib.es6-f9459658.js';
+import './tslib.es6-35653116.js';
 import 'dayjs';
-import 'number-precision';
 import 'axios';
 import 'ztxkui';
 import './crypto-c481f616.js';

package/dist/print.js

@@ -1,4 +1,4 @@
-import { a as __spreadArray, _ as __assign, c as __awaiter, d as __generator } from './tslib.es6-f9459658.js';
+import { d as __spreadArray, _ as __assign, b as __awaiter, c as __generator } from './tslib.es6-35653116.js';
 import { jsPDF } from 'jspdf';
 import html2canvas from 'html2canvas';
 

package/dist/{request-5ad0262d.js → request-bf07dd24.js}

@@ -1,4 +1,4 @@
-import { b as __rest, _ as __assign } from './tslib.es6-f9459658.js';
+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';
@@ -2563,6 +2563,21 @@ function setInterceptorsResponse(jumpCallback) {
         // catchPromiseObj = [];
         console.error(error);
         var errRes = error === null || error === void 0 ? void 0 : error.response;
+        /** 如果接口出错了，那么清理掉这个错误的接口 */
+        var item = catchPromiseObj.findIndex(function (item) {
+            return isEqual_1({
+                url: item.url,
+                params: item.params,
+            }, {
+                url: error === null || error === void 0 ? void 0 : error.config.url,
+                params: error === null || error === void 0 ? void 0 : error.config.params,
+            });
+        });
+        if (item !== -1) {
+            catchPromiseObj.splice(item, 1);
+        }
+        console.log(error === null || error === void 0 ? void 0 : error.config, catchPromiseObj);
+        /** 如果接口出错了，那么清理掉这个错误的接口 */
         // 超时异常统一处理，超时的异常没有response值，只能通过toString处理
         if (!errRes && error.toString().indexOf(timeoutNum + "ms") !== -1) {
             if (!isMessage) {
@@ -2660,13 +2675,13 @@ function transformObj(obj) {
     return obj;
 }
 function request(myOptions, jumpCallback) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     if (!isFirstSet) {
         // setInterceptorsRequest();
         setInterceptorsResponse(jumpCallback);
         isFirstSet = true;
     }
-    var encryptionType = myOptions.encryptionType, isTimeoutMessage = myOptions.isTimeoutMessage, options = __rest(myOptions, ["encryptionType", "isTimeoutMessage"]);
+    var encryptionType = myOptions.encryptionType, isTimeoutMessage = myOptions.isTimeoutMessage, isForceRequest = myOptions.isForceRequest, options = __rest(myOptions, ["encryptionType", "isTimeoutMessage", "isForceRequest"]);
     timeoutNum =
         typeof myOptions.timeout === 'number' ? myOptions.timeout : timeoutNum;
     __isTimeoutMessage = isTimeoutMessage;
@@ -2742,10 +2757,12 @@ function request(myOptions, jumpCallback) {
             };
         }
     }
-    // 缓存本次宏任务下的GET请求
-    if (((_h = newOptions.method) === null || _h === void 0 ? void 0 : _h.toUpperCase()) === 'GET') {
+    // 缓存本次宏任务下的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'))) {
         // 能不能找到，url与参数都一样得数据
-        var item = catchPromiseObj.find(function (item) {
+        var index = catchPromiseObj.findIndex(function (item) {
             return isEqual_1({
                 url: item.url,
                 params: item.params,
@@ -2754,7 +2771,13 @@ function request(myOptions, jumpCallback) {
                 params: newOptions.params,
             });
         });
-        if (item) {
+        // 如果是强制请求，并且之前有缓存 那么删除掉之前的缓存
+        if (isForceRequest && index !== -1) {
+            catchPromiseObj.splice(index, 1);
+            index = -1;
+        }
+        if (index !== -1) {
+            var item = catchPromiseObj[index];
             return item === null || item === void 0 ? void 0 : item.promiseObj;
         }
         else {

package/dist/request.d.ts

@@ -6,6 +6,7 @@ export interface IOptions extends AxiosRequestConfig {
     isFormData?: boolean;
     encryptionType?: 'aes' | 'des' | boolean;
     isTimeoutMessage?: boolean;
+    isForceRequest?: boolean;
 }
 export default function request(myOptions: IOptions, jumpCallback?: any): any;
 export declare function clearCatch(): void;

package/dist/request.js

@@ -1,7 +1,7 @@
-import './tslib.es6-f9459658.js';
+import './tslib.es6-35653116.js';
 import 'axios';
 import 'ztxkui';
-export { c as clearCatch, a as default } from './request-5ad0262d.js';
+export { c as clearCatch, a as default } from './request-bf07dd24.js';
 import './authority-e6bde99f.js';
 import './crypto-c481f616.js';
 import 'crypto';