ztxkutils 2.10.36 → 2.10.38

package/dist/index.js

@@ -1,7 +1,7 @@
 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-6e735536.js';
+export { v as validate } from './validate-e51e4026.js';
 export { r as request } from './request-8e2b5826.js';
 export { r as reqUrl } from './reqUrl-787dd9e5.js';
 import './tslib.es6-35653116.js';

package/dist/statistic.d.ts

@@ -0,0 +1,34 @@
+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;

package/dist/{validate-6e735536.js → validate-e51e4026.js}

@@ -40,7 +40,8 @@ var validate = {
     /**
      * @description 密码验证
      */
-    passwordValidate: /^(?![0-9]+$)(?![a-z]+$)(?![A-Z]+$)(?!([^(0-9a-zA-Z)])+$)^.{8,16}$/,
+    // passwordValidate: /^(?![0-9]+$)(?![a-z]+$)(?![A-Z]+$)(?!([^(0-9a-zA-Z)])+$)^.{8,16}$/,
+    passwordValidate: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^\da-zA-Z]).{8,}$/,
     /**
      * @description 空格验证
      */
@@ -66,14 +67,54 @@ var commonMessage = {
     phoneMessage: '请输入正确的手机号',
     idCardMessage: '请输入正确的身份证',
     emailMessage: '请输入正确的邮箱',
-    passwordMessage: '密码由8-16位的字母+数字，字母+特殊字符，数字+特殊字符组成',
+    // passwordMessage: '密码由8-16位的字母+数字，字母+特殊字符，数字+特殊字符组成',
+    passwordMessage: '密码必须包含大小写字母、数字、特殊字符且最小长度为8，且不能出现连续数字或字符，不能出现相同字符，且禁止使用用户账号作为密码',
     spaceMessage: '请勿输入空格',
-};
+};
+function validatePassword(password, username) {
+    // 用正则表达式检查密码基本规则
+    var regex = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^\da-zA-Z]).{8,}$/;
+    if (!regex.test(password)) {
+        return {
+            result: false,
+            message: '密码中必须包含大小写字母、数字、特殊字符,且长度必须大于8个字符!',
+        };
+    }
+    // 检查密码中是否有连续的字母或数字
+    for (var i = 0; i < password.length - 1; i++) {
+        if (Math.abs(password.charCodeAt(i) - password.charCodeAt(i + 1)) === 1) {
+            return {
+                result: false,
+                message: '密码中有连续的字母或数字!',
+            };
+        }
+    }
+    // 检查密码中是否有相同的字符
+    var uniqueChars = new Set(password.split(''));
+    if (uniqueChars.size !== password.length) {
+        return {
+            result: false,
+            message: '密码中有相同的字符!',
+        };
+    }
+    // 检查密码是否与用户名相同
+    if (password === username) {
+        return {
+            result: false,
+            message: '密码与用户名相同!',
+        };
+    }
+    // 如果通过了所有的检查，则返回true
+    return {
+        result: true,
+    };
+}
 
 var validate$1 = /*#__PURE__*/Object.freeze({
   __proto__: null,
+  validatePassword: validatePassword,
   validate: validate,
   commonMessage: commonMessage
 });
 
-export { validate as a, commonMessage as c, validate$1 as v };
+export { validatePassword as a, validate as b, commonMessage as c, validate$1 as v };

package/dist/validate.d.ts

@@ -55,4 +55,11 @@ declare const commonMessage: {
     passwordMessage: string;
     spaceMessage: string;
 };
+export declare function validatePassword(password: any, username: any): {
+    result: boolean;
+    message: string;
+} | {
+    result: boolean;
+    message?: undefined;
+};
 export { validate, commonMessage };

package/dist/validate.js

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

package/package.json

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