@whitesev/utils 2.9.5 → 2.9.7

package/dist/types/src/UtilsGMCookie.d.ts

@@ -24,7 +24,7 @@ export declare class UtilsGMCookie {
     };
     list(option: UtilsGMCookieListOptions | object, callback?: (data: UtilsGMCookieResult[], error?: Error) => void): void;
     /**
-     *  获取多组Cookie
+     * 获取多组Cookie
      * @param option 配置
      **/
     getList(option: UtilsGMCookieListOptions | object): UtilsGMCookieResult[];
@@ -41,7 +41,8 @@ export declare class UtilsGMCookie {
      */
     delete(option: UtilsGMCookieDeleteOptions, callback?: (error?: Error) => void): void;
     /**
-     * 解析cookie字符串
+     * 解析cookie字符串，按`;`分割
+     *
      * 例如：document.cookie
      * @param cookieStr
      */

package/dist/types/src/UtilsGMMenu.d.ts

@@ -73,7 +73,7 @@ export declare class GMMenu {
      * 根据键值获取callback函数
      * @param menuKey 菜单-键key
      */
-    getCallBack(menuKey: string): ((...args: any[]) => any) | undefined;
+    getCallBack(menuKey: string): ((data: import("./types/UtilsGMMenu").UtilsGMMenuClickCallBackData) => void) | undefined;
     /**
      * 获取当enable为true时默认显示在菜单中前面的emoji图标
      */
@@ -101,17 +101,17 @@ export declare class GMMenu {
     setEnable(menuKey: string, value: boolean): void;
     /**
      * 设置当enable为true时默认显示在菜单中前面的emoji图标
-     * @param emojiString
+     * @param emojiString emoji字符串
      */
     setEnableTrueEmoji(emojiString: string): void;
     /**
      * 设置当enable为false时默认显示在菜单中前面的emoji图标
-     * @param emojiString
+     * @param emojiString emoji字符串
      */
     setEnableFalseEmoji(emojiString: string): void;
     /**
      * 设置本地存储的菜单外部的键名
-     * @param keyName
+     * @param keyName 键名
      */
     setLocalStorageKeyName(keyName: string): void;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@whitesev/utils",
-  "version": "2.9.5",
+  "version": "2.9.7",
   "type": "module",
   "description": "一个常用的工具库",
   "main": "dist/index.cjs.js",
@@ -40,11 +40,11 @@
   },
   "devDependencies": {
     "@eslint/js": "^9.38.0",
-    "@rollup/plugin-commonjs": "^28.0.8",
+    "@rollup/plugin-commonjs": "^28.0.9",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-terser": "^0.4.4",
-    "@rollup/plugin-typescript": "^12.2.0",
+    "@rollup/plugin-typescript": "^12.3.0",
     "browserslist": "^4.27.0",
     "caniuse-lite": "^1.0.30001751",
     "eslint": "^9.38.0",

package/src/ColorConversion.ts

@@ -80,6 +80,9 @@ export class ColorConversion {
     if (typeof level !== "number") {
       level = Number(level);
     }
+    if (isNaN(level)) {
+      throw new TypeError(`输入错误的level：${level}`);
+    }
     const rgbc = this.hexToRgb(color);
     for (let index = 0; index < 3; index++) {
       const rgbcItemValue = rgbc[index];
@@ -101,6 +104,9 @@ export class ColorConversion {
     if (typeof level !== "number") {
       level = Number(level);
     }
+    if (isNaN(level)) {
+      throw new TypeError(`输入错误的level：${level}`);
+    }
     const rgbc = this.hexToRgb(color);
     for (let index = 0; index < 3; index++) {
       const rgbcItemValue = Number(rgbc[index]);

package/src/CommonUtil.ts

@@ -33,41 +33,43 @@ class CommonUtil {
     if (target == null) {
       target = {};
     }
+    // 当前遍历的目标对象
+    let iteratorTarget;
     if (isAdd) {
-      for (const sourceKeyName in source) {
-        const targetKeyName = sourceKeyName;
-        const targetValue = Reflect.get(target, targetKeyName);
-        const sourceValue = Reflect.get(source, sourceKeyName);
-        if (
-          typeof sourceValue === "object" &&
-          sourceValue != null &&
-          sourceKeyName in target &&
-          !UtilsContext.isDOM(sourceValue)
-        ) {
-          /* 源端的值是object类型，且不是元素节点 */
-          Reflect.set(target, sourceKeyName, UtilsContext.assign(targetValue, sourceValue, isAdd));
-          continue;
-        }
-        Reflect.set(target, sourceKeyName, sourceValue);
-      }
+      // 追加并覆盖是以source为准
+      iteratorTarget = source;
     } else {
-      for (const targetKeyName in target) {
-        if (targetKeyName in source) {
-          const targetValue = Reflect.get(target, targetKeyName);
-          const sourceValue = Reflect.get(source, targetKeyName);
-          if (
-            typeof sourceValue === "object" &&
-            sourceValue != null &&
-            !UtilsContext.isDOM(sourceValue) &&
-            Object.keys(sourceValue).length
-          ) {
-            /* 源端的值是object类型，且不是元素节点 */
-            Reflect.set(target, targetKeyName, UtilsContext.assign(targetValue, sourceValue, isAdd));
-            continue;
+      // 覆盖以target为准
+      iteratorTarget = target;
+    }
+    for (const keyName in iteratorTarget) {
+      if (!isAdd && !(keyName in source)) {
+        // 仅替换 但是源端没有此键
+        continue;
+      }
+      const targetValue = Reflect.get(target, keyName);
+      const sourceValue = Reflect.get(source, keyName);
+      if (
+        typeof sourceValue === "object" &&
+        sourceValue != null &&
+        keyName in target &&
+        !UtilsContext.isDOM(sourceValue)
+      ) {
+        // 源端的值是object类型，且不是元素节点
+        // 如果是数组，那此数组中有值，清空旧的数组再赋值
+        let childObjectValue;
+        if (Array.isArray(sourceValue)) {
+          if (Array.isArray(targetValue)) {
+            targetValue.length = 0;
           }
-          /* 直接赋值 */
-          Reflect.set(target, targetKeyName, sourceValue);
+          childObjectValue = sourceValue;
+        } else {
+          childObjectValue = UtilsContext.assign(targetValue, sourceValue, isAdd);
         }
+        Reflect.set(target, keyName, childObjectValue);
+      } else {
+        /* 直接赋值 */
+        Reflect.set(target, keyName, sourceValue);
       }
     }
 

package/src/UtilsGMCookie.ts

@@ -134,7 +134,7 @@ export class UtilsGMCookie {
     }
   }
   /**
-   *  获取多组Cookie
+   * 获取多组Cookie
    * @param option 配置
    **/
   getList(option: UtilsGMCookieListOptions | object): UtilsGMCookieResult[] {
@@ -246,7 +246,8 @@ export class UtilsGMCookie {
     }
   }
   /**
-   * 解析cookie字符串
+   * 解析cookie字符串，按`;`分割
+   *
    * 例如：document.cookie
    * @param cookieStr
    */

package/src/UtilsGMMenu.ts

@@ -370,7 +370,7 @@ export class GMMenu {
    * 根据键值获取callback函数
    * @param menuKey 菜单-键key
    */
-  getCallBack(menuKey: string): ((...args: any[]) => any) | undefined {
+  getCallBack(menuKey: string) {
     return this.MenuHandle.getMenuHandledOption(menuKey)?.callback;
   }
   /**
@@ -410,31 +410,31 @@ export class GMMenu {
   }
   /**
    * 设置当enable为true时默认显示在菜单中前面的emoji图标
-   * @param emojiString
+   * @param emojiString emoji字符串
    */
   setEnableTrueEmoji(emojiString: string) {
     if (typeof emojiString !== "string") {
-      throw new Error("参数emojiString必须是string类型");
+      throw new TypeError("参数emojiString必须是string类型");
     }
     this.MenuHandle.$emoji.success = emojiString;
   }
   /**
    * 设置当enable为false时默认显示在菜单中前面的emoji图标
-   * @param emojiString
+   * @param emojiString emoji字符串
    */
   setEnableFalseEmoji(emojiString: string) {
     if (typeof emojiString !== "string") {
-      throw new Error("参数emojiString必须是string类型");
+      throw new TypeError("参数emojiString必须是string类型");
     }
     this.MenuHandle.$emoji.error = emojiString;
   }
   /**
    * 设置本地存储的菜单外部的键名
-   * @param keyName
+   * @param keyName 键名
    */
   setLocalStorageKeyName(keyName: string) {
     if (typeof keyName !== "string") {
-      throw new Error("参数keyName必须是string类型");
+      throw new TypeError("参数keyName必须是string类型");
     }
     this.MenuHandle.$data.key = keyName;
   }