@magic-xpa/angular 4.1000.0-dev4100.404 → 4.1000.0-dev4100.405

package/fesm2020/magic-xpa-angular.mjs

@@ -18,9 +18,9 @@ import * as i1$1 from '@angular/platform-browser';
 import * as i1$2 from '@angular/common/http';
 import { HttpClientModule } from '@angular/common/http';
 import { maskitoTimeOptionsGenerator } from '@maskito/kit';
+import * as i2$1 from '@angular/cdk/platform';
 import { MaskitoModule } from '@maskito/angular';
 import { NativeDateAdapter, MAT_DATE_LOCALE, DateAdapter, MAT_DATE_FORMATS } from '@angular/material/core';
-import * as i1$3 from '@angular/cdk/platform';
 
 class ControlMetadata {
     constructor() {
@@ -718,6 +718,9 @@ class GuiInteractiveExecutor {
                 case InteractiveCommandType.GET_LAST_ROUTE:
                     this.OnGetLastRoute();
                     break;
+                case InteractiveCommandType.OPEN_FORM:
+                    this.OnOpenForm();
+                    break;
             }
         }
         catch (ex) {
@@ -759,6 +762,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);
     }
@@ -1282,17 +1289,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);
@@ -1303,6 +1335,7 @@ class OverlayWindowService {
             guiEvent.TaskID = taskId;
             this.engineMagicService.insertEvent(guiEvent);
         });
+        this.changeDetectorRef.detectChanges();
     }
     close(commandStr) {
         this.overlayWindowsContainerViewRef.remove();
@@ -1348,14 +1381,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;
@@ -2775,11 +2808,12 @@ class MagicDirective {
         this.eventsOnlyVal = true;
     }
     ;
-    constructor(_task, element, renderer, vcRef, magicRow) {
+    constructor(_task, element, renderer, vcRef, platform, magicRow) {
         this._task = _task;
         this.element = element;
         this.renderer = renderer;
         this.vcRef = vcRef;
+        this.platform = platform;
         this.magicRow = magicRow;
         this.eventHandlers = {};
         this.eventsOnlyVal = false;
@@ -2801,6 +2835,8 @@ class MagicDirective {
                 let fromButton = false;
                 if (this.htmlElement instanceof HTMLButtonElement)
                     fromButton = true;
+                if (fromButton && (this.platform.IOS || this.platform.SAFARI))
+                    this.task.insertEvent(getGuiEventObj("focus", this.id, +this.rowId));
                 this.task.insertEvent(getGuiEventObj(event, this.id, +this.rowId, fromButton));
                 if (MagicDirective.noOfAutoCompleteBoxesOpened < 1)
                     e.cancelBubble = true;
@@ -2942,14 +2978,14 @@ class MagicDirective {
 }
 MagicDirective.opened = false;
 MagicDirective.noOfAutoCompleteBoxesOpened = 0;
-MagicDirective.ɵfac = function MagicDirective_Factory(t) { return new (t || MagicDirective)(i0.ɵɵdirectiveInject(TaskMagicService), i0.ɵɵdirectiveInject(i0.ElementRef), i0.ɵɵdirectiveInject(i0.Renderer2), i0.ɵɵdirectiveInject(i0.ViewContainerRef), i0.ɵɵdirectiveInject(RowMagicDirective, 8)); };
+MagicDirective.ɵfac = function MagicDirective_Factory(t) { return new (t || MagicDirective)(i0.ɵɵdirectiveInject(TaskMagicService), i0.ɵɵdirectiveInject(i0.ElementRef), i0.ɵɵdirectiveInject(i0.Renderer2), i0.ɵɵdirectiveInject(i0.ViewContainerRef), i0.ɵɵdirectiveInject(i2$1.Platform), i0.ɵɵdirectiveInject(RowMagicDirective, 8)); };
 MagicDirective.ɵdir = i0.ɵɵdefineDirective({ type: MagicDirective, selectors: [["", "magic", ""]], inputs: { magic: "magic", eventsOnly: "eventsOnly", rowId: "rowId" } });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(MagicDirective, [{
         type: Directive,
         args: [{
                 selector: "[magic]"
             }]
-    }], function () { return [{ type: TaskMagicService }, { type: i0.ElementRef }, { type: i0.Renderer2 }, { type: i0.ViewContainerRef }, { type: RowMagicDirective, decorators: [{
+    }], function () { return [{ type: TaskMagicService }, { type: i0.ElementRef }, { type: i0.Renderer2 }, { type: i0.ViewContainerRef }, { type: i2$1.Platform }, { type: RowMagicDirective, decorators: [{
                 type: Optional
             }] }]; }, { magic: [{
             type: Input,
@@ -2964,8 +3000,8 @@ MagicDirective.ɵdir = i0.ɵɵdefineDirective({ type: MagicDirective, selectors:
 class NoControlMagicDirective extends MagicDirective {
     set magic(val) { this.id = val; this.selector = 'magicnc'; }
     ;
-    constructor(_task, element, renderer, vcRef, magicRow) {
-        super(_task, element, renderer, vcRef, magicRow);
+    constructor(_task, element, renderer, vcRef, platform, magicRow) {
+        super(_task, element, renderer, vcRef, platform, magicRow);
     }
     regEvents() {
         super.regEvents();
@@ -3127,14 +3163,14 @@ class NoControlMagicDirective extends MagicDirective {
         }
     }
 }
-NoControlMagicDirective.ɵfac = function NoControlMagicDirective_Factory(t) { return new (t || NoControlMagicDirective)(i0.ɵɵdirectiveInject(TaskMagicService), i0.ɵɵdirectiveInject(i0.ElementRef), i0.ɵɵdirectiveInject(i0.Renderer2), i0.ɵɵdirectiveInject(i0.ViewContainerRef), i0.ɵɵdirectiveInject(RowMagicDirective, 8)); };
+NoControlMagicDirective.ɵfac = function NoControlMagicDirective_Factory(t) { return new (t || NoControlMagicDirective)(i0.ɵɵdirectiveInject(TaskMagicService), i0.ɵɵdirectiveInject(i0.ElementRef), i0.ɵɵdirectiveInject(i0.Renderer2), i0.ɵɵdirectiveInject(i0.ViewContainerRef), i0.ɵɵdirectiveInject(i2$1.Platform), i0.ɵɵdirectiveInject(RowMagicDirective, 8)); };
 NoControlMagicDirective.ɵdir = i0.ɵɵdefineDirective({ type: NoControlMagicDirective, selectors: [["", "magicnc", ""]], inputs: { magic: ["magicnc", "magic"] }, features: [i0.ɵɵInheritDefinitionFeature] });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(NoControlMagicDirective, [{
         type: Directive,
         args: [{
                 selector: '[magicnc]'
             }]
-    }], function () { return [{ type: TaskMagicService }, { type: i0.ElementRef }, { type: i0.Renderer2 }, { type: i0.ViewContainerRef }, { type: RowMagicDirective, decorators: [{
+    }], function () { return [{ type: TaskMagicService }, { type: i0.ElementRef }, { type: i0.Renderer2 }, { type: i0.ViewContainerRef }, { type: i2$1.Platform }, { type: RowMagicDirective, decorators: [{
                 type: Optional
             }] }]; }, { magic: [{
             type: Input,
@@ -4068,7 +4104,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) {
@@ -4635,11 +4671,11 @@ class MgDateAdapter extends NativeDateAdapter {
         }
     }
 }
-MgDateAdapter.ɵfac = function MgDateAdapter_Factory(t) { return new (t || MgDateAdapter)(i0.ɵɵinject(i1$3.Platform), i0.ɵɵinject(TaskMagicService), i0.ɵɵinject(MAT_DATE_LOCALE)); };
+MgDateAdapter.ɵfac = function MgDateAdapter_Factory(t) { return new (t || MgDateAdapter)(i0.ɵɵinject(i2$1.Platform), i0.ɵɵinject(TaskMagicService), i0.ɵɵinject(MAT_DATE_LOCALE)); };
 MgDateAdapter.ɵprov = i0.ɵɵdefineInjectable({ token: MgDateAdapter, factory: MgDateAdapter.ɵfac });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(MgDateAdapter, [{
         type: Injectable
-    }], function () { return [{ type: i1$3.Platform }, { type: TaskMagicService }, { type: undefined, decorators: [{
+    }], function () { return [{ type: i2$1.Platform }, { type: TaskMagicService }, { type: undefined, decorators: [{
                 type: Inject,
                 args: [MAT_DATE_LOCALE]
             }] }]; }, null); })();