@nocobase/utils 1.3.38-beta → 1.4.0-alpha

package/lib/date.d.ts

@@ -35,3 +35,4 @@ 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";

package/lib/date.js

@@ -38,6 +38,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var date_exports = {};
 __export(date_exports, {
   getDefaultFormat: () => getDefaultFormat,
+  getPickerFormat: () => getPickerFormat,
   moment2str: () => moment2str,
   offsetFromString: () => offsetFromString,
   str2moment: () => str2moment,
@@ -64,7 +65,7 @@ const getDefaultFormat = /* @__PURE__ */ __name((props) => {
   } else if (props["picker"] === "year") {
     return "YYYY";
   } else if (props["picker"] === "week") {
-    return "YYYY-wo";
+    return "YYYY[W]W";
   }
   return props["showTime"] ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD";
 }, "getDefaultFormat");
@@ -85,22 +86,31 @@ const toLocal = /* @__PURE__ */ __name((value) => {
     return value.startOf("second").toISOString();
   }
 }, "toLocal");
+const convertQuarterToFirstDay = /* @__PURE__ */ __name((quarterStr) => {
+  const year = parseInt(quarterStr.slice(0, 4));
+  const quarter = parseInt(quarterStr.slice(-1));
+  return (0, import_dayjs.dayjs)().quarter(quarter).year(year);
+}, "convertQuarterToFirstDay");
 const toMoment = /* @__PURE__ */ __name((val, options) => {
   if (!val) {
     return;
   }
   const offset = options.utcOffset || -1 * (/* @__PURE__ */ new Date()).getTimezoneOffset();
   const { gmt, picker, utc = true } = options;
-  if (!utc) {
-    return (0, import_dayjs.dayjs)(val);
-  }
-  if (import_dayjs.dayjs.isDayjs(val)) {
-    return val.utcOffset(offsetFromString(offset));
-  }
-  if (gmt || picker) {
-    return (0, import_dayjs.dayjs)(val).utcOffset(0);
+  if ((0, import_dayjs.dayjs)(val).isValid()) {
+    if (!utc) {
+      return (0, import_dayjs.dayjs)(val);
+    }
+    if (import_dayjs.dayjs.isDayjs(val)) {
+      return val.utcOffset(offsetFromString(offset));
+    }
+    if (gmt) {
+      return (0, import_dayjs.dayjs)(val).utcOffset(0);
+    }
+    return (0, import_dayjs.dayjs)(val).utcOffset(offsetFromString(offset));
+  } else {
+    return convertQuarterToFirstDay(val);
   }
-  return (0, import_dayjs.dayjs)(val).utcOffset(offsetFromString(offset));
 }, "toMoment");
 const str2moment = /* @__PURE__ */ __name((value, options = {}) => {
   return Array.isArray(value) ? value.map((val) => {
@@ -178,9 +188,24 @@ function absFloor(number) {
   }
 }
 __name(absFloor, "absFloor");
+const getPickerFormat = /* @__PURE__ */ __name((picker) => {
+  switch (picker) {
+    case "week":
+      return "YYYY[W]W";
+    case "month":
+      return "YYYY-MM";
+    case "quarter":
+      return "YYYY[Q]Q";
+    case "year":
+      return "YYYY";
+    default:
+      return "YYYY-MM-DD";
+  }
+}, "getPickerFormat");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getDefaultFormat,
+  getPickerFormat,
   moment2str,
   offsetFromString,
   str2moment,

package/lib/parse-filter.js

@@ -191,6 +191,9 @@ const parseFilter = /* @__PURE__ */ __name(async (filter, opts = {}) => {
       }
       if (isDateOperator(operator)) {
         const field = getField == null ? void 0 : getField(path);
+        if ((field == null ? void 0 : field.constructor.name) === "DateOnlyField" || (field == null ? void 0 : field.constructor.name) === "DatetimeNoTzField") {
+          return value;
+        }
         return dateValueWrapper(value, (field == null ? void 0 : field.timezone) || timezone);
       }
       return value;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/utils",
-  "version": "1.3.38-beta",
+  "version": "1.4.0-alpha",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
@@ -14,5 +14,5 @@
     "multer": "^1.4.5-lts.1",
     "object-path": "^0.11.8"
   },
-  "gitHead": "1b9490667c9224cd0b179cbf75e10a581c49b230"
+  "gitHead": "f097a2bddec152522b5645bd5d451f4c866d2060"
 }