ztxkutils 2.10.38 → 2.10.40

package/dist/index.js

@@ -1,8 +1,8 @@
 export { c as authority } from './authority-e6bde99f.js';
 export { d as dataModel } from './dataModel-1fbaff40.js';
 export { t as tools } from './tools-09a4d620.js';
-export { v as validate } from './validate-e51e4026.js';
-export { r as request } from './request-8e2b5826.js';
+export { v as validate } from './validate-a06e1fa0.js';
+export { r as request } from './request-ba8abf99.js';
 export { r as reqUrl } from './reqUrl-787dd9e5.js';
 import './tslib.es6-35653116.js';
 import 'dayjs';

package/dist/myIndexDb.d.ts

@@ -0,0 +1 @@
+declare function openDB(dbName: string, version?: number): Promise<unknown>;

package/dist/{request-8e2b5826.js → request-ba8abf99.js}

@@ -2487,6 +2487,8 @@ var isFirstSet = false; // 首次初始化
 var OLD_AUTHORIZATION = 'Basic c3dvcmQ6c3dvcmRfc2VjcmV0';
 var NEW_AUTHORIZATION = 'Basic em1kbXM6em1kbXNfc2VjcmV0';
 var Authorization = OLD_AUTHORIZATION;
+// 用于存储目前状态为pending的请求标识信息 2023-05-15
+var pendingRequest = [];
 function loginRequest(params, InnerAuthorization) {
     return request({
         method: 'POST',
@@ -2712,9 +2714,18 @@ function setInterceptorsResponse(jumpCallback, otherOptions) {
 function setInterceptorsRequest() {
     // 拦截器，拦截响应头信息
     axios.interceptors.request.use(function (config) {
+        var _a;
         if (config.isCancelRepeat) {
             axiosCancel.pendingRequestCancel(config);
         }
+        // 如果需要清除未完成的请求 2023-05-15
+        if (config.isCancelNoCompleteRequest &&
+            !config.cancelToken &&
+            ((_a = config.method) === null || _a === void 0 ? void 0 : _a.toUpperCase()) !== 'POST') {
+            var cancelTokenObj = axios.CancelToken.source();
+            config.cancelToken = cancelTokenObj.token;
+            pendingRequest.push(cancelTokenObj.cancel);
+        }
         return config;
     });
 }
@@ -2868,6 +2879,13 @@ function request(myOptions, jumpCallback, otherOptions) {
     }
     return axios(newOptions);
 }
+// 清除未完成的请求 2023-05-15
+function clearNoCompleteRequest() {
+    pendingRequest.forEach(function (cancel, index) {
+        cancel && cancel();
+    });
+    pendingRequest = [];
+}
 function clearCatch() {
     catchPromiseObj = [];
 }
@@ -2877,7 +2895,8 @@ var request$1 = /*#__PURE__*/Object.freeze({
   OLD_AUTHORIZATION: OLD_AUTHORIZATION,
   NEW_AUTHORIZATION: NEW_AUTHORIZATION,
   'default': request,
+  clearNoCompleteRequest: clearNoCompleteRequest,
   clearCatch: clearCatch
 });
 
-export { NEW_AUTHORIZATION as N, OLD_AUTHORIZATION as O, request as a, clearCatch as c, request$1 as r };
+export { NEW_AUTHORIZATION as N, OLD_AUTHORIZATION as O, request as a, clearCatch as b, clearNoCompleteRequest as c, request$1 as r };

package/dist/request.d.ts

@@ -12,6 +12,8 @@ export interface IOptions extends AxiosRequestConfig {
     noCatchUrl?: string[];
     isCatch?: boolean;
     isCancelRepeat?: boolean;
+    isCancelNoCompleteRequest?: boolean;
 }
 export default function request(myOptions: IOptions, jumpCallback?: any, otherOptions?: any): any;
+export declare function clearNoCompleteRequest(): void;
 export declare function clearCatch(): 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, c as clearCatch, a as default } from './request-8e2b5826.js';
+export { N as NEW_AUTHORIZATION, O as OLD_AUTHORIZATION, b as clearCatch, c as clearNoCompleteRequest, a as default } from './request-ba8abf99.js';
 import './authority-e6bde99f.js';
 import './crypto-c481f616.js';
 import 'crypto';

package/dist/statistic.d.ts

@@ -1,34 +1 @@
-declare const PV_URL_SET: Set<unknown>;
-/**
- * routeUrl: string
- * systemId: string
- * userId: string
- * navigator: string // 浏览器信息 userAgent
- * platform: string // 系统信息
- * memory: string // 内存信息
- * eventKey: string // 事件名
- * eventValue: string // 事件值
- * {
- *  jsHeapSizeLimit: 上下文内可用堆的最大体积，以字节计算。
- *  totalJSHeapSize: 已分配的堆体积，以字节计算。
- *  usedJSHeapSize: 当前 JS 堆活跃段（segment）的体积，以字节计算。
- * }
- */
-declare function getUserOsInfo(userAgent?: string): "Windows 10" | "Windows 8" | "Windows 7" | "Windows Vista" | "Windows XP" | "Windows 2000" | "Mac/iOS" | "UNIX" | "Linux" | "Other";
-declare class MyStatistic {
-    private systemId;
-    private userId;
-    private navigator;
-    private platform;
-    constructor(systemId: any, userId: any);
-    private send;
-    private initPerformance;
-    private errorHandle;
-    private unhandledrejectionHandle;
-    private initError;
-    removeError(): void;
-    pv(): void;
-    event(eventKey: string, eventValue: string): void;
-    error(error: Error, info?: any): void;
-}
-declare const statistic: MyStatistic;
+export {};

package/dist/{validate-e51e4026.js → validate-a06e1fa0.js}

@@ -71,6 +71,19 @@ var commonMessage = {
     passwordMessage: '密码必须包含大小写字母、数字、特殊字符且最小长度为8，且不能出现连续数字或字符，不能出现相同字符，且禁止使用用户账号作为密码',
     spaceMessage: '请勿输入空格',
 };
+function isConsecutiveChars(char1, char2) {
+    var lowerCaseAlphabet = 'abcdefghijklmnopqrstuvwxyz'; // 小写字母
+    var upperCaseAlphabet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'; // 大写字母
+    var numeric = '0123456789'; // 数字
+    // 找到包含两个字符的字符集
+    var alphabet = [lowerCaseAlphabet, upperCaseAlphabet, numeric].find(function (alph) { return alph.includes(char1) && alph.includes(char2); });
+    if (!alphabet) {
+        return false; // 如果两个字符不在同一字符集中，那么它们不可能连续
+    }
+    var index1 = alphabet.indexOf(char1);
+    var index2 = alphabet.indexOf(char2);
+    return Math.abs(index1 - index2) === 1; // 如果两个字符在字符集中的位置相邻，那么它们是连续的
+}
 function validatePassword(password, username) {
     // 用正则表达式检查密码基本规则
     var regex = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^\da-zA-Z]).{8,}$/;
@@ -80,13 +93,26 @@ function validatePassword(password, username) {
             message: '密码中必须包含大小写字母、数字、特殊字符,且长度必须大于8个字符!',
         };
     }
-    // 检查密码中是否有连续的字母或数字
+    // 检查密码中是否有连续的字母或数字 连续超过三次
+    var count = 0;
+    var startChart = 0;
     for (var i = 0; i < password.length - 1; i++) {
-        if (Math.abs(password.charCodeAt(i) - password.charCodeAt(i + 1)) === 1) {
-            return {
-                result: false,
-                message: '密码中有连续的字母或数字!',
-            };
+        if (isConsecutiveChars(password[i], password[i + 1])) {
+            if (count === 0) {
+                startChart = i;
+            }
+            count++;
+            if (count >= 2) {
+                // 密码中不应含有连续的字母或数字
+                return {
+                    result: false,
+                    message: "\u4ECE\u7B2C" + (startChart + 1) + "\u4E2A\u5B57\u7B26\u5F00\u59CB\uFF0C\u6709\u8FDE\u7EED\u8D85\u8FC7\u4E09\u4F4D\u7684\u5B57\u6BCD\u6216\u6570\u5B57!",
+                };
+            }
+        }
+        else {
+            count = 0;
+            startChart = 0;
         }
     }
     // 检查密码中是否有相同的字符

package/dist/validate.js

@@ -1 +1 @@
-export { c as commonMessage, b as validate, a as validatePassword } from './validate-e51e4026.js';
+export { c as commonMessage, b as validate, a as validatePassword } from './validate-a06e1fa0.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkutils",
-  "version": "2.10.38",
+  "version": "2.10.40",
   "description": "",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -49,6 +49,7 @@
   "dependencies": {
     "crypto-js": "^4.1.1",
     "decimal.js-light": "^2.5.1",
+    "dexie": "^3.2.3",
     "js-base64": "^3.6.0",
     "jwt-decode": "^3.1.2",
     "screenfull": "^5.1.0",