ruiling/tachybase_todo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: action merge params (#1321)

Browse Source 
Co-authored-by: Chareice <chareice@live.com>
This commit is contained in:
chenos 2023-01-03 13:26:50 +08:00 committed by GitHub
parent d317fa056a
commit 43db2b641b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/core/resourcer/src/action.ts
View File

@ -246,6 +246,14 @@ export class Action {
} }
mergeParams(params: ActionParams, strategies: MergeStrategies = {}) { mergeParams(params: ActionParams, strategies: MergeStrategies = {}) {
if (!this.params) {
this.params = {};
}
if (!params) {
return;
}
assign(this.params, params, { assign(this.params, params, {
filter: 'andMerge', filter: 'andMerge',
fields: 'intersect', fields: 'intersect',
@ -291,16 +299,18 @@ export class Action {
if (typeof handler !== 'function') { if (typeof handler !== 'function') {
throw new Error('Handler must be a function!'); throw new Error('Handler must be a function!');
} }
return handler; return handler;
} }
getHandlers() { getHandlers() {
const handers = [ const handlers = [
...this.resource.resourcer.getMiddlewares(), ...this.resource.resourcer.getMiddlewares(),
...this.getMiddlewareHandlers(), ...this.getMiddlewareHandlers(),
this.getHandler(), this.getHandler(),
].filter(Boolean); ].filter(Boolean);
return handers;
return handlers;
} }
async execute(context: any, next?: any) { async execute(context: any, next?: any) {
@ -325,4 +335,4 @@ export class Action {
} }
} }
export default Action; export default Action;