diff --git a/packages/plugins/@nocobase/plugin-acl/src/server/server.ts b/packages/plugins/@nocobase/plugin-acl/src/server/server.ts index e9e522cb2..9d1ad2fba 100644 --- a/packages/plugins/@nocobase/plugin-acl/src/server/server.ts +++ b/packages/plugins/@nocobase/plugin-acl/src/server/server.ts @@ -381,6 +381,43 @@ export class PluginACL extends Plugin { default: true, }, }); + const data = { + name: 'rolesUsers', + title: 'rolesUsers', + hidden: true, + fields: [ + { + name: 'roleName', + type: 'string', + interface: 'input', + isForeignKey: true, + uiSchema: { + type: 'string', + title: 'roleName', + 'x-component': 'Input', + 'x-read-pretty': true, + }, + }, + { + name: 'userId', + type: 'bigInt', + interface: 'integer', + isForeignKey: true, + uiSchema: { + type: 'number', + title: 'userId', + 'x-component': 'InputNumber', + 'x-read-pretty': true, + }, + }, + ], + timestamps: true, + autoGenId: false, + autoCreate: true, + isThrough: true, + sortable: false, + }; + await this.db.getRepository('collections').create({ values: data }); }); this.app.on('beforeInstallPlugin', async (plugin) => { diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20221101111110-update-foreign-fields.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20221101111111-update-foreign-fields.ts similarity index 94% rename from packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20221101111110-update-foreign-fields.ts rename to packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20221101111111-update-foreign-fields.ts index 0bc430b7b..a07f85f9d 100644 --- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20221101111110-update-foreign-fields.ts +++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20221101111111-update-foreign-fields.ts @@ -3,7 +3,7 @@ import { afterCreateForForeignKeyField } from '../hooks/afterCreateForForeignKey export default class DropForeignKeysMigration extends Migration { async up() { - const result = await this.app.version.satisfies('<0.8.0'); + const result = await this.app.version.satisfies('<0.14.0-alpha.8'); if (!result) { return; diff --git a/packages/plugins/@nocobase/plugin-users/src/server/server.ts b/packages/plugins/@nocobase/plugin-users/src/server/server.ts index b1f5f811f..9c009462f 100644 --- a/packages/plugins/@nocobase/plugin-users/src/server/server.ts +++ b/packages/plugins/@nocobase/plugin-users/src/server/server.ts @@ -9,7 +9,6 @@ import * as actions from './actions/users'; import initAuthenticators from './authenticators'; import { JwtOptions, JwtService } from './jwt-service'; import { enUS, zhCN } from './locale'; -import { parseToken } from './middlewares'; export interface UserPluginConfig { name?: string;