@oeos-components/utils 0.0.6 → 0.0.8

package/dist/index.cjs

@@ -644,37 +644,38 @@ function toFixed(value, options = {}) {
   }
   return `${prefix}${res}${finalUnit}${suffix}`;
 }
-function formatBytes(bytes, { toFixed: toFixed2 = 2, thousands = true } = {}) {
+function formatBytes(bytes, options = {}) {
+  let { digit = 2, thousands = true, prefix = "", suffix = "" } = options;
   if (isStringNumber(bytes) || isNumber(bytes)) {
     bytes = Number(bytes);
   } else {
     return bytes;
   }
   if (bytes <= 0) {
-    return bytes.toFixed(toFixed2) + " B";
+    return bytes.toFixed(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));
-  let res = (bytes / Math.pow(k, i)).toFixed(toFixed2) + " " + sizes[i];
+  let res = (bytes / Math.pow(k, i)).toFixed(digit) + " " + sizes[i];
   if (thousands) {
     res = formatThousands(res);
   }
-  return res;
+  return `${prefix}${res}${suffix}`;
 }
-function formatBytesConvert(oBytes, { thounsand = false, toFixed: toFixed2 = 0 } = {}) {
+function formatBytesConvert(oBytes, { thounsands = false, digit = 0 } = {}) {
+  let bytes = oBytes;
   if (isStringNumber(oBytes) || isNumber(oBytes) || getType(oBytes) !== "string") {
-    return oBytes;
+    return parseDigitThounsands(oBytes);
   }
   if (!oBytes) {
-    return oBytes;
+    return parseDigitThounsands(oBytes);
   }
   const regex = /^\d{1,3}(,\d{3})*(\.\d+)?[a-zA-Z ]*$/;
-  let bytes = oBytes;
   if (regex.test(oBytes)) {
     bytes = oBytes.replace(/,/g, "");
     if (isStringNumber(bytes) || isNumber(bytes) || getType(bytes) !== "string") {
-      return bytes;
+      return parseDigitThounsands(bytes);
     }
   }
   const bytesRegex = /^(\d+(?:\.\d+)?)\s*([BKMGTPEZY]?B|Byte)$/i;
@@ -703,14 +704,17 @@ function formatBytesConvert(oBytes, { thounsand = false, toFixed: toFixed2 = 0 }
     );
     return;
   }
-  let finalRes = size * units[unit];
-  if (toFixed2) {
-    finalRes = Number(finalRes).toFixed(toFixed2);
-  }
-  if (thounsand) {
-    finalRes = formatThousands(finalRes);
+  function parseDigitThounsands(val) {
+    let finalRes = val;
+    if (digit) {
+      finalRes = Number(finalRes).toFixed(digit);
+    }
+    if (thounsands) {
+      finalRes = formatThousands(finalRes);
+    }
+    return finalRes;
   }
-  return finalRes;
+  return parseDigitThounsands(size * units[unit]);
 }
 function throttle(fn, delay = 1e3) {
   let last = 0;

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 import * as element_plus from 'element-plus';
-import { ElMessageOptions } from 'element-plus';
+import { MessageOptions } from 'element-plus';
 import { Ref } from '@vue/reactivity';
 
 /**
@@ -61,7 +61,7 @@ declare const isNumber: (val: any) => val is number;
 type MessageType = 'success' | 'info' | 'error' | 'warning';
 type ShortType = 's' | 'i' | 'e' | 'w';
 type ToastType = MessageType | ShortType;
-type ToastOptions = Partial<ElMessageOptions> & {
+type ToastOptions = Partial<MessageOptions> & {
     closeAll?: boolean;
 };
 declare function $toast(message: string | ToastOptions, type?: ToastType | ToastOptions, otherParams?: ToastOptions): void;
@@ -280,9 +280,11 @@ declare function toFixed(value: any, options?: {
  * proxy.formatBytes(536870912) // 512MB
  * proxy.formatBytes(536870912) // 512MB
  */
-declare function formatBytes(bytes: any, { toFixed, thousands }?: {
-    toFixed?: number | undefined;
-    thousands?: boolean | undefined;
+declare function formatBytes(bytes: any, options?: {
+    digit?: number;
+    thousands?: boolean;
+    prefix?: string;
+    suffix?: string;
 }): any;
 /**
  * 字节转数字
@@ -294,9 +296,9 @@ declare function formatBytes(bytes: any, { toFixed, thousands }?: {
  * 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;
+declare function formatBytesConvert(oBytes: any, { thounsands, digit }?: {
+    thounsands?: boolean | undefined;
+    digit?: number | undefined;
 }): any;
 declare function throttle(fn: any, delay?: number): () => void;
 /**

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import * as element_plus from 'element-plus';
-import { ElMessageOptions } from 'element-plus';
+import { MessageOptions } from 'element-plus';
 import { Ref } from '@vue/reactivity';
 
 /**
@@ -61,7 +61,7 @@ declare const isNumber: (val: any) => val is number;
 type MessageType = 'success' | 'info' | 'error' | 'warning';
 type ShortType = 's' | 'i' | 'e' | 'w';
 type ToastType = MessageType | ShortType;
-type ToastOptions = Partial<ElMessageOptions> & {
+type ToastOptions = Partial<MessageOptions> & {
     closeAll?: boolean;
 };
 declare function $toast(message: string | ToastOptions, type?: ToastType | ToastOptions, otherParams?: ToastOptions): void;
@@ -280,9 +280,11 @@ declare function toFixed(value: any, options?: {
  * proxy.formatBytes(536870912) // 512MB
  * proxy.formatBytes(536870912) // 512MB
  */
-declare function formatBytes(bytes: any, { toFixed, thousands }?: {
-    toFixed?: number | undefined;
-    thousands?: boolean | undefined;
+declare function formatBytes(bytes: any, options?: {
+    digit?: number;
+    thousands?: boolean;
+    prefix?: string;
+    suffix?: string;
 }): any;
 /**
  * 字节转数字
@@ -294,9 +296,9 @@ declare function formatBytes(bytes: any, { toFixed, thousands }?: {
  * 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;
+declare function formatBytesConvert(oBytes: any, { thounsands, digit }?: {
+    thounsands?: boolean | undefined;
+    digit?: number | undefined;
 }): any;
 declare function throttle(fn: any, delay?: number): () => void;
 /**

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as element_plus from 'element-plus';
-import { ElMessageOptions } from 'element-plus';
+import { MessageOptions } from 'element-plus';
 import { Ref } from '@vue/reactivity';
 
 /**
@@ -61,7 +61,7 @@ declare const isNumber: (val: any) => val is number;
 type MessageType = 'success' | 'info' | 'error' | 'warning';
 type ShortType = 's' | 'i' | 'e' | 'w';
 type ToastType = MessageType | ShortType;
-type ToastOptions = Partial<ElMessageOptions> & {
+type ToastOptions = Partial<MessageOptions> & {
     closeAll?: boolean;
 };
 declare function $toast(message: string | ToastOptions, type?: ToastType | ToastOptions, otherParams?: ToastOptions): void;
@@ -280,9 +280,11 @@ declare function toFixed(value: any, options?: {
  * proxy.formatBytes(536870912) // 512MB
  * proxy.formatBytes(536870912) // 512MB
  */
-declare function formatBytes(bytes: any, { toFixed, thousands }?: {
-    toFixed?: number | undefined;
-    thousands?: boolean | undefined;
+declare function formatBytes(bytes: any, options?: {
+    digit?: number;
+    thousands?: boolean;
+    prefix?: string;
+    suffix?: string;
 }): any;
 /**
  * 字节转数字
@@ -294,9 +296,9 @@ declare function formatBytes(bytes: any, { toFixed, thousands }?: {
  * 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;
+declare function formatBytesConvert(oBytes: any, { thounsands, digit }?: {
+    thounsands?: boolean | undefined;
+    digit?: number | undefined;
 }): any;
 declare function throttle(fn: any, delay?: number): () => void;
 /**

package/dist/index.mjs

@@ -641,37 +641,38 @@ function toFixed(value, options = {}) {
   }
   return `${prefix}${res}${finalUnit}${suffix}`;
 }
-function formatBytes(bytes, { toFixed: toFixed2 = 2, thousands = true } = {}) {
+function formatBytes(bytes, options = {}) {
+  let { digit = 2, thousands = true, prefix = "", suffix = "" } = options;
   if (isStringNumber(bytes) || isNumber(bytes)) {
     bytes = Number(bytes);
   } else {
     return bytes;
   }
   if (bytes <= 0) {
-    return bytes.toFixed(toFixed2) + " B";
+    return bytes.toFixed(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));
-  let res = (bytes / Math.pow(k, i)).toFixed(toFixed2) + " " + sizes[i];
+  let res = (bytes / Math.pow(k, i)).toFixed(digit) + " " + sizes[i];
   if (thousands) {
     res = formatThousands(res);
   }
-  return res;
+  return `${prefix}${res}${suffix}`;
 }
-function formatBytesConvert(oBytes, { thounsand = false, toFixed: toFixed2 = 0 } = {}) {
+function formatBytesConvert(oBytes, { thounsands = false, digit = 0 } = {}) {
+  let bytes = oBytes;
   if (isStringNumber(oBytes) || isNumber(oBytes) || getType(oBytes) !== "string") {
-    return oBytes;
+    return parseDigitThounsands(oBytes);
   }
   if (!oBytes) {
-    return oBytes;
+    return parseDigitThounsands(oBytes);
   }
   const regex = /^\d{1,3}(,\d{3})*(\.\d+)?[a-zA-Z ]*$/;
-  let bytes = oBytes;
   if (regex.test(oBytes)) {
     bytes = oBytes.replace(/,/g, "");
     if (isStringNumber(bytes) || isNumber(bytes) || getType(bytes) !== "string") {
-      return bytes;
+      return parseDigitThounsands(bytes);
     }
   }
   const bytesRegex = /^(\d+(?:\.\d+)?)\s*([BKMGTPEZY]?B|Byte)$/i;
@@ -700,14 +701,17 @@ function formatBytesConvert(oBytes, { thounsand = false, toFixed: toFixed2 = 0 }
     );
     return;
   }
-  let finalRes = size * units[unit];
-  if (toFixed2) {
-    finalRes = Number(finalRes).toFixed(toFixed2);
-  }
-  if (thounsand) {
-    finalRes = formatThousands(finalRes);
+  function parseDigitThounsands(val) {
+    let finalRes = val;
+    if (digit) {
+      finalRes = Number(finalRes).toFixed(digit);
+    }
+    if (thounsands) {
+      finalRes = formatThousands(finalRes);
+    }
+    return finalRes;
   }
-  return finalRes;
+  return parseDigitThounsands(size * units[unit]);
 }
 function throttle(fn, delay = 1e3) {
   let last = 0;

package/package.json

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