ztxkutils 2.10.64 → 2.10.66-1

package/dist/fileOperation.js

@@ -1,13 +1,17 @@
 import { g as getToken } from './authority-7a91cb9f.js';
 import { d as dangerouslySetXss } from './tools-390e3466.js';
+import { a as crypto } from './crypto-c481f616.js';
 import './tslib.es6-35653116.js';
 import 'dayjs';
+import 'crypto';
 
 /**
  * @author cyx
  * @description 文件操作相关
  */
 function downloadFile(apiUrl, fileId, fileName, otherOption) {
+    // 给附件id加密
+    fileId = encodeURIComponent(crypto.encrypt(fileId));
     var xhr = new XMLHttpRequest();
     var token = '';
     var addWaterMark = 'true';
@@ -42,6 +46,8 @@ function downloadFile(apiUrl, fileId, fileName, otherOption) {
     xhr.send();
 }
 function downloadFileCallBack(apiUrl, fileId, fileName, otherOption) {
+    // 给附件id加密
+    fileId = encodeURIComponent(crypto.encrypt(fileId));
     var _a = otherOption || {}, authToken = _a.authToken, callbackAfter = _a.callbackAfter, callbackError = _a.callbackError, _b = _a.addWaterMark, addWaterMark = _b === void 0 ? true : _b;
     var xhr = new XMLHttpRequest();
     var token = getToken() || authToken;
@@ -77,6 +83,8 @@ function downloadFileCallBack(apiUrl, fileId, fileName, otherOption) {
  * 批量下载
  */
 function batchDownloadFileCallBack(apiUrl, fileIds, fileNames, otherOption) {
+    // 给附件id加密
+    fileIds = encodeURIComponent(crypto.encrypt(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 xhr = new XMLHttpRequest();
     var token = getToken() || authToken;
@@ -117,6 +125,8 @@ function batchDownloadFileCallBack(apiUrl, fileIds, fileNames, otherOption) {
  * @param {string} fileName 文件名
  */
 function downloadPublicFile(apiUrl, fileId, fileName, otherOption) {
+    // 给附件id加密
+    fileId = encodeURIComponent(crypto.encrypt(fileId));
     var _a = otherOption || {}, callbackAfter = _a.callbackAfter, callbackError = _a.callbackError;
     var xhr = new XMLHttpRequest();
     var _apiUrl = apiUrl.endsWith('/')
@@ -153,6 +163,8 @@ function downloadPublicFile(apiUrl, fileId, fileName, otherOption) {
  * @param {string} fileId 文件id
  */
 function createDownloadUrl(apiUrl, fileId, authToken) {
+    // 给附件id加密
+    fileId = encodeURIComponent(crypto.encrypt(fileId));
     var token = getToken() || authToken;
     var _apiUrl = apiUrl.endsWith('/')
         ? apiUrl.slice(0, apiUrl.length - 1)
@@ -165,6 +177,8 @@ function createDownloadUrl(apiUrl, fileId, authToken) {
  * @param {string} fileId 文件id
  */
 function createDownloadUrlNoBase(fileId, authToken) {
+    // 给附件id加密
+    fileId = encodeURIComponent(crypto.encrypt(fileId));
     var token = getToken() || authToken;
     return "/api/zmdms-resource/oss/endpoint/download-file/" + fileId + "?Zmdms-Auth=bearer " + token;
 }
@@ -174,6 +188,8 @@ function createDownloadUrlNoBase(fileId, authToken) {
  * @param {string} fileId 文件id
  */
 function createPublicDownloadUrl(apiUrl, fileId) {
+    // 给附件id加密
+    fileId = encodeURIComponent(crypto.encrypt(fileId));
     var _apiUrl = apiUrl.endsWith('/')
         ? apiUrl.slice(0, apiUrl.length - 1)
         : apiUrl;
@@ -187,6 +203,8 @@ function createPublicDownloadUrl(apiUrl, fileId) {
  * @param {string} fileName 文件名
  */
 function previewFile(fileUrl, fileId, otherOption) {
+    // 给附件id加密
+    fileId = encodeURIComponent(crypto.encrypt(fileId));
     var token = '';
     if (typeof otherOption === 'object') {
         token = getToken() || (otherOption === null || otherOption === void 0 ? void 0 : otherOption.authToken);
@@ -225,6 +243,8 @@ function previewFile(fileUrl, fileId, otherOption) {
  * @param {string} fileName 文件名
  */
 function batchPreviewFile(fileUrl, fileId, otherOption) {
+    // 给附件id加密
+    fileId = encodeURIComponent(crypto.encrypt(fileId));
     var token = '';
     if (typeof otherOption === 'object') {
         token = getToken() || (otherOption === null || otherOption === void 0 ? void 0 : otherOption.authToken);

package/dist/hooks.js

@@ -7,6 +7,8 @@ import './fileOperation.js';
 import './authority-7a91cb9f.js';
 import './tools-390e3466.js';
 import 'dayjs';
+import './crypto-c481f616.js';
+import 'crypto';
 
 function useTableLinkage(_a) {
     var records = _a.records, callbackPromise = _a.callbackPromise, dependencies = _a.dependencies, devDependencies = _a.devDependencies;

package/dist/print.d.ts

@@ -31,7 +31,7 @@ export declare function htmlToPdf({ pageClassName, dom, pdfName, isShowPage, noW
     imgPositionX?: number;
     waterText?: string;
 }): Promise<jsPDF>;
-export declare function htmlToPdfUseCanvas({ pageClassName, dom, pdfName, isShowPage, isOnlyOne, noWater, pdfOptions, imgPositionX, isDownload, }: {
+export declare function htmlToPdfUseCanvas({ pageClassName, dom, pdfName, isShowPage, isOnlyOne, noWater, pdfOptions, imgPositionX, isDownload, isAutoPageCount, }: {
     pageClassName?: string;
     dom: HTMLElement;
     pdfName: string;
@@ -41,6 +41,7 @@ export declare function htmlToPdfUseCanvas({ pageClassName, dom, pdfName, isShow
     pdfOptions?: any;
     imgPositionX?: number;
     isDownload?: boolean;
+    isAutoPageCount?: boolean;
 }): Promise<{
     pdfs: any;
     pdfBase64: any;

package/dist/print.js

@@ -232,7 +232,7 @@ function htmlToPdf(_a) {
     }
 }
 function htmlToPdfUseCanvas(_a) {
-    var pageClassName = _a.pageClassName, dom = _a.dom, pdfName = _a.pdfName, isShowPage = _a.isShowPage, isOnlyOne = _a.isOnlyOne, noWater = _a.noWater, pdfOptions = _a.pdfOptions, imgPositionX = _a.imgPositionX, isDownload = _a.isDownload;
+    var pageClassName = _a.pageClassName, dom = _a.dom, pdfName = _a.pdfName, isShowPage = _a.isShowPage, isOnlyOne = _a.isOnlyOne, noWater = _a.noWater, pdfOptions = _a.pdfOptions, imgPositionX = _a.imgPositionX, isDownload = _a.isDownload; _a.isAutoPageCount;
     var allDom = document.querySelectorAll(pageClassName ? pageClassName : '.html2canvas-container-page');
     var format = (pdfOptions === null || pdfOptions === void 0 ? void 0 : pdfOptions.format) || [632.28, 841.89];
     var _pdfOptions = __assign({ unit: 'pt', format: format }, (pdfOptions || {}));

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

@@ -0,0 +1 @@
+export {};

package/dist/useFileIdToBase64.js

@@ -4,6 +4,8 @@ import './authority-7a91cb9f.js';
 import './tools-390e3466.js';
 import './tslib.es6-35653116.js';
 import 'dayjs';
+import './crypto-c481f616.js';
+import 'crypto';
 
 /**
  * 图片附件id转base64字符串

package/package.json

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