tools-min-ns 1.18.20 → 1.18.21

package/README.md

@@ -5,6 +5,14 @@ pnpm i tools-min-ns --save
 ```
 
 # updates
+## v1.18.21
+add: BaseUtil.compareVersions
+add: BaseUtil.isVersionGreater
+add: BaseUtil.isVersionEqual
+add: TransferUtil.blendHexWithAlpha
+add: TransferUtil.hexToRgba
+fix: ObjectUtil.mergeParams
+
 ## v1.18.20
 fix: 解密失败为undefined
 

package/esm/base/BaseUtil.d.ts

@@ -95,5 +95,20 @@ declare namespace BaseUtil {
      * isNotEmpty(null) => false
      */
     const isNotEmpty: (obj: any) => boolean;
+    /**
+     * 比较两个版本号
+     * @param version1 第一个版本号
+     * @param version2 第二个版本号
+     * @returns 1: version1 > version2, -1: version1 < version2, 0: version1 = version2
+     */
+    function compareVersions(version1: string, version2: string): number;
+    /**
+     * 判断version1是否大于version2
+     */
+    function isVersionGreater(version1: string | undefined, version2: string | undefined): boolean;
+    /**
+     * 判断两个版本是否相等
+     */
+    function isVersionEqual(version1: string | undefined, version2: string | undefined): boolean;
 }
 export default BaseUtil;

package/esm/base/BaseUtil.js

@@ -154,5 +154,50 @@ var BaseUtil;
   BaseUtil.isNotEmpty = function (obj) {
     return !BaseUtil.isEmpty(obj);
   };
+  /**
+   * 比较两个版本号
+   * @param version1 第一个版本号
+   * @param version2 第二个版本号
+   * @returns 1: version1 > version2, -1: version1 < version2, 0: version1 = version2
+   */
+  function compareVersions(version1, version2) {
+    // 移除可能存在的 'v' 前缀
+    var v1 = version1.replace(/^v/, '');
+    var v2 = version2.replace(/^v/, '');
+    // 分割版本号并转换为数字数组
+    var parts1 = v1.split('.').map(function (part) {
+      return parseInt(part, 10);
+    });
+    var parts2 = v2.split('.').map(function (part) {
+      return parseInt(part, 10);
+    });
+    // 确保两个数组长度相同，短的用0补齐
+    var maxLength = Math.max(parts1.length, parts2.length);
+    while (parts1.length < maxLength) parts1.push(0);
+    while (parts2.length < maxLength) parts2.push(0);
+    // 逐位比较
+    for (var i = 0; i < maxLength; i++) {
+      if (parts1[i] > parts2[i]) return 1;
+      if (parts1[i] < parts2[i]) return -1;
+    }
+    return 0;
+  }
+  BaseUtil.compareVersions = compareVersions;
+  /**
+   * 判断version1是否大于version2
+   */
+  function isVersionGreater(version1, version2) {
+    if (!version1 || !version2) return false;
+    return compareVersions(version1, version2) > 0;
+  }
+  BaseUtil.isVersionGreater = isVersionGreater;
+  /**
+   * 判断两个版本是否相等
+   */
+  function isVersionEqual(version1, version2) {
+    if (!version1 || !version2) return false;
+    return compareVersions(version1, version2) === 0;
+  }
+  BaseUtil.isVersionEqual = isVersionEqual;
 })(BaseUtil || (BaseUtil = {}));
 export default BaseUtil;

package/esm/object/ObjectUtil.js

@@ -128,31 +128,39 @@ var ObjectUtil;
     var isAObj = BaseUtil.isObject(paramsA);
     var isBObj = BaseUtil.isObject(paramsB);
     if (!isAObj && !isBObj) return {};
-    if (BaseUtil.isEmpty(paramsA) || !isAObj) return paramsB;
-    if (BaseUtil.isEmpty(paramsB) || !isBObj) return paramsA;
-    var dataAllMap = new Map();
-    Object.entries(paramsA || {}).forEach(function (_a) {
-      var _b = __read(_a, 2),
-        k = _b[0],
-        v = _b[1];
-      dataAllMap.set(k, v);
-    }); //浅拷贝A属性
-    Object.entries(paramsB || {}).forEach(function (_a) {
+    if (BaseUtil.isEmpty(paramsA) || !isAObj) return deepClone(paramsB);
+    if (BaseUtil.isEmpty(paramsB) || !isBObj) return deepClone(paramsA);
+    return deepMerge(paramsA, paramsB);
+  }
+  ObjectUtil.mergeParams = mergeParams;
+  /**
+   * 深度合并两个对象
+   * @param target 目标对象（优先级高）
+   * @param source 源对象
+   * @returns 合并后的新对象
+   */
+  function deepMerge(target, source) {
+    var result = deepClone(target);
+    if (!BaseUtil.isObject(source)) {
+      return result;
+    }
+    Object.entries(source || {}).forEach(function (_a) {
       var _b = __read(_a, 2),
-        k = _b[0],
-        v = _b[1];
-      // dataBMap.set(k, v);
-      if ([undefined, null].includes(dataAllMap.get(k))) {
-        dataAllMap.set(k, v);
+        key = _b[0],
+        sourceValue = _b[1];
+      var targetValue = result[key];
+      // 如果目标对象中该属性为 null 或 undefined，直接使用源对象的值
+      if ([undefined, null].includes(targetValue)) {
+        result[key] = deepClone(sourceValue);
       }
+      // 如果两个都是对象，则递归合并
+      else if (BaseUtil.isObject(targetValue) && BaseUtil.isObject(sourceValue)) {
+        result[key] = deepMerge(targetValue, sourceValue);
+      }
+      // 其他情况保持目标对象的值（A优先级高于B）
     });
-    var newData = {};
-    dataAllMap.forEach(function (v, k) {
-      newData[k] = v;
-    });
-    return newData;
+    return result;
   }
-  ObjectUtil.mergeParams = mergeParams;
   /**
    * 获取对象的唯一hash
    * @param obj

package/esm/transfer/TransferUtil.d.ts

@@ -96,5 +96,20 @@ declare namespace TransferUtil {
      * @param n - 保留小数默认2
      */
     const getFileSizeByBytes: (bytes: number, n?: number, render?: ((num: number, unit: string) => any) | undefined) => any;
+    /**
+     * 十六进制转rgba
+     * @param hex
+     * @param alpha
+     * @returns
+     */
+    function hexToRgba(hex: string, alpha?: number): string;
+    /**
+     * 颜色混合计算
+     * @param hex
+     * @param alpha
+     * @param backgroundColor
+     * @returns 背景下与带透明度的#xxx颜色视觉效果相近的不透明十六进制颜色
+     */
+    function blendHexWithAlpha(hex: string, alpha: number, backgroundColor?: string): string | undefined;
 }
 export default TransferUtil;

package/esm/transfer/TransferUtil.js

@@ -326,5 +326,82 @@ var TransferUtil;
     var unit = sizes[i];
     return (_a = render === null || render === void 0 ? void 0 : render(num, unit)) !== null && _a !== void 0 ? _a : num + unit;
   };
+  /**
+   * 十六进制转rgba
+   * @param hex
+   * @param alpha
+   * @returns
+   */
+  function hexToRgba(hex, alpha) {
+    if (alpha === void 0) {
+      alpha = 1;
+    }
+    // 移除#号（如果存在）
+    // eslint-disable-next-line no-param-reassign
+    hex = hex.replace('#', '');
+    // 确保是6位十六进制
+    if (hex.length === 3) {
+      // eslint-disable-next-line no-param-reassign
+      hex = hex.split('').map(function (char) {
+        return char + char;
+      }).join('');
+    }
+    // 提取RGB值
+    var r = parseInt(hex.substring(0, 2), 16);
+    var g = parseInt(hex.substring(2, 4), 16);
+    var b = parseInt(hex.substring(4, 6), 16);
+    // 返回rgba格式
+    return "rgba(".concat(r, ",").concat(g, ",").concat(b, ",").concat(alpha, ")");
+  }
+  TransferUtil.hexToRgba = hexToRgba;
+  /**
+   * 颜色混合计算
+   * @param hex
+   * @param alpha
+   * @param backgroundColor
+   * @returns 背景下与带透明度的#xxx颜色视觉效果相近的不透明十六进制颜色
+   */
+  function blendHexWithAlpha(hex, alpha, backgroundColor) {
+    if (backgroundColor === void 0) {
+      backgroundColor = '#ffffff';
+    }
+    if (!hex || !alpha) return undefined;
+    // 移除#号
+    // eslint-disable-next-line no-param-reassign
+    hex = hex.replace('#', '');
+    // eslint-disable-next-line no-param-reassign
+    backgroundColor = backgroundColor.replace('#', '');
+    // 确保是6位十六进制
+    if (hex.length === 3) {
+      // eslint-disable-next-line no-param-reassign
+      hex = hex.split('').map(function (char) {
+        return char + char;
+      }).join('');
+    }
+    if (backgroundColor.length === 3) {
+      // eslint-disable-next-line no-param-reassign
+      backgroundColor = backgroundColor.split('').map(function (char) {
+        return char + char;
+      }).join('');
+    }
+    // 提取前景色RGB值
+    var fgR = parseInt(hex.substring(0, 2), 16);
+    var fgG = parseInt(hex.substring(2, 4), 16);
+    var fgB = parseInt(hex.substring(4, 6), 16);
+    // 提取背景色RGB值
+    var bgR = parseInt(backgroundColor.substring(0, 2), 16);
+    var bgG = parseInt(backgroundColor.substring(2, 4), 16);
+    var bgB = parseInt(backgroundColor.substring(4, 6), 16);
+    // 颜色混合公式：result = foreground * alpha + background * (1 - alpha)
+    var blendedR = Math.round(fgR * alpha + bgR * (1 - alpha));
+    var blendedG = Math.round(fgG * alpha + bgG * (1 - alpha));
+    var blendedB = Math.round(fgB * alpha + bgB * (1 - alpha));
+    // 转换回十六进制
+    var toHex = function toHex(value) {
+      return value.toString(16).padStart(2, '0').toLowerCase();
+    };
+    return "#".concat(toHex(blendedR)).concat(toHex(blendedG)).concat(toHex(blendedB));
+  }
+  TransferUtil.blendHexWithAlpha = blendHexWithAlpha;
 })(TransferUtil || (TransferUtil = {}));
 export default TransferUtil;

package/lib/base/BaseUtil.d.ts

@@ -95,5 +95,20 @@ declare namespace BaseUtil {
      * isNotEmpty(null) => false
      */
     const isNotEmpty: (obj: any) => boolean;
+    /**
+     * 比较两个版本号
+     * @param version1 第一个版本号
+     * @param version2 第二个版本号
+     * @returns 1: version1 > version2, -1: version1 < version2, 0: version1 = version2
+     */
+    function compareVersions(version1: string, version2: string): number;
+    /**
+     * 判断version1是否大于version2
+     */
+    function isVersionGreater(version1: string | undefined, version2: string | undefined): boolean;
+    /**
+     * 判断两个版本是否相等
+     */
+    function isVersionEqual(version1: string | undefined, version2: string | undefined): boolean;
 }
 export default BaseUtil;

package/lib/base/BaseUtil.js

@@ -159,5 +159,50 @@ var BaseUtil;
   BaseUtil.isNotEmpty = function (obj) {
     return !BaseUtil.isEmpty(obj);
   };
+  /**
+   * 比较两个版本号
+   * @param version1 第一个版本号
+   * @param version2 第二个版本号
+   * @returns 1: version1 > version2, -1: version1 < version2, 0: version1 = version2
+   */
+  function compareVersions(version1, version2) {
+    // 移除可能存在的 'v' 前缀
+    var v1 = version1.replace(/^v/, '');
+    var v2 = version2.replace(/^v/, '');
+    // 分割版本号并转换为数字数组
+    var parts1 = v1.split('.').map(function (part) {
+      return parseInt(part, 10);
+    });
+    var parts2 = v2.split('.').map(function (part) {
+      return parseInt(part, 10);
+    });
+    // 确保两个数组长度相同，短的用0补齐
+    var maxLength = Math.max(parts1.length, parts2.length);
+    while (parts1.length < maxLength) parts1.push(0);
+    while (parts2.length < maxLength) parts2.push(0);
+    // 逐位比较
+    for (var i = 0; i < maxLength; i++) {
+      if (parts1[i] > parts2[i]) return 1;
+      if (parts1[i] < parts2[i]) return -1;
+    }
+    return 0;
+  }
+  BaseUtil.compareVersions = compareVersions;
+  /**
+   * 判断version1是否大于version2
+   */
+  function isVersionGreater(version1, version2) {
+    if (!version1 || !version2) return false;
+    return compareVersions(version1, version2) > 0;
+  }
+  BaseUtil.isVersionGreater = isVersionGreater;
+  /**
+   * 判断两个版本是否相等
+   */
+  function isVersionEqual(version1, version2) {
+    if (!version1 || !version2) return false;
+    return compareVersions(version1, version2) === 0;
+  }
+  BaseUtil.isVersionEqual = isVersionEqual;
 })(BaseUtil || (BaseUtil = {}));
 exports.default = BaseUtil;

package/lib/object/ObjectUtil.js

@@ -138,31 +138,39 @@ var ObjectUtil;
     var isAObj = BaseUtil_1.default.isObject(paramsA);
     var isBObj = BaseUtil_1.default.isObject(paramsB);
     if (!isAObj && !isBObj) return {};
-    if (BaseUtil_1.default.isEmpty(paramsA) || !isAObj) return paramsB;
-    if (BaseUtil_1.default.isEmpty(paramsB) || !isBObj) return paramsA;
-    var dataAllMap = new Map();
-    Object.entries(paramsA || {}).forEach(function (_a) {
-      var _b = __read(_a, 2),
-        k = _b[0],
-        v = _b[1];
-      dataAllMap.set(k, v);
-    }); //浅拷贝A属性
-    Object.entries(paramsB || {}).forEach(function (_a) {
+    if (BaseUtil_1.default.isEmpty(paramsA) || !isAObj) return deepClone(paramsB);
+    if (BaseUtil_1.default.isEmpty(paramsB) || !isBObj) return deepClone(paramsA);
+    return deepMerge(paramsA, paramsB);
+  }
+  ObjectUtil.mergeParams = mergeParams;
+  /**
+   * 深度合并两个对象
+   * @param target 目标对象（优先级高）
+   * @param source 源对象
+   * @returns 合并后的新对象
+   */
+  function deepMerge(target, source) {
+    var result = deepClone(target);
+    if (!BaseUtil_1.default.isObject(source)) {
+      return result;
+    }
+    Object.entries(source || {}).forEach(function (_a) {
       var _b = __read(_a, 2),
-        k = _b[0],
-        v = _b[1];
-      // dataBMap.set(k, v);
-      if ([undefined, null].includes(dataAllMap.get(k))) {
-        dataAllMap.set(k, v);
+        key = _b[0],
+        sourceValue = _b[1];
+      var targetValue = result[key];
+      // 如果目标对象中该属性为 null 或 undefined，直接使用源对象的值
+      if ([undefined, null].includes(targetValue)) {
+        result[key] = deepClone(sourceValue);
       }
+      // 如果两个都是对象，则递归合并
+      else if (BaseUtil_1.default.isObject(targetValue) && BaseUtil_1.default.isObject(sourceValue)) {
+        result[key] = deepMerge(targetValue, sourceValue);
+      }
+      // 其他情况保持目标对象的值（A优先级高于B）
     });
-    var newData = {};
-    dataAllMap.forEach(function (v, k) {
-      newData[k] = v;
-    });
-    return newData;
+    return result;
   }
-  ObjectUtil.mergeParams = mergeParams;
   /**
    * 获取对象的唯一hash
    * @param obj

package/lib/transfer/TransferUtil.d.ts

@@ -96,5 +96,20 @@ declare namespace TransferUtil {
      * @param n - 保留小数默认2
      */
     const getFileSizeByBytes: (bytes: number, n?: number, render?: ((num: number, unit: string) => any) | undefined) => any;
+    /**
+     * 十六进制转rgba
+     * @param hex
+     * @param alpha
+     * @returns
+     */
+    function hexToRgba(hex: string, alpha?: number): string;
+    /**
+     * 颜色混合计算
+     * @param hex
+     * @param alpha
+     * @param backgroundColor
+     * @returns 背景下与带透明度的#xxx颜色视觉效果相近的不透明十六进制颜色
+     */
+    function blendHexWithAlpha(hex: string, alpha: number, backgroundColor?: string): string | undefined;
 }
 export default TransferUtil;

package/lib/transfer/TransferUtil.js

@@ -336,5 +336,82 @@ var TransferUtil;
     var unit = sizes[i];
     return (_a = render === null || render === void 0 ? void 0 : render(num, unit)) !== null && _a !== void 0 ? _a : num + unit;
   };
+  /**
+   * 十六进制转rgba
+   * @param hex
+   * @param alpha
+   * @returns
+   */
+  function hexToRgba(hex, alpha) {
+    if (alpha === void 0) {
+      alpha = 1;
+    }
+    // 移除#号（如果存在）
+    // eslint-disable-next-line no-param-reassign
+    hex = hex.replace('#', '');
+    // 确保是6位十六进制
+    if (hex.length === 3) {
+      // eslint-disable-next-line no-param-reassign
+      hex = hex.split('').map(function (char) {
+        return char + char;
+      }).join('');
+    }
+    // 提取RGB值
+    var r = parseInt(hex.substring(0, 2), 16);
+    var g = parseInt(hex.substring(2, 4), 16);
+    var b = parseInt(hex.substring(4, 6), 16);
+    // 返回rgba格式
+    return "rgba(".concat(r, ",").concat(g, ",").concat(b, ",").concat(alpha, ")");
+  }
+  TransferUtil.hexToRgba = hexToRgba;
+  /**
+   * 颜色混合计算
+   * @param hex
+   * @param alpha
+   * @param backgroundColor
+   * @returns 背景下与带透明度的#xxx颜色视觉效果相近的不透明十六进制颜色
+   */
+  function blendHexWithAlpha(hex, alpha, backgroundColor) {
+    if (backgroundColor === void 0) {
+      backgroundColor = '#ffffff';
+    }
+    if (!hex || !alpha) return undefined;
+    // 移除#号
+    // eslint-disable-next-line no-param-reassign
+    hex = hex.replace('#', '');
+    // eslint-disable-next-line no-param-reassign
+    backgroundColor = backgroundColor.replace('#', '');
+    // 确保是6位十六进制
+    if (hex.length === 3) {
+      // eslint-disable-next-line no-param-reassign
+      hex = hex.split('').map(function (char) {
+        return char + char;
+      }).join('');
+    }
+    if (backgroundColor.length === 3) {
+      // eslint-disable-next-line no-param-reassign
+      backgroundColor = backgroundColor.split('').map(function (char) {
+        return char + char;
+      }).join('');
+    }
+    // 提取前景色RGB值
+    var fgR = parseInt(hex.substring(0, 2), 16);
+    var fgG = parseInt(hex.substring(2, 4), 16);
+    var fgB = parseInt(hex.substring(4, 6), 16);
+    // 提取背景色RGB值
+    var bgR = parseInt(backgroundColor.substring(0, 2), 16);
+    var bgG = parseInt(backgroundColor.substring(2, 4), 16);
+    var bgB = parseInt(backgroundColor.substring(4, 6), 16);
+    // 颜色混合公式：result = foreground * alpha + background * (1 - alpha)
+    var blendedR = Math.round(fgR * alpha + bgR * (1 - alpha));
+    var blendedG = Math.round(fgG * alpha + bgG * (1 - alpha));
+    var blendedB = Math.round(fgB * alpha + bgB * (1 - alpha));
+    // 转换回十六进制
+    var toHex = function toHex(value) {
+      return value.toString(16).padStart(2, '0').toLowerCase();
+    };
+    return "#".concat(toHex(blendedR)).concat(toHex(blendedG)).concat(toHex(blendedB));
+  }
+  TransferUtil.blendHexWithAlpha = blendHexWithAlpha;
 })(TransferUtil || (TransferUtil = {}));
 exports.default = TransferUtil;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tools-min-ns",
   "description": "工具包适用于前端以及node",
-  "version": "1.18.20",
+  "version": "1.18.21",
   "main": "lib/index.js",
   "license": "MIT",
   "author": "nanshen",