@magic-xpa/angular 4.1100.0-dev4110.6 → 4.1100.0-dev4110.60

package/fesm2020/magic-xpa-angular.mjs

@@ -718,6 +718,9 @@ class GuiInteractiveExecutor {
                 case InteractiveCommandType.GET_LAST_ROUTE:
                     this.OnGetLastRoute();
                     break;
+                case InteractiveCommandType.OPEN_FORM:
+                    this.OnOpenForm();
+                    break;
             }
         }
         catch (ex) {
@@ -754,6 +757,10 @@ class GuiInteractiveExecutor {
     OnMessageBox() {
         this.overlayService.openConfirmationBox(this.command._mgValue.title, this.command._mgValue.str, this.command._mgValue.style);
     }
+    OnOpenForm() {
+        if (this.command._boolVal)
+            this.overlayService.loadAndOpenModule(this.command.controlName, this.command._mgValue.str, this.command._mgValue.path);
+    }
     OnSetTitle() {
         this.task.setTitle(this.command._mgValue.title);
     }
@@ -1277,17 +1284,42 @@ class confirmationBox {
 }
 
 class OverlayWindowService {
-    constructor(componentFactoryResolver, componentList, engineMagicService, overlayContainerMagicProvider, confirmationComponentsMagicProvider) {
+    constructor(componentFactoryResolver, componentList, engineMagicService, magicLazyModuleLoader, injector, compiler, overlayContainerMagicProvider, confirmationComponentsMagicProvider) {
         this.componentFactoryResolver = componentFactoryResolver;
         this.componentList = componentList;
         this.engineMagicService = engineMagicService;
+        this.magicLazyModuleLoader = magicLazyModuleLoader;
+        this.injector = injector;
+        this.compiler = compiler;
         this.overlayContainerMagicProvider = overlayContainerMagicProvider;
         this.confirmationComponentsMagicProvider = confirmationComponentsMagicProvider;
         this.overlayWindowFocusManager = null;
+        this.changeDetectorRef = null;
     }
-    init(overlayWindowsContainerViewRef, rootMagicElement) {
+    init(overlayWindowsContainerViewRef, rootMagicElement, changeDetectorRef) {
         this.overlayWindowsContainerViewRef = overlayWindowsContainerViewRef;
         this.overlayWindowFocusManager = new OverlayWindowFocusManager(rootMagicElement);
+        this.changeDetectorRef = changeDetectorRef;
+    }
+    loadAndOpenModule(formName, taskId, taskDescription) {
+        let moduleRef = this.componentList.getModuleRef(formName);
+        if (moduleRef == null) {
+            let lazyLoadModule = this.componentList.getLazyLoadModuleData(formName);
+            if (lazyLoadModule != null) {
+                let moduleName = lazyLoadModule.moduleName.replace("Magic", "");
+                moduleName = moduleName.replace("Module", "");
+                this.magicLazyModuleLoader.Load(moduleName).then(m => {
+                    const compiled = this.compiler.compileModuleAndAllComponentsSync(m[lazyLoadModule.moduleName]);
+                    moduleRef = compiled.ngModuleFactory.create(this.injector);
+                    this.open(formName, taskId, taskDescription);
+                    this.finishConfirmation(Styles.MSGBOX_BUTTON_OK, true);
+                });
+            }
+        }
+        else {
+            this.open(formName, taskId, taskDescription);
+            this.finishConfirmation(Styles.MSGBOX_BUTTON_OK, true);
+        }
     }
     open(formName, taskId, taskDescription) {
         let comp = this.componentList.lazyLoadModulesMap != null && this.componentList.lazyLoadModulesMap.hasOwnProperty(formName) ? null : this.componentList.getComponent(formName);
@@ -1298,6 +1330,7 @@ class OverlayWindowService {
             guiEvent.TaskID = taskId;
             this.engineMagicService.insertEvent(guiEvent);
         });
+        this.changeDetectorRef.detectChanges();
     }
     close(commandStr) {
         this.overlayWindowsContainerViewRef.remove();
@@ -1343,14 +1376,14 @@ class OverlayWindowService {
         return componentRef;
     }
 }
-OverlayWindowService.ɵfac = function OverlayWindowService_Factory(t) { return new (t || OverlayWindowService)(i0.ɵɵinject(i0.ComponentFactoryResolver), i0.ɵɵinject(ComponentListMagicService), i0.ɵɵinject(EngineMagicService), i0.ɵɵinject(OverlayContainerMagicProvider), i0.ɵɵinject(ConfirmationComponentsMagicProvider)); };
+OverlayWindowService.ɵfac = function OverlayWindowService_Factory(t) { return new (t || OverlayWindowService)(i0.ɵɵinject(i0.ComponentFactoryResolver), i0.ɵɵinject(ComponentListMagicService), i0.ɵɵinject(EngineMagicService), i0.ɵɵinject(MagicLazyLoaderService), i0.ɵɵinject(i0.Injector), i0.ɵɵinject(i0.Compiler), i0.ɵɵinject(OverlayContainerMagicProvider), i0.ɵɵinject(ConfirmationComponentsMagicProvider)); };
 OverlayWindowService.ɵprov = i0.ɵɵdefineInjectable({ token: OverlayWindowService, factory: OverlayWindowService.ɵfac, providedIn: 'root' });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(OverlayWindowService, [{
         type: Injectable,
         args: [{
                 providedIn: 'root'
             }]
-    }], function () { return [{ type: i0.ComponentFactoryResolver }, { type: ComponentListMagicService }, { type: EngineMagicService }, { type: OverlayContainerMagicProvider }, { type: ConfirmationComponentsMagicProvider }]; }, null); })();
+    }], function () { return [{ type: i0.ComponentFactoryResolver }, { type: ComponentListMagicService }, { type: EngineMagicService }, { type: MagicLazyLoaderService }, { type: i0.Injector }, { type: i0.Compiler }, { type: OverlayContainerMagicProvider }, { type: ConfirmationComponentsMagicProvider }]; }, null); })();
 class OverlayWindowFocusManager {
     constructor(rootMagicElement) {
         this.rootMagicElement = null;
@@ -1886,7 +1919,7 @@ class TaskMagicService {
                 if (isUndefined(val))
                     return val;
                 else
-                    return (val != null) ? +val : null;
+                    return (val != null) ? (typeof val === 'string') ? val : +val : null;
             default:
                 return val;
         }
@@ -1941,7 +1974,7 @@ class TaskMagicService {
     }
     onScrollDown() {
         if (!this.Records.includesLast) {
-            let guiEvent = getGuiEventObj('getRows', 'table', 0);
+            let guiEvent = getGuiEventObj('getRows', '', 0);
             guiEvent.Line = this.formGroups.length;
             this.insertEvent(guiEvent);
         }
@@ -3991,7 +4024,7 @@ class MagicShellComponent {
             this.engineMagicService.TerminateContextUsingFetchAPI();
     }
     ngAfterViewInit() {
-        this.overlayWindowService.init(this.overlayWindowsContainerViewRef, this.rootMagicElementRef.nativeElement);
+        this.overlayWindowService.init(this.overlayWindowsContainerViewRef, this.rootMagicElementRef.nativeElement, this.changeDetectorRef);
         this.engineMagicService.startMagicEngine(this.httpClient);
     }
     setViewContainerRef(vcRef) {