@@ -69,78 +67,10 @@ describe('UnixTimestamp', () => {
`);
});
- it('millisecond', async () => {
- await renderAppOptions({
- Component: UnixTimestamp,
- value: 1712819630000,
- props: {
- accuracy: 'millisecond',
- },
- });
- await waitFor(() => {
- expect(screen.getByRole('textbox')).toHaveValue('2024-04-11');
- });
- });
-
- it('second', async () => {
- await renderAppOptions({
- Component: UnixTimestamp,
- value: 1712819630,
- props: {
- accuracy: 'second',
- },
- });
-
- await waitFor(() => {
- expect(screen.getByRole('textbox')).toHaveValue('2024-04-11');
- });
- });
-
- it('string', async () => {
- await renderAppOptions({
- Component: UnixTimestamp,
- value: '2024-04-11',
- props: {
- accuracy: 'millisecond',
- },
- });
-
- await waitFor(() => {
- expect(screen.getByRole('textbox')).toHaveValue('2024-04-11');
- });
- });
-
- it('change', async () => {
- const onChange = vitest.fn();
- await renderAppOptions({
- Component: UnixTimestamp,
- value: '2024-04-11',
- onChange,
- props: {
- accuracy: 'millisecond',
- },
- });
- await userEvent.click(screen.getByRole('textbox'));
-
- await waitFor(() => {
- expect(screen.queryByRole('table')).toBeInTheDocument();
- });
-
- await userEvent.click(document.querySelector('td[title="2024-04-12"]'));
-
- await waitFor(() => {
- expect(screen.getByRole('textbox')).toHaveValue('2024-04-12');
- });
- expect(onChange).toBeCalledWith(1712880000000);
- });
-
it('read pretty', async () => {
const { container } = await renderReadPrettyApp({
- Component: UnixTimestamp,
+ Component: UnixTimestamp as any,
value: '2024-04-11',
- props: {
- accuracy: 'millisecond',
- },
});
expect(screen.getByText('2024-04-11')).toBeInTheDocument();
diff --git a/packages/core/database/src/__tests__/fields/date-only.test.ts b/packages/core/database/src/__tests__/fields/date-only.test.ts
new file mode 100644
index 00000000000..1b6d9a60f70
--- /dev/null
+++ b/packages/core/database/src/__tests__/fields/date-only.test.ts
@@ -0,0 +1,42 @@
+/**
+ * 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 { Database, mockDatabase } from '@nocobase/database';
+
+describe('date only', () => {
+ let db: Database;
+
+ beforeEach(async () => {
+ db = mockDatabase({
+ timezone: '+08:00',
+ });
+ await db.clean({ drop: true });
+ });
+
+ afterEach(async () => {
+ await db.close();
+ });
+
+ it('should set date field with dateOnly', async () => {
+ db.collection({
+ name: 'tests',
+ fields: [{ name: 'date1', type: 'dateOnly' }],
+ });
+
+ await db.sync();
+
+ const item = await db.getRepository('tests').create({
+ values: {
+ date1: '2023-03-24',
+ },
+ });
+
+ expect(item.get('date1')).toBe('2023-03-24');
+ });
+});
diff --git a/packages/core/database/src/__tests__/fields/date.test.ts b/packages/core/database/src/__tests__/fields/date.test.ts
index e1a2ff189e8..4c6b373721d 100644
--- a/packages/core/database/src/__tests__/fields/date.test.ts
+++ b/packages/core/database/src/__tests__/fields/date.test.ts
@@ -11,6 +11,69 @@ import { mockDatabase } from '../';
import { Database } from '../../database';
import { Repository } from '../../repository';
+describe('timezone', () => {
+ let db: Database;
+
+ beforeEach(async () => {
+ db = mockDatabase({
+ timezone: '+08:00',
+ });
+ await db.clean({ drop: true });
+ });
+
+ afterEach(async () => {
+ await db.close();
+ });
+
+ describe('timezone', () => {
+ test('custom', async () => {
+ db.collection({
+ name: 'tests',
+ timestamps: false,
+ fields: [{ name: 'date1', type: 'date', timezone: '+06:00' }],
+ });
+
+ await db.sync();
+ const repository = db.getRepository('tests');
+ const instance = await repository.create({ values: { date1: '2023-03-24 00:00:00' } });
+ const date1 = instance.get('date1');
+ expect(date1.toISOString()).toEqual('2023-03-23T18:00:00.000Z');
+ });
+
+ test('client', async () => {
+ db.collection({
+ name: 'tests',
+ timestamps: false,
+ fields: [{ name: 'date1', type: 'date', timezone: 'client' }],
+ });
+
+ await db.sync();
+ const repository = db.getRepository('tests');
+ const instance = await repository.create({
+ values: { date1: '2023-03-24 01:00:00' },
+ context: {
+ timezone: '+01:00',
+ },
+ });
+ const date1 = instance.get('date1');
+ expect(date1.toISOString()).toEqual('2023-03-24T00:00:00.000Z');
+ });
+
+ test('server', async () => {
+ db.collection({
+ name: 'tests',
+ fields: [{ name: 'date1', type: 'date', timezone: 'server' }],
+ });
+
+ await db.sync();
+ const repository = db.getRepository('tests');
+ const instance = await repository.create({ values: { date1: '2023-03-24 08:00:00' } });
+ const date1 = instance.get('date1');
+ expect(date1.toISOString()).toEqual('2023-03-24T00:00:00.000Z');
+ });
+ });
+});
+
describe('date-field', () => {
let db: Database;
let repository: Repository;
@@ -30,16 +93,80 @@ describe('date-field', () => {
await db.close();
});
- const createExpectToBe = async (key, actual, expected) => {
- const instance = await repository.create({
+ it('should set default to current time', async () => {
+ const c1 = db.collection({
+ name: 'test11',
+ fields: [
+ {
+ name: 'date1',
+ type: 'date',
+ defaultToCurrentTime: true,
+ },
+ ],
+ });
+
+ await db.sync();
+
+ const instance = await c1.repository.create({});
+ const date1 = instance.get('date1');
+ expect(date1).toBeDefined();
+ });
+
+ it('should set to current time when update', async () => {
+ const c1 = db.collection({
+ name: 'test11',
+ fields: [
+ {
+ name: 'date1',
+ type: 'date',
+ onUpdateToCurrentTime: true,
+ },
+ {
+ name: 'title',
+ type: 'string',
+ },
+ ],
+ });
+
+ await db.sync();
+
+ const instance = await c1.repository.create({
values: {
- [key]: actual,
+ title: 'test',
},
});
- return expect(instance.get(key).toISOString()).toEqual(expected);
- };
+
+ const date1Val = instance.get('date1');
+ expect(date1Val).toBeDefined();
+
+ console.log('update');
+ await c1.repository.update({
+ values: {
+ title: 'test2',
+ },
+ filter: {
+ id: instance.get('id'),
+ },
+ });
+
+ await instance.reload();
+
+ const date1Val2 = instance.get('date1');
+ expect(date1Val2).toBeDefined();
+
+ expect(date1Val2.getTime()).toBeGreaterThan(date1Val.getTime());
+ });
test('create', async () => {
+ const createExpectToBe = async (key, actual, expected) => {
+ const instance = await repository.create({
+ values: {
+ [key]: actual,
+ },
+ });
+ return expect(instance.get(key).toISOString()).toEqual(expected);
+ };
+
// sqlite 时区不能自定义，只有 +00:00，postgres 和 mysql 可以自定义 DB_TIMEZONE
await createExpectToBe('date1', '2023-03-24', '2023-03-24T00:00:00.000Z');
await createExpectToBe('date1', '2023-03-24T16:00:00.000Z', '2023-03-24T16:00:00.000Z');
diff --git a/packages/core/database/src/__tests__/fields/unix-timestamp-field.tests.ts b/packages/core/database/src/__tests__/fields/unix-timestamp-field.tests.ts
new file mode 100644
index 00000000000..d5906538110
--- /dev/null
+++ b/packages/core/database/src/__tests__/fields/unix-timestamp-field.tests.ts
@@ -0,0 +1,86 @@
+/**
+ * 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 { Database, mockDatabase } from '@nocobase/database';
+import moment from 'moment';
+
+describe('unix timestamp field', () => {
+ let db: Database;
+
+ beforeEach(async () => {
+ db = mockDatabase();
+ await db.clean({ drop: true });
+ });
+
+ afterEach(async () => {
+ await db.close();
+ });
+
+ it('should set default to current time', async () => {
+ const c1 = db.collection({
+ name: 'test11',
+ fields: [
+ {
+ name: 'date1',
+ type: 'unixTimestamp',
+ defaultToCurrentTime: true,
+ },
+ ],
+ });
+
+ await db.sync();
+
+ const instance = await c1.repository.create({});
+ const date1 = instance.get('date1');
+ expect(date1).toBeDefined();
+
+ console.log(instance.toJSON());
+ });
+
+ it('should set date value', async () => {
+ const c1 = db.collection({
+ name: 'test12',
+ fields: [
+ {
+ name: 'date1',
+ type: 'unixTimestamp',
+ },
+ ],
+ });
+
+ await db.sync();
+
+ await c1.repository.create({
+ values: {
+ date1: '2021-01-01T00:00:00Z',
+ },
+ });
+
+ const item = await c1.repository.findOne();
+ const val = item.get('date1');
+ const date = moment(val).utc().format('YYYY-MM-DD HH:mm:ss');
+ expect(date).toBe('2021-01-01 00:00:00');
+ });
+
+ describe('timezone', () => {
+ test('custom', async () => {
+ db.collection({
+ name: 'tests',
+ timestamps: false,
+ fields: [{ name: 'date1', type: 'unixTimestamp', timezone: '+06:00' }],
+ });
+
+ await db.sync();
+ const repository = db.getRepository('tests');
+ const instance = await repository.create({ values: { date1: '2023-03-24 00:00:00' } });
+ const date1 = instance.get('date1');
+ expect(date1.toISOString()).toEqual('2023-03-23T18:00:00.000Z');
+ });
+ });
+});
diff --git a/packages/core/database/src/database.ts b/packages/core/database/src/database.ts
index 6300eb55bf5..bf10c3bf174 100644
--- a/packages/core/database/src/database.ts
+++ b/packages/core/database/src/database.ts
@@ -34,7 +34,6 @@ import {
import { SequelizeStorage, Umzug } from 'umzug';
import { Collection, CollectionOptions, RepositoryType } from './collection';
import { CollectionFactory } from './collection-factory';
-import { CollectionGroupManager } from './collection-group-manager';
import { ImporterReader, ImportFileExtension } from './collection-importer';
import DatabaseUtils from './database-utils';
import ReferencesMap from './features/references-map';
@@ -42,7 +41,6 @@ import { referentialIntegrityCheck } from './features/referential-integrity-chec
import { ArrayFieldRepository } from './field-repository/array-field-repository';
import * as FieldTypes from './fields';
import { Field, FieldContext, RelationField } from './fields';
-import { checkDatabaseVersion } from './helpers';
import { InheritedCollection } from './inherited-collection';
import InheritanceMap from './inherited-map';
import { InterfaceManager } from './interface-manager';
@@ -221,6 +219,9 @@ export class Database extends EventEmitter implements AsyncEmitter {
}
}
+ // @ts-ignore
+ opts.rawTimezone = opts.timezone;
+
if (options.dialect === 'sqlite') {
delete opts.timezone;
} else if (!opts.timezone) {
@@ -848,7 +849,8 @@ export class Database extends EventEmitter implements AsyncEmitter {
* @internal
*/
async checkVersion() {
- return await checkDatabaseVersion(this);
+ return true;
+ // return await checkDatabaseVersion(this);
}
/**
diff --git a/packages/core/database/src/fields/date-field.ts b/packages/core/database/src/fields/date-field.ts
index f40b27de3ef..8cae2221d5f 100644
--- a/packages/core/database/src/fields/date-field.ts
+++ b/packages/core/database/src/fields/date-field.ts
@@ -10,8 +10,14 @@
import { DataTypes } from 'sequelize';
import { BaseColumnFieldOptions, Field } from './field';
+const datetimeRegex = /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/;
+
+function isValidDatetime(str) {
+ return datetimeRegex.test(str);
+}
+
export class DateField extends Field {
- get dataType() {
+ get dataType(): any {
return DataTypes.DATE(3);
}
@@ -33,6 +39,59 @@ export class DateField extends Field {
return props.gmt;
}
+ init() {
+ const { name, defaultToCurrentTime, onUpdateToCurrentTime, timezone } = this.options;
+
+ this.resolveTimeZone = (context) => {
+ // @ts-ignore
+ const serverTimeZone = this.database.options.rawTimezone;
+ if (timezone === 'server') {
+ return serverTimeZone;
+ }
+
+ if (timezone === 'client') {
+ return context?.timezone || serverTimeZone;
+ }
+
+ if (timezone) {
+ return timezone;
+ }
+
+ return serverTimeZone;
+ };
+
+ this.beforeSave = async (instance, options) => {
+ const value = instance.get(name);
+
+ if (!value && instance.isNewRecord && defaultToCurrentTime) {
+ instance.set(name, new Date());
+ return;
+ }
+
+ if (onUpdateToCurrentTime) {
+ instance.set(name, new Date());
+ return;
+ }
+ };
+ }
+
+ setter(value, options) {
+ if (value === null) {
+ return value;
+ }
+ if (value instanceof Date) {
+ return value;
+ }
+
+ if (typeof value === 'string' && isValidDatetime(value)) {
+ const dateTimezone = this.resolveTimeZone(options?.context);
+ const dateString = `${value} ${dateTimezone}`;
+ return new Date(dateString);
+ }
+
+ return value;
+ }
+
bind() {
super.bind();
@@ -51,6 +110,13 @@ export class DateField extends Field {
// @ts-ignore
model.refreshAttributes();
}
+
+ this.on('beforeSave', this.beforeSave);
+ }
+
+ unbind() {
+ super.unbind();
+ this.off('beforeSave', this.beforeSave);
}
}
diff --git a/packages/core/database/src/fields/date-only-field.ts b/packages/core/database/src/fields/date-only-field.ts
new file mode 100644
index 00000000000..5fce9d1b743
--- /dev/null
+++ b/packages/core/database/src/fields/date-only-field.ts
@@ -0,0 +1,21 @@
+/**
+ * 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 { BaseColumnFieldOptions, Field } from './field';
+import { DataTypes } from 'sequelize';
+
+export class DateOnlyField extends Field {
+ get dataType(): any {
+ return DataTypes.DATEONLY;
+ }
+}
+
+export interface DateOnlyFieldOptions extends BaseColumnFieldOptions {
+ type: 'dateOnly';
+}
diff --git a/packages/core/database/src/fields/field.ts b/packages/core/database/src/fields/field.ts
index b9f230dd4fc..e4b0b700247 100644
--- a/packages/core/database/src/fields/field.ts
+++ b/packages/core/database/src/fields/field.ts
@@ -56,7 +56,7 @@ export abstract class Field {
return this.options.type;
}
- abstract get dataType();
+ abstract get dataType(): any;
isRelationField() {
return false;
@@ -171,11 +171,13 @@ export abstract class Field {
Object.assign(opts, { type: this.database.sequelize.normalizeDataType(this.dataType) });
}
+ Object.assign(opts, this.additionalSequelizeOptions());
+
return opts;
}
- isSqlite() {
- return this.database.sequelize.getDialect() === 'sqlite';
+ additionalSequelizeOptions() {
+ return {};
}
typeToString() {
diff --git a/packages/core/database/src/fields/index.ts b/packages/core/database/src/fields/index.ts
index 610b6f1ad13..d698e44cd66 100644
--- a/packages/core/database/src/fields/index.ts
+++ b/packages/core/database/src/fields/index.ts
@@ -36,6 +36,8 @@ import { UUIDFieldOptions } from './uuid-field';
import { VirtualFieldOptions } from './virtual-field';
import { NanoidFieldOptions } from './nanoid-field';
import { EncryptionField } from './encryption-field';
+import { UnixTimestampFieldOptions } from './unix-timestamp-field';
+import { DateOnlyFieldOptions } from './date-only-field';
export * from './array-field';
export * from './belongs-to-field';
@@ -43,6 +45,7 @@ export * from './belongs-to-many-field';
export * from './boolean-field';
export * from './context-field';
export * from './date-field';
+export * from './date-only-field';
export * from './field';
export * from './has-many-field';
export * from './has-one-field';
@@ -61,6 +64,7 @@ export * from './uuid-field';
export * from './virtual-field';
export * from './nanoid-field';
export * from './encryption-field';
+export * from './unix-timestamp-field';
export type FieldOptions =
| BaseFieldOptions
@@ -81,6 +85,8 @@ export type FieldOptions =
| SetFieldOptions
| TimeFieldOptions
| DateFieldOptions
+ | DateOnlyFieldOptions
+ | UnixTimestampFieldOptions
| UidFieldOptions
| UUIDFieldOptions
| NanoidFieldOptions
diff --git a/packages/core/database/src/fields/unix-timestamp-field.ts b/packages/core/database/src/fields/unix-timestamp-field.ts
new file mode 100644
index 00000000000..fc634ecde55
--- /dev/null
+++ b/packages/core/database/src/fields/unix-timestamp-field.ts
@@ -0,0 +1,60 @@
+/**
+ * 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 { DataTypes } from 'sequelize';
+import { DateField } from './date-field';
+import { BaseColumnFieldOptions } from './field';
+
+export class UnixTimestampField extends DateField {
+ get dataType() {
+ return DataTypes.BIGINT;
+ }
+
+ additionalSequelizeOptions(): {} {
+ const { name } = this.options;
+ let { accuracy } = this.options;
+
+ if (this.options?.uiSchema['x-component-props']?.accuracy) {
+ accuracy = this.options?.uiSchema['x-component-props']?.accuracy;
+ }
+
+ if (!accuracy) {
+ accuracy = 'second';
+ }
+
+ let rationalNumber = 1000;
+
+ if (accuracy === 'millisecond') {
+ rationalNumber = 1;
+ }
+
+ return {
+ get() {
+ const value = this.getDataValue(name);
+ if (value === null || value === undefined) {
+ return value;
+ }
+
+ return new Date(value * rationalNumber);
+ },
+ set(value) {
+ if (value === null || value === undefined) {
+ this.setDataValue(name, value);
+ } else {
+ // date to unix timestamp
+ this.setDataValue(name, Math.floor(new Date(value).getTime() / rationalNumber));
+ }
+ },
+ };
+ }
+}
+
+export interface UnixTimestampFieldOptions extends BaseColumnFieldOptions {
+ type: 'unix-timestamp';
+}
diff --git a/packages/core/database/src/model.ts b/packages/core/database/src/model.ts
index a7581dece3f..9ec745fccad 100644
--- a/packages/core/database/src/model.ts
+++ b/packages/core/database/src/model.ts
@@ -7,7 +7,7 @@
* For more information, please refer to: https://www.nocobase.com/agreement.
*/
-import lodash, { isPlainObject } from 'lodash';
+import lodash from 'lodash';
import { Model as SequelizeModel, ModelStatic } from 'sequelize';
import { Collection } from './collection';
import { Database } from './database';
@@ -30,7 +30,8 @@ interface JSONTransformerOptions {
export class Model
extends SequelizeModel
- implements IModel {
+ implements IModel
+{
public static database: Database;
public static collection: Collection;
@@ -49,6 +50,21 @@ export class Model(values, {
...options,
@@ -645,7 +645,7 @@ export class Repository exten
* @internal
*/
public perfHistograms = new Map();
- protected plugins = new Map();
- protected _appSupervisor: AppSupervisor = AppSupervisor.getInstance();
- protected _started: Date | null = null;
- private _authenticated = false;
- private _maintaining = false;
- private _maintainingCommandStatus: MaintainingCommandStatus;
- private _maintainingStatusBeforeCommand: MaintainingCommandStatus | null;
- private _actionCommand: Command;
-
/**
* @internal
*/
public syncManager: SyncManager;
public requestLogger: Logger;
+ protected plugins = new Map();
+ protected _appSupervisor: AppSupervisor = AppSupervisor.getInstance();
+ private _authenticated = false;
+ private _maintaining = false;
+ private _maintainingCommandStatus: MaintainingCommandStatus;
+ private _maintainingStatusBeforeCommand: MaintainingCommandStatus | null;
+ private _actionCommand: Command;
private sqlLogger: Logger;
- protected _logger: SystemLogger;
constructor(public options: ApplicationOptions) {
super();
@@ -241,6 +238,8 @@ export class Application exten
}
}
+ protected _started: Date | null = null;
+
/**
* @experimental
*/
@@ -248,6 +247,8 @@ export class Application exten
return this._started;
}
+ protected _logger: SystemLogger;
+
get logger() {
return this._logger;
}