@oeos-components/utils 0.0.15 → 0.0.17

package/dist/index.cjs

@@ -232,7 +232,12 @@ function formatTime(time, cFormat = "{y}-{m}-{d} {h}:{i}:{s}") {
   if (typeof time === "object") {
     date = time;
   } else {
-    if (("" + time).length === 10) time = parseInt(time) * 1e3;
+    const timeStr = "" + time;
+    if (timeStr.includes(".") && !isNaN(parseFloat(timeStr))) {
+      time = parseFloat(time) * 1e3;
+    } else if (timeStr.length === 10) {
+      time = parseInt(time) * 1e3;
+    }
     date = new Date(time);
   }
   const formatObj = {
@@ -295,54 +300,63 @@ function formatDurationTime(timestamp, cFormat = "{d}\u5929{h}\u65F6{i}\u5206{s}
   });
   return time_str;
 }
-function uuid(type = "", length = 4, { emailStr = "@qq.com", timeStr = "{m}-{d} {h}:{i}:{s}", startStr = "", optionsIndex = null } = {}) {
-  let randomStr = "ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678";
-  let res = type;
-  if (reactivity.isRef(type)) {
-    type = reactivity.unref(type);
+function uuid(type = "", length = 4, options = {}) {
+  const { emailStr = "@qq.com", timeStr = "{y}-{m}-{d} {h}:{i}:{s}", startStr = "", optionsIndex = null } = options;
+  function isRef2(obj) {
+    return obj && typeof obj === "object" && obj._isRef === true;
+  }
+  function unref2(ref) {
+    return isRef2(ref) ? ref.value : ref;
+  }
+  function random2(min, max) {
+    return Math.floor(Math.random() * (max - min + 1) + min);
   }
-  if (getType(type) === "array" && type.length > 0) {
-    let randNum = random(0, type.length - 1);
-    if (!length) {
-      return type[optionsIndex ?? randNum];
+  type = unref2(type);
+  if (Array.isArray(type)) {
+    if (type.length === 0) return "";
+    const randIndex = optionsIndex ?? random2(0, type.length - 1);
+    const selectedItem = type[randIndex];
+    if (typeof selectedItem === "object" && selectedItem !== null && "value" in selectedItem) {
+      return selectedItem.value;
     }
-    return type[optionsIndex ?? randNum][length === 4 ? "value" : length];
+    return selectedItem;
   }
+  let randomChars = "ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678";
+  let result = startStr;
   if (type === "phone") {
-    let prefixArray = new Array("130", "131", "132", "133", "135", "136", "137", "138", "170", "187", "189");
-    let i = parseInt(Math.random() * 10);
-    let res2 = prefixArray[i];
-    for (var j = 0; j < 8; j++) {
-      res2 += Math.floor(Math.random() * 10);
+    const prefixes = ["130", "131", "132", "133", "135", "136", "137", "138", "170", "187", "189"];
+    result = prefixes[random2(0, prefixes.length - 1)];
+    for (let i = 0; i < 8; i++) {
+      result += Math.floor(Math.random() * 10);
     }
-    return res2;
+    return result;
   }
   if (type === "email") {
-    return uuid(startStr, length) + emailStr;
+    result = uuid(startStr, length) + emailStr;
+    return result;
   }
   if (type === "time") {
-    return uuid(startStr, length) + " " + formatTime(/* @__PURE__ */ new Date(), timeStr);
+    return uuid(startStr, length, options) + " " + formatTime(/* @__PURE__ */ new Date(), timeStr);
   }
   if (type === "number") {
-    let randomStr2 = "123456789";
-    let res2 = "";
-    for (let i = length; i > 0; --i) {
-      res2 += randomStr2[Math.floor(Math.random() * randomStr2.length)];
+    const numChars = "123456789";
+    result = "";
+    for (let i = 0; i < length; i++) {
+      result += numChars[random2(0, numChars.length - 1)];
     }
-    return Number(res2);
+    return Number(result);
   }
   if (type === "ip") {
-    let randomNum = random(1, 99);
-    return `10.0.11.` + randomNum;
+    const randomNum = random2(1, 99);
+    return `10.0.11.${randomNum}`;
   }
   if (type === "port") {
-    let randomNum = random(1, 65535);
-    return randomNum;
+    return random2(1, 65535);
   }
-  for (let i = length; i > 0; --i) {
-    res += randomStr[Math.floor(Math.random() * randomStr.length)];
+  for (let i = 0; i < length; i++) {
+    result += randomChars[random2(0, randomChars.length - 1)];
   }
-  return res;
+  return result;
 }
 function getType(type) {
   if (typeof type === "object") {
@@ -360,6 +374,13 @@ function sleep(delay = 0, fn) {
     }, delay)
   );
 }
+function validateTrigger(type = "required", rules = {}, pureValid = false) {
+  let mergeRules = {
+    trigger: ["blur", "change"],
+    ...rules
+  };
+  return validate(type, mergeRules, pureValid);
+}
 function validate(type = "required", rules = {}, pureValid = false) {
   if (getType(type) === "object") {
     pureValid = rules || false;
@@ -367,7 +388,7 @@ function validate(type = "required", rules = {}, pureValid = false) {
     type = "required";
   }
   let trigger = rules.trigger || [];
-  const typeMaps = ["required", "pwd", "number", "mobile", "between", "length", "same", "ip", "port", "custom"];
+  const typeMaps = ["required", "pwd", "number", "mobile", "email", "between", "length", "same", "ip", "port", "custom"];
   let parseRequired = rules.required ?? true;
   if (!typeMaps.includes(type)) {
     return {
@@ -412,6 +433,9 @@ function validate(type = "required", rules = {}, pureValid = false) {
   if (type === "mobile") {
     return _validValue(rules, "\u8BF7\u8F93\u5165\u6B63\u786E\u7684\u624B\u673A\u53F7", pureValid, /^[1][0-9]{10}$/);
   }
+  if (type === "email") {
+    return _validValue(rules, "\u8BF7\u8F93\u5165\u6B63\u786E\u7684email", pureValid, /^[^\s@]+@[^\s@]+\.[^\s@]+$/);
+  }
   if (type === "ip") {
     return _validValue(
       rules,
@@ -421,17 +445,17 @@ function validate(type = "required", rules = {}, pureValid = false) {
     );
   }
   if (type === "between") {
-    let min = rules.min || 1;
-    let max = rules.max || 10;
+    let min = rules.min;
+    let max = rules.max;
     const validateBetween = (rule, value, callback) => {
-      let validFlag = /^[0-9]+$/.test(value);
+      let validFlag = /^-?[0-9]+$/.test(value);
       if (!validFlag) {
         callback(new Error("\u8BF7\u8F93\u5165\u6570\u5B57"));
       }
-      if (value < min) {
+      if (value < min && min !== void 0) {
         callback(new Error(`\u6570\u5B57\u4E0D\u80FD\u5C0F\u4E8E${min}`));
       }
-      if (value > max) {
+      if (value > max && max !== void 0) {
         callback(new Error(`\u6570\u5B57\u4E0D\u80FD\u5927\u4E8E${max}`));
       }
       callback();
@@ -651,26 +675,15 @@ function formatBytes(bytes, options = {}) {
   } else {
     return bytes;
   }
-  if (bytes <= 0) {
-    return bytes.toFixed(digit) + " B";
+  if (bytes <= 1) {
+    return Math[roundType](bytes * Math.pow(10, digit)) / Math.pow(10, digit) + " B";
   }
   const k = 1024;
   const sizes = ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
   const i = Math.floor(Math.log(bytes) / Math.log(k));
   const power = Math.pow(k, i);
   let num = bytes / power;
-  switch (roundType) {
-    case "ceil":
-      num = Math.ceil(num * Math.pow(10, digit)) / Math.pow(10, digit);
-      break;
-    case "round":
-      num = Math.round(num * Math.pow(10, digit)) / Math.pow(10, digit);
-      break;
-    case "floor":
-    default:
-      num = Math.floor(num * Math.pow(10, digit)) / Math.pow(10, digit);
-      break;
-  }
+  num = Math[roundType](num * Math.pow(10, digit)) / Math.pow(10, digit);
   let res = num.toFixed(digit) + " " + sizes[i];
   if (thousands) {
     res = formatThousands(res);
@@ -842,3 +855,4 @@ exports.tryCatch = tryCatch;
 exports.uuid = uuid;
 exports.validForm = validForm;
 exports.validate = validate;
+exports.validateTrigger = validateTrigger;

package/dist/index.d.cts

@@ -130,8 +130,9 @@ declare function clone(data: any, times?: number): any;
  * formatTime(1541927611000); //2018-11-11 17:13:21
  * formatTime(1541927611000, "{y}年{m}月{d}日 {h}时{m}分{s}秒"); // 2018年11月11日 17时11分31秒
  * formatTime(1541927611, "{y}/{m}/{d} {h}:{m}:{s}"); // 2018/11/11 17:11:31
- * formatTime(new Date()); //2018-11-11 17:13:21
- * formatTime(new Date().getTime()); //2018-11-11 17:13:21
+ * formatTime(new Date()); // 2018-11-11 17:13:21
+ * formatTime(new Date().getTime()); // 2018-11-11 17:13:21
+ * formatTime('1764128798.456'); // 2025/11/26 11:11:38
  */
 declare function formatTime(time: any, cFormat?: string): any;
 /**
@@ -145,15 +146,15 @@ declare function formatTime(time: any, cFormat?: string): any;
 declare function formatDurationTime(timestamp: any, cFormat?: string): string;
 /**
  * 生成 UUID
- * @param {string} [type=''] - 生成 UUID 的类型，可以是 'phone', 'email', 'time', 'number' 或空字符串
- * @param {number} [length=4] - 生成字符串的长度
- * @param {object} [options={}] - 额外的选项
- * @param {string} [options.emailStr='@qq.com'] - 生成 email 时使用的后缀
- * @param {string} [options.timeStr='{m}-{d} {h}:{i}:{s}'] - 生成时间字符串的格式
- * @param {string} [options.startStr=''] - 起始字符串
- * @param {number|null} [options.optionsIndex=null] - 数组索引
- * @returns {string|number} - 生成的 UUID
- * uuid("名字") => 名字hc8f
+ * @param type - 生成 UUID 的类型，可以是 'phone', 'email', 'time', 'number', 'ip', 'port' 或空字符串
+ * @param length - 生成字符串的长度（默认为4）
+ * @param options - 额外的选项
+ * @param options.emailStr - 生成 email 时使用的后缀（默认为 '@qq.com'）
+ * @param options.timeStr - 生成时间字符串的格式（默认为 '{m}-{d} {h}:{i}:{s}'）
+ * @param options.startStr - 起始字符串（默认为空）
+ * @param options.optionsIndex - 数组索引（默认为随机）
+ * @returns 生成的 UUID (字符串或数字)
+ * * uuid("名字") => 名字hc8f
  * uuid() => abcd
  * uuid('time') => 25MR 10-27 17:34:01
  * uuid('time', 0, {startStr:'andy', timeStr:"{h}:{i}:{s}"}) => andy 17:38:23
@@ -162,12 +163,15 @@ declare function formatDurationTime(timestamp: any, cFormat?: string): string;
  * uuid('number') => 2319
  * uuid([ { label: "小泽泽", value: "xzz" },{ label: "小月月", value: "xyy" }]) => xzz
  */
-declare function uuid(type?: string, length?: number, { emailStr, timeStr, startStr, optionsIndex }?: {
-    emailStr?: string | undefined;
-    timeStr?: string | undefined;
-    startStr?: string | undefined;
-    optionsIndex?: null | undefined;
-}): any;
+declare function uuid(type?: string | Array<{
+    label: string;
+    value: any;
+}>, length?: number, options?: {
+    emailStr?: string;
+    timeStr?: string;
+    startStr?: string;
+    optionsIndex?: number | null;
+}): string | number;
 /**
  * 判断传入参数的类型
  * @param {*} type
@@ -179,7 +183,36 @@ declare function uuid(type?: string, length?: number, { emailStr, timeStr, start
  * getType(123) number
  */
 declare function getType(type: any): string;
-declare function sleep(delay?: number, fn?: () => void): Promise<unknown>;
+/**
+ * 一个辅助函数，用于在代码中创建一个暂停（延迟）。
+ * 它返回一个 Promise，你可以在 `await` 后使用它来实现类似 "sleep" 的效果。
+ *
+ * @param delay - 等待的毫秒数。默认值为 0，表示不延迟。
+ * @param fn - (可选) 一个在延迟结束后立即执行的函数。
+ *
+ * @returns 一个 Promise，当延迟结束后解析（resolve）。
+ *
+ * @example
+ * // 基本用法：延迟 2 秒后打印消息
+ * console.log('开始');
+ * await sleep(2000);
+ * console.log('2秒后执行');
+ *
+ * @example
+ * // 带回调函数的用法：延迟 1 秒后执行清理工作
+ * sleep(1000, () => {
+ *   console.log('执行清理操作...');
+ *   // 清理代码...
+ * });
+ *
+ * @example
+ * // 在循环中使用：每次迭代后延迟 500 毫秒
+ * for (let i = 0; i < 5; i++) {
+ *   console.log(`当前值: ${i}`);
+ *   await sleep(500);
+ * }
+ */
+declare function sleep(delay?: number, fn?: () => void): Promise<void>;
 /** @使用方式
  * 1. 在el-form中使用
 name: [ proxy.validate('name', { message: '你干嘛哈哈' })],
@@ -199,6 +232,7 @@ confirmRegPwd: [
  let ip = proxy.validate('ip', 122322, true)
  let custom = proxy.validate('custom', { value: -123, reg: /^-\d+\.?\d{0,2}$/ }, true)
 */
+declare function validateTrigger(type?: string, rules?: {}, pureValid?: boolean): any;
 declare function validate(type?: string, rules?: {}, pureValid?: boolean): any;
 /**
  *
@@ -366,4 +400,4 @@ declare function formatNewLines(str: any): any;
  *  */
 declare function getVariable(propertyName: any): string;
 
-export { $toast, asyncWrapper, clearStorage, clone, confirm, copy, debounce, formatBytes, formatBytesConvert, formatDurationTime, formatImg, formatNewLines, formatThousands, formatTime, getStorage, getType, getVariable, isEmpty, isNumber, isString, isStringNumber, log, merge, notEmpty, processWidth, random, setStorage, sleep, throttle, toFixed, toLine, tryCatch, uuid, validForm, validate };
+export { $toast, asyncWrapper, clearStorage, clone, confirm, copy, debounce, formatBytes, formatBytesConvert, formatDurationTime, formatImg, formatNewLines, formatThousands, formatTime, getStorage, getType, getVariable, isEmpty, isNumber, isString, isStringNumber, log, merge, notEmpty, processWidth, random, setStorage, sleep, throttle, toFixed, toLine, tryCatch, uuid, validForm, validate, validateTrigger };

package/dist/index.d.mts

@@ -130,8 +130,9 @@ declare function clone(data: any, times?: number): any;
  * formatTime(1541927611000); //2018-11-11 17:13:21
  * formatTime(1541927611000, "{y}年{m}月{d}日 {h}时{m}分{s}秒"); // 2018年11月11日 17时11分31秒
  * formatTime(1541927611, "{y}/{m}/{d} {h}:{m}:{s}"); // 2018/11/11 17:11:31
- * formatTime(new Date()); //2018-11-11 17:13:21
- * formatTime(new Date().getTime()); //2018-11-11 17:13:21
+ * formatTime(new Date()); // 2018-11-11 17:13:21
+ * formatTime(new Date().getTime()); // 2018-11-11 17:13:21
+ * formatTime('1764128798.456'); // 2025/11/26 11:11:38
  */
 declare function formatTime(time: any, cFormat?: string): any;
 /**
@@ -145,15 +146,15 @@ declare function formatTime(time: any, cFormat?: string): any;
 declare function formatDurationTime(timestamp: any, cFormat?: string): string;
 /**
  * 生成 UUID
- * @param {string} [type=''] - 生成 UUID 的类型，可以是 'phone', 'email', 'time', 'number' 或空字符串
- * @param {number} [length=4] - 生成字符串的长度
- * @param {object} [options={}] - 额外的选项
- * @param {string} [options.emailStr='@qq.com'] - 生成 email 时使用的后缀
- * @param {string} [options.timeStr='{m}-{d} {h}:{i}:{s}'] - 生成时间字符串的格式
- * @param {string} [options.startStr=''] - 起始字符串
- * @param {number|null} [options.optionsIndex=null] - 数组索引
- * @returns {string|number} - 生成的 UUID
- * uuid("名字") => 名字hc8f
+ * @param type - 生成 UUID 的类型，可以是 'phone', 'email', 'time', 'number', 'ip', 'port' 或空字符串
+ * @param length - 生成字符串的长度（默认为4）
+ * @param options - 额外的选项
+ * @param options.emailStr - 生成 email 时使用的后缀（默认为 '@qq.com'）
+ * @param options.timeStr - 生成时间字符串的格式（默认为 '{m}-{d} {h}:{i}:{s}'）
+ * @param options.startStr - 起始字符串（默认为空）
+ * @param options.optionsIndex - 数组索引（默认为随机）
+ * @returns 生成的 UUID (字符串或数字)
+ * * uuid("名字") => 名字hc8f
  * uuid() => abcd
  * uuid('time') => 25MR 10-27 17:34:01
  * uuid('time', 0, {startStr:'andy', timeStr:"{h}:{i}:{s}"}) => andy 17:38:23
@@ -162,12 +163,15 @@ declare function formatDurationTime(timestamp: any, cFormat?: string): string;
  * uuid('number') => 2319
  * uuid([ { label: "小泽泽", value: "xzz" },{ label: "小月月", value: "xyy" }]) => xzz
  */
-declare function uuid(type?: string, length?: number, { emailStr, timeStr, startStr, optionsIndex }?: {
-    emailStr?: string | undefined;
-    timeStr?: string | undefined;
-    startStr?: string | undefined;
-    optionsIndex?: null | undefined;
-}): any;
+declare function uuid(type?: string | Array<{
+    label: string;
+    value: any;
+}>, length?: number, options?: {
+    emailStr?: string;
+    timeStr?: string;
+    startStr?: string;
+    optionsIndex?: number | null;
+}): string | number;
 /**
  * 判断传入参数的类型
  * @param {*} type
@@ -179,7 +183,36 @@ declare function uuid(type?: string, length?: number, { emailStr, timeStr, start
  * getType(123) number
  */
 declare function getType(type: any): string;
-declare function sleep(delay?: number, fn?: () => void): Promise<unknown>;
+/**
+ * 一个辅助函数，用于在代码中创建一个暂停（延迟）。
+ * 它返回一个 Promise，你可以在 `await` 后使用它来实现类似 "sleep" 的效果。
+ *
+ * @param delay - 等待的毫秒数。默认值为 0，表示不延迟。
+ * @param fn - (可选) 一个在延迟结束后立即执行的函数。
+ *
+ * @returns 一个 Promise，当延迟结束后解析（resolve）。
+ *
+ * @example
+ * // 基本用法：延迟 2 秒后打印消息
+ * console.log('开始');
+ * await sleep(2000);
+ * console.log('2秒后执行');
+ *
+ * @example
+ * // 带回调函数的用法：延迟 1 秒后执行清理工作
+ * sleep(1000, () => {
+ *   console.log('执行清理操作...');
+ *   // 清理代码...
+ * });
+ *
+ * @example
+ * // 在循环中使用：每次迭代后延迟 500 毫秒
+ * for (let i = 0; i < 5; i++) {
+ *   console.log(`当前值: ${i}`);
+ *   await sleep(500);
+ * }
+ */
+declare function sleep(delay?: number, fn?: () => void): Promise<void>;
 /** @使用方式
  * 1. 在el-form中使用
 name: [ proxy.validate('name', { message: '你干嘛哈哈' })],
@@ -199,6 +232,7 @@ confirmRegPwd: [
  let ip = proxy.validate('ip', 122322, true)
  let custom = proxy.validate('custom', { value: -123, reg: /^-\d+\.?\d{0,2}$/ }, true)
 */
+declare function validateTrigger(type?: string, rules?: {}, pureValid?: boolean): any;
 declare function validate(type?: string, rules?: {}, pureValid?: boolean): any;
 /**
  *
@@ -366,4 +400,4 @@ declare function formatNewLines(str: any): any;
  *  */
 declare function getVariable(propertyName: any): string;
 
-export { $toast, asyncWrapper, clearStorage, clone, confirm, copy, debounce, formatBytes, formatBytesConvert, formatDurationTime, formatImg, formatNewLines, formatThousands, formatTime, getStorage, getType, getVariable, isEmpty, isNumber, isString, isStringNumber, log, merge, notEmpty, processWidth, random, setStorage, sleep, throttle, toFixed, toLine, tryCatch, uuid, validForm, validate };
+export { $toast, asyncWrapper, clearStorage, clone, confirm, copy, debounce, formatBytes, formatBytesConvert, formatDurationTime, formatImg, formatNewLines, formatThousands, formatTime, getStorage, getType, getVariable, isEmpty, isNumber, isString, isStringNumber, log, merge, notEmpty, processWidth, random, setStorage, sleep, throttle, toFixed, toLine, tryCatch, uuid, validForm, validate, validateTrigger };

package/dist/index.d.ts

@@ -130,8 +130,9 @@ declare function clone(data: any, times?: number): any;
  * formatTime(1541927611000); //2018-11-11 17:13:21
  * formatTime(1541927611000, "{y}年{m}月{d}日 {h}时{m}分{s}秒"); // 2018年11月11日 17时11分31秒
  * formatTime(1541927611, "{y}/{m}/{d} {h}:{m}:{s}"); // 2018/11/11 17:11:31
- * formatTime(new Date()); //2018-11-11 17:13:21
- * formatTime(new Date().getTime()); //2018-11-11 17:13:21
+ * formatTime(new Date()); // 2018-11-11 17:13:21
+ * formatTime(new Date().getTime()); // 2018-11-11 17:13:21
+ * formatTime('1764128798.456'); // 2025/11/26 11:11:38
  */
 declare function formatTime(time: any, cFormat?: string): any;
 /**
@@ -145,15 +146,15 @@ declare function formatTime(time: any, cFormat?: string): any;
 declare function formatDurationTime(timestamp: any, cFormat?: string): string;
 /**
  * 生成 UUID
- * @param {string} [type=''] - 生成 UUID 的类型，可以是 'phone', 'email', 'time', 'number' 或空字符串
- * @param {number} [length=4] - 生成字符串的长度
- * @param {object} [options={}] - 额外的选项
- * @param {string} [options.emailStr='@qq.com'] - 生成 email 时使用的后缀
- * @param {string} [options.timeStr='{m}-{d} {h}:{i}:{s}'] - 生成时间字符串的格式
- * @param {string} [options.startStr=''] - 起始字符串
- * @param {number|null} [options.optionsIndex=null] - 数组索引
- * @returns {string|number} - 生成的 UUID
- * uuid("名字") => 名字hc8f
+ * @param type - 生成 UUID 的类型，可以是 'phone', 'email', 'time', 'number', 'ip', 'port' 或空字符串
+ * @param length - 生成字符串的长度（默认为4）
+ * @param options - 额外的选项
+ * @param options.emailStr - 生成 email 时使用的后缀（默认为 '@qq.com'）
+ * @param options.timeStr - 生成时间字符串的格式（默认为 '{m}-{d} {h}:{i}:{s}'）
+ * @param options.startStr - 起始字符串（默认为空）
+ * @param options.optionsIndex - 数组索引（默认为随机）
+ * @returns 生成的 UUID (字符串或数字)
+ * * uuid("名字") => 名字hc8f
  * uuid() => abcd
  * uuid('time') => 25MR 10-27 17:34:01
  * uuid('time', 0, {startStr:'andy', timeStr:"{h}:{i}:{s}"}) => andy 17:38:23
@@ -162,12 +163,15 @@ declare function formatDurationTime(timestamp: any, cFormat?: string): string;
  * uuid('number') => 2319
  * uuid([ { label: "小泽泽", value: "xzz" },{ label: "小月月", value: "xyy" }]) => xzz
  */
-declare function uuid(type?: string, length?: number, { emailStr, timeStr, startStr, optionsIndex }?: {
-    emailStr?: string | undefined;
-    timeStr?: string | undefined;
-    startStr?: string | undefined;
-    optionsIndex?: null | undefined;
-}): any;
+declare function uuid(type?: string | Array<{
+    label: string;
+    value: any;
+}>, length?: number, options?: {
+    emailStr?: string;
+    timeStr?: string;
+    startStr?: string;
+    optionsIndex?: number | null;
+}): string | number;
 /**
  * 判断传入参数的类型
  * @param {*} type
@@ -179,7 +183,36 @@ declare function uuid(type?: string, length?: number, { emailStr, timeStr, start
  * getType(123) number
  */
 declare function getType(type: any): string;
-declare function sleep(delay?: number, fn?: () => void): Promise<unknown>;
+/**
+ * 一个辅助函数，用于在代码中创建一个暂停（延迟）。
+ * 它返回一个 Promise，你可以在 `await` 后使用它来实现类似 "sleep" 的效果。
+ *
+ * @param delay - 等待的毫秒数。默认值为 0，表示不延迟。
+ * @param fn - (可选) 一个在延迟结束后立即执行的函数。
+ *
+ * @returns 一个 Promise，当延迟结束后解析（resolve）。
+ *
+ * @example
+ * // 基本用法：延迟 2 秒后打印消息
+ * console.log('开始');
+ * await sleep(2000);
+ * console.log('2秒后执行');
+ *
+ * @example
+ * // 带回调函数的用法：延迟 1 秒后执行清理工作
+ * sleep(1000, () => {
+ *   console.log('执行清理操作...');
+ *   // 清理代码...
+ * });
+ *
+ * @example
+ * // 在循环中使用：每次迭代后延迟 500 毫秒
+ * for (let i = 0; i < 5; i++) {
+ *   console.log(`当前值: ${i}`);
+ *   await sleep(500);
+ * }
+ */
+declare function sleep(delay?: number, fn?: () => void): Promise<void>;
 /** @使用方式
  * 1. 在el-form中使用
 name: [ proxy.validate('name', { message: '你干嘛哈哈' })],
@@ -199,6 +232,7 @@ confirmRegPwd: [
  let ip = proxy.validate('ip', 122322, true)
  let custom = proxy.validate('custom', { value: -123, reg: /^-\d+\.?\d{0,2}$/ }, true)
 */
+declare function validateTrigger(type?: string, rules?: {}, pureValid?: boolean): any;
 declare function validate(type?: string, rules?: {}, pureValid?: boolean): any;
 /**
  *
@@ -366,4 +400,4 @@ declare function formatNewLines(str: any): any;
  *  */
 declare function getVariable(propertyName: any): string;
 
-export { $toast, asyncWrapper, clearStorage, clone, confirm, copy, debounce, formatBytes, formatBytesConvert, formatDurationTime, formatImg, formatNewLines, formatThousands, formatTime, getStorage, getType, getVariable, isEmpty, isNumber, isString, isStringNumber, log, merge, notEmpty, processWidth, random, setStorage, sleep, throttle, toFixed, toLine, tryCatch, uuid, validForm, validate };
+export { $toast, asyncWrapper, clearStorage, clone, confirm, copy, debounce, formatBytes, formatBytesConvert, formatDurationTime, formatImg, formatNewLines, formatThousands, formatTime, getStorage, getType, getVariable, isEmpty, isNumber, isString, isStringNumber, log, merge, notEmpty, processWidth, random, setStorage, sleep, throttle, toFixed, toLine, tryCatch, uuid, validForm, validate, validateTrigger };

package/dist/index.mjs

@@ -229,7 +229,12 @@ function formatTime(time, cFormat = "{y}-{m}-{d} {h}:{i}:{s}") {
   if (typeof time === "object") {
     date = time;
   } else {
-    if (("" + time).length === 10) time = parseInt(time) * 1e3;
+    const timeStr = "" + time;
+    if (timeStr.includes(".") && !isNaN(parseFloat(timeStr))) {
+      time = parseFloat(time) * 1e3;
+    } else if (timeStr.length === 10) {
+      time = parseInt(time) * 1e3;
+    }
     date = new Date(time);
   }
   const formatObj = {
@@ -292,54 +297,63 @@ function formatDurationTime(timestamp, cFormat = "{d}\u5929{h}\u65F6{i}\u5206{s}
   });
   return time_str;
 }
-function uuid(type = "", length = 4, { emailStr = "@qq.com", timeStr = "{m}-{d} {h}:{i}:{s}", startStr = "", optionsIndex = null } = {}) {
-  let randomStr = "ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678";
-  let res = type;
-  if (isRef(type)) {
-    type = unref(type);
+function uuid(type = "", length = 4, options = {}) {
+  const { emailStr = "@qq.com", timeStr = "{y}-{m}-{d} {h}:{i}:{s}", startStr = "", optionsIndex = null } = options;
+  function isRef2(obj) {
+    return obj && typeof obj === "object" && obj._isRef === true;
+  }
+  function unref2(ref) {
+    return isRef2(ref) ? ref.value : ref;
+  }
+  function random2(min, max) {
+    return Math.floor(Math.random() * (max - min + 1) + min);
   }
-  if (getType(type) === "array" && type.length > 0) {
-    let randNum = random(0, type.length - 1);
-    if (!length) {
-      return type[optionsIndex ?? randNum];
+  type = unref2(type);
+  if (Array.isArray(type)) {
+    if (type.length === 0) return "";
+    const randIndex = optionsIndex ?? random2(0, type.length - 1);
+    const selectedItem = type[randIndex];
+    if (typeof selectedItem === "object" && selectedItem !== null && "value" in selectedItem) {
+      return selectedItem.value;
     }
-    return type[optionsIndex ?? randNum][length === 4 ? "value" : length];
+    return selectedItem;
   }
+  let randomChars = "ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678";
+  let result = startStr;
   if (type === "phone") {
-    let prefixArray = new Array("130", "131", "132", "133", "135", "136", "137", "138", "170", "187", "189");
-    let i = parseInt(Math.random() * 10);
-    let res2 = prefixArray[i];
-    for (var j = 0; j < 8; j++) {
-      res2 += Math.floor(Math.random() * 10);
+    const prefixes = ["130", "131", "132", "133", "135", "136", "137", "138", "170", "187", "189"];
+    result = prefixes[random2(0, prefixes.length - 1)];
+    for (let i = 0; i < 8; i++) {
+      result += Math.floor(Math.random() * 10);
     }
-    return res2;
+    return result;
   }
   if (type === "email") {
-    return uuid(startStr, length) + emailStr;
+    result = uuid(startStr, length) + emailStr;
+    return result;
   }
   if (type === "time") {
-    return uuid(startStr, length) + " " + formatTime(/* @__PURE__ */ new Date(), timeStr);
+    return uuid(startStr, length, options) + " " + formatTime(/* @__PURE__ */ new Date(), timeStr);
   }
   if (type === "number") {
-    let randomStr2 = "123456789";
-    let res2 = "";
-    for (let i = length; i > 0; --i) {
-      res2 += randomStr2[Math.floor(Math.random() * randomStr2.length)];
+    const numChars = "123456789";
+    result = "";
+    for (let i = 0; i < length; i++) {
+      result += numChars[random2(0, numChars.length - 1)];
     }
-    return Number(res2);
+    return Number(result);
   }
   if (type === "ip") {
-    let randomNum = random(1, 99);
-    return `10.0.11.` + randomNum;
+    const randomNum = random2(1, 99);
+    return `10.0.11.${randomNum}`;
   }
   if (type === "port") {
-    let randomNum = random(1, 65535);
-    return randomNum;
+    return random2(1, 65535);
   }
-  for (let i = length; i > 0; --i) {
-    res += randomStr[Math.floor(Math.random() * randomStr.length)];
+  for (let i = 0; i < length; i++) {
+    result += randomChars[random2(0, randomChars.length - 1)];
   }
-  return res;
+  return result;
 }
 function getType(type) {
   if (typeof type === "object") {
@@ -357,6 +371,13 @@ function sleep(delay = 0, fn) {
     }, delay)
   );
 }
+function validateTrigger(type = "required", rules = {}, pureValid = false) {
+  let mergeRules = {
+    trigger: ["blur", "change"],
+    ...rules
+  };
+  return validate(type, mergeRules, pureValid);
+}
 function validate(type = "required", rules = {}, pureValid = false) {
   if (getType(type) === "object") {
     pureValid = rules || false;
@@ -364,7 +385,7 @@ function validate(type = "required", rules = {}, pureValid = false) {
     type = "required";
   }
   let trigger = rules.trigger || [];
-  const typeMaps = ["required", "pwd", "number", "mobile", "between", "length", "same", "ip", "port", "custom"];
+  const typeMaps = ["required", "pwd", "number", "mobile", "email", "between", "length", "same", "ip", "port", "custom"];
   let parseRequired = rules.required ?? true;
   if (!typeMaps.includes(type)) {
     return {
@@ -409,6 +430,9 @@ function validate(type = "required", rules = {}, pureValid = false) {
   if (type === "mobile") {
     return _validValue(rules, "\u8BF7\u8F93\u5165\u6B63\u786E\u7684\u624B\u673A\u53F7", pureValid, /^[1][0-9]{10}$/);
   }
+  if (type === "email") {
+    return _validValue(rules, "\u8BF7\u8F93\u5165\u6B63\u786E\u7684email", pureValid, /^[^\s@]+@[^\s@]+\.[^\s@]+$/);
+  }
   if (type === "ip") {
     return _validValue(
       rules,
@@ -418,17 +442,17 @@ function validate(type = "required", rules = {}, pureValid = false) {
     );
   }
   if (type === "between") {
-    let min = rules.min || 1;
-    let max = rules.max || 10;
+    let min = rules.min;
+    let max = rules.max;
     const validateBetween = (rule, value, callback) => {
-      let validFlag = /^[0-9]+$/.test(value);
+      let validFlag = /^-?[0-9]+$/.test(value);
       if (!validFlag) {
         callback(new Error("\u8BF7\u8F93\u5165\u6570\u5B57"));
       }
-      if (value < min) {
+      if (value < min && min !== void 0) {
         callback(new Error(`\u6570\u5B57\u4E0D\u80FD\u5C0F\u4E8E${min}`));
       }
-      if (value > max) {
+      if (value > max && max !== void 0) {
         callback(new Error(`\u6570\u5B57\u4E0D\u80FD\u5927\u4E8E${max}`));
       }
       callback();
@@ -648,26 +672,15 @@ function formatBytes(bytes, options = {}) {
   } else {
     return bytes;
   }
-  if (bytes <= 0) {
-    return bytes.toFixed(digit) + " B";
+  if (bytes <= 1) {
+    return Math[roundType](bytes * Math.pow(10, digit)) / Math.pow(10, digit) + " B";
   }
   const k = 1024;
   const sizes = ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
   const i = Math.floor(Math.log(bytes) / Math.log(k));
   const power = Math.pow(k, i);
   let num = bytes / power;
-  switch (roundType) {
-    case "ceil":
-      num = Math.ceil(num * Math.pow(10, digit)) / Math.pow(10, digit);
-      break;
-    case "round":
-      num = Math.round(num * Math.pow(10, digit)) / Math.pow(10, digit);
-      break;
-    case "floor":
-    default:
-      num = Math.floor(num * Math.pow(10, digit)) / Math.pow(10, digit);
-      break;
-  }
+  num = Math[roundType](num * Math.pow(10, digit)) / Math.pow(10, digit);
   let res = num.toFixed(digit) + " " + sizes[i];
   if (thousands) {
     res = formatThousands(res);
@@ -804,4 +817,4 @@ function getVariable(propertyName) {
   return res;
 }
 
-export { $toast, asyncWrapper, clearStorage, clone, confirm, copy, debounce, formatBytes, formatBytesConvert, formatDurationTime, formatImg, formatNewLines, formatThousands, formatTime, getStorage, getType, getVariable, isEmpty, isNumber, isString, isStringNumber, log, merge, notEmpty, processWidth, random, setStorage, sleep, throttle, toFixed, toLine, tryCatch, uuid, validForm, validate };
+export { $toast, asyncWrapper, clearStorage, clone, confirm, copy, debounce, formatBytes, formatBytesConvert, formatDurationTime, formatImg, formatNewLines, formatThousands, formatTime, getStorage, getType, getVariable, isEmpty, isNumber, isString, isStringNumber, log, merge, notEmpty, processWidth, random, setStorage, sleep, throttle, toFixed, toLine, tryCatch, uuid, validForm, validate, validateTrigger };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oeos-components/utils",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "description": "utils of oeos-components",
   "license": "MIT",
   "type": "commonjs",
@@ -18,14 +18,14 @@
     "stub": "npx unbuild --stub",
     "version": "git add . && git commit -am \"chore: release v$npm_package_version\"",
     "postversion": "git push && git push origin --tags && npm publish",
-    "release": "npx unbuild && npm version patch && gg \"chore: release v$(npm pkg get version | sed 's/\"//g')\" && npm publish"
+    "release": "npx unbuild && npm version patch && gg \"chore: release @oeos-components/utils v$(npm pkg get version | sed 's/\"//g')\" && npm publish"
   },
   "author": "",
   "dependencies": {
     "@vue/reactivity": "^3.5.18",
     "@vue/shared": "^3.5.18",
     "consola": "^3.4.2",
-    "element-plus": "^2.10.4",
+    "element-plus": "^2.11.5",
     "es-toolkit": "^1.39.10",
     "lodash-es": "^4.17.21",
     "vue": "3.4.15"