tools-min-ns 1.18.20 → 1.18.28

package/README.md

@@ -5,6 +5,30 @@ pnpm i tools-min-ns --save
 ```
 
 # updates
+## v1.18.28
+fix: mgop 鸿蒙这种原生桥/容器环境里，如果请求层异步读取 headers 引用
+## v1.18.27
+add: NumberUtil.correctNumberInputStr
+## v1.18.26
+fix: TransferUtil.numPlusUnit负数处理
+## v1.18.25
+fix: DateUtil.formatBySeconds
+## v1.18.24
+fix: maskIDCard
+
+## v1.18.23
+fix: getFileSizeByBytes
+## v1.18.22
+add: DateUtil.getSectionTimeList
+
+## 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/check/CheckUtil.js

@@ -275,9 +275,6 @@ var CheckUtil;
     if (len === void 0) {
       len = 16;
     }
-    if (!CheckUtil.idcardIsValid(idcard)) {
-      return idcard;
-    }
     if (start < 0) {
       start = 0;
     }

package/esm/date/DateUtil.d.ts

@@ -244,6 +244,14 @@ declare namespace DateUtil {
         endTime: Date | string;
         time?: string | Date | undefined;
     }, format?: string) => boolean;
+    /**
+     * 补全时间区间数组
+     * @param {string} time1 '16:00:00'
+     * @param {string} time2 '16:00:02'
+     * @param {string} outFormat "HH:mm:ss" 输出的格式
+     * @returns {string[]} ['16:00:00','16:00:01','16:00:02']
+     */
+    function getSectionTimeList(time1: string, time2: string, outFormat?: string): string[];
     /**
      * 补全日期区间数组
      * @param {string} day1 '2022-01-01'

package/esm/date/DateUtil.js

@@ -241,8 +241,8 @@ var DateUtil;
    */
   function formatBySeconds(seconds) {
     if (!isFinite(seconds) || seconds < 0) return '计算中...';
-    var day = Math.floor(seconds / 3600 * 24);
-    var hours = Math.floor(seconds / 3600);
+    var day = Math.floor(seconds / 86400);
+    var hours = Math.floor(seconds % 86400 / 3600);
     var minutes = Math.floor(seconds % 3600 / 60);
     var secs = Math.floor(seconds % 60);
     if (day > 0) {
@@ -673,6 +673,54 @@ var DateUtil;
       time = _a === void 0 ? new Date() : _a;
     return DateUtil.timestamp(beginTime, format) < DateUtil.timestamp(time, format) && DateUtil.timestamp(time, format) < DateUtil.timestamp(endTime, format);
   };
+  /**
+   * 补全时间区间数组
+   * @param {string} time1 '16:00:00'
+   * @param {string} time2 '16:00:02'
+   * @param {string} outFormat "HH:mm:ss" 输出的格式
+   * @returns {string[]} ['16:00:00','16:00:01','16:00:02']
+   */
+  function getSectionTimeList(time1, time2, outFormat) {
+    if (outFormat === void 0) {
+      outFormat = 'HH:mm:ss';
+    }
+    // 将时间字符串转换为秒数
+    var timeToSeconds = function timeToSeconds(timeStr) {
+      var _a = __read(timeStr.split(':').map(Number), 3),
+        hours = _a[0],
+        minutes = _a[1],
+        seconds = _a[2];
+      return hours * 3600 + minutes * 60 + seconds;
+    };
+    // 将秒数转换为时间字符串
+    var secondsToTime = function secondsToTime(totalSeconds, format) {
+      // 确保秒数在24小时范围内
+      var normalizedSeconds = (totalSeconds % 86400 + 86400) % 86400;
+      var hours = Math.floor(normalizedSeconds / 3600);
+      var minutes = Math.floor(normalizedSeconds % 3600 / 60);
+      var seconds = normalizedSeconds % 60;
+      // 使用正则表达式替换格式模板
+      return format.replace(/HH/g, hours.toString().padStart(2, '0')) // 两位小时
+      .replace(/H/g, hours.toString()) // 一位小时
+      .replace(/mm/g, minutes.toString().padStart(2, '0')) // 两位分钟
+      .replace(/m/g, minutes.toString()) // 一位分钟
+      .replace(/ss/g, seconds.toString().padStart(2, '0')) // 两位秒
+      .replace(/s/g, seconds.toString()); // 一位秒
+    };
+    var startSeconds = timeToSeconds(time1);
+    var endSeconds = timeToSeconds(time2);
+    // 处理跨日期情况（如果结束时间小于开始时间，说明跨了一天）
+    if (endSeconds < startSeconds) {
+      endSeconds += 86400; // 加上一天的秒数
+    }
+    var result = [];
+    // 从开始时间到结束时间，每秒递增
+    for (var i = startSeconds; i <= endSeconds; i++) {
+      result.push(secondsToTime(i, outFormat));
+    }
+    return result;
+  }
+  DateUtil.getSectionTimeList = getSectionTimeList;
   /**
    * 补全日期区间数组
    * @param {string} day1 '2022-01-01'

package/esm/number/NumberUtil.d.ts

@@ -57,6 +57,13 @@ declare namespace NumberUtil {
      * @returns 不是string｜number 返回0
      */
     function correctNumberInput(val: any, n?: number): number;
+    /**
+     * 保留n位小数（补全小数位数）
+     * @param val 任意类型
+     * @param n 小数位数 默认为2
+     * @returns  返回 "0.00"，否则返回对应小数位数的字符串
+     */
+    function correctNumberInputStr(val: any, n?: number): string;
     /**
      * 解决两个数相加精度丢失问题
      * @param a 任意类型

package/esm/number/NumberUtil.js

@@ -142,6 +142,19 @@ var NumberUtil;
     return NumberUtil.isaFinite(num) ? num : 0;
   }
   NumberUtil.correctNumberInput = correctNumberInput;
+  /**
+   * 保留n位小数（补全小数位数）
+   * @param val 任意类型
+   * @param n 小数位数 默认为2
+   * @returns  返回 "0.00"，否则返回对应小数位数的字符串
+   */
+  function correctNumberInputStr(val, n) {
+    if (n === void 0) {
+      n = 2;
+    }
+    return Number(correctNumberInput(val, n)).toFixed(n);
+  }
+  NumberUtil.correctNumberInputStr = correctNumberInputStr;
   /**
    * 解决两个数相加精度丢失问题
    * @param a 任意类型

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/request/mgop/index.js

@@ -129,8 +129,7 @@ var Mgop = /*#__PURE__*/function () {
       url = _this$processRequestU.url,
       query = _this$processRequestU.query;
     /* 合并 defaultHeader 和 传入的header */
-    var headers = defaultHeader;
-    Object.assign(headers, this.config.header, {
+    var headers = Object.assign({}, defaultHeader, this.config.header, {
       'Content-Type': 'application/json'
     });
     var _this$config$data = this.config.data,
@@ -231,7 +230,7 @@ var Mgop = /*#__PURE__*/function () {
   return Mgop;
 }();
 export function setDefaultHeader(header) {
-  defaultHeader = header;
+  defaultHeader = Object.assign({}, header);
 }
 export default function (params) {
   debug(_NAME_, 'call mgop with param', params);

package/esm/request/uniRquest/index.js

@@ -61,6 +61,6 @@ export default function (options) {
   var afterOptions = Object.assign({}, DEFAULT_REQUEST_OPTIONS, options, {
     method: (options.method || 'GET').toUpperCase()
   });
-  options.headers = normalizeHeaders(options.headers || {});
+  afterOptions.headers = normalizeHeaders(afterOptions.headers || {});
   return dutyChain(handleWeex.bind(null, afterOptions), handleWeb.bind(null, afterOptions), handleMiniApp.bind(null, afterOptions), handleBytedanceMiniprogram.bind(null, afterOptions), handleWeChatMiniprogram.bind(null, afterOptions));
 }

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

@@ -260,9 +260,11 @@ var TransferUtil;
     if (index === void 0) {
       index = 2;
     }
-    if (!/^(0|[1-9]\d*)(\.\d+)?$/.test("".concat(value))) {
+    if (!BaseUtil.isNumber(value)) {
       return ''; //暂无数据
     }
+    var firStr = value < 0 ? '-' : '';
+    value = Math.abs(value);
     var newValue = ['', '', ''];
     var fr = 1000;
     var num = 3;
@@ -304,7 +306,7 @@ var TransferUtil;
       newValue[1] = '';
       newValue[0] = "".concat(value);
     }
-    return newValue.join('');
+    return firStr + newValue.join('');
   }
   TransferUtil.numPlusUnit = numPlusUnit;
   /**
@@ -313,10 +315,10 @@ var TransferUtil;
    * @param n - 保留小数默认2
    */
   TransferUtil.getFileSizeByBytes = function (bytes, n, render) {
-    var _a;
+    var _a, _b;
     var sizes = ['B', 'KB', 'MB', 'GB', 'TB'];
     if (bytes === 0) {
-      return '0B';
+      return (_a = render === null || render === void 0 ? void 0 : render(0, 'B')) !== null && _a !== void 0 ? _a : '0B';
     }
     var i = Math.floor(Math.log(bytes) / Math.log(1024));
     if (i === 0) {
@@ -324,7 +326,84 @@ var TransferUtil;
     }
     var num = NumberUtil.correctNumberInput(bytes / Math.pow(1024, i), n);
     var unit = sizes[i];
-    return (_a = render === null || render === void 0 ? void 0 : render(num, unit)) !== null && _a !== void 0 ? _a : num + unit;
+    return (_b = render === null || render === void 0 ? void 0 : render(num, unit)) !== null && _b !== void 0 ? _b : 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/check/CheckUtil.js

@@ -285,9 +285,6 @@ var CheckUtil;
     if (len === void 0) {
       len = 16;
     }
-    if (!CheckUtil.idcardIsValid(idcard)) {
-      return idcard;
-    }
     if (start < 0) {
       start = 0;
     }

package/lib/date/DateUtil.d.ts

@@ -244,6 +244,14 @@ declare namespace DateUtil {
         endTime: Date | string;
         time?: string | Date | undefined;
     }, format?: string) => boolean;
+    /**
+     * 补全时间区间数组
+     * @param {string} time1 '16:00:00'
+     * @param {string} time2 '16:00:02'
+     * @param {string} outFormat "HH:mm:ss" 输出的格式
+     * @returns {string[]} ['16:00:00','16:00:01','16:00:02']
+     */
+    function getSectionTimeList(time1: string, time2: string, outFormat?: string): string[];
     /**
      * 补全日期区间数组
      * @param {string} day1 '2022-01-01'

package/lib/date/DateUtil.js

@@ -251,8 +251,8 @@ var DateUtil;
    */
   function formatBySeconds(seconds) {
     if (!isFinite(seconds) || seconds < 0) return '计算中...';
-    var day = Math.floor(seconds / 3600 * 24);
-    var hours = Math.floor(seconds / 3600);
+    var day = Math.floor(seconds / 86400);
+    var hours = Math.floor(seconds % 86400 / 3600);
     var minutes = Math.floor(seconds % 3600 / 60);
     var secs = Math.floor(seconds % 60);
     if (day > 0) {
@@ -683,6 +683,54 @@ var DateUtil;
       time = _a === void 0 ? new Date() : _a;
     return DateUtil.timestamp(beginTime, format) < DateUtil.timestamp(time, format) && DateUtil.timestamp(time, format) < DateUtil.timestamp(endTime, format);
   };
+  /**
+   * 补全时间区间数组
+   * @param {string} time1 '16:00:00'
+   * @param {string} time2 '16:00:02'
+   * @param {string} outFormat "HH:mm:ss" 输出的格式
+   * @returns {string[]} ['16:00:00','16:00:01','16:00:02']
+   */
+  function getSectionTimeList(time1, time2, outFormat) {
+    if (outFormat === void 0) {
+      outFormat = 'HH:mm:ss';
+    }
+    // 将时间字符串转换为秒数
+    var timeToSeconds = function timeToSeconds(timeStr) {
+      var _a = __read(timeStr.split(':').map(Number), 3),
+        hours = _a[0],
+        minutes = _a[1],
+        seconds = _a[2];
+      return hours * 3600 + minutes * 60 + seconds;
+    };
+    // 将秒数转换为时间字符串
+    var secondsToTime = function secondsToTime(totalSeconds, format) {
+      // 确保秒数在24小时范围内
+      var normalizedSeconds = (totalSeconds % 86400 + 86400) % 86400;
+      var hours = Math.floor(normalizedSeconds / 3600);
+      var minutes = Math.floor(normalizedSeconds % 3600 / 60);
+      var seconds = normalizedSeconds % 60;
+      // 使用正则表达式替换格式模板
+      return format.replace(/HH/g, hours.toString().padStart(2, '0')) // 两位小时
+      .replace(/H/g, hours.toString()) // 一位小时
+      .replace(/mm/g, minutes.toString().padStart(2, '0')) // 两位分钟
+      .replace(/m/g, minutes.toString()) // 一位分钟
+      .replace(/ss/g, seconds.toString().padStart(2, '0')) // 两位秒
+      .replace(/s/g, seconds.toString()); // 一位秒
+    };
+    var startSeconds = timeToSeconds(time1);
+    var endSeconds = timeToSeconds(time2);
+    // 处理跨日期情况（如果结束时间小于开始时间，说明跨了一天）
+    if (endSeconds < startSeconds) {
+      endSeconds += 86400; // 加上一天的秒数
+    }
+    var result = [];
+    // 从开始时间到结束时间，每秒递增
+    for (var i = startSeconds; i <= endSeconds; i++) {
+      result.push(secondsToTime(i, outFormat));
+    }
+    return result;
+  }
+  DateUtil.getSectionTimeList = getSectionTimeList;
   /**
    * 补全日期区间数组
    * @param {string} day1 '2022-01-01'

package/lib/number/NumberUtil.d.ts

@@ -57,6 +57,13 @@ declare namespace NumberUtil {
      * @returns 不是string｜number 返回0
      */
     function correctNumberInput(val: any, n?: number): number;
+    /**
+     * 保留n位小数（补全小数位数）
+     * @param val 任意类型
+     * @param n 小数位数 默认为2
+     * @returns  返回 "0.00"，否则返回对应小数位数的字符串
+     */
+    function correctNumberInputStr(val: any, n?: number): string;
     /**
      * 解决两个数相加精度丢失问题
      * @param a 任意类型

package/lib/number/NumberUtil.js

@@ -152,6 +152,19 @@ var NumberUtil;
     return NumberUtil.isaFinite(num) ? num : 0;
   }
   NumberUtil.correctNumberInput = correctNumberInput;
+  /**
+   * 保留n位小数（补全小数位数）
+   * @param val 任意类型
+   * @param n 小数位数 默认为2
+   * @returns  返回 "0.00"，否则返回对应小数位数的字符串
+   */
+  function correctNumberInputStr(val, n) {
+    if (n === void 0) {
+      n = 2;
+    }
+    return Number(correctNumberInput(val, n)).toFixed(n);
+  }
+  NumberUtil.correctNumberInputStr = correctNumberInputStr;
   /**
    * 解决两个数相加精度丢失问题
    * @param a 任意类型

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/request/mgop/index.js

@@ -140,8 +140,7 @@ var Mgop = /*#__PURE__*/function () {
       url = _this$processRequestU.url,
       query = _this$processRequestU.query;
     /* 合并 defaultHeader 和 传入的header */
-    var headers = defaultHeader;
-    Object.assign(headers, this.config.header, {
+    var headers = Object.assign({}, defaultHeader, this.config.header, {
       'Content-Type': 'application/json'
     });
     var _this$config$data = this.config.data,
@@ -242,7 +241,7 @@ var Mgop = /*#__PURE__*/function () {
   return Mgop;
 }();
 function setDefaultHeader(header) {
-  defaultHeader = header;
+  defaultHeader = Object.assign({}, header);
 }
 exports.setDefaultHeader = setDefaultHeader;
 function default_1(params) {

package/lib/request/uniRquest/index.js

@@ -71,7 +71,7 @@ function default_1(options) {
   var afterOptions = Object.assign({}, types_1.DEFAULT_REQUEST_OPTIONS, options, {
     method: (options.method || 'GET').toUpperCase()
   });
-  options.headers = (0, utils_1.normalizeHeaders)(options.headers || {});
+  afterOptions.headers = (0, utils_1.normalizeHeaders)(afterOptions.headers || {});
   return dutyChain(handleWeex.bind(null, afterOptions), handleWeb.bind(null, afterOptions), handleMiniApp.bind(null, afterOptions), handleBytedanceMiniprogram.bind(null, afterOptions), handleWeChatMiniprogram.bind(null, afterOptions));
 }
 exports.default = default_1;

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

@@ -270,9 +270,11 @@ var TransferUtil;
     if (index === void 0) {
       index = 2;
     }
-    if (!/^(0|[1-9]\d*)(\.\d+)?$/.test("".concat(value))) {
+    if (!BaseUtil_1.default.isNumber(value)) {
       return ''; //暂无数据
     }
+    var firStr = value < 0 ? '-' : '';
+    value = Math.abs(value);
     var newValue = ['', '', ''];
     var fr = 1000;
     var num = 3;
@@ -314,7 +316,7 @@ var TransferUtil;
       newValue[1] = '';
       newValue[0] = "".concat(value);
     }
-    return newValue.join('');
+    return firStr + newValue.join('');
   }
   TransferUtil.numPlusUnit = numPlusUnit;
   /**
@@ -323,10 +325,10 @@ var TransferUtil;
    * @param n - 保留小数默认2
    */
   TransferUtil.getFileSizeByBytes = function (bytes, n, render) {
-    var _a;
+    var _a, _b;
     var sizes = ['B', 'KB', 'MB', 'GB', 'TB'];
     if (bytes === 0) {
-      return '0B';
+      return (_a = render === null || render === void 0 ? void 0 : render(0, 'B')) !== null && _a !== void 0 ? _a : '0B';
     }
     var i = Math.floor(Math.log(bytes) / Math.log(1024));
     if (i === 0) {
@@ -334,7 +336,84 @@ var TransferUtil;
     }
     var num = NumberUtil_1.default.correctNumberInput(bytes / Math.pow(1024, i), n);
     var unit = sizes[i];
-    return (_a = render === null || render === void 0 ? void 0 : render(num, unit)) !== null && _a !== void 0 ? _a : num + unit;
+    return (_b = render === null || render === void 0 ? void 0 : render(num, unit)) !== null && _b !== void 0 ? _b : 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.28",
   "main": "lib/index.js",
   "license": "MIT",
   "author": "nanshen",