ngx-axis-appforge 1.0.7 → 1.0.9

package/fesm2022/ngx-axis-appforge-core.mjs

@@ -1,6 +1,6 @@
 import * as i0 from '@angular/core';
 import { InjectionToken, effect, inject, input, ElementRef, isSignal, Directive, Optional, Inject, Injectable, Injector, HostBinding, untracked, model, ViewChild, output, ViewContainerRef, forwardRef, Pipe, signal, ChangeDetectionStrategy, Component, computed, ContentChild } from '@angular/core';
-import { BehaviorSubject, filter, map, catchError, of, Subject, switchMap, debounceTime, isObservable, NEVER, merge, take, zip, Observable, tap, concat, last, mergeMap, from, mergeWith } from 'rxjs';
+import { BehaviorSubject, filter, map, catchError, of, Subject, switchMap, debounceTime, isObservable, NEVER, merge, take, zip, Observable, tap, concat, last, from, defer, mergeWith } from 'rxjs';
 import * as i1 from '@angular/common/http';
 import { HttpContextToken, HttpContext, HttpRequest, HttpEventType, HttpClient } from '@angular/common/http';
 import { fromPromise } from 'rxjs/internal/observable/innerFrom';
@@ -901,7 +901,7 @@ class EventsHandlerService {
     apiEventHandler(e) {
         const opt = e.data;
         opt.context ??= e.ref?.injector.get(AXIS_HTTP_CONTEXT_DATA_TOKEN, null);
-        return sendApi(opt, this.http).pipe(mergeMap(res => {
+        return sendApi(opt, this.http).pipe(switchMap(res => {
             if (e.ref) {
                 return e.ref.triggeEvents("apiResponse", { ...e.tempDataSource, apiResponse: res }, e.triggeEvents);
             }
@@ -1004,6 +1004,7 @@ class EventsHandlerService {
     }
     routeEventHandler(e) {
         let { type, newtab, path } = e.data;
+        let obs;
         switch (type) {
             case "web":
                 if (newtab) {
@@ -1016,7 +1017,8 @@ class EventsHandlerService {
                     }
                     if (url) {
                         window.open(url, "_blank");
-                        return of(true);
+                        obs = of(true);
+                        break;
                     }
                 }
                 else {
@@ -1024,7 +1026,8 @@ class EventsHandlerService {
                     if (typeof path == "string") {
                         if (path.startsWith("http")) {
                             window.open(path, "_self");
-                            return of(true);
+                            obs = of(true);
+                            break;
                         }
                         url = [path];
                     }
@@ -1037,13 +1040,20 @@ class EventsHandlerService {
                         }
                         else {
                             const route = e.ref?.injector.get(ActivatedRoute);
-                            return from(this.router.navigate(url, { relativeTo: route, state: e.data?.params }));
+                            obs = from(this.router.navigate(url, { relativeTo: route, state: e.data?.params }));
+                            break;
                         }
                     }
                 }
                 break;
         }
-        return of(false);
+        obs ??= of(false);
+        return obs.pipe(switchMap(res => {
+            if (res && e.ref) {
+                return e.ref.triggeEvents("routeEnd", e.tempDataSource, e.triggeEvents);
+            }
+            return of(res);
+        }));
     }
     runScriptEventHandler(e) {
         if (e.data?.script) {
@@ -1191,7 +1201,7 @@ class Base {
     triggeEvents(trigger, tempDataSource, triggeEvents, scope) {
         scope ??= this.scope ?? undefined;
         const te = triggeEvents ?? this.options.triggeEvents();
-        if (te && te[trigger]) {
+        if (te && te[trigger]?.length) {
             return merge(...te[trigger].filter(e => !(scope?.snapshotField(e, "disabled", tempDataSource) ?? e.disabled)).map(e => {
                 if (scope) {
                     e = scope.snapshotOptions(e, tempDataSource);
@@ -1206,24 +1216,26 @@ class Base {
         return of(true);
     }
     triggeEvent(e, scope) {
-        scope ??= this.scope ?? undefined;
-        console.log("triggeEvent", e);
-        e.ref = this;
-        let obs;
-        switch (e.target) {
-            case "component":
-                if (e.id) {
-                    obs = (scope)?.findInstance(e.id)?.onEvents?.(e);
-                }
-                break;
-            case "service":
-                obs = this.eventsService.onEvents(e);
-                break;
-            case "scope":
-                obs = scope?.onEvents(e);
-                break;
-        }
-        return obs ?? of(true);
+        return defer(() => {
+            scope ??= this.scope ?? undefined;
+            console.log("triggeEvent", e);
+            e.ref = this;
+            let obs;
+            switch (e.target) {
+                case "component":
+                    if (e.id) {
+                        obs = (scope)?.findInstance(e.id)?.onEvents?.(e);
+                    }
+                    break;
+                case "service":
+                    obs = this.eventsService.onEvents(e);
+                    break;
+                case "scope":
+                    obs = scope?.onEvents(e);
+                    break;
+            }
+            return obs ?? of(true);
+        });
     }
     getScope() {
         return this.scope;
@@ -3297,7 +3309,13 @@ const baseEventHandlerDescs = {
         formStyle: {
             labelSpan: 8
         },
-        dataComponent: RouteHandler
+        dataComponent: RouteHandler,
+        events: [
+            {
+                name: "routeEnd",
+                title: "路由结束",
+            }
+        ]
     },
     runScript: {
         name: "runScript",