tools-min-ns 1.7.0 → 1.8.0

package/README.md

@@ -5,6 +5,18 @@ cnpm i tools-min-ns --save
 ```
 
 # updates
+## v1.8.0
+
+> TreeUtil 新增getItemPathByTree
+
+## v1.7.2
+
+> TreeUtil 修复getIdPathByTree
+
+## v1.7.1
+
+> DateUtil 新增getDatesOfMonth
+
 ## v1.7.0
 
 > 新增FileUtil

package/esm/array/TreeUtil.d.ts

@@ -49,6 +49,13 @@ declare namespace TreeUtil {
      * @param fieldNames 映射对象
      */
     function getIdPathByTree<T>(tree: T[], id: ValueType, fieldNames?: FieldNames): ValueType[];
+    /**
+     * @name 获取树中路径对象数组
+     * @param tree 树
+     * @param id 主键
+     * @param fieldNames 映射对象
+     */
+    function getItemPathByTree<T>(tree: T[], id: ValueType, fieldNames?: FieldNames): T[];
     /**
      * @name 字符串分割转为树结构
      * @param str string

package/esm/array/TreeUtil.js

@@ -178,6 +178,20 @@ var TreeUtil;
    * @param fieldNames 映射对象
    */
   function getIdPathByTree(tree, id, fieldNames) {
+    var _a = (fieldNames !== null && fieldNames !== void 0 ? fieldNames : {}).value,
+      value = _a === void 0 ? 'id' : _a;
+    return getItemPathByTree(tree, id, fieldNames).map(function (item) {
+      return item[value];
+    });
+  }
+  TreeUtil.getIdPathByTree = getIdPathByTree;
+  /**
+   * @name 获取树中路径对象数组
+   * @param tree 树
+   * @param id 主键
+   * @param fieldNames 映射对象
+   */
+  function getItemPathByTree(tree, id, fieldNames) {
     var _a = fieldNames !== null && fieldNames !== void 0 ? fieldNames : {},
       _b = _a.value,
       value = _b === void 0 ? 'id' : _b,
@@ -188,15 +202,17 @@ var TreeUtil;
       _e = _a.rootPid,
       rootPid = _e === void 0 ? undefined : _e;
     if (BaseUtil.isEmpty(id)) return [];
-    var idList = [id];
-    var list = getListByTree(tree);
+    var idList = filterTreeData(tree, function (t) {
+      return t[value] === id;
+    });
+    var list = getListByTree(tree, children);
     var getList = function getList(importOid) {
       forEachTree(tree, function (info) {
         if (String(info[value]) === String(importOid)) {
           if (parent in info && info[parent] && list.some(function (e) {
             return String(e[value]) === String(info[parent]);
           })) {
-            idList.unshift(info === null || info === void 0 ? void 0 : info[parent]);
+            idList.unshift(info);
             getList(info === null || info === void 0 ? void 0 : info[parent]);
           }
         }
@@ -211,7 +227,7 @@ var TreeUtil;
     }
     return idList;
   }
-  TreeUtil.getIdPathByTree = getIdPathByTree;
+  TreeUtil.getItemPathByTree = getItemPathByTree;
   /**
    * @name 字符串分割转为树结构
    * @param str string

package/esm/date/DateUtil.d.ts

@@ -257,5 +257,12 @@ declare namespace DateUtil {
      * @returns
      */
     const timeFix: (t?: string) => string | undefined;
+    /**
+     * 格式为“年-月”，然后输出该月所有日期的数组
+     * @param yearMonth 2024-01
+     * @param format 'yyyy-MM-dd'
+     * @returns ['2024-01-01',...]
+     */
+    function getDatesOfMonth(yearMonth: string, format?: string): string[];
 }
 export default DateUtil;

package/esm/date/DateUtil.js

@@ -731,6 +731,32 @@ var DateUtil;
     var _a;
     return (_a = t === null || t === void 0 ? void 0 : t.split('.')) === null || _a === void 0 ? void 0 : _a[0];
   };
+  /**
+   * 格式为“年-月”，然后输出该月所有日期的数组
+   * @param yearMonth 2024-01
+   * @param format 'yyyy-MM-dd'
+   * @returns ['2024-01-01',...]
+   */
+  function getDatesOfMonth(yearMonth, format) {
+    if (format === void 0) {
+      format = 'yyyy-MM-dd';
+    }
+    var _a = __read(yearMonth.split('-').map(Number), 2),
+      year = _a[0],
+      month = _a[1]; // 分割字符串并转换为数字
+    var dates = []; // 初始化存储日期的数组
+    // 获取该月的第一天
+    var date = new Date(year, month - 1, 1);
+    // 循环直到月份改变
+    while (date.getMonth() === month - 1) {
+      // 将日期格式化为字符串并添加到数组中
+      dates.push(DateUtil.formatDate(date, format));
+      // 日期加一天
+      date.setDate(date.getDate() + 2);
+    }
+    return dates;
+  }
+  DateUtil.getDatesOfMonth = getDatesOfMonth;
 })(DateUtil || (DateUtil = {}));
 export default DateUtil;
 var dateFormatRules = [{

package/lib/array/TreeUtil.d.ts

@@ -49,6 +49,13 @@ declare namespace TreeUtil {
      * @param fieldNames 映射对象
      */
     function getIdPathByTree<T>(tree: T[], id: ValueType, fieldNames?: FieldNames): ValueType[];
+    /**
+     * @name 获取树中路径对象数组
+     * @param tree 树
+     * @param id 主键
+     * @param fieldNames 映射对象
+     */
+    function getItemPathByTree<T>(tree: T[], id: ValueType, fieldNames?: FieldNames): T[];
     /**
      * @name 字符串分割转为树结构
      * @param str string

package/lib/array/TreeUtil.js

@@ -188,6 +188,20 @@ var TreeUtil;
    * @param fieldNames 映射对象
    */
   function getIdPathByTree(tree, id, fieldNames) {
+    var _a = (fieldNames !== null && fieldNames !== void 0 ? fieldNames : {}).value,
+      value = _a === void 0 ? 'id' : _a;
+    return getItemPathByTree(tree, id, fieldNames).map(function (item) {
+      return item[value];
+    });
+  }
+  TreeUtil.getIdPathByTree = getIdPathByTree;
+  /**
+   * @name 获取树中路径对象数组
+   * @param tree 树
+   * @param id 主键
+   * @param fieldNames 映射对象
+   */
+  function getItemPathByTree(tree, id, fieldNames) {
     var _a = fieldNames !== null && fieldNames !== void 0 ? fieldNames : {},
       _b = _a.value,
       value = _b === void 0 ? 'id' : _b,
@@ -198,15 +212,17 @@ var TreeUtil;
       _e = _a.rootPid,
       rootPid = _e === void 0 ? undefined : _e;
     if (BaseUtil_1.default.isEmpty(id)) return [];
-    var idList = [id];
-    var list = getListByTree(tree);
+    var idList = filterTreeData(tree, function (t) {
+      return t[value] === id;
+    });
+    var list = getListByTree(tree, children);
     var getList = function getList(importOid) {
       forEachTree(tree, function (info) {
         if (String(info[value]) === String(importOid)) {
           if (parent in info && info[parent] && list.some(function (e) {
             return String(e[value]) === String(info[parent]);
           })) {
-            idList.unshift(info === null || info === void 0 ? void 0 : info[parent]);
+            idList.unshift(info);
             getList(info === null || info === void 0 ? void 0 : info[parent]);
           }
         }
@@ -221,7 +237,7 @@ var TreeUtil;
     }
     return idList;
   }
-  TreeUtil.getIdPathByTree = getIdPathByTree;
+  TreeUtil.getItemPathByTree = getItemPathByTree;
   /**
    * @name 字符串分割转为树结构
    * @param str string

package/lib/date/DateUtil.d.ts

@@ -257,5 +257,12 @@ declare namespace DateUtil {
      * @returns
      */
     const timeFix: (t?: string) => string | undefined;
+    /**
+     * 格式为“年-月”，然后输出该月所有日期的数组
+     * @param yearMonth 2024-01
+     * @param format 'yyyy-MM-dd'
+     * @returns ['2024-01-01',...]
+     */
+    function getDatesOfMonth(yearMonth: string, format?: string): string[];
 }
 export default DateUtil;

package/lib/date/DateUtil.js

@@ -741,6 +741,32 @@ var DateUtil;
     var _a;
     return (_a = t === null || t === void 0 ? void 0 : t.split('.')) === null || _a === void 0 ? void 0 : _a[0];
   };
+  /**
+   * 格式为“年-月”，然后输出该月所有日期的数组
+   * @param yearMonth 2024-01
+   * @param format 'yyyy-MM-dd'
+   * @returns ['2024-01-01',...]
+   */
+  function getDatesOfMonth(yearMonth, format) {
+    if (format === void 0) {
+      format = 'yyyy-MM-dd';
+    }
+    var _a = __read(yearMonth.split('-').map(Number), 2),
+      year = _a[0],
+      month = _a[1]; // 分割字符串并转换为数字
+    var dates = []; // 初始化存储日期的数组
+    // 获取该月的第一天
+    var date = new Date(year, month - 1, 1);
+    // 循环直到月份改变
+    while (date.getMonth() === month - 1) {
+      // 将日期格式化为字符串并添加到数组中
+      dates.push(DateUtil.formatDate(date, format));
+      // 日期加一天
+      date.setDate(date.getDate() + 2);
+    }
+    return dates;
+  }
+  DateUtil.getDatesOfMonth = getDatesOfMonth;
 })(DateUtil || (DateUtil = {}));
 exports.default = DateUtil;
 var dateFormatRules = [{

package/package.json

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