@nocobase/utils 1.7.0-beta.25 → 1.7.0-beta.26

package/lib/common.d.ts

@@ -13,13 +13,22 @@ export declare const isPlainObject: (value: any) => boolean;
 export declare const hasEmptyValue: (objOrArr: object | any[]) => any;
 export declare const nextTick: (fn: () => void) => void;
 /**
- * 通用树节点深度优先遍历函数
- * @param {Object|Array} tree - 要遍历的树结构
- * @param {Function} callback - 遍历每个节点时执行的回调函数，返回真值时停止遍历并返回当前节点
- * @param {Object} options - 配置选项
- * @param {string|Function} options.childrenKey - 子节点的属性名，默认为'children'，也可以是一个函数
- * @returns {any|undefined} - 找到的节点或undefined
+ * Generic tree node depth-first traversal function
+ * @param {Object|Array} tree - The tree structure to traverse
+ * @param {Function} callback - The callback function executed for each node, stops traversing and returns the current node when a truthy value is returned
+ * @param {Object} options - Configuration options
+ * @param {string|Function} options.childrenKey - The property name of child nodes, defaults to 'children', can also be a function
+ * @returns {any|undefined} - The found node or undefined
  */
 export declare function treeFind<T = any>(tree: T | T[], callback: (node: T) => boolean, options?: {
     childrenKey?: string | ((node: T) => T[] | undefined);
 }): T | undefined;
+/**
+ * Sort a tree structure
+ * @param {Array} tree - Tree structure array
+ * @param {string|Function} sortBy - Sort field or sort function
+ * @param {string} childrenKey - The key name of child nodes, defaults to 'children'
+ * @param {boolean} isAsc - Whether to sort in ascending order, defaults to true
+ * @returns {Array} - The sorted tree structure
+ */
+export declare function sortTree(tree: any[], sortBy: string | Function, childrenKey?: string, isAsc?: boolean): any;

package/lib/common.js

@@ -7,9 +7,11 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
@@ -24,6 +26,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var common_exports = {};
 __export(common_exports, {
@@ -33,9 +43,11 @@ __export(common_exports, {
   isPlainObject: () => isPlainObject,
   isString: () => isString,
   nextTick: () => nextTick,
+  sortTree: () => sortTree,
   treeFind: () => treeFind
 });
 module.exports = __toCommonJS(common_exports);
+var import_lodash = __toESM(require("lodash"));
 const isString = /* @__PURE__ */ __name((value) => {
   return typeof value === "string";
 }, "isString");
@@ -96,6 +108,22 @@ function treeFind(tree, callback, options = {}) {
   return void 0;
 }
 __name(treeFind, "treeFind");
+function sortTree(tree, sortBy, childrenKey = "children", isAsc = true) {
+  if (!tree || !Array.isArray(tree) || tree.length === 0) {
+    return tree;
+  }
+  const sortedTree = import_lodash.default.orderBy(tree, sortBy, isAsc ? "asc" : "desc");
+  return sortedTree.map((node) => {
+    if (node[childrenKey] && node[childrenKey].length > 0) {
+      return {
+        ...node,
+        [childrenKey]: sortTree(node[childrenKey], sortBy, childrenKey, isAsc)
+      };
+    }
+    return node;
+  });
+}
+__name(sortTree, "sortTree");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   hasEmptyValue,
@@ -104,5 +132,6 @@ __name(treeFind, "treeFind");
   isPlainObject,
   isString,
   nextTick,
+  sortTree,
   treeFind
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/utils",
-  "version": "1.7.0-beta.25",
+  "version": "1.7.0-beta.26",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
@@ -16,5 +16,5 @@
     "multer": "^1.4.5-lts.2",
     "object-path": "^0.11.8"
   },
-  "gitHead": "339f313227a3ead87abbf884b303728c0814fce7"
+  "gitHead": "01d3e77c1f4a853d1f592ac2d70916010e9c510a"
 }