mirror of
https://github.com/nocobase/nocobase
synced 2024-11-15 07:38:13 +00:00
fix: make default view/tab cannot be destroyed (#63)
* fix: make default view/tab cannot be destroyed * refactor: return count for destroy action
This commit is contained in:
parent
eb5581646c
commit
cef64bb7f5
@ -16,7 +16,7 @@ describe('destroy', () => {
|
||||
const response = await agent
|
||||
.delete(`/posts/${post.id}`);
|
||||
// console.log(response.body);
|
||||
expect(response.body).toBe(post.id);
|
||||
expect(response.body.count).toBe(1);
|
||||
});
|
||||
|
||||
it('batch delete by filter', async () => {
|
||||
|
@ -442,6 +442,7 @@ export async function destroy(ctx: Context, next: Next) {
|
||||
} = ctx.action.params;
|
||||
const transaction = await ctx.db.sequelize.transaction();
|
||||
const commonOptions = { transaction, context: ctx };
|
||||
let count;
|
||||
if (associated && resourceField) {
|
||||
const AssociatedModel = ctx.db.getModel(associatedName);
|
||||
if (!(associated instanceof AssociatedModel)) {
|
||||
@ -456,7 +457,7 @@ export async function destroy(ctx: Context, next: Next) {
|
||||
// TODO:不能程序上解除关系,直接通过 onDelete 触发,或者通过 afterDestroy 处理
|
||||
// await associated[setAccessor](null, commonOptions);
|
||||
// @ts-ignore
|
||||
ctx.body = await model.destroy(commonOptions);
|
||||
count = await model.destroy(commonOptions);
|
||||
} else if (resourceField instanceof HASMANY || resourceField instanceof BELONGSTOMANY) {
|
||||
const primaryKey = resourceKeyAttribute || resourceField.options.targetKey || TargetModel.primaryKeyAttribute;
|
||||
const models: Model[] = await associated[getAccessor]({
|
||||
@ -466,7 +467,7 @@ export async function destroy(ctx: Context, next: Next) {
|
||||
// TODO:不能程序上解除关系,直接通过 onDelete 触发,或者通过 afterDestroy 处理
|
||||
// await associated[removeAccessor](models, commonOptions);
|
||||
// @ts-ignore
|
||||
ctx.body = await TargetModel.destroy({
|
||||
count = await TargetModel.destroy({
|
||||
where: { [primaryKey]: { [Op.in]: models.map(item => item[primaryKey]) } },
|
||||
...commonOptions,
|
||||
individualHooks: true,
|
||||
@ -476,14 +477,14 @@ export async function destroy(ctx: Context, next: Next) {
|
||||
const Model = ctx.db.getModel(resourceName);
|
||||
const { where } = Model.parseApiJson({ filter, context: ctx });
|
||||
const primaryKey = resourceKeyAttribute || Model.primaryKeyAttribute;
|
||||
const data = await Model.destroy({
|
||||
count = await Model.destroy({
|
||||
where: resourceKey ? { [primaryKey]: resourceKey } : where,
|
||||
// @ts-ignore hooks 里添加 context
|
||||
...commonOptions,
|
||||
individualHooks: true,
|
||||
});
|
||||
ctx.body = data;
|
||||
}
|
||||
ctx.body = { count };
|
||||
await transaction.commit();
|
||||
await next();
|
||||
}
|
||||
|
@ -274,6 +274,11 @@ export default {
|
||||
list: {
|
||||
sort: 'sort',
|
||||
},
|
||||
destroy: {
|
||||
filter: {
|
||||
default: false
|
||||
}
|
||||
}
|
||||
},
|
||||
component: {
|
||||
type: 'drawerSelect',
|
||||
@ -290,6 +295,11 @@ export default {
|
||||
list: {
|
||||
sort: 'sort',
|
||||
},
|
||||
destroy: {
|
||||
filter: {
|
||||
default: false
|
||||
}
|
||||
}
|
||||
},
|
||||
component: {
|
||||
type: 'drawerSelect',
|
||||
|
@ -349,6 +349,9 @@ export default {
|
||||
type: 'destroy',
|
||||
name: 'destroy',
|
||||
title: '删除',
|
||||
filter: {
|
||||
default: false
|
||||
}
|
||||
},
|
||||
{
|
||||
type: 'create',
|
||||
|
@ -353,6 +353,9 @@ export default {
|
||||
type: 'destroy',
|
||||
name: 'destroy',
|
||||
title: '删除',
|
||||
filter: {
|
||||
default: false
|
||||
}
|
||||
},
|
||||
{
|
||||
type: 'create',
|
||||
|
Loading…
Reference in New Issue
Block a user