@oeos-components/utils 0.0.3 → 0.0.5

package/dist/index.cjs

@@ -243,7 +243,7 @@ function formatTime(time, cFormat = "{y}-{m}-{d} {h}:{i}:{s}") {
   });
   return time_str;
 }
-function formatDurationTime(timestamp, cFormat = "{d} \u5929 {h} \u65F6 {i} \u5206 {s} \u79D2") {
+function formatDurationTime(timestamp, cFormat = "{d}\u5929{h}\u65F6{i}\u5206{s}\u79D2") {
   const secondsPerMinute = 60;
   const minutesPerHour = 60;
   const hoursPerDay = 24;
@@ -610,19 +610,26 @@ function processWidth(initValue, isBase = false) {
   }
   return { width: res };
 }
-function toFixed(value, digits = 2) {
+function toFixed(value, options = {}) {
+  if (typeof options === "number") {
+    options = { digit: options };
+  }
+  let { digit = 2, prefix = "", suffix = "", unit = true } = options;
   let matches = ("" + value).match(/^([\d,]+)(\.?)(\d+)?(\D+)?$/);
   if (!matches) {
     return value;
   }
   let numericString = matches[1].replace(/\D/g, "");
   let decimalString = matches[3] ? `.${matches[3]}` : "";
-  let unit = matches[4] || "";
+  let finalUnit = matches[4] || "";
   let res = numericString;
   if (isStringNumber(numericString) || isNumber(numericString)) {
-    res = Number(numericString + decimalString).toFixed(digits);
+    res = Number(numericString + decimalString).toFixed(digit);
   }
-  return `${res}${unit}`;
+  if (!unit) {
+    finalUnit = "";
+  }
+  return `${prefix}${res}${finalUnit}${suffix}`;
 }
 function formatBytes(bytes, { toFixed: toFixed2 = 2, thousands = true } = {}) {
   if (isStringNumber(bytes) || isNumber(bytes)) {
@@ -711,6 +718,23 @@ function throttle(fn, delay = 1e3) {
     }
   };
 }
+function tryCatch(promise, sendLoading) {
+  const updateLoading = (value) => {
+    if (reactivity.isRef(sendLoading)) {
+      sendLoading.value = value;
+    } else if (sendLoading !== null) {
+      console.warn("Cannot modify non-ref sendLoading directly!");
+    }
+  };
+  updateLoading(true);
+  return promise.then((data) => {
+    updateLoading(false);
+    return { data, error: null };
+  }).catch((error) => {
+    updateLoading(false);
+    return { data: null, error };
+  });
+}
 function debounce(fn, delay = 1e3) {
   let timer = null;
   return function() {
@@ -783,6 +807,7 @@ exports.sleep = sleep;
 exports.throttle = throttle;
 exports.toFixed = toFixed;
 exports.toLine = toLine;
+exports.tryCatch = tryCatch;
 exports.uuid = uuid;
 exports.validForm = validForm;
 exports.validate = validate;

package/dist/index.d.cts

@@ -1,4 +1,5 @@
 import * as element_plus from 'element-plus';
+import { Ref } from '@vue/reactivity';
 
 /**
  * 现有方法如下
@@ -37,15 +38,17 @@ declare const isString: (val: any) => val is string;
 declare const isStringNumber: (val: string) => boolean;
 declare const isNumber: (val: any) => val is number;
 /**
- * @example
+ * @example1
   proxy.$toast('保存成功')
   proxy.$toast('保存失败', 'e')
   proxy.$toast({
     message: 'andy',
     type: 'warning',
+    duration: 300,
+    closeAll: true,
   })
 * $toast.success('This is a success message')
-* @example 显示对象
+* @example2 显示对象
 * $toast({
     dangerouslyUseHTMLString: true,
     message: `<h6>复制成功</h6><pre>${JSON.stringify(obj, null, 2)}</pre>`,
@@ -241,11 +244,17 @@ declare function processWidth(initValue: any, isBase?: boolean): any;
 /**
  * 增加小数点
  * toFixed(22) -> '22.00'
- * proxy.toFixed('22') -> '22.00'
- * proxy.toFixed('22', 4) -> '22.0000'
- * proxy.toFixed('22', 2, true) -> 22
+ * toFixed('22') -> '22.00'
+ * toFixed('22', 4) -> '22.0000'
+ * toFixed('22', 2) -> 22
+ * toFixed('22 TB', {prefix: '$', suffix: '%', unit: false}) -> $22.00%
  */
-declare function toFixed(value: any, digits?: number): any;
+declare function toFixed(value: any, options?: {
+    digit?: number;
+    prefix?: string;
+    suffix?: string;
+    unit?: boolean;
+} | number): any;
 /**
  * 只有对正整数或者字符串正整数才进行单位的转换,
  * 否则返回原始数据
@@ -260,6 +269,21 @@ declare function formatBytesConvert(oBytes: any, { thounsand, toFixed }?: {
     toFixed?: number | undefined;
 }): any;
 declare function throttle(fn: any, delay?: number): () => void;
+/**
+ * 封装 Promise 执行，提供自动 loading 状态管理
+ * @param promise 需要执行的 Promise
+ * @param sendLoading 可选的 loading 状态(支持 Ref<boolean> 或 boolean)
+ * @returns Promise<{ data: T | null; error: any }>
+ * @example1
+ * const loading = ref(false);
+ * const { data, error } = await tryCatch(fetchUserData(), loading);
+ * @example2 // 无视 loading 状态
+ * const { data, error } = await tryCatch(fetchUserData());
+ */
+declare function tryCatch<T>(promise: Promise<T>, sendLoading?: Ref<boolean> | null): Promise<{
+    data: T | null;
+    error: any;
+}>;
 declare function debounce(fn: any, delay?: number): () => void;
 /**
  * proxy.confirm('确定删除吗?')
@@ -306,4 +330,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, 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 };

package/dist/index.d.mts

@@ -1,4 +1,5 @@
 import * as element_plus from 'element-plus';
+import { Ref } from '@vue/reactivity';
 
 /**
  * 现有方法如下
@@ -37,15 +38,17 @@ declare const isString: (val: any) => val is string;
 declare const isStringNumber: (val: string) => boolean;
 declare const isNumber: (val: any) => val is number;
 /**
- * @example
+ * @example1
   proxy.$toast('保存成功')
   proxy.$toast('保存失败', 'e')
   proxy.$toast({
     message: 'andy',
     type: 'warning',
+    duration: 300,
+    closeAll: true,
   })
 * $toast.success('This is a success message')
-* @example 显示对象
+* @example2 显示对象
 * $toast({
     dangerouslyUseHTMLString: true,
     message: `<h6>复制成功</h6><pre>${JSON.stringify(obj, null, 2)}</pre>`,
@@ -241,11 +244,17 @@ declare function processWidth(initValue: any, isBase?: boolean): any;
 /**
  * 增加小数点
  * toFixed(22) -> '22.00'
- * proxy.toFixed('22') -> '22.00'
- * proxy.toFixed('22', 4) -> '22.0000'
- * proxy.toFixed('22', 2, true) -> 22
+ * toFixed('22') -> '22.00'
+ * toFixed('22', 4) -> '22.0000'
+ * toFixed('22', 2) -> 22
+ * toFixed('22 TB', {prefix: '$', suffix: '%', unit: false}) -> $22.00%
  */
-declare function toFixed(value: any, digits?: number): any;
+declare function toFixed(value: any, options?: {
+    digit?: number;
+    prefix?: string;
+    suffix?: string;
+    unit?: boolean;
+} | number): any;
 /**
  * 只有对正整数或者字符串正整数才进行单位的转换,
  * 否则返回原始数据
@@ -260,6 +269,21 @@ declare function formatBytesConvert(oBytes: any, { thounsand, toFixed }?: {
     toFixed?: number | undefined;
 }): any;
 declare function throttle(fn: any, delay?: number): () => void;
+/**
+ * 封装 Promise 执行，提供自动 loading 状态管理
+ * @param promise 需要执行的 Promise
+ * @param sendLoading 可选的 loading 状态(支持 Ref<boolean> 或 boolean)
+ * @returns Promise<{ data: T | null; error: any }>
+ * @example1
+ * const loading = ref(false);
+ * const { data, error } = await tryCatch(fetchUserData(), loading);
+ * @example2 // 无视 loading 状态
+ * const { data, error } = await tryCatch(fetchUserData());
+ */
+declare function tryCatch<T>(promise: Promise<T>, sendLoading?: Ref<boolean> | null): Promise<{
+    data: T | null;
+    error: any;
+}>;
 declare function debounce(fn: any, delay?: number): () => void;
 /**
  * proxy.confirm('确定删除吗?')
@@ -306,4 +330,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, 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 };

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 import * as element_plus from 'element-plus';
+import { Ref } from '@vue/reactivity';
 
 /**
  * 现有方法如下
@@ -37,15 +38,17 @@ declare const isString: (val: any) => val is string;
 declare const isStringNumber: (val: string) => boolean;
 declare const isNumber: (val: any) => val is number;
 /**
- * @example
+ * @example1
   proxy.$toast('保存成功')
   proxy.$toast('保存失败', 'e')
   proxy.$toast({
     message: 'andy',
     type: 'warning',
+    duration: 300,
+    closeAll: true,
   })
 * $toast.success('This is a success message')
-* @example 显示对象
+* @example2 显示对象
 * $toast({
     dangerouslyUseHTMLString: true,
     message: `<h6>复制成功</h6><pre>${JSON.stringify(obj, null, 2)}</pre>`,
@@ -241,11 +244,17 @@ declare function processWidth(initValue: any, isBase?: boolean): any;
 /**
  * 增加小数点
  * toFixed(22) -> '22.00'
- * proxy.toFixed('22') -> '22.00'
- * proxy.toFixed('22', 4) -> '22.0000'
- * proxy.toFixed('22', 2, true) -> 22
+ * toFixed('22') -> '22.00'
+ * toFixed('22', 4) -> '22.0000'
+ * toFixed('22', 2) -> 22
+ * toFixed('22 TB', {prefix: '$', suffix: '%', unit: false}) -> $22.00%
  */
-declare function toFixed(value: any, digits?: number): any;
+declare function toFixed(value: any, options?: {
+    digit?: number;
+    prefix?: string;
+    suffix?: string;
+    unit?: boolean;
+} | number): any;
 /**
  * 只有对正整数或者字符串正整数才进行单位的转换,
  * 否则返回原始数据
@@ -260,6 +269,21 @@ declare function formatBytesConvert(oBytes: any, { thounsand, toFixed }?: {
     toFixed?: number | undefined;
 }): any;
 declare function throttle(fn: any, delay?: number): () => void;
+/**
+ * 封装 Promise 执行，提供自动 loading 状态管理
+ * @param promise 需要执行的 Promise
+ * @param sendLoading 可选的 loading 状态(支持 Ref<boolean> 或 boolean)
+ * @returns Promise<{ data: T | null; error: any }>
+ * @example1
+ * const loading = ref(false);
+ * const { data, error } = await tryCatch(fetchUserData(), loading);
+ * @example2 // 无视 loading 状态
+ * const { data, error } = await tryCatch(fetchUserData());
+ */
+declare function tryCatch<T>(promise: Promise<T>, sendLoading?: Ref<boolean> | null): Promise<{
+    data: T | null;
+    error: any;
+}>;
 declare function debounce(fn: any, delay?: number): () => void;
 /**
  * proxy.confirm('确定删除吗?')
@@ -306,4 +330,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, 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 };

package/dist/index.mjs

@@ -240,7 +240,7 @@ function formatTime(time, cFormat = "{y}-{m}-{d} {h}:{i}:{s}") {
   });
   return time_str;
 }
-function formatDurationTime(timestamp, cFormat = "{d} \u5929 {h} \u65F6 {i} \u5206 {s} \u79D2") {
+function formatDurationTime(timestamp, cFormat = "{d}\u5929{h}\u65F6{i}\u5206{s}\u79D2") {
   const secondsPerMinute = 60;
   const minutesPerHour = 60;
   const hoursPerDay = 24;
@@ -607,19 +607,26 @@ function processWidth(initValue, isBase = false) {
   }
   return { width: res };
 }
-function toFixed(value, digits = 2) {
+function toFixed(value, options = {}) {
+  if (typeof options === "number") {
+    options = { digit: options };
+  }
+  let { digit = 2, prefix = "", suffix = "", unit = true } = options;
   let matches = ("" + value).match(/^([\d,]+)(\.?)(\d+)?(\D+)?$/);
   if (!matches) {
     return value;
   }
   let numericString = matches[1].replace(/\D/g, "");
   let decimalString = matches[3] ? `.${matches[3]}` : "";
-  let unit = matches[4] || "";
+  let finalUnit = matches[4] || "";
   let res = numericString;
   if (isStringNumber(numericString) || isNumber(numericString)) {
-    res = Number(numericString + decimalString).toFixed(digits);
+    res = Number(numericString + decimalString).toFixed(digit);
   }
-  return `${res}${unit}`;
+  if (!unit) {
+    finalUnit = "";
+  }
+  return `${prefix}${res}${finalUnit}${suffix}`;
 }
 function formatBytes(bytes, { toFixed: toFixed2 = 2, thousands = true } = {}) {
   if (isStringNumber(bytes) || isNumber(bytes)) {
@@ -708,6 +715,23 @@ function throttle(fn, delay = 1e3) {
     }
   };
 }
+function tryCatch(promise, sendLoading) {
+  const updateLoading = (value) => {
+    if (isRef(sendLoading)) {
+      sendLoading.value = value;
+    } else if (sendLoading !== null) {
+      console.warn("Cannot modify non-ref sendLoading directly!");
+    }
+  };
+  updateLoading(true);
+  return promise.then((data) => {
+    updateLoading(false);
+    return { data, error: null };
+  }).catch((error) => {
+    updateLoading(false);
+    return { data: null, error };
+  });
+}
 function debounce(fn, delay = 1e3) {
   let timer = null;
   return function() {
@@ -749,4 +773,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, 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 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oeos-components/utils",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "utils of oeos-components",
   "license": "MIT",
   "type": "commonjs",