@nocobase/utils 1.7.0-beta.20 → 1.7.0-beta.21

package/lib/common.d.ts

@@ -12,3 +12,14 @@ export declare const isEmpty: (value: unknown) => boolean;
 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
+ */
+export declare function treeFind<T = any>(tree: T | T[], callback: (node: T) => boolean, options?: {
+    childrenKey?: string | ((node: T) => T[] | undefined);
+}): T | undefined;

package/lib/common.js

@@ -32,7 +32,8 @@ __export(common_exports, {
   isEmpty: () => isEmpty,
   isPlainObject: () => isPlainObject,
   isString: () => isString,
-  nextTick: () => nextTick
+  nextTick: () => nextTick,
+  treeFind: () => treeFind
 });
 module.exports = __toCommonJS(common_exports);
 const isString = /* @__PURE__ */ __name((value) => {
@@ -76,6 +77,25 @@ const hasEmptyValue = /* @__PURE__ */ __name((objOrArr) => {
 const nextTick = /* @__PURE__ */ __name((fn) => {
   setTimeout(fn);
 }, "nextTick");
+function treeFind(tree, callback, options = {}) {
+  if (!tree) return void 0;
+  const { childrenKey = "children" } = options;
+  const nodes = Array.isArray(tree) ? [...tree] : [tree];
+  for (const node of nodes) {
+    if (callback(node)) {
+      return node;
+    }
+    const children = typeof childrenKey === "function" ? childrenKey(node) : node[childrenKey];
+    if (Array.isArray(children) && children.length > 0) {
+      const found = treeFind(children, callback, options);
+      if (found !== void 0) {
+        return found;
+      }
+    }
+  }
+  return void 0;
+}
+__name(treeFind, "treeFind");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   hasEmptyValue,
@@ -83,5 +103,6 @@ const nextTick = /* @__PURE__ */ __name((fn) => {
   isEmpty,
   isPlainObject,
   isString,
-  nextTick
+  nextTick,
+  treeFind
 });

package/lib/date.d.ts

@@ -35,5 +35,6 @@ export declare const moment2str: (value?: dayjs.Dayjs, options?: Moment2strOptio
  * from https://github.com/moment/moment/blob/dca02edaeceda3fcd52b20b51c130631a058a022/src/lib/units/offset.js#L55-L70
  */
 export declare function offsetFromString(string: string | number): number;
-export declare const getPickerFormat: (picker: any) => "YYYY-MM" | "YYYY" | "YYYY[W]W" | "YYYY-MM-DD" | "YYYY[Q]Q";
+export declare const getPickerFormat: (picker: any) => "YYYY-MM-DD" | "YYYY-MM" | "YYYY" | "YYYY[Q]Q" | "YYYY[W]W";
 export declare const getDateTimeFormat: (picker: any, format: any, showTime: any, timeFormat: any) => any;
+export declare function getFormatFromDateStr(dateStr: string): string | null;

package/lib/date.js

@@ -39,6 +39,7 @@ var date_exports = {};
 __export(date_exports, {
   getDateTimeFormat: () => getDateTimeFormat,
   getDefaultFormat: () => getDefaultFormat,
+  getFormatFromDateStr: () => getFormatFromDateStr,
   getPickerFormat: () => getPickerFormat,
   moment2str: () => moment2str,
   offsetFromString: () => offsetFromString,
@@ -88,12 +89,13 @@ const toLocal = /* @__PURE__ */ __name((value) => {
   }
 }, "toLocal");
 const convertQuarterToFirstDay = /* @__PURE__ */ __name((quarterStr) => {
-  if ((0, import_dayjs.dayjs)(quarterStr).isValid()) {
+  try {
     const year = parseInt(quarterStr.slice(0, 4));
     const quarter = parseInt(quarterStr.slice(-1));
     return (0, import_dayjs.dayjs)().quarter(quarter).year(year);
+  } catch (error) {
+    return null;
   }
-  return null;
 }, "convertQuarterToFirstDay");
 const toMoment = /* @__PURE__ */ __name((val, options) => {
   if (!val) {
@@ -215,10 +217,21 @@ const getDateTimeFormat = /* @__PURE__ */ __name((picker, format, showTime, time
   }
   return format;
 }, "getDateTimeFormat");
+function getFormatFromDateStr(dateStr) {
+  if (/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/.test(dateStr)) return "YYYY-MM-DD HH:mm:ss";
+  if (/^\d{4}-\d{2}-\d{2}$/.test(dateStr)) return "YYYY-MM-DD";
+  if (/^\d{4}-\d{2}$/.test(dateStr)) return "YYYY-MM";
+  if (/^\d{4}$/.test(dateStr)) return "YYYY";
+  if (/^\d{4}Q[1-4]$/.test(dateStr)) return "YYYY[Q]Q";
+  if (/^\d{4}-\d{2}-\d{2}T/.test(dateStr)) return "YYYY-MM-DDTHH:mm:ss.SSSZ";
+  return null;
+}
+__name(getFormatFromDateStr, "getFormatFromDateStr");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getDateTimeFormat,
   getDefaultFormat,
+  getFormatFromDateStr,
   getPickerFormat,
   moment2str,
   offsetFromString,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/utils",
-  "version": "1.7.0-beta.20",
+  "version": "1.7.0-beta.21",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
@@ -13,8 +13,8 @@
     "flat-to-nested": "^1.1.1",
     "graphlib": "^2.1.8",
     "handlebars": "^4.7.8",
-    "multer": "^1.4.5-lts.1",
+    "multer": "^1.4.5-lts.2",
     "object-path": "^0.11.8"
   },
-  "gitHead": "178910a2afe33bd4850e2519507d32b631a380fc"
+  "gitHead": "845f6124b170717387ba9d7ebf3cc2df7a861bc3"
 }