@oeos-components/utils 0.0.22 → 0.0.24

package/dist/base.cjs

@@ -67,8 +67,8 @@ function setStorage(storageName, params, isSession = false) {
   }
 }
 function getStorage(data, isSession = false) {
-  let getLocalData = "";
-  let getSessionData = "";
+  let getLocalData = null;
+  let getSessionData = null;
   if (isSession) {
     getSessionData = sessionStorage.getItem(data);
   } else {
@@ -534,32 +534,26 @@ function toLine(text, connect = "-") {
   }).toLocaleLowerCase();
   return translateText;
 }
+const _CSS_UNIT_RE = /^[0-9]+(\.[0-9]+)?(px|%|em|rem|vw|vh|ch)$/;
 function processWidth(initValue, isBase = false) {
-  let value = reactivity.unref(initValue);
-  let res = "";
-  if (!value) {
-    return isBase ? value : {};
-  } else if (typeof value === "number") {
-    value = String(value);
-  }
-  if (value === "") {
-    return isBase ? value : {};
-  } else if (typeof value === "string" && !isNaN(value)) {
-    res = value + "px";
-  } else if (typeof value === "string" && /^[0-9]+(\.[0-9]+)?(px|%|em|rem|vw|vh|ch)*$/.test(value)) {
-    res = value;
+  const raw = reactivity.unref(initValue);
+  if (!raw) {
+    return isBase ? "" : {};
+  }
+  const str = typeof raw === "number" ? `${raw}` : raw;
+  let res;
+  if (!isNaN(Number(str))) {
+    res = str + "px";
+  } else if (_CSS_UNIT_RE.test(str)) {
+    res = str;
   } else {
-    console.warn(`${value} is Invalid unit provided`);
-    return value;
+    return isBase ? "" : {};
   }
-  if (isBase) {
-    return res;
-  }
-  return { width: res };
+  return isBase ? res : { width: res };
 }
 function throttle(fn, delay = 1e3) {
   let last = 0;
-  let timer = null;
+  let timer = void 0;
   return function() {
     let context = this;
     let args = arguments;
@@ -630,28 +624,24 @@ function debounce(func, delay = 500, immediate, resultCallback) {
   };
   return _debounce;
 }
-function confirm(message, options) {
+function confirm(message, options = {}, appContext = null) {
   const resolvedMessage = typeof message === "function" ? message() : message;
-  const elContext = elementPlus.ElMessageBox.install?.context || elementPlus.ElMessageBox._context || document.querySelector("#app")?._vue_app?._context;
   const mergeOptions = {
     title: "\u63D0\u793A",
     draggable: true,
     showCancelButton: false,
     confirmButtonText: "\u786E\u5B9A",
     dangerouslyUseHTMLString: true,
-    // 允许 HTML
-    appContext: elContext,
-    // 强制注入 Element Plus 的上下文
     ...options
   };
-  return elementPlus.ElMessageBox.confirm(resolvedMessage, mergeOptions);
+  return elementPlus.ElMessageBox.confirm(resolvedMessage, mergeOptions, appContext || elementPlus.ElMessageBox._context);
 }
 function getVariable(propertyName) {
   let res = getComputedStyle(document.documentElement).getPropertyValue(propertyName).trim();
   return res;
 }
 function test() {
-  return "\u54C8\u54C8\u54C8" + /* @__PURE__ */ new Date();
+  return "\u54C8\u54C8\u54C81111" + /* @__PURE__ */ new Date();
 }
 
 exports.$toast = $toast;

package/dist/base.d.cts

@@ -64,7 +64,7 @@ declare namespace $toast {
     var warning: (message: any, otherParams?: {}) => void;
 }
 declare function setStorage(storageName: string, params: any, isSession?: boolean): void;
-declare function getStorage(data: any, isSession?: boolean): string | null;
+declare function getStorage(data: any, isSession?: boolean): any;
 /**
  *
  * @param {*} str 需要清空的localStorage或sessionStorage, 如果不传清空所有
@@ -281,7 +281,22 @@ declare function random(min?: number, max?: number): number;
  * toLine('_nameAndy') // _name-andy
  */
 declare function toLine(text: any, connect?: string): any;
-declare function processWidth(initValue: any, isBase?: boolean): any;
+type WidthInput = string | number | Ref<string | number>;
+/**
+ * processWidth(200)         // { width: '200px' }
+ *
+ * processWidth('200', true) // '200px'
+ *
+ * processWidth('200.33px')  // { width: '200.33px' }
+ *
+ * processWidth('')          // {}
+ *
+ * processWidth('invalid')   // {}
+ *
+ */
+declare function processWidth(initValue: WidthInput, isBase?: boolean): {
+    width: string;
+} | {} | string;
 declare function throttle(fn: any, delay?: number): () => void;
 /**
  * 封装 Promise 执行，提供自动 loading 状态管理
@@ -331,7 +346,7 @@ declare function debounce(func: Func, delay?: number, immediate?: boolean, resul
     })
  * 如果是多个dialog嵌套, 可以给上层的dom设置个id如highSettingsForm, 然后appendTo: '#highSettingsForm'
  */
-declare function confirm(message: any, options: any): Promise<element_plus.MessageBoxData>;
+declare function confirm(message: any, options?: {}, appContext?: null): Promise<element_plus.MessageBoxData>;
 /** Function to get a CSS custom property value
  *
  * getVariable('--blue');

package/dist/base.d.mts

@@ -64,7 +64,7 @@ declare namespace $toast {
     var warning: (message: any, otherParams?: {}) => void;
 }
 declare function setStorage(storageName: string, params: any, isSession?: boolean): void;
-declare function getStorage(data: any, isSession?: boolean): string | null;
+declare function getStorage(data: any, isSession?: boolean): any;
 /**
  *
  * @param {*} str 需要清空的localStorage或sessionStorage, 如果不传清空所有
@@ -281,7 +281,22 @@ declare function random(min?: number, max?: number): number;
  * toLine('_nameAndy') // _name-andy
  */
 declare function toLine(text: any, connect?: string): any;
-declare function processWidth(initValue: any, isBase?: boolean): any;
+type WidthInput = string | number | Ref<string | number>;
+/**
+ * processWidth(200)         // { width: '200px' }
+ *
+ * processWidth('200', true) // '200px'
+ *
+ * processWidth('200.33px')  // { width: '200.33px' }
+ *
+ * processWidth('')          // {}
+ *
+ * processWidth('invalid')   // {}
+ *
+ */
+declare function processWidth(initValue: WidthInput, isBase?: boolean): {
+    width: string;
+} | {} | string;
 declare function throttle(fn: any, delay?: number): () => void;
 /**
  * 封装 Promise 执行，提供自动 loading 状态管理
@@ -331,7 +346,7 @@ declare function debounce(func: Func, delay?: number, immediate?: boolean, resul
     })
  * 如果是多个dialog嵌套, 可以给上层的dom设置个id如highSettingsForm, 然后appendTo: '#highSettingsForm'
  */
-declare function confirm(message: any, options: any): Promise<element_plus.MessageBoxData>;
+declare function confirm(message: any, options?: {}, appContext?: null): Promise<element_plus.MessageBoxData>;
 /** Function to get a CSS custom property value
  *
  * getVariable('--blue');

package/dist/base.d.ts

@@ -64,7 +64,7 @@ declare namespace $toast {
     var warning: (message: any, otherParams?: {}) => void;
 }
 declare function setStorage(storageName: string, params: any, isSession?: boolean): void;
-declare function getStorage(data: any, isSession?: boolean): string | null;
+declare function getStorage(data: any, isSession?: boolean): any;
 /**
  *
  * @param {*} str 需要清空的localStorage或sessionStorage, 如果不传清空所有
@@ -281,7 +281,22 @@ declare function random(min?: number, max?: number): number;
  * toLine('_nameAndy') // _name-andy
  */
 declare function toLine(text: any, connect?: string): any;
-declare function processWidth(initValue: any, isBase?: boolean): any;
+type WidthInput = string | number | Ref<string | number>;
+/**
+ * processWidth(200)         // { width: '200px' }
+ *
+ * processWidth('200', true) // '200px'
+ *
+ * processWidth('200.33px')  // { width: '200.33px' }
+ *
+ * processWidth('')          // {}
+ *
+ * processWidth('invalid')   // {}
+ *
+ */
+declare function processWidth(initValue: WidthInput, isBase?: boolean): {
+    width: string;
+} | {} | string;
 declare function throttle(fn: any, delay?: number): () => void;
 /**
  * 封装 Promise 执行，提供自动 loading 状态管理
@@ -331,7 +346,7 @@ declare function debounce(func: Func, delay?: number, immediate?: boolean, resul
     })
  * 如果是多个dialog嵌套, 可以给上层的dom设置个id如highSettingsForm, 然后appendTo: '#highSettingsForm'
  */
-declare function confirm(message: any, options: any): Promise<element_plus.MessageBoxData>;
+declare function confirm(message: any, options?: {}, appContext?: null): Promise<element_plus.MessageBoxData>;
 /** Function to get a CSS custom property value
  *
  * getVariable('--blue');

package/dist/base.mjs

@@ -65,8 +65,8 @@ function setStorage(storageName, params, isSession = false) {
   }
 }
 function getStorage(data, isSession = false) {
-  let getLocalData = "";
-  let getSessionData = "";
+  let getLocalData = null;
+  let getSessionData = null;
   if (isSession) {
     getSessionData = sessionStorage.getItem(data);
   } else {
@@ -532,32 +532,26 @@ function toLine(text, connect = "-") {
   }).toLocaleLowerCase();
   return translateText;
 }
+const _CSS_UNIT_RE = /^[0-9]+(\.[0-9]+)?(px|%|em|rem|vw|vh|ch)$/;
 function processWidth(initValue, isBase = false) {
-  let value = unref(initValue);
-  let res = "";
-  if (!value) {
-    return isBase ? value : {};
-  } else if (typeof value === "number") {
-    value = String(value);
-  }
-  if (value === "") {
-    return isBase ? value : {};
-  } else if (typeof value === "string" && !isNaN(value)) {
-    res = value + "px";
-  } else if (typeof value === "string" && /^[0-9]+(\.[0-9]+)?(px|%|em|rem|vw|vh|ch)*$/.test(value)) {
-    res = value;
+  const raw = unref(initValue);
+  if (!raw) {
+    return isBase ? "" : {};
+  }
+  const str = typeof raw === "number" ? `${raw}` : raw;
+  let res;
+  if (!isNaN(Number(str))) {
+    res = str + "px";
+  } else if (_CSS_UNIT_RE.test(str)) {
+    res = str;
   } else {
-    console.warn(`${value} is Invalid unit provided`);
-    return value;
+    return isBase ? "" : {};
   }
-  if (isBase) {
-    return res;
-  }
-  return { width: res };
+  return isBase ? res : { width: res };
 }
 function throttle(fn, delay = 1e3) {
   let last = 0;
-  let timer = null;
+  let timer = void 0;
   return function() {
     let context = this;
     let args = arguments;
@@ -628,28 +622,24 @@ function debounce(func, delay = 500, immediate, resultCallback) {
   };
   return _debounce;
 }
-function confirm(message, options) {
+function confirm(message, options = {}, appContext = null) {
   const resolvedMessage = typeof message === "function" ? message() : message;
-  const elContext = ElMessageBox.install?.context || ElMessageBox._context || document.querySelector("#app")?._vue_app?._context;
   const mergeOptions = {
     title: "\u63D0\u793A",
     draggable: true,
     showCancelButton: false,
     confirmButtonText: "\u786E\u5B9A",
     dangerouslyUseHTMLString: true,
-    // 允许 HTML
-    appContext: elContext,
-    // 强制注入 Element Plus 的上下文
     ...options
   };
-  return ElMessageBox.confirm(resolvedMessage, mergeOptions);
+  return ElMessageBox.confirm(resolvedMessage, mergeOptions, appContext || ElMessageBox._context);
 }
 function getVariable(propertyName) {
   let res = getComputedStyle(document.documentElement).getPropertyValue(propertyName).trim();
   return res;
 }
 function test() {
-  return "\u54C8\u54C8\u54C8" + /* @__PURE__ */ new Date();
+  return "\u54C8\u54C8\u54C81111" + /* @__PURE__ */ new Date();
 }
 
 export { $toast, asyncWrapper, clearStorage, clone, confirm, copy, debounce, getStorage, getType, getVariable, isEmpty, log, merge, notEmpty, processWidth, random, setStorage, sleep, test, throttle, toLine, tryCatch, uuid, validForm, validate, validateTrigger };

package/package.json

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