fix: event

This commit is contained in:
手瓜一十雪 2024-11-18 19:51:08 +08:00
parent 0222664db8
commit 0b8bf739e9
2 changed files with 27 additions and 19 deletions

View File

@ -234,9 +234,10 @@ export class NTEventWrapper {
this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.set(id, eventCallback); this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.set(id, eventCallback);
this.createListenerFunction(ListenerMainName); this.createListenerFunction(ListenerMainName);
this.createEventFunction(serviceAndMethod)!(...(args)) let eventResult = this.createEventFunction(serviceAndMethod)!(...(args));
.then((eventResult: any) => {
retEvent = eventResult; const eventRetHandle = (eventData: any) => {
retEvent = eventData;
if (!checkerEvent(retEvent) && timeoutRef.hasRef()) { if (!checkerEvent(retEvent) && timeoutRef.hasRef()) {
clearTimeout(timeoutRef); clearTimeout(timeoutRef);
reject( reject(
@ -251,8 +252,15 @@ export class NTEventWrapper {
), ),
); );
} }
}
if (eventResult instanceof Promise) {
eventResult.then((eventResult: any) => {
eventRetHandle(eventResult);
}) })
.catch(reject); .catch(reject);
} else {
eventRetHandle(eventResult);
}
}, },
); );
} }

View File

@ -28,7 +28,7 @@ export class GetGroupRootFiles extends BaseAction<Payload, {
startIndex: 0, startIndex: 0,
sortOrder: 2, sortOrder: 2,
showOnlinedocFolder: 0, showOnlinedocFolder: 0,
}).catch(() => []); });
return { return {
files: ret.filter(item => item.fileInfo) files: ret.filter(item => item.fileInfo)