@nocobase/utils 1.7.0-beta.9 → 1.8.0-beta.1

package/lib/assign.js

@@ -53,8 +53,14 @@ function getKeys(target) {
 }
 __name(getKeys, "getKeys");
 const mergeStrategies = /* @__PURE__ */ new Map();
-mergeStrategies.set("overwrite", (_, y) => {
-  if (typeof y === "string") {
+mergeStrategies.set("overwrite", (x, y) => {
+  if (y === void 0) {
+    if (typeof x === "string" && x.includes(",")) {
+      return x.split(",");
+    }
+    return x;
+  }
+  if (typeof y === "string" && y.includes(",")) {
     y = y.split(",");
   }
   return y;
@@ -123,15 +129,22 @@ mergeStrategies.set(
   })().filter(Boolean)
 );
 function assign(target, source, strategies = {}) {
-  getKeys(source).forEach((sourceKey) => {
+  const sourceKeys = getKeys(source);
+  const targetKeys = getKeys(target);
+  import_lodash.default.uniq([...sourceKeys, ...targetKeys]).forEach((sourceKey) => {
     const strategy = strategies[sourceKey];
-    let func = mergeStrategies.get("deepMerge");
+    let func;
     if (typeof strategy === "function") {
       func = strategy;
     } else if (typeof strategy === "string" && mergeStrategies.has(strategy)) {
       func = mergeStrategies.get(strategy);
     }
-    target[sourceKey] = func(target[sourceKey], source[sourceKey]);
+    if (func) {
+      target[sourceKey] = func(target[sourceKey], source[sourceKey]);
+    } else if (sourceKeys.includes(sourceKey)) {
+      const func2 = mergeStrategies.get("deepMerge");
+      target[sourceKey] = func2(target[sourceKey], source[sourceKey]);
+    }
   });
   return target;
 }

package/lib/client.d.ts

@@ -8,6 +8,7 @@
  */
 import lodash from 'lodash';
 import { dayjs } from './dayjs';
+import { getDayRangeByParams, getOffsetRangeByParams } from './dateRangeUtils';
 export * from './collections-graph';
 export * from './common';
 export * from './date';
@@ -28,4 +29,4 @@ export * from './parseHTML';
 export * from './uid';
 export * from './url';
 export * from './transformMultiColumnToSingleColumn';
-export { dayjs, lodash };
+export { dayjs, lodash, getDayRangeByParams, getOffsetRangeByParams };

package/lib/client.js

@@ -38,11 +38,14 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var client_exports = {};
 __export(client_exports, {
   dayjs: () => import_dayjs.dayjs,
+  getDayRangeByParams: () => import_dateRangeUtils.getDayRangeByParams,
+  getOffsetRangeByParams: () => import_dateRangeUtils.getOffsetRangeByParams,
   lodash: () => import_lodash.default
 });
 module.exports = __toCommonJS(client_exports);
 var import_lodash = __toESM(require("lodash"));
 var import_dayjs = require("./dayjs");
+var import_dateRangeUtils = require("./dateRangeUtils");
 __reExport(client_exports, require("./collections-graph"), module.exports);
 __reExport(client_exports, require("./common"), module.exports);
 __reExport(client_exports, require("./date"), module.exports);
@@ -66,6 +69,8 @@ __reExport(client_exports, require("./transformMultiColumnToSingleColumn"), modu
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   dayjs,
+  getDayRangeByParams,
+  getOffsetRangeByParams,
   lodash,
   ...require("./collections-graph"),
   ...require("./common"),

package/lib/common.d.ts

@@ -12,3 +12,23 @@ 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;
+/**
+ * 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, {
@@ -32,9 +42,12 @@ __export(common_exports, {
   isEmpty: () => isEmpty,
   isPlainObject: () => isPlainObject,
   isString: () => isString,
-  nextTick: () => nextTick
+  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");
@@ -76,6 +89,41 @@ 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");
+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,
@@ -83,5 +131,7 @@ const nextTick = /* @__PURE__ */ __name((fn) => {
   isEmpty,
   isPlainObject,
   isString,
-  nextTick
+  nextTick,
+  sortTree,
+  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/lib/dateRangeUtils.d.ts

@@ -0,0 +1,22 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+type DateUnit = 'day' | 'week' | 'isoWeek' | 'month' | 'quarter' | 'year';
+type RangeType = 'today' | 'yesterday' | 'tomorrow' | 'thisWeek' | 'lastWeek' | 'nextWeek' | 'thisMonth' | 'lastMonth' | 'nextMonth' | 'thisQuarter' | 'lastQuarter' | 'nextQuarter' | 'thisYear' | 'lastYear' | 'nextYear' | 'past' | 'next';
+interface RangeParams {
+    type: RangeType;
+    unit?: DateUnit;
+    number?: number;
+    timezone?: string;
+}
+export declare const getOffsetRangeByParams: (params: RangeParams) => [string, string];
+/**
+ * 获取某个时间范围的起止时间（字符串格式）
+ */
+export declare const getDayRangeByParams: (params: RangeParams) => [string, string];
+export {};

package/lib/dateRangeUtils.js

@@ -0,0 +1,101 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var dateRangeUtils_exports = {};
+__export(dateRangeUtils_exports, {
+  getDayRangeByParams: () => getDayRangeByParams,
+  getOffsetRangeByParams: () => getOffsetRangeByParams
+});
+module.exports = __toCommonJS(dateRangeUtils_exports);
+var import_dayjs2 = require("./dayjs");
+const getNow = /* @__PURE__ */ __name((tz) => {
+  if (!tz) return (0, import_dayjs2.dayjs)();
+  if (/^[+-]\d{2}:\d{2}$/.test(tz)) {
+    const [sign, hour, minute] = tz.match(/([+-])(\d{2}):(\d{2})/).slice(1);
+    const offset = (parseInt(hour) * 60 + parseInt(minute)) * (sign === "+" ? 1 : -1);
+    return (0, import_dayjs2.dayjs)().utcOffset(offset);
+  }
+  return (0, import_dayjs2.dayjs)().tz(tz);
+}, "getNow");
+const getOffsetRangeByParams = /* @__PURE__ */ __name((params) => {
+  const { type, unit = "day", number = 1, timezone } = params;
+  const now = getNow(timezone);
+  const actualUnit = unit === "week" ? "isoWeek" : unit;
+  let start;
+  let end;
+  if (type === "past") {
+    const base = now.startOf(actualUnit);
+    start = base.subtract(number, unit).startOf(actualUnit);
+    end = base.subtract(1, unit).endOf(actualUnit);
+  } else if (type === "next") {
+    const base = now.startOf(actualUnit);
+    start = base.add(1, unit).startOf(actualUnit);
+    end = start.add(number - 1, unit).endOf(actualUnit);
+  } else {
+    throw new Error(`Unsupported type: ${type}`);
+  }
+  return [start.format("YYYY-MM-DD HH:mm:ss"), end.format("YYYY-MM-DD HH:mm:ss")];
+}, "getOffsetRangeByParams");
+const getStart = /* @__PURE__ */ __name((offset, unit, tz) => {
+  const actualUnit = unit === "isoWeek" ? "week" : unit;
+  return getNow(tz).add(offset, actualUnit).startOf(unit);
+}, "getStart");
+const getEnd = /* @__PURE__ */ __name((offset, unit, tz) => {
+  const actualUnit = unit === "isoWeek" ? "week" : unit;
+  return getNow(tz).add(offset, actualUnit).endOf(unit);
+}, "getEnd");
+const strategies = {
+  today: /* @__PURE__ */ __name((params) => [getStart(0, "day", params == null ? void 0 : params.timezone), getEnd(0, "day", params == null ? void 0 : params.timezone)], "today"),
+  yesterday: /* @__PURE__ */ __name((params) => [getStart(-1, "day", params == null ? void 0 : params.timezone), getEnd(-1, "day", params == null ? void 0 : params.timezone)], "yesterday"),
+  tomorrow: /* @__PURE__ */ __name((params) => [getStart(1, "day", params == null ? void 0 : params.timezone), getEnd(1, "day", params == null ? void 0 : params.timezone)], "tomorrow"),
+  thisWeek: /* @__PURE__ */ __name((params) => [getStart(0, "isoWeek", params == null ? void 0 : params.timezone), getEnd(0, "isoWeek", params == null ? void 0 : params.timezone)], "thisWeek"),
+  lastWeek: /* @__PURE__ */ __name((params) => [getStart(-1, "isoWeek", params == null ? void 0 : params.timezone), getEnd(-1, "isoWeek", params == null ? void 0 : params.timezone)], "lastWeek"),
+  nextWeek: /* @__PURE__ */ __name((params) => [getStart(1, "isoWeek", params == null ? void 0 : params.timezone), getEnd(1, "isoWeek", params == null ? void 0 : params.timezone)], "nextWeek"),
+  thisMonth: /* @__PURE__ */ __name((params) => [getStart(0, "month", params == null ? void 0 : params.timezone), getEnd(0, "month", params == null ? void 0 : params.timezone)], "thisMonth"),
+  lastMonth: /* @__PURE__ */ __name((params) => [getStart(-1, "month", params == null ? void 0 : params.timezone), getEnd(-1, "month", params == null ? void 0 : params.timezone)], "lastMonth"),
+  nextMonth: /* @__PURE__ */ __name((params) => [getStart(1, "month", params == null ? void 0 : params.timezone), getEnd(1, "month", params == null ? void 0 : params.timezone)], "nextMonth"),
+  thisQuarter: /* @__PURE__ */ __name((params) => [getStart(0, "quarter", params == null ? void 0 : params.timezone), getEnd(0, "quarter", params == null ? void 0 : params.timezone)], "thisQuarter"),
+  lastQuarter: /* @__PURE__ */ __name((params) => [getStart(-1, "quarter", params == null ? void 0 : params.timezone), getEnd(-1, "quarter", params == null ? void 0 : params.timezone)], "lastQuarter"),
+  nextQuarter: /* @__PURE__ */ __name((params) => [getStart(1, "quarter", params == null ? void 0 : params.timezone), getEnd(1, "quarter", params == null ? void 0 : params.timezone)], "nextQuarter"),
+  thisYear: /* @__PURE__ */ __name((params) => [getStart(0, "year", params == null ? void 0 : params.timezone), getEnd(0, "year", params == null ? void 0 : params.timezone)], "thisYear"),
+  lastYear: /* @__PURE__ */ __name((params) => [getStart(-1, "year", params == null ? void 0 : params.timezone), getEnd(-1, "year", params == null ? void 0 : params.timezone)], "lastYear"),
+  nextYear: /* @__PURE__ */ __name((params) => [getStart(1, "year", params == null ? void 0 : params.timezone), getEnd(1, "year", params == null ? void 0 : params.timezone)], "nextYear")
+};
+const getDayRangeByParams = /* @__PURE__ */ __name((params) => {
+  if (params.type === "past" || params.type === "next") {
+    return getOffsetRangeByParams(params);
+  }
+  const fn = strategies[params.type];
+  if (!fn) throw new Error(`Unsupported type: ${params.type}`);
+  const [start, end] = fn(params);
+  return [start.format("YYYY-MM-DD HH:mm:ss"), end.format("YYYY-MM-DD HH:mm:ss")];
+}, "getDayRangeByParams");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getDayRangeByParams,
+  getOffsetRangeByParams
+});

package/lib/dayjs.js

@@ -42,6 +42,7 @@ module.exports = __toCommonJS(dayjs_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_advancedFormat = __toESM(require("dayjs/plugin/advancedFormat"));
 var import_customParseFormat = __toESM(require("dayjs/plugin/customParseFormat"));
+var import_duration = __toESM(require("dayjs/plugin/duration"));
 var import_isBetween = __toESM(require("dayjs/plugin/isBetween"));
 var import_isSameOrAfter = __toESM(require("dayjs/plugin/isSameOrAfter"));
 var import_isSameOrBefore = __toESM(require("dayjs/plugin/isSameOrBefore"));
@@ -66,6 +67,7 @@ import_dayjs.default.extend(import_weekOfYear.default);
 import_dayjs.default.extend(import_weekYear.default);
 import_dayjs.default.extend(import_customParseFormat.default);
 import_dayjs.default.extend(import_advancedFormat.default);
+import_dayjs.default.extend(import_duration.default);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   dayjs

package/lib/index.d.ts

@@ -37,4 +37,5 @@ export * from './url';
 export * from './i18n';
 export * from './wrap-middleware';
 export * from './object-to-cli-args';
+export * from './dateRangeUtils';
 export { Schema } from '@formily/json-schema';

package/lib/index.js

@@ -72,6 +72,7 @@ __reExport(src_exports, require("./url"), module.exports);
 __reExport(src_exports, require("./i18n"), module.exports);
 __reExport(src_exports, require("./wrap-middleware"), module.exports);
 __reExport(src_exports, require("./object-to-cli-args"), module.exports);
+__reExport(src_exports, require("./dateRangeUtils"), module.exports);
 var import_json_schema = require("@formily/json-schema");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
@@ -105,5 +106,6 @@ var import_json_schema = require("@formily/json-schema");
   ...require("./url"),
   ...require("./i18n"),
   ...require("./wrap-middleware"),
-  ...require("./object-to-cli-args")
+  ...require("./object-to-cli-args"),
+  ...require("./dateRangeUtils")
 });

package/lib/parse-date.js

@@ -33,14 +33,16 @@ __export(parse_date_exports, {
 module.exports = __toCommonJS(parse_date_exports);
 var import_date = require("./date");
 var import_dayjs = require("./dayjs");
+var import_dateRangeUtils = require("./dateRangeUtils");
 function parseUTC(value) {
+  var _a;
   if (value instanceof Date || import_dayjs.dayjs.isDayjs(value)) {
     return {
       unit: "utc",
       start: value.toISOString()
     };
   }
-  if (value.endsWith("Z")) {
+  if ((_a = value == null ? void 0 : value.endsWith) == null ? void 0 : _a.call(value, "Z")) {
     return {
       unit: "utc",
       start: value
@@ -186,6 +188,9 @@ function parseDate(value, options = {}) {
   if (!value) {
     return;
   }
+  if (value.type) {
+    value = (0, import_dateRangeUtils.getDayRangeByParams)({ ...value, ...options });
+  }
   if (Array.isArray(value)) {
     return parseDateBetween(value, options);
   }

package/lib/parse-filter.js

@@ -53,6 +53,7 @@ var import_moment = __toESM(require("moment"));
 var import_date = require("./date");
 var import_dayjs = require("./dayjs");
 var import_getValuesByPath = require("./getValuesByPath");
+var import_dateRangeUtils = require("./dateRangeUtils");
 const re = /^\s*\{\{([\s\S]*)\}\}\s*$/;
 function isBuffer(obj) {
   return obj && obj.constructor && typeof obj.constructor.isBuffer === "function" && obj.constructor.isBuffer(obj);
@@ -131,6 +132,9 @@ const dateValueWrapper = /* @__PURE__ */ __name((value, timezone) => {
   if (!value) {
     return null;
   }
+  if (value.type) {
+    value = (0, import_dateRangeUtils.getDayRangeByParams)({ ...value, timezone });
+  }
   if (Array.isArray(value)) {
     if (value.length === 2) {
       value.push("[]", timezone);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/utils",
-  "version": "1.7.0-beta.9",
+  "version": "1.8.0-beta.1",
   "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": "7013a5080f3695d7750ab21005c90d2172c16480"
+  "gitHead": "103935669123174f2942247202e3d9ff15f0d4ed"
 }