@nocobase/database 2.1.0-beta.8 → 2.1.0

package/lib/collection.d.ts

@@ -30,10 +30,23 @@ export type DumpRules = BuiltInGroup | ({
     group: BuiltInGroup | string;
 } & BaseDumpRules);
 export type MigrationRule = 'overwrite' | 'skip' | 'upsert' | 'schema-only' | 'insert-ignore' | (string & {}) | null;
+/**
+ * `dataCategory = system` marks data that is foundational to system operation and should be treated as core runtime data.
+ * `dataCategory = business` marks data owned by plugin features and used as part of the plugin's business domain.
+ * `dataCategory = runtime` excludes the collection's data from backup snapshots.
+ */
+export type DataCategory = 'system' | 'business' | 'runtime';
+export type DataCategories = DataCategory | DataCategory[];
+export declare const TAG: {
+    basic: string;
+    business: string;
+    ignoredBackup: string;
+};
 export interface CollectionOptions extends Omit<ModelOptions, 'name' | 'hooks'> {
     name: string;
     title?: string;
     namespace?: string;
+    dataCategory?: DataCategories;
     migrationRules?: MigrationRule[];
     dumpRules?: DumpRules;
     tableName?: string;
@@ -81,6 +94,7 @@ export declare class Collection<TModelAttributes extends {} = any, TCreationAttr
     model: ModelStatic<Model>;
     repository: Repository<TModelAttributes, TCreationAttributes>;
     constructor(options: CollectionOptions, context: CollectionContext);
+    get dataCategory(): DataCategories;
     get underscored(): boolean;
     get filterTargetKey(): string | string[];
     get name(): string;

package/lib/collection.js

@@ -45,7 +45,8 @@ var __decorateClass = (decorators, target, key, kind) => {
 };
 var collection_exports = {};
 __export(collection_exports, {
-  Collection: () => Collection
+  Collection: () => Collection,
+  TAG: () => TAG
 });
 module.exports = __toCommonJS(collection_exports);
 var import_deepmerge = __toESM(require("deepmerge"));
@@ -89,6 +90,11 @@ function EnsureAtomicity(target, propertyKey, descriptor) {
   return descriptor;
 }
 __name(EnsureAtomicity, "EnsureAtomicity");
+const TAG = {
+  basic: "basic",
+  business: "business",
+  ignoredBackup: "ignored:backup"
+};
 const _Collection = class _Collection extends import_events.EventEmitter {
   options;
   context;
@@ -112,6 +118,9 @@ const _Collection = class _Collection extends import_events.EventEmitter {
     this.setRepository(options.repository);
     this.setSortable(options.sortable);
   }
+  get dataCategory() {
+    return this.options.dataCategory;
+  }
   get underscored() {
     return this.options.underscored;
   }
@@ -188,7 +197,7 @@ const _Collection = class _Collection extends import_events.EventEmitter {
         label: `${this.name}.${field.name}`,
         value: val
       });
-      const { error } = joiSchema.validate(val, { convert: false });
+      const { error } = joiSchema.validate(val);
       if (error) {
         throw error;
       }
@@ -817,5 +826,6 @@ __decorateClass([
 let Collection = _Collection;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  Collection
+  Collection,
+  TAG
 });

package/lib/database.d.ts

@@ -45,6 +45,7 @@ export interface IDatabaseOptions extends Options {
     migrator?: any;
     usingBigIntForId?: boolean;
     underscored?: boolean;
+    rawTimezone?: string;
     logger?: LoggerOptions | Logger;
     customHooks?: any;
     instanceId?: string;

package/lib/database.js

@@ -213,6 +213,9 @@ const _Database = class _Database extends import_events.EventEmitter {
     this.migrations = new import_migration.Migrations(context);
     this.sequelize.beforeDefine((model, opts2) => {
       if (this.options.tablePrefix) {
+        if (opts2.tableName && opts2["from"] === "dbsync") {
+          return;
+        }
         if (opts2.tableName && opts2.tableName.startsWith(this.options.tablePrefix)) {
           return;
         }
@@ -221,6 +224,7 @@ const _Database = class _Database extends import_events.EventEmitter {
     });
     this.collection({
       name: "migrations",
+      dataCategory: "system",
       autoGenId: false,
       timestamps: false,
       dumpRules: "required",

package/lib/eager-loading/eager-loading-tree.js

@@ -75,16 +75,20 @@ const queryParentSQL = /* @__PURE__ */ __name((options) => {
   const targetKeyField = collection.model.rawAttributes[targetKey].field;
   const queryInterface = db.sequelize.getQueryInterface();
   const q = queryInterface.quoteIdentifier.bind(queryInterface);
-  return `WITH RECURSIVE cte AS (
+  const placeholders = nodeIds.map((_, index) => `$${index + 1}`).join(", ");
+  return {
+    sql: `WITH RECURSIVE cte AS (
       SELECT ${q(targetKeyField)}, ${q(foreignKeyField)}
       FROM ${tableName}
-      WHERE ${q(targetKeyField)} IN ('${nodeIds.join("','")}')
+      WHERE ${q(targetKeyField)} IN (${placeholders})
       UNION ALL
       SELECT t.${q(targetKeyField)}, t.${q(foreignKeyField)}
       FROM ${tableName} AS t
       INNER JOIN cte ON t.${q(targetKeyField)} = cte.${q(foreignKeyField)}
       )
-      SELECT ${q(targetKeyField)} AS ${q(targetKey)}, ${q(foreignKeyField)} AS ${q(foreignKey)} FROM cte`;
+      SELECT ${q(targetKeyField)} AS ${q(targetKey)}, ${q(foreignKeyField)} AS ${q(foreignKey)} FROM cte`,
+    bind: nodeIds
+  };
 }, "queryParentSQL");
 const _EagerLoadingTree = class _EagerLoadingTree {
   root;
@@ -305,7 +309,7 @@ const _EagerLoadingTree = class _EagerLoadingTree {
           });
           if (node.includeOption.recursively && instances.length > 0) {
             const targetKey = association.targetKey;
-            const sql = queryParentSQL({
+            const { sql, bind } = queryParentSQL({
               db: this.db,
               collection: collection2,
               foreignKey,
@@ -313,6 +317,7 @@ const _EagerLoadingTree = class _EagerLoadingTree {
               nodeIds: instances.map((instance) => instance.get(targetKey))
             });
             const results = await this.db.sequelize.query(sql, {
+              bind,
               type: "SELECT",
               transaction
             });

package/lib/errors/association-not-found-error.d.ts

@@ -0,0 +1,11 @@
+/**
+ * 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.
+ */
+export declare class AssociationNotFoundError extends Error {
+    constructor(message: string);
+}

package/lib/errors/association-not-found-error.js

@@ -0,0 +1,44 @@
+/**
+ * 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 association_not_found_error_exports = {};
+__export(association_not_found_error_exports, {
+  AssociationNotFoundError: () => AssociationNotFoundError
+});
+module.exports = __toCommonJS(association_not_found_error_exports);
+const _AssociationNotFoundError = class _AssociationNotFoundError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "AssociationNotFoundError";
+  }
+};
+__name(_AssociationNotFoundError, "AssociationNotFoundError");
+let AssociationNotFoundError = _AssociationNotFoundError;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  AssociationNotFoundError
+});

package/lib/fields/password-field.d.ts

@@ -7,6 +7,8 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { DataTypes } from 'sequelize';
+import type { UpdateOptions } from 'sequelize';
+import { Model } from '../model';
 import { BaseColumnFieldOptions, Field } from './field';
 export interface PasswordFieldOptions extends BaseColumnFieldOptions {
     type: 'password';
@@ -19,11 +21,17 @@ export interface PasswordFieldOptions extends BaseColumnFieldOptions {
      */
     randomBytesSize?: number;
 }
+type PasswordValue = string | number;
+type BulkUpdateOptions = UpdateOptions<Record<string, unknown>> & {
+    attributes?: Record<string, unknown>;
+};
 export declare class PasswordField extends Field {
     get dataType(): DataTypes.StringDataTypeConstructor;
-    verify(password: string, hash: string): Promise<unknown>;
-    hash(password: string): Promise<unknown>;
-    init(): void;
+    listener: (instances: Model | Model[]) => Promise<void>;
+    bulkUpdateListener: (options: BulkUpdateOptions) => Promise<void>;
+    verify(password: PasswordValue, hash: string): Promise<boolean>;
+    hash(password: PasswordValue): Promise<string>;
     bind(): void;
     unbind(): void;
 }
+export {};

package/lib/fields/password-field.js

@@ -47,58 +47,78 @@ const _PasswordField = class _PasswordField extends import_field.Field {
   get dataType() {
     return import_sequelize.DataTypes.STRING;
   }
+  listener = /* @__PURE__ */ __name(async (instances) => {
+    const { name } = this.options;
+    const fieldName = name;
+    instances = Array.isArray(instances) ? instances : [instances];
+    for (const instance of instances) {
+      if (!instance.changed(fieldName)) {
+        continue;
+      }
+      const value = instance.get(fieldName);
+      if (value !== null && value !== void 0 && value !== "") {
+        const password = typeof value === "number" ? value : String(value);
+        const hash = await this.hash(password);
+        instance.set(fieldName, hash);
+      } else {
+        instance.set(fieldName, instance.previous(fieldName));
+      }
+    }
+  }, "listener");
+  bulkUpdateListener = /* @__PURE__ */ __name(async (options) => {
+    var _a;
+    const { name } = this.options;
+    const fieldName = name;
+    const { attributes } = options;
+    if (!attributes || !Object.prototype.hasOwnProperty.call(attributes, fieldName)) {
+      return;
+    }
+    const value = attributes[fieldName];
+    if (value !== null && value !== void 0 && value !== "") {
+      const password = typeof value === "number" ? value : String(value);
+      attributes[fieldName] = await this.hash(password);
+    } else {
+      delete attributes[fieldName];
+      options.fields = (_a = options.fields) == null ? void 0 : _a.filter((field) => field !== fieldName);
+    }
+  }, "bulkUpdateListener");
   async verify(password, hash) {
-    password = password || "";
+    const passwordString = password === null || password === void 0 ? "" : String(password);
     hash = hash || "";
     const { length = 64, randomBytesSize = 8 } = this.options;
     return new Promise((resolve, reject) => {
       const salt = hash.substring(0, randomBytesSize * 2);
       const key = hash.substring(randomBytesSize * 2);
-      import_crypto.default.scrypt(password, salt, length / 2 - randomBytesSize, (err, derivedKey) => {
+      import_crypto.default.scrypt(passwordString, salt, length / 2 - randomBytesSize, (err, derivedKey) => {
         if (err) reject(err);
         resolve(key == derivedKey.toString("hex"));
       });
     });
   }
   async hash(password) {
+    const passwordString = String(password);
     const { length = 64, randomBytesSize = 8 } = this.options;
     return new Promise((resolve, reject) => {
       const salt = import_crypto.default.randomBytes(randomBytesSize).toString("hex");
-      import_crypto.default.scrypt(password, salt, length / 2 - randomBytesSize, (err, derivedKey) => {
+      import_crypto.default.scrypt(passwordString, salt, length / 2 - randomBytesSize, (err, derivedKey) => {
         if (err) reject(err);
         resolve(salt + derivedKey.toString("hex"));
       });
     });
   }
-  init() {
-    const { name } = this.options;
-    this.listener = async (instances) => {
-      instances = Array.isArray(instances) ? instances : [instances];
-      for (const instance of instances) {
-        if (!instance.changed(name)) {
-          continue;
-        }
-        const value = instance.get(name);
-        if (value) {
-          const hash = await this.hash(value);
-          instance.set(name, hash);
-        } else {
-          instance.set(name, instance.previous(name));
-        }
-      }
-    };
-  }
   bind() {
     super.bind();
     this.on("beforeCreate", this.listener);
     this.on("beforeBulkCreate", this.listener);
     this.on("beforeUpdate", this.listener);
+    this.on("beforeBulkUpdate", this.bulkUpdateListener);
   }
   unbind() {
     super.unbind();
     this.off("beforeCreate", this.listener);
     this.off("beforeBulkCreate", this.listener);
     this.off("beforeUpdate", this.listener);
+    this.off("beforeBulkUpdate", this.bulkUpdateListener);
   }
 };
 __name(_PasswordField, "PasswordField");

package/lib/fields/relation-field.js

@@ -43,7 +43,7 @@ const _RelationField = class _RelationField extends import_field.Field {
     return this.options.foreignKey;
   }
   get sourceKey() {
-    return this.options.sourceKey || this.collection.model.primaryKeyAttribute;
+    return this.options.sourceKey || this.collection.filterTargetKey;
   }
   get targetKey() {
     return this.options.targetKey || this.TargetModel.primaryKeyAttribute;

package/lib/index.d.ts

@@ -32,6 +32,9 @@ export * from './relation-repository/hasmany-repository';
 export * from './relation-repository/hasone-repository';
 export * from './relation-repository/multiple-relation-repository';
 export * from './relation-repository/single-relation-repository';
+export * from './query/builder';
+export * from './query/formatter';
+export * from './query/types';
 export * from './repository';
 export * from './relation-repository/relation-repository';
 export { default as sqlParser, SQLParserTypes } from './sql-parser';

package/lib/index.js

@@ -93,6 +93,9 @@ __reExport(src_exports, require("./relation-repository/hasmany-repository"), mod
 __reExport(src_exports, require("./relation-repository/hasone-repository"), module.exports);
 __reExport(src_exports, require("./relation-repository/multiple-relation-repository"), module.exports);
 __reExport(src_exports, require("./relation-repository/single-relation-repository"), module.exports);
+__reExport(src_exports, require("./query/builder"), module.exports);
+__reExport(src_exports, require("./query/formatter"), module.exports);
+__reExport(src_exports, require("./query/types"), module.exports);
 __reExport(src_exports, require("./repository"), module.exports);
 __reExport(src_exports, require("./relation-repository/relation-repository"), module.exports);
 var import_sql_parser = __toESM(require("./sql-parser"));
@@ -157,6 +160,9 @@ var import_filter_include = require("./utils/filter-include");
   ...require("./relation-repository/hasone-repository"),
   ...require("./relation-repository/multiple-relation-repository"),
   ...require("./relation-repository/single-relation-repository"),
+  ...require("./query/builder"),
+  ...require("./query/formatter"),
+  ...require("./query/types"),
   ...require("./repository"),
   ...require("./relation-repository/relation-repository"),
   ...require("./update-associations"),

package/lib/interfaces/date-interface.d.ts

@@ -1,4 +1,13 @@
+/**
+ * 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.
+ */
 import { DatetimeInterface } from './datetime-interface';
 export declare class DateInterface extends DatetimeInterface {
+    toValue(value: any, ctx?: any): Promise<any>;
     toString(value: any, ctx?: any): any;
 }

package/lib/interfaces/date-interface.js

@@ -31,7 +31,34 @@ __export(date_interface_exports, {
 });
 module.exports = __toCommonJS(date_interface_exports);
 var import_datetime_interface = require("./datetime-interface");
+function pad2(value) {
+  return String(value).padStart(2, "0");
+}
+__name(pad2, "pad2");
+function formatDateOnlyFromDate(date, timezone) {
+  const offsetMinutes = (0, import_datetime_interface.getTimeZoneOffsetMinutes)(timezone);
+  if (offsetMinutes == null) {
+    return `${date.getFullYear()}-${pad2(date.getMonth() + 1)}-${pad2(date.getDate())}`;
+  }
+  const shifted = new Date(date.getTime() + offsetMinutes * 60 * 1e3);
+  return `${shifted.getUTCFullYear()}-${pad2(shifted.getUTCMonth() + 1)}-${pad2(shifted.getUTCDate())}`;
+}
+__name(formatDateOnlyFromDate, "formatDateOnlyFromDate");
 const _DateInterface = class _DateInterface extends import_datetime_interface.DatetimeInterface {
+  async toValue(value, ctx) {
+    const normalized = await super.toValue(value, ctx);
+    if (!normalized) {
+      return normalized;
+    }
+    if (typeof normalized === "string" && /^\d{4}-\d{2}-\d{2}$/.test(normalized)) {
+      return normalized;
+    }
+    const date = normalized instanceof Date ? normalized : new Date(normalized);
+    if (Number.isNaN(date.getTime())) {
+      return normalized;
+    }
+    return formatDateOnlyFromDate(date, (0, import_datetime_interface.resolveTimeZoneFromCtx)(ctx));
+  }
   toString(value, ctx) {
     return value;
   }

package/lib/interfaces/datetime-interface.d.ts

@@ -7,6 +7,8 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { BaseInterface } from './base-interface';
+export declare function getTimeZoneOffsetMinutes(timezone: string | number | null | undefined): number;
+export declare function resolveTimeZoneFromCtx(ctx: any): any;
 export declare class DatetimeInterface extends BaseInterface {
     protected parseDateString(value: string): {
         year: string;
@@ -30,7 +32,7 @@ export declare class DatetimeInterface extends BaseInterface {
         hour?: string;
         minute?: string;
         second?: string;
-    }): string;
+    }, ctx?: any): string;
     toValue(value: any, ctx?: any): Promise<any>;
     toString(value: any, ctx?: any): any;
 }

package/lib/interfaces/datetime-interface.js

@@ -37,7 +37,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var datetime_interface_exports = {};
 __export(datetime_interface_exports, {
-  DatetimeInterface: () => DatetimeInterface
+  DatetimeInterface: () => DatetimeInterface,
+  getTimeZoneOffsetMinutes: () => getTimeZoneOffsetMinutes,
+  resolveTimeZoneFromCtx: () => resolveTimeZoneFromCtx
 });
 module.exports = __toCommonJS(datetime_interface_exports);
 var import_base_interface = require("./base-interface");
@@ -54,13 +56,79 @@ function isNumeric(str) {
   return !isNaN(str) && !isNaN(parseFloat(str));
 }
 __name(isNumeric, "isNumeric");
+function getTimeZoneOffsetMinutes(timezone) {
+  if (typeof timezone === "number" && Number.isFinite(timezone)) {
+    return timezone;
+  }
+  if (typeof timezone !== "string") {
+    return null;
+  }
+  const normalized = timezone.trim().toUpperCase();
+  if (!normalized) {
+    return null;
+  }
+  if (normalized === "Z" || normalized === "UTC") {
+    return 0;
+  }
+  const match = normalized.match(/^([+-])(\d{2})(?::?(\d{2}))?$/);
+  if (!match) {
+    return null;
+  }
+  const [, sign, hours, minutes = "00"] = match;
+  const totalMinutes = Number(hours) * 60 + Number(minutes);
+  return sign === "+" ? totalMinutes : -totalMinutes;
+}
+__name(getTimeZoneOffsetMinutes, "getTimeZoneOffsetMinutes");
 function resolveTimeZoneFromCtx(ctx) {
-  if ((ctx == null ? void 0 : ctx.get) && (ctx == null ? void 0 : ctx.get("X-Timezone"))) {
-    return ctx.get("X-Timezone");
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+  let timezone;
+  if (typeof (ctx == null ? void 0 : ctx.get) === "function") {
+    timezone = ctx.get("X-Timezone") || ctx.get("x-timezone");
+  } else if (typeof ((_a = ctx == null ? void 0 : ctx.request) == null ? void 0 : _a.get) === "function") {
+    timezone = ctx.request.get("X-Timezone") || ctx.request.get("x-timezone");
+  }
+  timezone = timezone || ((_c = (_b = ctx == null ? void 0 : ctx.request) == null ? void 0 : _b.headers) == null ? void 0 : _c["x-timezone"]) || ((_e = (_d = ctx == null ? void 0 : ctx.request) == null ? void 0 : _d.headers) == null ? void 0 : _e["X-Timezone"]) || ((_g = (_f = ctx == null ? void 0 : ctx.request) == null ? void 0 : _f.header) == null ? void 0 : _g["x-timezone"]) || ((_i = (_h = ctx == null ? void 0 : ctx.request) == null ? void 0 : _h.header) == null ? void 0 : _i["X-Timezone"]) || ((_k = (_j = ctx == null ? void 0 : ctx.req) == null ? void 0 : _j.headers) == null ? void 0 : _k["x-timezone"]) || ((_m = (_l = ctx == null ? void 0 : ctx.req) == null ? void 0 : _l.headers) == null ? void 0 : _m["X-Timezone"]);
+  if (timezone !== void 0 && timezone !== null && timezone !== "") {
+    return timezone;
   }
-  return 0;
+  return null;
 }
 __name(resolveTimeZoneFromCtx, "resolveTimeZoneFromCtx");
+function toISOWithTimezone(dateInfo, timezone) {
+  const offsetMinutes = getTimeZoneOffsetMinutes(timezone);
+  if (offsetMinutes == null) {
+    return null;
+  }
+  const utcMillis = Date.UTC(
+    Number(dateInfo.year),
+    Number(dateInfo.month) - 1,
+    Number(dateInfo.day),
+    Number(dateInfo.hour || "00"),
+    Number(dateInfo.minute || "00"),
+    Number(dateInfo.second || "00"),
+    0
+  ) - offsetMinutes * 60 * 1e3;
+  return new Date(utcMillis).toISOString();
+}
+__name(toISOWithTimezone, "toISOWithTimezone");
+function excelSerialToISO(value, timezone) {
+  const wallClockUtcDate = (0, import_excel_date_to_js.getJsDateFromExcel)(value);
+  const offsetMinutes = getTimeZoneOffsetMinutes(timezone);
+  if (offsetMinutes == null) {
+    return wallClockUtcDate.toISOString();
+  }
+  const utcMillis = Date.UTC(
+    wallClockUtcDate.getUTCFullYear(),
+    wallClockUtcDate.getUTCMonth(),
+    wallClockUtcDate.getUTCDate(),
+    wallClockUtcDate.getUTCHours(),
+    wallClockUtcDate.getUTCMinutes(),
+    wallClockUtcDate.getUTCSeconds(),
+    wallClockUtcDate.getUTCMilliseconds()
+  ) - offsetMinutes * 60 * 1e3;
+  return new Date(utcMillis).toISOString();
+}
+__name(excelSerialToISO, "excelSerialToISO");
 const _DatetimeInterface = class _DatetimeInterface extends import_base_interface.BaseInterface {
   parseDateString(value) {
     const dateOnlyMatch = /^(\d{4})[-/]?(\d{2})[-/]?(\d{2})$/.exec(value);
@@ -75,7 +143,12 @@ const _DatetimeInterface = class _DatetimeInterface extends import_base_interfac
     }
     return null;
   }
-  formatDateTimeToISO(dateInfo) {
+  formatDateTimeToISO(dateInfo, ctx) {
+    const timezone = resolveTimeZoneFromCtx(ctx);
+    const timezoneAwareISO = toISOWithTimezone(dateInfo, timezone);
+    if (timezoneAwareISO) {
+      return timezoneAwareISO;
+    }
     const { year, month, day, hour = "00", minute = "00", second = "00" } = dateInfo;
     const m = (0, import_dayjs.default)(`${year}-${month}-${day} ${hour}:${minute}:${second}.000`);
     return m.toISOString();
@@ -94,7 +167,7 @@ const _DatetimeInterface = class _DatetimeInterface extends import_base_interfac
     if (typeof value === "string") {
       const dateInfo = this.parseDateString(value);
       if (dateInfo) {
-        return this.formatDateTimeToISO(dateInfo);
+        return this.formatDateTimeToISO(dateInfo, ctx);
       }
     }
     if (import_dayjs.default.isDayjs(value)) {
@@ -102,7 +175,7 @@ const _DatetimeInterface = class _DatetimeInterface extends import_base_interfac
     } else if (isDate(value)) {
       return value;
     } else if (isNumeric(value)) {
-      return (0, import_excel_date_to_js.getJsDateFromExcel)(value).toISOString();
+      return excelSerialToISO(value, resolveTimeZoneFromCtx(ctx));
     } else if (typeof value === "string") {
       return value;
     }
@@ -110,7 +183,7 @@ const _DatetimeInterface = class _DatetimeInterface extends import_base_interfac
   }
   toString(value, ctx) {
     var _a, _b;
-    const utcOffset = resolveTimeZoneFromCtx(ctx);
+    const utcOffset = resolveTimeZoneFromCtx(ctx) ?? 0;
     const props = ((_b = (_a = this.options) == null ? void 0 : _a.uiSchema) == null ? void 0 : _b["x-component-props"]) ?? {};
     const format = (0, import_utils.getDefaultFormat)(props);
     const m = (0, import_utils.str2moment)(value, { ...props, utcOffset });
@@ -121,5 +194,7 @@ __name(_DatetimeInterface, "DatetimeInterface");
 let DatetimeInterface = _DatetimeInterface;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  DatetimeInterface
+  DatetimeInterface,
+  getTimeZoneOffsetMinutes,
+  resolveTimeZoneFromCtx
 });

package/lib/interfaces/datetime-no-tz-interface.d.ts

@@ -1,3 +1,11 @@
+/**
+ * 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.
+ */
 import { DatetimeInterface } from './datetime-interface';
 export declare class DatetimeNoTzInterface extends DatetimeInterface {
     protected formatDateTimeToString(dateInfo: {
@@ -8,6 +16,7 @@ export declare class DatetimeNoTzInterface extends DatetimeInterface {
         minute?: string;
         second?: string;
     }): string;
+    protected formatExcelSerialToString(value: number | string): string;
     toValue(value: any, ctx?: any): Promise<any>;
     toString(value: any, ctx?: any): any;
 }

package/lib/interfaces/datetime-no-tz-interface.js

@@ -54,6 +54,10 @@ function isNumeric(str) {
   return !isNaN(str) && !isNaN(parseFloat(str));
 }
 __name(isNumeric, "isNumeric");
+function pad2(value) {
+  return String(value).padStart(2, "0");
+}
+__name(pad2, "pad2");
 const _DatetimeNoTzInterface = class _DatetimeNoTzInterface extends import_datetime_interface.DatetimeInterface {
   formatDateTimeToString(dateInfo) {
     const { year, month, day, hour, minute, second } = dateInfo;
@@ -62,6 +66,17 @@ const _DatetimeNoTzInterface = class _DatetimeNoTzInterface extends import_datet
     }
     return `${year}-${month}-${day}`;
   }
+  formatExcelSerialToString(value) {
+    const date = (0, import_excel_date_to_js.getJsDateFromExcel)(value);
+    return this.formatDateTimeToString({
+      year: String(date.getUTCFullYear()),
+      month: pad2(date.getUTCMonth() + 1),
+      day: pad2(date.getUTCDate()),
+      hour: pad2(date.getUTCHours()),
+      minute: pad2(date.getUTCMinutes()),
+      second: pad2(date.getUTCSeconds())
+    });
+  }
   async toValue(value, ctx = {}) {
     if (!value) {
       return null;
@@ -77,8 +92,7 @@ const _DatetimeNoTzInterface = class _DatetimeNoTzInterface extends import_datet
     } else if (isDate(value)) {
       return value;
     } else if (isNumeric(value)) {
-      const date = (0, import_excel_date_to_js.getJsDateFromExcel)(value);
-      return date.toISOString();
+      return this.formatExcelSerialToString(value);
     } else if (typeof value === "string") {
       return value;
     }