diff --git a/packages/database/src/fields/index.ts b/packages/database/src/fields/index.ts index 27c54f614..04ae3200f 100644 --- a/packages/database/src/fields/index.ts +++ b/packages/database/src/fields/index.ts @@ -1,37 +1,40 @@ -import { StringFieldOptions } from './string-field'; - -import { BooleanFieldOptions } from './boolean-field'; +import { ArrayFieldOptions } from './array-field'; import { BelongsToFieldOptions } from './belongs-to-field'; -import { HasOneFieldOptions } from './has-one-field'; -import { HasManyFieldOptions } from './has-many-field'; import { BelongsToManyFieldOptions } from './belongs-to-many-field'; +import { BooleanFieldOptions } from './boolean-field'; +import { ContextFieldOptions } from './context-field'; +import { DateFieldOptions } from './date-field'; +import { BaseFieldOptions } from './field'; +import { HasManyFieldOptions } from './has-many-field'; +import { HasOneFieldOptions } from './has-one-field'; +import { JsonbFieldOptions, JsonFieldOptions } from './json-field'; import { DecimalFieldOptions, DoubleFieldOptions, FloatFieldOptions, IntegerFieldOptions, - RealFieldOptions, + RealFieldOptions } from './number-field'; -import { JsonbFieldOptions, JsonFieldOptions } from './json-field'; -import { SortFieldOptions } from './sort-field'; -import { TextFieldOptions } from './text-field'; -import { VirtualFieldOptions } from './virtual-field'; -import { TimeFieldOptions } from './time-field'; -import { DateFieldOptions } from './date-field'; -import { ArrayFieldOptions } from './array-field'; -import { BaseFieldOptions } from './field'; import { PasswordFieldOptions } from './password-field'; -import { ContextFieldOptions } from './context-field'; +import { SortFieldOptions } from './sort-field'; +import { StringFieldOptions } from './string-field'; +import { TextFieldOptions } from './text-field'; +import { TimeFieldOptions } from './time-field'; +import { UidFieldOptions } from './uid-field'; +import { VirtualFieldOptions } from './virtual-field'; export * from './array-field'; export * from './belongs-to-field'; export * from './belongs-to-many-field'; export * from './boolean-field'; +export * from './context-field'; export * from './date-field'; +export * from './field'; export * from './has-many-field'; export * from './has-one-field'; export * from './json-field'; export * from './number-field'; +export * from './password-field'; export * from './relation-field'; export * from './sort-field'; export * from './string-field'; @@ -39,9 +42,6 @@ export * from './text-field'; export * from './time-field'; export * from './uid-field'; export * from './virtual-field'; -export * from './password-field'; -export * from './context-field'; -export * from './field'; export type FieldOptions = | BaseFieldOptions @@ -60,6 +60,7 @@ export type FieldOptions = | ArrayFieldOptions | TimeFieldOptions | DateFieldOptions + | UidFieldOptions | PasswordFieldOptions | ContextFieldOptions | BelongsToFieldOptions diff --git a/packages/database/src/fields/uid-field.ts b/packages/database/src/fields/uid-field.ts index fb4372aa0..5010172ba 100644 --- a/packages/database/src/fields/uid-field.ts +++ b/packages/database/src/fields/uid-field.ts @@ -1,6 +1,6 @@ +import { uid } from '@nocobase/utils'; import { DataTypes } from 'sequelize'; import { BaseColumnFieldOptions, Field } from './field'; -import { uid } from '@nocobase/utils'; export class UidField extends Field { get dataType() { @@ -20,4 +20,5 @@ export class UidField extends Field { export interface UidFieldOptions extends BaseColumnFieldOptions { type: 'uid'; + prefix?: string; }