mirror of
https://github.com/nocobase/nocobase
synced 2024-11-15 09:38:51 +00:00
feat: collection autoGenId option
This commit is contained in:
parent
9ff6575cff
commit
8f0a71a1cf
@ -2,6 +2,21 @@ import { generatePrefixByPath, mockDatabase } from './index';
|
||||
import { Collection } from '../collection';
|
||||
import { Database } from '../database';
|
||||
|
||||
test('collection disable authGenId', async () => {
|
||||
const db = mockDatabase();
|
||||
|
||||
const Test = db.collection({
|
||||
name: 'test',
|
||||
autoGenId: false,
|
||||
fields: [{ type: 'string', name: 'uid', primaryKey: true }],
|
||||
});
|
||||
|
||||
const model = Test.model;
|
||||
|
||||
await db.sync();
|
||||
expect(model.rawAttributes['id']).toBeUndefined();
|
||||
});
|
||||
|
||||
test('new collection', async () => {
|
||||
const db = mockDatabase();
|
||||
const collection = new Collection(
|
||||
|
@ -18,6 +18,7 @@ export interface CollectionOptions extends Omit<ModelOptions, 'name'> {
|
||||
fields?: FieldOptions[];
|
||||
model?: string | ModelCtor<Model>;
|
||||
repository?: string | RepositoryType;
|
||||
autoGenId?: boolean;
|
||||
[key: string]: any;
|
||||
}
|
||||
|
||||
@ -67,7 +68,7 @@ export class Collection<
|
||||
if (this.model) {
|
||||
return;
|
||||
}
|
||||
const { name, model } = this.options;
|
||||
const { name, model, autoGenId = true } = this.options;
|
||||
let M = Model;
|
||||
if (this.context.database.sequelize.isDefined(name)) {
|
||||
const m = this.context.database.sequelize.model(name);
|
||||
@ -84,6 +85,11 @@ export class Collection<
|
||||
}
|
||||
this.model = class extends M {};
|
||||
this.model.init(null, this.sequelizeModelOptions());
|
||||
|
||||
if (!autoGenId) {
|
||||
this.model.removeAttribute('id');
|
||||
}
|
||||
|
||||
Object.defineProperty(this.model, 'database', { value: this.context.database });
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user