tools-min-ns 1.9.2 → 1.9.4

package/README.md

@@ -5,6 +5,15 @@ cnpm i tools-min-ns --save
 ```
 
 # updates
+## v1.9.4
+
+> UrlUtil 优化setUrlParamsNotRefresh在web，h5中的路由为hash的兼容性
+
+## v1.9.3
+
+> DateUtil 优化并新增isDateInYearAndMonth方法
+> UrlUtil 优化getUrlRequest在web，h5中的路由为hash的兼容性
+
 ## v1.9.2
 
 > CheckUtil  getFormItemRules required默认为false

package/esm/date/DateUtil.d.ts

@@ -108,15 +108,15 @@ declare namespace DateUtil {
      *   isLeapYear(2001) = false
      *   isLeapYear(2004) = true
      */
-    const isLeapYear: (year: number) => boolean;
+    const isLeapYear: (year: string | number) => boolean;
     /**
      * 计算在给定的年份中，给定的月份有多少天(会自动判断是否为闰年)
      * @param {Number} year 年份
-     * @param {Number} month 月份 (0-11)
+     * @param {Number} month 月份 (1-12)
      * @example
      * getDaysInMonth(2012,2) => 31
      */
-    const getDaysInMonth: (year: number, month: number) => number;
+    const getDaysInMonth: (year: string | number, month: string | number) => number;
     /**
      * 获取时间的开头
      * @param date 日期
@@ -250,7 +250,7 @@ declare namespace DateUtil {
      * @param {string} day2 '2024'
      * @returns ['2022','2023','2024']
      */
-    const getSectionYearList: (day1: string, day2: string) => string[];
+    const getSectionYearList: (day1: string | number, day2: string | number) => (string | number)[];
     /**
      * 后端给的时间修复
      * @param t
@@ -264,5 +264,15 @@ declare namespace DateUtil {
      * @returns ['2024-01-01',...]
      */
     function getDatesOfMonth(yearMonth: string, format?: string): string[];
+    /**
+     * 判断日期字符串是否在指定的年月内。
+     *
+     * @param date    日期
+     * @param yearStr 指定的年份，字符串格式
+     * @param month   指定的月份，整型(1-12)
+     * @param format  目标字符串格式，支持的字符有：y,M,d,q,w,H,h,m,S，默认：yyyy-MM-dd
+     * @return 如果在指定的年月内返回true，否则返回false
+     */
+    const isDateInYearAndMonth: (date: Date | string | number, yearStr: string, month: number, format?: string) => boolean;
 }
 export default DateUtil;

package/esm/date/DateUtil.js

@@ -338,17 +338,18 @@ var DateUtil;
    *   isLeapYear(2004) = true
    */
   DateUtil.isLeapYear = function (year) {
-    return year % 4 === 0 && year % 100 !== 0 || year % 400 === 0;
+    var _year = Number(year);
+    return _year % 4 === 0 && _year % 100 !== 0 || _year % 400 === 0;
   };
   /**
    * 计算在给定的年份中，给定的月份有多少天(会自动判断是否为闰年)
    * @param {Number} year 年份
-   * @param {Number} month 月份 (0-11)
+   * @param {Number} month 月份 (1-12)
    * @example
    * getDaysInMonth(2012,2) => 31
    */
   DateUtil.getDaysInMonth = function (year, month) {
-    return [31, DateUtil.isLeapYear(year) ? 29 : 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][month];
+    return [31, DateUtil.isLeapYear(year) ? 29 : 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][Number(month) - 1];
   };
   /**
    * 获取时间的开头
@@ -479,11 +480,11 @@ var DateUtil;
       format = 'yyyy-MM-dd';
     }
     try {
-      date = DateUtil.parseDate(date);
+      date = DateUtil.parseDate(date, format);
     } catch (_a) {
       date = new Date();
     }
-    var init = DateUtil.getDateStart(date, 'YEAR');
+    var init = DateUtil.getDateStart(date, 'YEAR', format);
     return Math.floor((date.getTime() - init.getTime()) / (24 * 60 * 60 * 1000)) + 1;
   };
   /**
@@ -500,11 +501,11 @@ var DateUtil;
       format = 'yyyy-MM-dd';
     }
     try {
-      date = DateUtil.parseDate(date);
+      date = DateUtil.parseDate(date, format);
     } catch (_a) {
       date = new Date();
     }
-    var init = DateUtil.getDateStart(date, 'YEAR');
+    var init = DateUtil.getDateStart(date, 'YEAR', format);
     return Math.floor((date.getTime() - init.getTime()) / (7 * 24 * 60 * 60 * 1000)) + 1;
   };
   /**
@@ -521,11 +522,11 @@ var DateUtil;
       format = 'yyyy-MM-dd';
     }
     try {
-      date = DateUtil.parseDate(date);
+      date = DateUtil.parseDate(date, format);
     } catch (_a) {
       date = new Date();
     }
-    var init = DateUtil.getDateStart(date, 'MONTH');
+    var init = DateUtil.getDateStart(date, 'MONTH', format);
     return Math.floor((date.getTime() - init.getTime()) / (7 * 24 * 60 * 60 * 1000)) + 1;
   };
   /**
@@ -550,22 +551,12 @@ var DateUtil;
     } catch (_b) {
       date2 = new Date();
     }
-    var isFirstMore = date1 > date2;
-    var timestampDiff = isFirstMore ? date1.getTime() - date2.getTime() : date2.getTime() - date1.getTime();
+    var timestampDiff = Math.abs(date1.getTime() - date2.getTime());
     var day = Math.floor(timestampDiff / (24 * 60 * 60 * 1000));
     var hour = Math.floor(timestampDiff % (24 * 60 * 60 * 1000) / (60 * 60 * 1000));
     var minute = Math.floor((timestampDiff - day * 24 * 60 * 60 * 1000 - hour * 60 * 60 * 1000) / (60 * 1000));
     var second = Math.floor((timestampDiff - day * 24 * 60 * 60 * 1000 - hour * 60 * 60 * 1000 - minute * 60 * 1000) / 1000);
     var ms = timestampDiff - day * 24 * 60 * 60 * 1000 - hour * 60 * 60 * 1000 - minute * 60 * 1000 - second * 1000;
-    if (isFirstMore) {
-      return {
-        Day: day === 0 ? 0 : -day,
-        Hour: hour === 0 ? 0 : -hour,
-        Minute: minute === 0 ? 0 : -minute,
-        Second: second === 0 ? 0 : -second,
-        Millsecond: ms === 0 ? 0 : -ms
-      };
-    }
     return {
       Day: day,
       Hour: hour,
@@ -757,6 +748,26 @@ var DateUtil;
     return dates;
   }
   DateUtil.getDatesOfMonth = getDatesOfMonth;
+  /**
+   * 判断日期字符串是否在指定的年月内。
+   *
+   * @param date    日期
+   * @param yearStr 指定的年份，字符串格式
+   * @param month   指定的月份，整型(1-12)
+   * @param format  目标字符串格式，支持的字符有：y,M,d,q,w,H,h,m,S，默认：yyyy-MM-dd
+   * @return 如果在指定的年月内返回true，否则返回false
+   */
+  DateUtil.isDateInYearAndMonth = function (date, yearStr, month, format) {
+    if (format === void 0) {
+      format = 'yyyy-MM-dd';
+    }
+    try {
+      date = DateUtil.parseDate(date, format);
+    } catch (_a) {
+      date = new Date();
+    }
+    return date.getFullYear() == Number(yearStr) && date.getMonth() + 1 == month;
+  };
 })(DateUtil || (DateUtil = {}));
 export default DateUtil;
 var dateFormatRules = [{

package/esm/url/UrlUtil.d.ts

@@ -20,11 +20,11 @@ declare namespace UrlUtil {
      * @example
      * getUrlRequest('https://ss.cn?sdf=213&bdl=231111'); => {sdf: "213", bdl: "231111"}
      */
-    const getUrlRequest: (href?: string) => Record<any, any>;
+    function getUrlRequest<T extends Record<string, string>>(href?: string): T;
     /**
      * 不刷新改变url参数
      * @param obj 对象
      */
-    function setUrlParamsNotRefresh(obj: Record<any, any>): void;
+    function setUrlParamsNotRefresh<T extends Record<string, any>>(obj: T): void;
 }
 export default UrlUtil;

package/esm/url/UrlUtil.js

@@ -1,3 +1,25 @@
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+    r,
+    ar = [],
+    e;
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+  return ar;
+};
 /**
  * url工具
  * @description
@@ -44,7 +66,7 @@ var UrlUtil;
       var _a;
       (_a = urlSearch === null || urlSearch === void 0 ? void 0 : urlSearch['delete']) === null || _a === void 0 ? void 0 : _a.call(urlSearch, param);
     });
-    return (urlSearch === null || urlSearch === void 0 ? void 0 : urlSearch.toString()) ? "".concat(hostAndPath, "?").concat(urlSearch.toString()) : hostAndPath;
+    return (urlSearch === null || urlSearch === void 0 ? void 0 : urlSearch.toString()) ? "".concat(hostAndPath, "?").concat(urlSearch) : hostAndPath;
   }
   UrlUtil.deleteUrlParam = deleteUrlParam;
   /**
@@ -53,29 +75,45 @@ var UrlUtil;
    * @example
    * getUrlRequest('https://ss.cn?sdf=213&bdl=231111'); => {sdf: "213", bdl: "231111"}
    */
-  UrlUtil.getUrlRequest = function (href) {
+  function getUrlRequest(href) {
     if (href === void 0) {
       href = window.location.href;
     }
-    var url = href === null || href === void 0 ? void 0 : href.slice(href === null || href === void 0 ? void 0 : href.indexOf('?'));
+    href = "".concat(href === null || href === void 0 ? void 0 : href.slice(-1)) === '/' ? href === null || href === void 0 ? void 0 : href.slice(0, href.length - 1) : href;
     var theRequest = {};
-    if (url.indexOf('?') !== -1) {
-      var str = url.substr(1);
-      var strs = str.split('&');
+    if (href.includes('#/')) {
+      //hash
+      href = "".concat(href.split('/').slice(-1));
+    }
+    if (href === null || href === void 0 ? void 0 : href.includes('?')) {
+      var strs = href === null || href === void 0 ? void 0 : href.split('?').slice(-1).toString().split('&');
       for (var i = 0; i < strs.length; i++) {
-        theRequest[strs[i].split('=')[0]] = decodeURI(strs[i].split('=')[1]).replaceAll('#/', '');
+        var _a = __read(strs[i].split('='), 2),
+          key = _a[0],
+          value = _a[1];
+        if (key) theRequest[key] = decodeURIComponent(value);
       }
     }
     return theRequest;
-  };
+  }
+  UrlUtil.getUrlRequest = getUrlRequest;
   /**
    * 不刷新改变url参数
    * @param obj 对象
    */
   function setUrlParamsNotRefresh(obj) {
-    var urlParams = UrlUtil.getUrlRequest();
+    var urlParams = getUrlRequest();
     var str = objToUrlParam(ObjectUtil.mergeParams(obj, urlParams));
-    var url = "".concat(window.location.href.split('?')[0]).concat(str ? "?".concat(str) : '');
+    var href = window.location.href;
+    if (href.includes('#/') && !"".concat(href.split('/').slice(-1)).includes('?')) {
+      var url_1 = "".concat(href).concat(str ? "?".concat(str) : '');
+      window.history.replaceState({
+        url: url_1
+      }, '', url_1);
+      return;
+    }
+    var _arr = window.location.href.split('?');
+    var url = "".concat(_arr.slice(0, _arr.length - 1).join('?')).concat(str ? "?".concat(str) : '');
     window.history.replaceState({
       url: url
     }, '', url);

package/lib/date/DateUtil.d.ts

@@ -108,15 +108,15 @@ declare namespace DateUtil {
      *   isLeapYear(2001) = false
      *   isLeapYear(2004) = true
      */
-    const isLeapYear: (year: number) => boolean;
+    const isLeapYear: (year: string | number) => boolean;
     /**
      * 计算在给定的年份中，给定的月份有多少天(会自动判断是否为闰年)
      * @param {Number} year 年份
-     * @param {Number} month 月份 (0-11)
+     * @param {Number} month 月份 (1-12)
      * @example
      * getDaysInMonth(2012,2) => 31
      */
-    const getDaysInMonth: (year: number, month: number) => number;
+    const getDaysInMonth: (year: string | number, month: string | number) => number;
     /**
      * 获取时间的开头
      * @param date 日期
@@ -250,7 +250,7 @@ declare namespace DateUtil {
      * @param {string} day2 '2024'
      * @returns ['2022','2023','2024']
      */
-    const getSectionYearList: (day1: string, day2: string) => string[];
+    const getSectionYearList: (day1: string | number, day2: string | number) => (string | number)[];
     /**
      * 后端给的时间修复
      * @param t
@@ -264,5 +264,15 @@ declare namespace DateUtil {
      * @returns ['2024-01-01',...]
      */
     function getDatesOfMonth(yearMonth: string, format?: string): string[];
+    /**
+     * 判断日期字符串是否在指定的年月内。
+     *
+     * @param date    日期
+     * @param yearStr 指定的年份，字符串格式
+     * @param month   指定的月份，整型(1-12)
+     * @param format  目标字符串格式，支持的字符有：y,M,d,q,w,H,h,m,S，默认：yyyy-MM-dd
+     * @return 如果在指定的年月内返回true，否则返回false
+     */
+    const isDateInYearAndMonth: (date: Date | string | number, yearStr: string, month: number, format?: string) => boolean;
 }
 export default DateUtil;

package/lib/date/DateUtil.js

@@ -348,17 +348,18 @@ var DateUtil;
    *   isLeapYear(2004) = true
    */
   DateUtil.isLeapYear = function (year) {
-    return year % 4 === 0 && year % 100 !== 0 || year % 400 === 0;
+    var _year = Number(year);
+    return _year % 4 === 0 && _year % 100 !== 0 || _year % 400 === 0;
   };
   /**
    * 计算在给定的年份中，给定的月份有多少天(会自动判断是否为闰年)
    * @param {Number} year 年份
-   * @param {Number} month 月份 (0-11)
+   * @param {Number} month 月份 (1-12)
    * @example
    * getDaysInMonth(2012,2) => 31
    */
   DateUtil.getDaysInMonth = function (year, month) {
-    return [31, DateUtil.isLeapYear(year) ? 29 : 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][month];
+    return [31, DateUtil.isLeapYear(year) ? 29 : 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][Number(month) - 1];
   };
   /**
    * 获取时间的开头
@@ -489,11 +490,11 @@ var DateUtil;
       format = 'yyyy-MM-dd';
     }
     try {
-      date = DateUtil.parseDate(date);
+      date = DateUtil.parseDate(date, format);
     } catch (_a) {
       date = new Date();
     }
-    var init = DateUtil.getDateStart(date, 'YEAR');
+    var init = DateUtil.getDateStart(date, 'YEAR', format);
     return Math.floor((date.getTime() - init.getTime()) / (24 * 60 * 60 * 1000)) + 1;
   };
   /**
@@ -510,11 +511,11 @@ var DateUtil;
       format = 'yyyy-MM-dd';
     }
     try {
-      date = DateUtil.parseDate(date);
+      date = DateUtil.parseDate(date, format);
     } catch (_a) {
       date = new Date();
     }
-    var init = DateUtil.getDateStart(date, 'YEAR');
+    var init = DateUtil.getDateStart(date, 'YEAR', format);
     return Math.floor((date.getTime() - init.getTime()) / (7 * 24 * 60 * 60 * 1000)) + 1;
   };
   /**
@@ -531,11 +532,11 @@ var DateUtil;
       format = 'yyyy-MM-dd';
     }
     try {
-      date = DateUtil.parseDate(date);
+      date = DateUtil.parseDate(date, format);
     } catch (_a) {
       date = new Date();
     }
-    var init = DateUtil.getDateStart(date, 'MONTH');
+    var init = DateUtil.getDateStart(date, 'MONTH', format);
     return Math.floor((date.getTime() - init.getTime()) / (7 * 24 * 60 * 60 * 1000)) + 1;
   };
   /**
@@ -560,22 +561,12 @@ var DateUtil;
     } catch (_b) {
       date2 = new Date();
     }
-    var isFirstMore = date1 > date2;
-    var timestampDiff = isFirstMore ? date1.getTime() - date2.getTime() : date2.getTime() - date1.getTime();
+    var timestampDiff = Math.abs(date1.getTime() - date2.getTime());
     var day = Math.floor(timestampDiff / (24 * 60 * 60 * 1000));
     var hour = Math.floor(timestampDiff % (24 * 60 * 60 * 1000) / (60 * 60 * 1000));
     var minute = Math.floor((timestampDiff - day * 24 * 60 * 60 * 1000 - hour * 60 * 60 * 1000) / (60 * 1000));
     var second = Math.floor((timestampDiff - day * 24 * 60 * 60 * 1000 - hour * 60 * 60 * 1000 - minute * 60 * 1000) / 1000);
     var ms = timestampDiff - day * 24 * 60 * 60 * 1000 - hour * 60 * 60 * 1000 - minute * 60 * 1000 - second * 1000;
-    if (isFirstMore) {
-      return {
-        Day: day === 0 ? 0 : -day,
-        Hour: hour === 0 ? 0 : -hour,
-        Minute: minute === 0 ? 0 : -minute,
-        Second: second === 0 ? 0 : -second,
-        Millsecond: ms === 0 ? 0 : -ms
-      };
-    }
     return {
       Day: day,
       Hour: hour,
@@ -767,6 +758,26 @@ var DateUtil;
     return dates;
   }
   DateUtil.getDatesOfMonth = getDatesOfMonth;
+  /**
+   * 判断日期字符串是否在指定的年月内。
+   *
+   * @param date    日期
+   * @param yearStr 指定的年份，字符串格式
+   * @param month   指定的月份，整型(1-12)
+   * @param format  目标字符串格式，支持的字符有：y,M,d,q,w,H,h,m,S，默认：yyyy-MM-dd
+   * @return 如果在指定的年月内返回true，否则返回false
+   */
+  DateUtil.isDateInYearAndMonth = function (date, yearStr, month, format) {
+    if (format === void 0) {
+      format = 'yyyy-MM-dd';
+    }
+    try {
+      date = DateUtil.parseDate(date, format);
+    } catch (_a) {
+      date = new Date();
+    }
+    return date.getFullYear() == Number(yearStr) && date.getMonth() + 1 == month;
+  };
 })(DateUtil || (DateUtil = {}));
 exports.default = DateUtil;
 var dateFormatRules = [{

package/lib/url/UrlUtil.d.ts

@@ -20,11 +20,11 @@ declare namespace UrlUtil {
      * @example
      * getUrlRequest('https://ss.cn?sdf=213&bdl=231111'); => {sdf: "213", bdl: "231111"}
      */
-    const getUrlRequest: (href?: string) => Record<any, any>;
+    function getUrlRequest<T extends Record<string, string>>(href?: string): T;
     /**
      * 不刷新改变url参数
      * @param obj 对象
      */
-    function setUrlParamsNotRefresh(obj: Record<any, any>): void;
+    function setUrlParamsNotRefresh<T extends Record<string, any>>(obj: T): void;
 }
 export default UrlUtil;

package/lib/url/UrlUtil.js

@@ -1,5 +1,27 @@
 "use strict";
 
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+    r,
+    ar = [],
+    e;
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+  return ar;
+};
 var __importDefault = this && this.__importDefault || function (mod) {
   return mod && mod.__esModule ? mod : {
     "default": mod
@@ -54,7 +76,7 @@ var UrlUtil;
       var _a;
       (_a = urlSearch === null || urlSearch === void 0 ? void 0 : urlSearch['delete']) === null || _a === void 0 ? void 0 : _a.call(urlSearch, param);
     });
-    return (urlSearch === null || urlSearch === void 0 ? void 0 : urlSearch.toString()) ? "".concat(hostAndPath, "?").concat(urlSearch.toString()) : hostAndPath;
+    return (urlSearch === null || urlSearch === void 0 ? void 0 : urlSearch.toString()) ? "".concat(hostAndPath, "?").concat(urlSearch) : hostAndPath;
   }
   UrlUtil.deleteUrlParam = deleteUrlParam;
   /**
@@ -63,29 +85,45 @@ var UrlUtil;
    * @example
    * getUrlRequest('https://ss.cn?sdf=213&bdl=231111'); => {sdf: "213", bdl: "231111"}
    */
-  UrlUtil.getUrlRequest = function (href) {
+  function getUrlRequest(href) {
     if (href === void 0) {
       href = window.location.href;
     }
-    var url = href === null || href === void 0 ? void 0 : href.slice(href === null || href === void 0 ? void 0 : href.indexOf('?'));
+    href = "".concat(href === null || href === void 0 ? void 0 : href.slice(-1)) === '/' ? href === null || href === void 0 ? void 0 : href.slice(0, href.length - 1) : href;
     var theRequest = {};
-    if (url.indexOf('?') !== -1) {
-      var str = url.substr(1);
-      var strs = str.split('&');
+    if (href.includes('#/')) {
+      //hash
+      href = "".concat(href.split('/').slice(-1));
+    }
+    if (href === null || href === void 0 ? void 0 : href.includes('?')) {
+      var strs = href === null || href === void 0 ? void 0 : href.split('?').slice(-1).toString().split('&');
       for (var i = 0; i < strs.length; i++) {
-        theRequest[strs[i].split('=')[0]] = decodeURI(strs[i].split('=')[1]).replaceAll('#/', '');
+        var _a = __read(strs[i].split('='), 2),
+          key = _a[0],
+          value = _a[1];
+        if (key) theRequest[key] = decodeURIComponent(value);
       }
     }
     return theRequest;
-  };
+  }
+  UrlUtil.getUrlRequest = getUrlRequest;
   /**
    * 不刷新改变url参数
    * @param obj 对象
    */
   function setUrlParamsNotRefresh(obj) {
-    var urlParams = UrlUtil.getUrlRequest();
+    var urlParams = getUrlRequest();
     var str = objToUrlParam(ObjectUtil_1.default.mergeParams(obj, urlParams));
-    var url = "".concat(window.location.href.split('?')[0]).concat(str ? "?".concat(str) : '');
+    var href = window.location.href;
+    if (href.includes('#/') && !"".concat(href.split('/').slice(-1)).includes('?')) {
+      var url_1 = "".concat(href).concat(str ? "?".concat(str) : '');
+      window.history.replaceState({
+        url: url_1
+      }, '', url_1);
+      return;
+    }
+    var _arr = window.location.href.split('?');
+    var url = "".concat(_arr.slice(0, _arr.length - 1).join('?')).concat(str ? "?".concat(str) : '');
     window.history.replaceState({
       url: url
     }, '', url);

package/package.json

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