@oeos-components/utils 0.0.5 → 0.0.6

package/dist/index.cjs

@@ -15,21 +15,27 @@ const isStringNumber = (val) => {
 };
 const isNumber = (val) => typeof val === "number";
 function $toast(message, type = "success", otherParams = {}) {
-  const map = {
+  const typeMap = {
     s: "success",
     i: "info",
     e: "error",
     w: "warning"
   };
-  if (getType(message) === "object") {
-    if (message.clodeAll) {
+  function isShortType(t) {
+    return ["s", "i", "e", "w"].includes(t);
+  }
+  function isToastOptions(obj) {
+    return typeof obj === "object" && obj !== null;
+  }
+  if (isToastOptions(message)) {
+    if (message.closeAll) {
       elementPlus.ElMessage.closeAll();
     }
     elementPlus.ElMessage(message);
     return;
   }
-  if (getType(type) === "object") {
-    if (type.clodeAll) {
+  if (isToastOptions(type)) {
+    if (type.closeAll) {
       elementPlus.ElMessage.closeAll();
     }
     elementPlus.ElMessage({
@@ -42,9 +48,10 @@ function $toast(message, type = "success", otherParams = {}) {
   if (otherParams.closeAll) {
     elementPlus.ElMessage.closeAll();
   }
+  const resolvedType = isShortType(type) ? typeMap[type] : type;
   elementPlus.ElMessage({
     message,
-    type: map[type] || type,
+    type: resolvedType,
     ...otherParams
   });
 }
@@ -152,32 +159,38 @@ function validForm(ref, { message = "\u8868\u5355\u6821\u9A8C\u9519\u8BEF, \u8BF
     });
   });
 }
-function isEmpty(data) {
+function isEmpty(data, strict = false) {
   if (reactivity.isRef(data)) {
     data = reactivity.unref(data);
   }
+  if (strict) {
+    if (data === false || data === 0 || data === BigInt(0)) {
+      return false;
+    }
+  }
+  if (data == null) return true;
   if (data instanceof Date) {
     return isNaN(data.getTime());
   }
   switch (typeof data) {
-    case "undefined":
-      return true;
     case "string":
-      if (data.trim().length === 0) return true;
-      break;
+      return data.trim().length === 0;
     case "boolean":
-      if (!data) return true;
-      break;
+      return !data;
     case "number":
-      if (0 === data) return true;
-      break;
-    case "object":
-      if (null === data) return true;
-      if (void 0 !== data.length && data.length === 0) return true;
-      for (var k in data) {
-        return false;
-      }
-      return true;
+      return 0 === data || isNaN(data);
+    // ❗ `NaN`或者0 被认为是空
+    case "symbol":
+      return false;
+    case "bigint":
+      return data === BigInt(0);
+  }
+  if (data instanceof Map || data instanceof Set) return data.size === 0;
+  if (Array.isArray(data) || typeof data.length === "number" && Object.prototype.toString.call(data) === "[object Object]") {
+    return data.length === 0;
+  }
+  if (typeof data === "object") {
+    return Object.keys(data).length === 0;
   }
   return false;
 }
@@ -692,7 +705,7 @@ function formatBytesConvert(oBytes, { thounsand = false, toFixed: toFixed2 = 0 }
   }
   let finalRes = size * units[unit];
   if (toFixed2) {
-    finalRes = parseFloat(finalRes.toFixed(toFixed2));
+    finalRes = Number(finalRes).toFixed(toFixed2);
   }
   if (thounsand) {
     finalRes = formatThousands(finalRes);

package/dist/index.d.cts

@@ -1,4 +1,5 @@
 import * as element_plus from 'element-plus';
+import { ElMessageOptions } from 'element-plus';
 import { Ref } from '@vue/reactivity';
 
 /**
@@ -39,8 +40,9 @@ declare const isStringNumber: (val: string) => boolean;
 declare const isNumber: (val: any) => val is number;
 /**
  * @example1
-  proxy.$toast('保存成功')
+  proxy.$toast('保存成功') // s:success; i: info; w: warning; e: error;
   proxy.$toast('保存失败', 'e')
+  proxy.$toast('永不关闭', {duration: 0})
   proxy.$toast({
     message: 'andy',
     type: 'warning',
@@ -56,7 +58,13 @@ declare const isNumber: (val: any) => val is number;
     duration: 5000,
   })
 */
-declare function $toast(message: any, type?: string | object, otherParams?: object): void;
+type MessageType = 'success' | 'info' | 'error' | 'warning';
+type ShortType = 's' | 'i' | 'e' | 'w';
+type ToastType = MessageType | ShortType;
+type ToastOptions = Partial<ElMessageOptions> & {
+    closeAll?: boolean;
+};
+declare function $toast(message: string | ToastOptions, type?: ToastType | ToastOptions, otherParams?: ToastOptions): void;
 declare namespace $toast {
     var success: (message: any, otherParams?: {}) => void;
     var info: (message: any, otherParams?: {}) => void;
@@ -76,6 +84,16 @@ declare function getStorage(data: any, isSession?: boolean): string | null;
  * clearStorage({ exclude: ['loginId', 'token'] })
  */
 declare function clearStorage(str?: string | [] | object): void;
+/**
+ * element-plus的form表单使用promise进行封装
+ * @param ref
+ * @param param1
+ * @returns Promise
+ * await proxy.validForm(formRef);
+ * await proxy.validForm(formRef, {message: '自定义错误'});
+ * await proxy.validForm(formRef, {showMessage: false});
+ * await proxy.validForm(formRef, {detail: true});
+ */
 declare function validForm(ref: any, { message, detail, showMessage }?: {
     message?: string | undefined;
     detail?: boolean | undefined;
@@ -83,9 +101,9 @@ declare function validForm(ref: any, { message, detail, showMessage }?: {
 }): Promise<unknown>;
 /**
  * 判断变量是否空值
- * undefined, null, '', '   ', false, 0, [], {} 均返回true，否则返回false
+ * undefined, null, '', '   ', false, 0, [], {}, NaN, new Set(), new Map(), BigInt(0), new Date('无效日期') 均返回true，否则返回false
  */
-declare function isEmpty(data: any): boolean;
+declare function isEmpty(data: any, strict?: boolean): boolean;
 declare function notEmpty(v: any): boolean;
 /**
  *  将两个对象合并, 以第二个对象为准, 如果两个对象, 一个属性有值, 一个没值, 合并后有值; 如果两个属性都有值, 以第二个属性为准
@@ -258,12 +276,24 @@ declare function toFixed(value: any, options?: {
 /**
  * 只有对正整数或者字符串正整数才进行单位的转换,
  * 否则返回原始数据
+ * @example
+ * proxy.formatBytes(536870912) // 512MB
  * proxy.formatBytes(536870912) // 512MB
  */
 declare function formatBytes(bytes: any, { toFixed, thousands }?: {
     toFixed?: number | undefined;
     thousands?: boolean | undefined;
 }): any;
+/**
+ * 字节转数字
+ * @param oBytes
+ * @param param1
+ * @returns number
+ * formatBytesConvert('0.5GB') 536870912
+ * formatBytesConvert('1,234 GB') 1324997410816
+ * formatBytesConvert('1,234 GB', {thousand: true}) 1,324,997,410,816
+ * formatBytesConvert('1,234 GB', {toFixed: 2}) 1324997410816.00
+ */
 declare function formatBytesConvert(oBytes: any, { thounsand, toFixed }?: {
     thounsand?: boolean | undefined;
     toFixed?: number | undefined;

package/dist/index.d.mts

@@ -1,4 +1,5 @@
 import * as element_plus from 'element-plus';
+import { ElMessageOptions } from 'element-plus';
 import { Ref } from '@vue/reactivity';
 
 /**
@@ -39,8 +40,9 @@ declare const isStringNumber: (val: string) => boolean;
 declare const isNumber: (val: any) => val is number;
 /**
  * @example1
-  proxy.$toast('保存成功')
+  proxy.$toast('保存成功') // s:success; i: info; w: warning; e: error;
   proxy.$toast('保存失败', 'e')
+  proxy.$toast('永不关闭', {duration: 0})
   proxy.$toast({
     message: 'andy',
     type: 'warning',
@@ -56,7 +58,13 @@ declare const isNumber: (val: any) => val is number;
     duration: 5000,
   })
 */
-declare function $toast(message: any, type?: string | object, otherParams?: object): void;
+type MessageType = 'success' | 'info' | 'error' | 'warning';
+type ShortType = 's' | 'i' | 'e' | 'w';
+type ToastType = MessageType | ShortType;
+type ToastOptions = Partial<ElMessageOptions> & {
+    closeAll?: boolean;
+};
+declare function $toast(message: string | ToastOptions, type?: ToastType | ToastOptions, otherParams?: ToastOptions): void;
 declare namespace $toast {
     var success: (message: any, otherParams?: {}) => void;
     var info: (message: any, otherParams?: {}) => void;
@@ -76,6 +84,16 @@ declare function getStorage(data: any, isSession?: boolean): string | null;
  * clearStorage({ exclude: ['loginId', 'token'] })
  */
 declare function clearStorage(str?: string | [] | object): void;
+/**
+ * element-plus的form表单使用promise进行封装
+ * @param ref
+ * @param param1
+ * @returns Promise
+ * await proxy.validForm(formRef);
+ * await proxy.validForm(formRef, {message: '自定义错误'});
+ * await proxy.validForm(formRef, {showMessage: false});
+ * await proxy.validForm(formRef, {detail: true});
+ */
 declare function validForm(ref: any, { message, detail, showMessage }?: {
     message?: string | undefined;
     detail?: boolean | undefined;
@@ -83,9 +101,9 @@ declare function validForm(ref: any, { message, detail, showMessage }?: {
 }): Promise<unknown>;
 /**
  * 判断变量是否空值
- * undefined, null, '', '   ', false, 0, [], {} 均返回true，否则返回false
+ * undefined, null, '', '   ', false, 0, [], {}, NaN, new Set(), new Map(), BigInt(0), new Date('无效日期') 均返回true，否则返回false
  */
-declare function isEmpty(data: any): boolean;
+declare function isEmpty(data: any, strict?: boolean): boolean;
 declare function notEmpty(v: any): boolean;
 /**
  *  将两个对象合并, 以第二个对象为准, 如果两个对象, 一个属性有值, 一个没值, 合并后有值; 如果两个属性都有值, 以第二个属性为准
@@ -258,12 +276,24 @@ declare function toFixed(value: any, options?: {
 /**
  * 只有对正整数或者字符串正整数才进行单位的转换,
  * 否则返回原始数据
+ * @example
+ * proxy.formatBytes(536870912) // 512MB
  * proxy.formatBytes(536870912) // 512MB
  */
 declare function formatBytes(bytes: any, { toFixed, thousands }?: {
     toFixed?: number | undefined;
     thousands?: boolean | undefined;
 }): any;
+/**
+ * 字节转数字
+ * @param oBytes
+ * @param param1
+ * @returns number
+ * formatBytesConvert('0.5GB') 536870912
+ * formatBytesConvert('1,234 GB') 1324997410816
+ * formatBytesConvert('1,234 GB', {thousand: true}) 1,324,997,410,816
+ * formatBytesConvert('1,234 GB', {toFixed: 2}) 1324997410816.00
+ */
 declare function formatBytesConvert(oBytes: any, { thounsand, toFixed }?: {
     thounsand?: boolean | undefined;
     toFixed?: number | undefined;

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 import * as element_plus from 'element-plus';
+import { ElMessageOptions } from 'element-plus';
 import { Ref } from '@vue/reactivity';
 
 /**
@@ -39,8 +40,9 @@ declare const isStringNumber: (val: string) => boolean;
 declare const isNumber: (val: any) => val is number;
 /**
  * @example1
-  proxy.$toast('保存成功')
+  proxy.$toast('保存成功') // s:success; i: info; w: warning; e: error;
   proxy.$toast('保存失败', 'e')
+  proxy.$toast('永不关闭', {duration: 0})
   proxy.$toast({
     message: 'andy',
     type: 'warning',
@@ -56,7 +58,13 @@ declare const isNumber: (val: any) => val is number;
     duration: 5000,
   })
 */
-declare function $toast(message: any, type?: string | object, otherParams?: object): void;
+type MessageType = 'success' | 'info' | 'error' | 'warning';
+type ShortType = 's' | 'i' | 'e' | 'w';
+type ToastType = MessageType | ShortType;
+type ToastOptions = Partial<ElMessageOptions> & {
+    closeAll?: boolean;
+};
+declare function $toast(message: string | ToastOptions, type?: ToastType | ToastOptions, otherParams?: ToastOptions): void;
 declare namespace $toast {
     var success: (message: any, otherParams?: {}) => void;
     var info: (message: any, otherParams?: {}) => void;
@@ -76,6 +84,16 @@ declare function getStorage(data: any, isSession?: boolean): string | null;
  * clearStorage({ exclude: ['loginId', 'token'] })
  */
 declare function clearStorage(str?: string | [] | object): void;
+/**
+ * element-plus的form表单使用promise进行封装
+ * @param ref
+ * @param param1
+ * @returns Promise
+ * await proxy.validForm(formRef);
+ * await proxy.validForm(formRef, {message: '自定义错误'});
+ * await proxy.validForm(formRef, {showMessage: false});
+ * await proxy.validForm(formRef, {detail: true});
+ */
 declare function validForm(ref: any, { message, detail, showMessage }?: {
     message?: string | undefined;
     detail?: boolean | undefined;
@@ -83,9 +101,9 @@ declare function validForm(ref: any, { message, detail, showMessage }?: {
 }): Promise<unknown>;
 /**
  * 判断变量是否空值
- * undefined, null, '', '   ', false, 0, [], {} 均返回true，否则返回false
+ * undefined, null, '', '   ', false, 0, [], {}, NaN, new Set(), new Map(), BigInt(0), new Date('无效日期') 均返回true，否则返回false
  */
-declare function isEmpty(data: any): boolean;
+declare function isEmpty(data: any, strict?: boolean): boolean;
 declare function notEmpty(v: any): boolean;
 /**
  *  将两个对象合并, 以第二个对象为准, 如果两个对象, 一个属性有值, 一个没值, 合并后有值; 如果两个属性都有值, 以第二个属性为准
@@ -258,12 +276,24 @@ declare function toFixed(value: any, options?: {
 /**
  * 只有对正整数或者字符串正整数才进行单位的转换,
  * 否则返回原始数据
+ * @example
+ * proxy.formatBytes(536870912) // 512MB
  * proxy.formatBytes(536870912) // 512MB
  */
 declare function formatBytes(bytes: any, { toFixed, thousands }?: {
     toFixed?: number | undefined;
     thousands?: boolean | undefined;
 }): any;
+/**
+ * 字节转数字
+ * @param oBytes
+ * @param param1
+ * @returns number
+ * formatBytesConvert('0.5GB') 536870912
+ * formatBytesConvert('1,234 GB') 1324997410816
+ * formatBytesConvert('1,234 GB', {thousand: true}) 1,324,997,410,816
+ * formatBytesConvert('1,234 GB', {toFixed: 2}) 1324997410816.00
+ */
 declare function formatBytesConvert(oBytes: any, { thounsand, toFixed }?: {
     thounsand?: boolean | undefined;
     toFixed?: number | undefined;

package/dist/index.mjs

@@ -12,21 +12,27 @@ const isStringNumber = (val) => {
 };
 const isNumber = (val) => typeof val === "number";
 function $toast(message, type = "success", otherParams = {}) {
-  const map = {
+  const typeMap = {
     s: "success",
     i: "info",
     e: "error",
     w: "warning"
   };
-  if (getType(message) === "object") {
-    if (message.clodeAll) {
+  function isShortType(t) {
+    return ["s", "i", "e", "w"].includes(t);
+  }
+  function isToastOptions(obj) {
+    return typeof obj === "object" && obj !== null;
+  }
+  if (isToastOptions(message)) {
+    if (message.closeAll) {
       ElMessage.closeAll();
     }
     ElMessage(message);
     return;
   }
-  if (getType(type) === "object") {
-    if (type.clodeAll) {
+  if (isToastOptions(type)) {
+    if (type.closeAll) {
       ElMessage.closeAll();
     }
     ElMessage({
@@ -39,9 +45,10 @@ function $toast(message, type = "success", otherParams = {}) {
   if (otherParams.closeAll) {
     ElMessage.closeAll();
   }
+  const resolvedType = isShortType(type) ? typeMap[type] : type;
   ElMessage({
     message,
-    type: map[type] || type,
+    type: resolvedType,
     ...otherParams
   });
 }
@@ -149,32 +156,38 @@ function validForm(ref, { message = "\u8868\u5355\u6821\u9A8C\u9519\u8BEF, \u8BF
     });
   });
 }
-function isEmpty(data) {
+function isEmpty(data, strict = false) {
   if (isRef(data)) {
     data = unref(data);
   }
+  if (strict) {
+    if (data === false || data === 0 || data === BigInt(0)) {
+      return false;
+    }
+  }
+  if (data == null) return true;
   if (data instanceof Date) {
     return isNaN(data.getTime());
   }
   switch (typeof data) {
-    case "undefined":
-      return true;
     case "string":
-      if (data.trim().length === 0) return true;
-      break;
+      return data.trim().length === 0;
     case "boolean":
-      if (!data) return true;
-      break;
+      return !data;
     case "number":
-      if (0 === data) return true;
-      break;
-    case "object":
-      if (null === data) return true;
-      if (void 0 !== data.length && data.length === 0) return true;
-      for (var k in data) {
-        return false;
-      }
-      return true;
+      return 0 === data || isNaN(data);
+    // ❗ `NaN`或者0 被认为是空
+    case "symbol":
+      return false;
+    case "bigint":
+      return data === BigInt(0);
+  }
+  if (data instanceof Map || data instanceof Set) return data.size === 0;
+  if (Array.isArray(data) || typeof data.length === "number" && Object.prototype.toString.call(data) === "[object Object]") {
+    return data.length === 0;
+  }
+  if (typeof data === "object") {
+    return Object.keys(data).length === 0;
   }
   return false;
 }
@@ -689,7 +702,7 @@ function formatBytesConvert(oBytes, { thounsand = false, toFixed: toFixed2 = 0 }
   }
   let finalRes = size * units[unit];
   if (toFixed2) {
-    finalRes = parseFloat(finalRes.toFixed(toFixed2));
+    finalRes = Number(finalRes).toFixed(toFixed2);
   }
   if (thounsand) {
     finalRes = formatThousands(finalRes);

package/package.json

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