fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-09 23:49:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: beforeModelFind db hooks

Browse Source
This commit is contained in:
aaaaaajie 2025-04-07 23:29:14 +08:00
parent 5be0bb9807
commit c17ba532f5
6 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/core/database/src/fields/field.ts
View File

@ -62,6 +62,10 @@ export abstract class Field {
abstract get dataType(): any; abstract get dataType(): any;
get rawDataType() {
return this.dataType;
}
isRelationField() { isRelationField() {
return false; return false;
} }
@ -179,7 +183,10 @@ export abstract class Field {
const opts = _.omit(this.options, ['name']); const opts = _.omit(this.options, ['name']);
if (this.dataType) { if (this.dataType) {
// @ts-ignore // @ts-ignore
Object.assign(opts, { type: this.database.sequelize.normalizeDataType(this.dataType) }); Object.assign(opts, {
type: this.database.sequelize.normalizeDataType(this.dataType),
rawDataType: this.rawDataType,
});
} }
Object.assign(opts, this.additionalSequelizeOptions()); Object.assign(opts, this.additionalSequelizeOptions());

7
packages/core/database/src/model.ts
View File

@ -8,7 +8,7 @@
*/ */
import lodash from 'lodash'; import lodash from 'lodash';
import { Model as SequelizeModel, ModelStatic } from 'sequelize'; import { Model as SequelizeModel, ModelStatic, FindOptions } from 'sequelize';
import { Collection } from './collection'; import { Collection } from './collection';
import { Database } from './database'; import { Database } from './database';
import { Field } from './fields'; import { Field } from './fields';
@ -216,4 +216,9 @@ export class Model<TModelAttributes extends {} = any, TCreationAttributes extend
return lodash.orderBy(data, orderItems, orderDirections); return lodash.orderBy(data, orderItems, orderDirections);
} }
public static findAll(options?: FindOptions<any>): Promise<any[]> {
this.database.emit('beforeModelFind', this, options);
return super.findAll(options);
}
} }

5
packages/core/database/src/query-interface/query-interface.ts
View File

@ -17,6 +17,7 @@ import {
} from 'sequelize'; } from 'sequelize';
import { Collection } from '../collection'; import { Collection } from '../collection';
import Database from '../database'; import Database from '../database';
import { Literal } from 'sequelize/types/utils';
export type TableInfo = { export type TableInfo = {
tableName: string; tableName: string;
@ -167,7 +168,7 @@ export default abstract class QueryInterface {
} }
} }
public generateJsonPathExpression(field: string, path: string) { public generateJsonPathExpression(field: string, path: string): Literal {
return `${field}.${path}`; return this.db.sequelize.literal(`${field}.${path}`);
} }
} }

2
packages/plugins/@nocobase/plugin-collection-sql/src/server/__tests__/actions.test.ts
View File

@ -90,7 +90,7 @@ describe('sql collection', () => {
expect(res.body.data.sources).toEqual(['testSqlCollection']); expect(res.body.data.sources).toEqual(['testSqlCollection']);
}); });
it.only('sqlCollection:update', async () => { it('sqlCollection:update', async () => {
await agent.resource('collections').create({ await agent.resource('collections').create({
values: { values: {
name: 'fakeCollection', name: 'fakeCollection',

2
packages/plugins/@nocobase/plugin-data-source-main/src/server/__tests__/http-api/collections.test.ts
View File

@ -252,7 +252,7 @@ describe('collections repository', () => {
expect(response1.body.data.length).toBe(2); expect(response1.body.data.length).toBe(2);
}); });
it('case 7', async () => { it.only('case 7', async () => {
const response = await agent.resource('posts').create({ const response = await agent.resource('posts').create({
values: { values: {
tags: [ tags: [

28
packages/plugins/@nocobase/plugin-data-source-main/src/server/hooks/beforeDestoryField.ts
View File

@ -7,7 +7,7 @@
* For more information, please refer to: https://www.nocobase.com/agreement. * For more information, please refer to: https://www.nocobase.com/agreement.
*/ */
import { Database } from '@nocobase/database'; import { Database, Op } from '@nocobase/database';
import { FieldIsDependedOnByOtherError } from '../errors/field-is-depended-on-by-other'; import { FieldIsDependedOnByOtherError } from '../errors/field-is-depended-on-by-other';
export function beforeDestoryField(db: Database) { export function beforeDestoryField(db: Database) {
@ -18,20 +18,22 @@ export function beforeDestoryField(db: Database) {
if (['belongsTo', 'hasOne', 'hasMany', 'belongsToMany'].includes(type)) { if (['belongsTo', 'hasOne', 'hasMany', 'belongsToMany'].includes(type)) {
return; return;
} }
const $or = [
const relatedFields = await db.getRepository('fields').find({ {
filter: { [Op.and]: [
$or: [ db.sequelize.where(db.queryInterface.generateJsonPathExpression('options', 'sourceKey'), Op.eq, name),
{ { collectionName },
[db.queryInterface.generateJsonPathExpression('options', 'sourceKey')]: name,
collectionName,
},
{
[db.queryInterface.generateJsonPathExpression('options', 'targetKey')]: name,
[db.queryInterface.generateJsonPathExpression('options', 'targetKey')]: collectionName,
},
], ],
}, },
{
[Op.and]: [
db.sequelize.where(db.queryInterface.generateJsonPathExpression('options', 'targetKey'), Op.eq, name),
db.sequelize.where(db.queryInterface.generateJsonPathExpression('options', 'target'), Op.eq, collectionName),
],
},
];
const relatedFields = await db.getRepository('fields').find({
filter: { $or },
transaction, transaction,
}); });