@nocobase/utils 1.8.0-beta.11 → 1.8.0-beta.13

package/lib/date.d.ts

@@ -12,6 +12,7 @@ export interface Str2momentOptions {
     picker?: 'year' | 'month' | 'week' | 'quarter';
     utcOffset?: number;
     utc?: boolean;
+    dateOnly?: boolean;
 }
 export type Str2momentValue = string | string[] | dayjs.Dayjs | dayjs.Dayjs[];
 export interface GetDefaultFormatProps {

package/lib/date.js

@@ -102,10 +102,13 @@ const toMoment = /* @__PURE__ */ __name((val, options) => {
     return;
   }
   const offset = options.utcOffset;
-  const { gmt, picker, utc = true } = options;
+  const { gmt, picker, utc = true, dateOnly } = options;
   if ((0, import_dayjs.dayjs)(val).isValid()) {
+    if (dateOnly) {
+      return import_dayjs.dayjs.utc(val, "YYYY-MM-DD");
+    }
     if (!utc) {
-      return (0, import_dayjs.dayjs)(val);
+      return import_dayjs.dayjs.utc(val);
     }
     if (import_dayjs.dayjs.isDayjs(val)) {
       return offset ? val.utcOffset(offsetFromString(offset)) : val;

package/lib/index.d.ts

@@ -37,5 +37,6 @@ export * from './url';
 export * from './i18n';
 export * from './wrap-middleware';
 export * from './object-to-cli-args';
+export * from './parsedValue';
 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("./parsedValue"), 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:
@@ -107,5 +108,6 @@ var import_json_schema = require("@formily/json-schema");
   ...require("./i18n"),
   ...require("./wrap-middleware"),
   ...require("./object-to-cli-args"),
+  ...require("./parsedValue"),
   ...require("./dateRangeUtils")
 });

package/lib/parse-filter.js

@@ -196,6 +196,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") {
+          if (value.type) {
+            return (0, import_dateRangeUtils.getDayRangeByParams)({ ...value, timezone: (field == null ? void 0 : field.timezone) || timezone });
+          }
           return value;
         }
         return dateValueWrapper(value, (field == null ? void 0 : field.timezone) || timezone);

package/lib/parsedValue.d.ts

@@ -0,0 +1 @@
+export declare const parsedValue: (value: any, variables: any) => any;

package/lib/parsedValue.js

@@ -0,0 +1,57 @@
+/**
+ * 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 parsedValue_exports = {};
+__export(parsedValue_exports, {
+  parsedValue: () => parsedValue
+});
+module.exports = __toCommonJS(parsedValue_exports);
+var import_json_templates = require("./json-templates");
+function appendArrayColumn(scope, key) {
+  const paths = key.split(".");
+  let data = scope;
+  for (let p = 0; p < paths.length && data != null; p++) {
+    const path = paths[p];
+    const isIndex = path.match(/^\d+$/);
+    if (Array.isArray(data) && !isIndex && !data[path]) {
+      data[path] = data.map((item) => item[path]).flat();
+    }
+    data = data == null ? void 0 : data[path];
+  }
+}
+__name(appendArrayColumn, "appendArrayColumn");
+const parsedValue = /* @__PURE__ */ __name((value, variables) => {
+  const template = (0, import_json_templates.parse)(value);
+  template.parameters.forEach(({ key }) => {
+    appendArrayColumn(variables, key);
+  });
+  return template(variables);
+}, "parsedValue");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  parsedValue
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/utils",
-  "version": "1.8.0-beta.11",
+  "version": "1.8.0-beta.13",
   "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": "95dcdf842f5dce58786ec01f0e4d40a87d2fff2e"
+  "gitHead": "9ccd306ff667a54317ba07a000fc5aa00685d5e6"
 }